You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by vi...@apache.org on 2022/01/03 17:06:31 UTC

[netbeans] branch cnd updated: cnd/small-1: Module removal

This is an automated email from the ASF dual-hosted git repository.

vieiro pushed a commit to branch cnd
in repository https://gitbox.apache.org/repos/asf/netbeans.git


The following commit(s) were added to refs/heads/cnd by this push:
     new d84e125  cnd/small-1: Module removal
     new 57c417e  Merge pull request #3399 from vieiro/feature/cndsmall/1
d84e125 is described below

commit d84e125315b1a3c31c1b9eeef49e46dd38d6fdbb
Author: Antonio Vieiro <vi...@apache.org>
AuthorDate: Mon Jan 3 15:36:51 2022 +0100

    cnd/small-1: Module removal
---
 .../cnd/classview/QuoteTestCase/quote.cc.err       |   0
 .../completion/AutosTestCase/testAutosFirst.ref    |   0
 .../completion/AutosTestCase/testAutosIfEnd.ref    |   0
 .../completion/AutosTestCase/testAutosWrong.ref    |   0
 .../testCompletionInEmptySysInclude.ref            |   0
 .../testCompletionInEmptyUsrInclude.ref            |   0
 .../testCompletionInsideChar.ref                   |   0
 .../testCompletionInsideInclude.ref                |   0
 .../testCompletionInsideString.ref                 |   0
 .../testErrorCompletion1.ref                       |   0
 .../testErrorCompletion10.ref                      |   0
 .../testErrorCompletion2.ref                       |   0
 .../testErrorCompletion3.ref                       |   0
 .../testErrorCompletion4.ref                       |   0
 .../testErrorCompletion5.ref                       |   0
 .../testErrorCompletion6.ref                       |   0
 .../testErrorCompletion7.ref                       |   0
 .../testErrorCompletion8.ref                       |   0
 .../testErrorCompletion9.ref                       |   0
 .../testErrorCompletionInFun1.ref                  |   0
 .../testErrorCompletionInFun2.ref                  |   0
 .../testErrorCompletionInFun3.ref                  |   0
 .../testErrorCompletionInFun4.ref                  |   0
 .../testErrorCompletionInFun5.ref                  |   0
 .../testErrorCompletionInFun6.ref                  |   0
 .../testErrorCompletionInFun7.ref                  |   0
 .../testFunctionCallsNoStd.ref                     |   0
 .../testFunctionCallsNone.ref                      |   0
 .../testFunctionCallsWrong.ref                     |   0
 .../testClassDdPubFunClassA.ref                    |   0
 .../CCIncludesCompletionTestCase/testNothing.ref   |   0
 .../first_first.cpp.dat                            |   0
 .../forth_forth.cpp.dat                            |   0
 .../includedLibrary_lib_header.h.dat               |   0
 .../otherLibrary_other_lib_header.h.dat            |   0
 .../second_second.cpp.dat                          |   0
 .../third_third.cpp.dat                            |   0
 .../UnresolvedIdentifierTest/bug210983_1.cpp.dat   |   0
 .../UnresolvedIdentifierTest/bug210983_2.cpp.dat   |   0
 .../UnresolvedIdentifierTest/bug211143_1.cpp.dat   |   0
 .../UnresolvedIdentifierTest/bug211143_2.cpp.dat   |   0
 .../UnresolvedIdentifierTest/ddd_errors.cpp.dat    |   0
 .../error/UnresolvedIdentifierTest/inc211143.h.dat |   0
 .../UnresolvedIdentifierTest/iz142674.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz144537.cpp.dat      |   0
 .../error/UnresolvedIdentifierTest/iz145280.cc.dat |   0
 .../UnresolvedIdentifierTest/iz148236.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz149285.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz150827.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz158216.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz159615.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz175231.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz175782.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz175782_2.cpp.dat    |   0
 .../UnresolvedIdentifierTest/iz191336.cpp.dat      |   0
 .../error/UnresolvedIdentifierTest/iz191610.cc.dat |   0
 .../UnresolvedIdentifierTest/iz_144873.cpp.dat     |   0
 .../UnresolvedIdentifierTest/skipBlocks.cpp.dat    |   0
 .../template_class_enums.cpp.dat                   |   0
 .../unnamed_enum_typedef.cpp.dat                   |   0
 .../testNSOneAndNsTwoAreVisible.decl               |   0
 .../testNSOneAndNsTwoAreVisibleInMain.decl         |   0
 .../testNSOneIsVisible.decl                        |   0
 .../testNSOneIsVisibleNsTwoIsUsedInFun.decl        |   0
 .../testNSOneIsVisibleNsTwoNotYetInFun.decl        |   0
 .../testOnlyGlobalIsVisible.decl                   |   0
 .../testOnlyGlobalIsVisible.nsp                    |   0
 .../testOuterIsVisble.decl                         |   0
 .../testUnnamedIsVisble.decl                       |   0
 .../trace/FileModel2Test/bug195338.cpp.err         |   0
 .../trace/FileModel2Test/bug198460.cpp.err         |   0
 .../trace/FileModel2Test/bug204497.cpp.err         |   0
 .../trace/FileModel2Test/bug205292.cpp.err         |   0
 .../trace/FileModel2Test/bug209947.cpp.err         |   0
 .../trace/FileModel2Test/bug215605.cpp.err         |   0
 .../trace/FileModel2Test/bug217390.cpp.err         |   0
 .../trace/FileModel2Test/bug224027.cpp.err         |   0
 .../modelimpl/trace/FileModel2Test/bug229069.c.err |   0
 .../trace/FileModel2Test/c_namespaces.c.err        |   0
 .../FileModel2Test/explicit_specialization.cc.err  |   0
 .../iz103462_first_and_second_1.cc.err             |   0
 .../modelimpl/trace/FileModel2Test/iz134182.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz142674.cc.err |   0
 .../trace/FileModel2Test/iz143977_0.cc.err         |   0
 .../trace/FileModel2Test/iz143977_1.cc.err         |   0
 .../trace/FileModel2Test/iz143977_2.cc.err         |   0
 .../trace/FileModel2Test/iz143977_3.cc.err         |   0
 .../modelimpl/trace/FileModel2Test/iz145280.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz146560.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz147574.c.err  |   0
 .../modelimpl/trace/FileModel2Test/iz148014.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz149225.c.err  |   0
 .../modelimpl/trace/FileModel2Test/iz149525.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz151621.c.err  |   0
 .../FileModel2Test/iz151957_namespace_alias.cc.err |   0
 .../iz152872_initializer_in_expression.c.err       |   0
 .../modelimpl/trace/FileModel2Test/iz154349.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz156004.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz156009.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz156061.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz156696.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz157836.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz158124.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz158615.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz158684.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz158872.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz159238.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz159324.cc.err |   0
 .../trace/FileModel2Test/iz164583.cpp.err          |   0
 .../modelimpl/trace/FileModel2Test/iz165038.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz166165.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz167547.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz168253.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz174256.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz175324.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz175653.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz176530.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz189777.c.err  |   0
 .../modelimpl/trace/FileModel2Test/iz190413.c.err  |   0
 .../modelimpl/trace/FileModel2Test/iz190710.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz190782.c.err  |   0
 .../modelimpl/trace/FileModel2Test/iz190821.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz191085.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz191446.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz191598.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz191799.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz195560.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz197997.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz199899.c.err  |   0
 .../modelimpl/trace/FileModel2Test/iz205270.cc.err |   0
 .../FileModel2Test/iz_145553_namesakes.cc.err      |   0
 .../FileModel2Test/testHeaderWithCKeywords.c.err   |   0
 .../trace/FileModel3Test/align_local_assert.c.err  |   0
 .../modelimpl/trace/FileModel3Test/atomic.c.err    |   0
 .../modelimpl/trace/FileModel3Test/const.cpp.err   |   0
 .../trace/FileModel3Test/cross_inclusionA.h.err    |   0
 .../trace/FileModel3Test/cross_inclusionB.h.err    |   0
 .../cnd/modelimpl/trace/FileModel3Test/delay.c.err |   0
 .../trace/FileModel3Test/ifdef_guard.cpp.err       |   0
 .../trace/FileModel3Test/init_array.cpp.err        |   0
 .../trace/FileModel3Test/lexer_dollar.cc.err       |   0
 .../trace/FileModel3Test/operators.cc.err          |   0
 .../modelimpl/trace/FileModel3Test/operators.h.err |   0
 .../trace/FileModel3Test/ppExpression.cpp.err      |   0
 .../trace/FileModel3Test/preproc_endif.cpp.err     |   0
 .../preproc_include_with_macro.cpp.err             |   0
 .../preproc_multi_line_macro_param.cpp.err         |   0
 .../trace/FileModel3Test/recurse_define.h.err      |   0
 .../FileModel3Test/resolver_typedef_s_e_c_u.cc.err |   0
 .../trace/FileModel3Test/va_arg_using.cpp.err      |   0
 .../trace/FileModelCpp11Test/bug224666.cpp.err     |   0
 .../FileModelCpp11Test/classMemberFwdEnum.cpp.err  |   0
 .../trace/FileModelCpp11Test/cpp11.cpp.err         |   0
 .../FileModelIncludeBodyTest/includer_file.cpp.err |   0
 .../accessModifiers.cpp.err                        |   0
 .../FileModelNewGrammarTest/bitFields.cpp.err      |   0
 .../classForwardScope.cpp.err                      |   0
 .../clearingImportedSymbols.cpp.err                |   0
 .../FileModelNewGrammarTest/constMethod.cpp.err    |   0
 .../constructorImportSymbols.cpp.err               |   0
 .../constructorInitializerListScope.cpp.err        |   0
 .../FileModelNewGrammarTest/destructor.cpp.err     |   0
 .../FileModelNewGrammarTest/friendFunction.cpp.err |   0
 .../functionParametersInFunctionBody.cpp.err       |   0
 .../multipleDeclarativeRegions.cpp.err             |   0
 .../nestedClassScope.cpp.err                       |   0
 .../FileModelNewGrammarTest/parameters.cpp.err     |   0
 .../FileModelNewGrammarTest/typedefEnum.cpp.err    |   0
 .../cnd/modelimpl/trace/FileModelTest/0x01.c.err   |   0
 .../cnd/modelimpl/trace/FileModelTest/0x16.cc.err  |   0
 .../trace/FileModelTest/10000parameters.c.err      |   0
 .../modelimpl/trace/FileModelTest/IZ138320.cc.err  |   0
 .../modelimpl/trace/FileModelTest/IZ138551.cc.err  |   0
 .../modelimpl/trace/FileModelTest/IZ144009.cc.err  |   0
 .../modelimpl/trace/FileModelTest/IZ144276.cc.err  |   0
 .../modelimpl/trace/FileModelTest/IZ144968.cc.err  |   0
 .../modelimpl/trace/FileModelTest/IZ146150.cc.err  |   0
 .../cnd/modelimpl/trace/FileModelTest/array.cc.err |   0
 .../trace/FileModelTest/array_cast.cc.err          |   0
 .../FileModelTest/attribute_in_constructor.cc.err  |   0
 .../FileModelTest/attributes_aligned_class.cc.err  |   0
 .../modelimpl/trace/FileModelTest/bitFields.cc.err |   0
 .../trace/FileModelTest/branches_1.cc.err          |   0
 {cnd => contrib}/cnd.analysis.api/build.xml        |   0
 {cnd => contrib}/cnd.analysis.api/manifest.mf      |   0
 .../cnd.analysis.api}/nbproject/project.properties |   0
 .../cnd.analysis.api/nbproject/project.xml         |   0
 .../modules/cnd/analysis/api/AbstractAnalyzer.java |   0
 .../analysis/api/AbstractCustomizerProvider.java   |   0
 .../cnd/analysis/api/AbstractHintsPanel.java       |   0
 .../modules/cnd/analysis/api/AnalyzerRequest.java  |   0
 .../modules/cnd/analysis/api/AnalyzerResponse.java |   0
 .../modules/cnd/analysis/api/Bundle.properties     |   0
 .../cnd/analysis/api/CodeAuditProviderImpl.java    |   0
 .../modules/cnd/analysis/api/Line2Offset.java      |   0
 .../netbeans/modules/cnd/analysis/api/layer.xml    |   0
 .../cnd/analysis/api/options/Bundle.properties     |   0
 .../api/options/HintsOptionsPanelController.java   |   0
 .../cnd/analysis/api/options/HintsPanel.form       |   0
 .../cnd/analysis/api/options/HintsPanel.java       |   0
 .../cnd/analysis/api/options/HintsPanelLogic.java  |   0
 {cnd => contrib}/cnd.analysis.impl/build.xml       |   0
 {cnd => contrib}/cnd.analysis.impl/manifest.mf     |   0
 .../cnd.analysis.impl/nbproject/project.properties |   0
 .../cnd.analysis.impl/nbproject/project.xml        |   0
 .../modules/cnd/analysis/impl/ScopeProvider.java   |   0
 .../cnd/analysis/impl/resources/Bundle.properties  |   0
 {cnd => contrib}/cnd.api.model/build.xml           |   0
 {cnd => contrib}/cnd.api.model/manifest.mf         |   0
 .../cnd.api.model/nbproject/project.properties     |   0
 .../cnd.api.model/nbproject/project.xml            |   0
 .../netbeans/modules/cnd/api/model/CsmBuiltIn.java |   0
 .../modules/cnd/api/model/CsmChangeEvent.java      |   0
 .../netbeans/modules/cnd/api/model/CsmClass.java   |   0
 .../cnd/api/model/CsmClassForwardDeclaration.java  |   0
 .../modules/cnd/api/model/CsmClassifier.java       |   0
 .../model/CsmClassifierBasedTemplateParameter.java |   0
 .../cnd/api/model/CsmClosureClassifier.java        |   0
 .../modules/cnd/api/model/CsmClosureType.java      |   0
 .../cnd/api/model/CsmCompoundClassifier.java       |   0
 .../modules/cnd/api/model/CsmConstructor.java      |   0
 .../modules/cnd/api/model/CsmDeclaration.java      |   0
 .../CsmDeclarationBasedTemplateParameter.java      |   0
 .../netbeans/modules/cnd/api/model/CsmEnum.java    |   0
 .../cnd/api/model/CsmEnumForwardDeclaration.java   |   0
 .../modules/cnd/api/model/CsmEnumerator.java       |   0
 .../modules/cnd/api/model/CsmErrorDirective.java   |   0
 .../CsmExpressionBasedSpecializationParameter.java |   0
 .../netbeans/modules/cnd/api/model/CsmField.java   |   0
 .../netbeans/modules/cnd/api/model/CsmFile.java    |   0
 .../netbeans/modules/cnd/api/model/CsmFriend.java  |   0
 .../modules/cnd/api/model/CsmFriendClass.java      |   0
 .../modules/cnd/api/model/CsmFriendFunction.java   |   0
 .../modules/cnd/api/model/CsmFunction.java         |   0
 .../cnd/api/model/CsmFunctionDefinition.java       |   0
 .../cnd/api/model/CsmFunctionInstantiation.java    |   0
 .../cnd/api/model/CsmFunctionParameterList.java    |   0
 .../api/model/CsmFunctionPointerClassifier.java    |   0
 .../cnd/api/model/CsmFunctionPointerType.java      |   0
 .../modules/cnd/api/model/CsmFunctional.java       |   0
 .../netbeans/modules/cnd/api/model/CsmInclude.java |   0
 .../modules/cnd/api/model/CsmInheritance.java      |   0
 .../cnd/api/model/CsmInitializerListContainer.java |   0
 .../modules/cnd/api/model/CsmInstantiation.java    |   0
 .../netbeans/modules/cnd/api/model/CsmKnRName.java |   0
 .../modules/cnd/api/model/CsmListeners.java        |   0
 .../netbeans/modules/cnd/api/model/CsmMacro.java   |   0
 .../modules/cnd/api/model/CsmMacroParameter.java   |   0
 .../netbeans/modules/cnd/api/model/CsmMember.java  |   0
 .../netbeans/modules/cnd/api/model/CsmMethod.java  |   0
 .../netbeans/modules/cnd/api/model/CsmModel.java   |   0
 .../modules/cnd/api/model/CsmModelAccessor.java    |   0
 .../modules/cnd/api/model/CsmModelListener.java    |   0
 .../modules/cnd/api/model/CsmModelState.java       |   0
 .../cnd/api/model/CsmModelStateListener.java       |   0
 .../netbeans/modules/cnd/api/model/CsmModule.java  |   0
 .../modules/cnd/api/model/CsmNamedElement.java     |   0
 .../modules/cnd/api/model/CsmNamespace.java        |   0
 .../modules/cnd/api/model/CsmNamespaceAlias.java   |   0
 .../cnd/api/model/CsmNamespaceDefinition.java      |   0
 .../netbeans/modules/cnd/api/model/CsmObject.java  |   0
 .../modules/cnd/api/model/CsmOffsetable.java       |   0
 .../cnd/api/model/CsmOffsetableDeclaration.java    |   0
 .../modules/cnd/api/model/CsmOffsetableName.java   |   0
 .../modules/cnd/api/model/CsmParameter.java        |   0
 .../modules/cnd/api/model/CsmParameterList.java    |   0
 .../netbeans/modules/cnd/api/model/CsmProgram.java |   0
 .../modules/cnd/api/model/CsmProgressAdapter.java  |   0
 .../modules/cnd/api/model/CsmProgressListener.java |   0
 .../netbeans/modules/cnd/api/model/CsmProject.java |   0
 .../cnd/api/model/CsmQualifiedNamedElement.java    |   0
 .../netbeans/modules/cnd/api/model/CsmScope.java   |   0
 .../modules/cnd/api/model/CsmScopeElement.java     |   0
 .../cnd/api/model/CsmSpecializationParameter.java  |   0
 .../modules/cnd/api/model/CsmTemplate.java         |   0
 .../cnd/api/model/CsmTemplateParameter.java        |   0
 .../cnd/api/model/CsmTemplateParameterType.java    |   0
 .../netbeans/modules/cnd/api/model/CsmType.java    |   0
 .../modules/cnd/api/model/CsmTypeAlias.java        |   0
 .../model/CsmTypeBasedSpecializationParameter.java |   0
 .../netbeans/modules/cnd/api/model/CsmTypedef.java |   0
 .../org/netbeans/modules/cnd/api/model/CsmUID.java |   0
 .../modules/cnd/api/model/CsmUsingDeclaration.java |   0
 .../modules/cnd/api/model/CsmUsingDirective.java   |   0
 .../modules/cnd/api/model/CsmValidable.java        |   0
 .../modules/cnd/api/model/CsmVariable.java         |   0
 .../cnd/api/model/CsmVariableDefinition.java       |   0
 .../model/CsmVariadicSpecializationParameter.java  |   0
 .../modules/cnd/api/model/CsmVisibility.java       |   0
 .../cnd/api/model/deep/CsmCaseStatement.java       |   0
 .../cnd/api/model/deep/CsmCompoundStatement.java   |   0
 .../modules/cnd/api/model/deep/CsmCondition.java   |   0
 .../api/model/deep/CsmDeclarationStatement.java    |   0
 .../cnd/api/model/deep/CsmExceptionHandler.java    |   0
 .../modules/cnd/api/model/deep/CsmExpression.java  |   0
 .../cnd/api/model/deep/CsmExpressionStatement.java |   0
 .../cnd/api/model/deep/CsmForStatement.java        |   0
 .../cnd/api/model/deep/CsmGotoStatement.java       |   0
 .../modules/cnd/api/model/deep/CsmIfStatement.java |   0
 .../modules/cnd/api/model/deep/CsmLabel.java       |   0
 .../cnd/api/model/deep/CsmLoopStatement.java       |   0
 .../cnd/api/model/deep/CsmRangeForStatement.java   |   0
 .../cnd/api/model/deep/CsmReturnStatement.java     |   0
 .../modules/cnd/api/model/deep/CsmStatement.java   |   0
 .../cnd/api/model/deep/CsmSwitchStatement.java     |   0
 .../cnd/api/model/deep/CsmTryCatchStatement.java   |   0
 .../cnd/api/model/resources/Bundle.properties      |   0
 .../api/model/support/CsmClassifierResolver.java   |   0
 .../api/model/support/CsmFileLanguageProvider.java |   0
 .../modules/cnd/api/model/support/CsmTypes.java    |   0
 .../cnd/api/model/util/CsmBaseUtilities.java       |   0
 .../cnd/api/model/util/CsmKindUtilities.java       |   0
 .../cnd/api/model/util/CsmSortUtilities.java       |   0
 .../modules/cnd/api/model/util/CsmTracer.java      |   0
 .../netbeans/modules/cnd/api/model/util/UIDs.java  |   0
 .../cnd/spi/model/CsmBaseUtilitiesProvider.java    |   0
 .../modules/cnd/spi/model/TypesProvider.java       |   0
 .../modules/cnd/spi/model/UIDProvider.java         |   0
 {cnd => contrib}/cnd.apt/build.xml                 |   0
 {cnd => contrib}/cnd.apt/manifest.mf               |   0
 .../cnd.apt/nbproject/project.properties           |   0
 {cnd => contrib}/cnd.apt/nbproject/project.xml     |   0
 .../org/netbeans/modules/cnd/apt/Bundle.properties |   0
 .../modules/cnd/apt/debug/APTTraceFlags.java       |   0
 .../cnd/apt/impl/structure/APTBaseNode.java        |   0
 .../cnd/apt/impl/structure/APTBuilderImpl.java     |   0
 .../cnd/apt/impl/structure/APTContainerNode.java   |   0
 .../cnd/apt/impl/structure/APTDefineNode.java      |   0
 .../cnd/apt/impl/structure/APTElifNode.java        |   0
 .../cnd/apt/impl/structure/APTElseNode.java        |   0
 .../cnd/apt/impl/structure/APTEndifNode.java       |   0
 .../cnd/apt/impl/structure/APTErrorNode.java       |   0
 .../cnd/apt/impl/structure/APTFileNode.java        |   0
 .../apt/impl/structure/APTIfConditionBaseNode.java |   0
 .../modules/cnd/apt/impl/structure/APTIfNode.java  |   0
 .../impl/structure/APTIfdefConditionBaseNode.java  |   0
 .../cnd/apt/impl/structure/APTIfdefNode.java       |   0
 .../cnd/apt/impl/structure/APTIfndefNode.java      |   0
 .../cnd/apt/impl/structure/APTIncludeBaseNode.java |   0
 .../cnd/apt/impl/structure/APTIncludeNextNode.java |   0
 .../cnd/apt/impl/structure/APTIncludeNode.java     |   0
 .../cnd/apt/impl/structure/APTMacroBaseNode.java   |   0
 .../cnd/apt/impl/structure/APTNodeBuilder.java     |   0
 .../cnd/apt/impl/structure/APTPragmaNode.java      |   0
 .../cnd/apt/impl/structure/APTStreamBaseNode.java  |   0
 .../cnd/apt/impl/structure/APTStreamNode.java      |   0
 .../impl/structure/APTTokenAndChildBasedNode.java  |   0
 .../cnd/apt/impl/structure/APTTokenBasedNode.java  |   0
 .../cnd/apt/impl/structure/APTUndefineNode.java    |   0
 .../cnd/apt/impl/structure/APTUnknownNode.java     |   0
 .../cnd/apt/impl/support/APTBaseMacroMap.java      |   0
 .../cnd/apt/impl/support/APTCommentToken.java      |   0
 .../cnd/apt/impl/support/APTConstTextToken.java    |   0
 .../cnd/apt/impl/support/APTDriverImpl.java        |   0
 .../cnd/apt/impl/support/APTFileMacroMap.java      |   0
 .../apt/impl/support/APTHandlersSupportImpl.java   |   0
 .../apt/impl/support/APTIncludeHandlerImpl.java    |   0
 .../apt/impl/support/APTIncludeResolverImpl.java   |   0
 .../apt/impl/support/APTLiteConstTextToken.java    |   0
 .../cnd/apt/impl/support/APTLiteIdToken.java       |   0
 .../cnd/apt/impl/support/APTLiteLiteralToken.java  |   0
 .../cnd/apt/impl/support/APTMacroCache.java        |   0
 .../modules/cnd/apt/impl/support/APTMacroImpl.java |   0
 .../cnd/apt/impl/support/APTMacroMapSnapshot.java  |   0
 .../apt/impl/support/APTMacroParamExpansion.java   |   0
 .../apt/impl/support/APTPredefinedMacroMap.java    |   0
 .../apt/impl/support/APTPreprocHandlerImpl.java    |   0
 .../cnd/apt/impl/support/APTPreprocessorToken.java |   0
 .../cnd/apt/impl/support/APTSystemMacroMap.java    |   0
 .../modules/cnd/apt/impl/support/APTTestToken.java |   0
 .../support/FileExistsSensitiveCacheDriver.java    |   0
 .../cnd/apt/impl/support/MacroExpandedToken.java   |   0
 .../apt/impl/support/PathsCollectionIterator.java  |   0
 .../cnd/apt/impl/support/ResolverResultsCache.java |   0
 .../cnd/apt/impl/support/SnapshotHolderCache.java  |   0
 .../impl/support/SplitShiftRightTokenFilter.java   |   0
 .../cnd/apt/impl/support/SupportAPIAccessor.java   |   0
 .../cnd/apt/impl/support/aptBigIntegerExpr.g       |   0
 .../modules/cnd/apt/impl/support/aptexpr.g         |   0
 .../modules/cnd/apt/impl/support/aptlexer.g        |   0
 .../support/clank/APTToClankCompilationDB.java     |   0
 .../apt/impl/support/clank/ClankDriverImpl.java    |   0
 .../apt/impl/support/clank/ClankFileMacroMap.java  |   0
 .../clank/ClankFileObjectBasedFileSystem.java      |   0
 .../support/clank/ClankFileSystemProviderImpl.java |   0
 .../support/clank/ClankIncludeHandlerImpl.java     |   0
 .../support/clank/ClankMacroExpandedToken.java     |   0
 .../cnd/apt/impl/support/clank/ClankMacroMap.java  |   0
 .../impl/support/clank/ClankMemoryBufferImpl.java  |   0
 .../clank/ClankMemoryBufferProviderImpl.java       |   0
 .../apt/impl/support/clank/ClankPPCallback.java    |   0
 .../impl/support/clank/ClankSystemMacroMap.java    |   0
 .../apt/impl/support/clank/ClankToAPTToken.java    |   0
 .../apt/impl/support/clank/ClankToAPTUtils.java    |   0
 .../clank/FileExistsSensitiveClankCacheDriver.java |   0
 .../src/org/netbeans/modules/cnd/apt/layer.xml     |   0
 .../netbeans/modules/cnd/apt/structure/APT.java    |   0
 .../modules/cnd/apt/structure/APTDefine.java       |   0
 .../modules/cnd/apt/structure/APTElif.java         |   0
 .../modules/cnd/apt/structure/APTElse.java         |   0
 .../modules/cnd/apt/structure/APTEndif.java        |   0
 .../modules/cnd/apt/structure/APTError.java        |   0
 .../modules/cnd/apt/structure/APTFile.java         |   0
 .../netbeans/modules/cnd/apt/structure/APTIf.java  |   0
 .../modules/cnd/apt/structure/APTIfCondition.java  |   0
 .../modules/cnd/apt/structure/APTIfdef.java        |   0
 .../modules/cnd/apt/structure/APTIfndef.java       |   0
 .../modules/cnd/apt/structure/APTInclude.java      |   0
 .../modules/cnd/apt/structure/APTIncludeNext.java  |   0
 .../modules/cnd/apt/structure/APTPragma.java       |   0
 .../modules/cnd/apt/structure/APTStream.java       |   0
 .../modules/cnd/apt/structure/APTUndefine.java     |   0
 .../modules/cnd/apt/structure/APTUnknown.java      |   0
 .../modules/cnd/apt/support/APTAbstractWalker.java |   0
 .../modules/cnd/apt/support/APTBaseToken.java      |   0
 .../modules/cnd/apt/support/APTBuilder.java        |   0
 .../cnd/apt/support/APTConditionResolver.java      |   0
 .../modules/cnd/apt/support/APTDriver.java         |   0
 .../modules/cnd/apt/support/APTExpandedStream.java |   0
 .../modules/cnd/apt/support/APTFileBuffer.java     |   0
 .../modules/cnd/apt/support/APTFileCache.java      |   0
 .../modules/cnd/apt/support/APTFileCacheEntry.java |   0
 .../cnd/apt/support/APTFileCacheManager.java       |   0
 .../modules/cnd/apt/support/APTFileSearch.java     |   0
 .../cnd/apt/support/APTHandlersSupport.java        |   0
 .../modules/cnd/apt/support/APTIncludeFake.java    |   0
 .../modules/cnd/apt/support/APTIncludeHandler.java |   0
 .../cnd/apt/support/APTIncludePathStorage.java     |   0
 .../cnd/apt/support/APTIncludeResolver.java        |   0
 .../netbeans/modules/cnd/apt/support/APTMacro.java |   0
 .../modules/cnd/apt/support/APTMacroCallback.java  |   0
 .../cnd/apt/support/APTMacroExpandedStream.java    |   0
 .../modules/cnd/apt/support/APTMacroMap.java       |   0
 .../modules/cnd/apt/support/APTPreprocHandler.java |   0
 .../modules/cnd/apt/support/APTSystemStorage.java  |   0
 .../netbeans/modules/cnd/apt/support/APTToken.java |   0
 .../modules/cnd/apt/support/APTTokenAbstact.java   |   0
 .../modules/cnd/apt/support/APTTokenStream.java    |   0
 .../cnd/apt/support/APTTokenStreamBuilder.java     |   0
 .../modules/cnd/apt/support/APTWalker.java         |   0
 .../modules/cnd/apt/support/AccessorImpl.java      |   0
 .../modules/cnd/apt/support/ClankDriver.java       |   0
 .../modules/cnd/apt/support/IncludeDirEntry.java   |   0
 .../modules/cnd/apt/support/PostIncludeData.java   |   0
 .../modules/cnd/apt/support/ResolvedPath.java      |   0
 .../cnd/apt/support/api/PPIncludeHandler.java      |   0
 .../modules/cnd/apt/support/api/PPMacroMap.java    |   0
 .../cnd/apt/support/api/PreprocHandler.java        |   0
 .../modules/cnd/apt/support/api/StartEntry.java    |   0
 .../apt/support/lang/APTBaseLanguageFilter.java    |   0
 .../cnd/apt/support/lang/APTFortranEOSFilter.java  |   0
 .../cnd/apt/support/lang/APTFortranFilter.java     |   0
 .../cnd/apt/support/lang/APTFortranFilterEx.java   |   0
 .../cnd/apt/support/lang/APTGnuCFilter.java        |   0
 .../cnd/apt/support/lang/APTGnuCpp11Filter.java    |   0
 .../cnd/apt/support/lang/APTGnuCpp14Filter.java    |   0
 .../cnd/apt/support/lang/APTGnuCppFilter.java      |   0
 .../cnd/apt/support/lang/APTLanguageFilter.java    |   0
 .../cnd/apt/support/lang/APTLanguageSupport.java   |   0
 .../cnd/apt/support/lang/APTStdCFilter.java        |   0
 .../cnd/apt/support/lang/APTStdCppFilter.java      |   0
 .../cnd/apt/support/spi/APTBufferProvider.java     |   0
 .../support/spi/APTFileSearchImplementation.java   |   0
 .../support/spi/APTProjectFileSearchProvider.java  |   0
 .../cnd/apt/support/spi/CndTextIndexFilter.java    |   0
 .../modules/cnd/apt/utils/APTCommentsFilter.java   |   0
 .../modules/cnd/apt/utils/APTIncludeUtils.java     |   0
 .../modules/cnd/apt/utils/APTPreprocFilter.java    |   0
 .../modules/cnd/apt/utils/APTSerializeUtils.java   |   0
 .../modules/cnd/apt/utils/APTTraceFilter.java      |   0
 .../modules/cnd/apt/utils/APTTraceUtils.java       |   0
 .../netbeans/modules/cnd/apt/utils/APTUtils.java   |   0
 .../cnd/apt/utils/LinkedListBasedTokenStream.java  |   0
 .../cnd/apt/utils/ListBasedTokenStream.java        |   0
 .../cnd/apt/utils/TokenBasedTokenStream.java       |   0
 .../cnd/apt/impl/support/APTMacroMapTest.java      |   0
 .../cnd/apt/impl/support/clank/ClankToAPTTest.java |   0
 .../cnd/apt/support/APTConditionResolverTest.java  |   0
 .../modules/cnd/apt/support/APTFileNodeTest.java   |   0
 .../modules/cnd/apt/support/DummyProjectKey.java   |   0
 .../cnd/apt/support/GuardDetectorTestCase.java     |   0
 {cnd => contrib}/cnd.asm/build.xml                 |   0
 {cnd => contrib}/cnd.asm/licenseinfo.xml           |   0
 {cnd => contrib}/cnd.asm/manifest.mf               |   0
 .../cnd.asm/nbproject/project.properties           |   0
 {cnd => contrib}/cnd.asm/nbproject/project.xml     |   0
 .../modules/cnd/asm/base/AntlrTokenTypes.txt       |   0
 .../modules/cnd/asm/base/BaseAsmModel.java         |   0
 .../modules/cnd/asm/base/BaseModelProvider.java    |   0
 .../modules/cnd/asm/base/SparcModelProvider.java   |   0
 .../modules/cnd/asm/base/X86ModelProvider.java     |   0
 .../org/netbeans/modules/cnd/asm/base/amd64.xml    |   0
 .../modules/cnd/asm/base/att/ATTIdentResolver.java |   0
 .../modules/cnd/asm/base/att/ATTParser.java        |   0
 .../netbeans/modules/cnd/asm/base/att/ATTScanner.g |   0
 .../cnd/asm/base/att/ATTSparcSyntaxProvider.java   |   0
 .../cnd/asm/base/att/ATTx86SyntaxProvider.java     |   0
 .../modules/cnd/asm/base/att/TokenIterator.java    |   0
 .../cnd/asm/base/dis/DisFuncNameDetector.java      |   0
 .../netbeans/modules/cnd/asm/base/dis/DisScanner.g |   0
 .../cnd/asm/base/dis/DisSparcSyntaxProvider.java   |   0
 .../cnd/asm/base/dis/DisX86SyntaxProvider.java     |   0
 .../modules/cnd/asm/base/ident/IdentScanner.g      |   0
 .../cnd/asm/base/ident/SparcX86Resolver.java       |   0
 .../org/netbeans/modules/cnd/asm/base/sparc5.xml   |   0
 .../modules/cnd/asm/base/syntax/AntlrLexer.java    |   0
 .../modules/cnd/asm/base/syntax/AntlrScanner.java  |   0
 .../modules/cnd/asm/base/syntax/AntlrToken.java    |   0
 .../modules/cnd/asm/base/syntax/BaseAsmSyntax.java |   0
 .../cnd/asm/base/syntax/BranchElementImpl.java     |   0
 .../modules/cnd/asm/base/syntax/IdentResolver.java |   0
 .../cnd/asm/base/syntax/InstructionToken.java      |   0
 .../cnd/asm/base/syntax/LabelElementImpl.java      |   0
 .../cnd/asm/base/syntax/RegisterElementImpl.java   |   0
 .../cnd/asm/base/syntax/ScannerFactory.java        |   0
 .../cnd/asm/base/syntax/SmartTemplateMatcher.java  |   0
 .../cnd/asm/base/syntax/WhitespaceToken.java       |   0
 .../cnd/asm/base/syntax/fake/FakeInstruction.java  |   0
 .../cnd/asm/core/assistance/Bundle.properties      |   0
 .../asm/core/assistance/CodeAnnotationSidebar.java |   0
 .../asm/core/assistance/CodeHighlightFactory.java  |   0
 .../cnd/asm/core/assistance/FunctionNavigator.java |   0
 .../cnd/asm/core/assistance/GoToLabelAction.java   |   0
 .../core/assistance/LiveRangeSidebarFactory.java   |   0
 .../asm/core/assistance/LiveRangesAccessor.java    |   0
 .../cnd/asm/core/assistance/LiveRangesAction.java  |   0
 .../asm/core/assistance/LiveRangesAssistance.java  |   0
 .../cnd/asm/core/assistance/RegisterChooser.java   |   0
 .../core/assistance/RegisterChooserListener.java   |   0
 .../core/assistance/RegisterHighlightAccessor.java |   0
 .../core/assistance/RegisterHighlightAction.java   |   0
 .../assistance/RegisterHighlightAssistance.java    |   0
 .../asm/core/assistance/RegisterUsageAccesor.java  |   0
 .../asm/core/assistance/RegisterUsageAction.java   |   0
 .../core/assistance/RegisterUsageAssistance.java   |   0
 .../dataobjects/AsmCreateFromTemplateHandler.java  |   0
 .../cnd/asm/core/dataobjects/AsmDataLoader.java    |   0
 .../core/dataobjects/AsmDataLoaderBeanInfo.java    |   0
 .../cnd/asm/core/dataobjects/AsmDataNode.java      |   0
 .../cnd/asm/core/dataobjects/AsmDataObject.java    |   0
 .../asm/core/dataobjects/AsmObjectUtilities.java   |   0
 .../cnd/asm/core/dataobjects/Bundle.properties     |   0
 .../modules/cnd/asm/core/editor/AsmEditorKit.java  |   0
 .../cnd/asm/core/editor/AsmEditorSupport.java      |   0
 .../cnd/asm/core/editor/AsmLanguageHierarchy.java  |   0
 .../modules/cnd/asm/core/editor/AsmLexer.java      |   0
 .../cnd/asm/core/editor/AsmModelAccessorImpl.java  |   0
 .../modules/cnd/asm/core/editor/EditorSyntax.java  |   0
 .../cnd/asm/core/editor/LexerInputReader.java      |   0
 .../core/folding/AsmCodeFoldingSideBarFactory.java |   0
 .../cnd/asm/core/folding/AsmFoldManager.java       |   0
 .../asm/core/hyperlink/AsmHyperlinkProvider.java   |   0
 .../modules/cnd/asm/core/resources/AsmExample.s    |   0
 .../modules/cnd/asm/core/resources/AsmTemplate.s   |   0
 .../cnd/asm/core/resources/Bundle.properties       |   0
 .../cnd/asm/core/resources/InlineTemplate.il       |   0
 .../resources/NavigatorTopComponentSettings.xml    |   0
 .../resources/NavigatorTopComponentWstcref.xml     |   0
 .../core/resources/NetBeans-Asm-fontsColors.xml    |   0
 .../modules/cnd/asm/core/resources/asm-file.html   |   0
 .../modules/cnd/asm/core/resources/asm_icon.png    | Bin
 .../cnd/asm/core}/resources/error-glyph.gif        | Bin
 .../modules/cnd/asm/core/resources/file_asm_16.png | Bin
 .../modules/cnd/asm/core/resources/function.png    | Bin
 .../modules/cnd/asm/core/resources/il-file.html    |   0
 .../modules/cnd/asm/core/resources/layer.xml       |   0
 .../modules/cnd/asm/core/ui/menu/Bundle.properties |   0
 .../modules/cnd/asm/core/ui/menu/ModelChooser.java |   0
 .../modules/cnd/asm/core/ui/top/Bundle.properties  |   0
 .../cnd/asm/core/ui/top/InstructionInfoPanel.form  |   0
 .../cnd/asm/core/ui/top/InstructionInfoPanel.java  |   0
 .../cnd/asm/core/ui/top/InstructionListPanel.form  |   0
 .../cnd/asm/core/ui/top/InstructionListPanel.java  |   0
 .../cnd/asm/core/ui/top/NavigatorAction.java       |   0
 .../modules/cnd/asm/core/ui/top/NavigatorTab.java  |   0
 .../cnd/asm/core/ui/top/NavigatorTopComponent.form |   0
 .../cnd/asm/core/ui/top/NavigatorTopComponent.java |   0
 .../modules/cnd/asm/core/ui/top/NavigatorUI.form   |   0
 .../modules/cnd/asm/core/ui/top/NavigatorUI.java   |   0
 .../cnd/asm/core/ui/top/RegisterUsagesPanel.form   |   0
 .../cnd/asm/core/ui/top/RegisterUsagesPanel.java   |   0
 .../cnd/asm/core/ui/top/ext/TableSorter.java       |   0
 .../modules/cnd/asm/model/AbstractAsmModel.java    |   0
 .../netbeans/modules/cnd/asm/model/AsmModel.java   |   0
 .../modules/cnd/asm/model/AsmModelAccessor.java    |   0
 .../modules/cnd/asm/model/AsmModelProvider.java    |   0
 .../netbeans/modules/cnd/asm/model/AsmState.java   |   0
 .../netbeans/modules/cnd/asm/model/AsmSyntax.java  |   0
 .../modules/cnd/asm/model/AsmSyntaxProvider.java   |   0
 .../modules/cnd/asm/model/AsmTypesProvider.java    |   0
 .../modules/cnd/asm/model/cpu/OpcodeFactory.java   |   0
 .../netbeans/modules/cnd/asm/model/cpu/State.java  |   0
 .../modules/cnd/asm/model/cpu/StateFactory.java    |   0
 .../modules/cnd/asm/model/lang/AsmElement.java     |   0
 .../cnd/asm/model/lang/AsmElementBuilder.java      |   0
 .../modules/cnd/asm/model/lang/AsmElementPath.java |   0
 .../modules/cnd/asm/model/lang/AsmIconable.java    |   0
 .../modules/cnd/asm/model/lang/AsmMeasurable.java  |   0
 .../modules/cnd/asm/model/lang/AsmNameable.java    |   0
 .../modules/cnd/asm/model/lang/AsmOffsetable.java  |   0
 .../modules/cnd/asm/model/lang/AsmPropHandler.java |   0
 .../modules/cnd/asm/model/lang/BitWidth.java       |   0
 .../modules/cnd/asm/model/lang/BranchElement.java  |   0
 .../cnd/asm/model/lang/InstructionElement.java     |   0
 .../modules/cnd/asm/model/lang/LabelElement.java   |   0
 .../modules/cnd/asm/model/lang/OperandElement.java |   0
 .../modules/cnd/asm/model/lang/Register.java       |   0
 .../cnd/asm/model/lang/RegisterElement.java        |   0
 .../asm/model/lang/impl/AbstractAsmElement.java    |   0
 .../cnd/asm/model/lang/impl/AsmRootElement.java    |   0
 .../asm/model/lang/impl/AsmStructureElement.java   |   0
 .../cnd/asm/model/lang/impl/BaseAsmElement.java    |   0
 .../model/lang/impl/BaseInstructionElement.java    |   0
 .../cnd/asm/model/lang/impl/LeafAsmElement.java    |   0
 .../lang/instruction/ArithmeticInstruction.java    |   0
 .../model/lang/instruction/BranchInstruction.java  |   0
 .../model/lang/instruction/InstrVereficator.java   |   0
 .../asm/model/lang/instruction/Instruction.java    |   0
 .../model/lang/instruction/InstructionArgs.java    |   0
 .../asm/model/lang/operand/ImmediateOperand.java   |   0
 .../cnd/asm/model/lang/operand/LabelOperand.java   |   0
 .../cnd/asm/model/lang/operand/MemoryOperand.java  |   0
 .../cnd/asm/model/lang/operand/Operand.java        |   0
 .../cnd/asm/model/lang/operand/PlainOperand.java   |   0
 .../asm/model/lang/operand/RegisterOperand.java    |   0
 .../cnd/asm/model/lang/syntax/AsmBaseTokenId.java  |   0
 .../asm/model/lang/syntax/AsmHighlightLexer.java   |   0
 .../cnd/asm/model/lang/syntax/AsmModelStream.java  |   0
 .../cnd/asm/model/lang/syntax/AsmParser.java       |   0
 .../cnd/asm/model/lang/syntax/AsmToken.java        |   0
 .../cnd/asm/model/lang/syntax/AsmTokenId.java      |   0
 .../model/lang/syntax/FunctionBoundsResolver.java  |   0
 .../modules/cnd/asm/model/util/AsmFakeable.java    |   0
 .../cnd/asm/model/util/AsmModelUtilities.java      |   0
 .../modules/cnd/asm/model/util/BitMask.java        |   0
 .../cnd/asm/model/util/DefaultAsmTypesEntry.java   |   0
 .../cnd/asm/model/util/DefaultOffsetable.java      |   0
 .../cnd/asm/model/util/DefaultResolverResult.java  |   0
 .../modules/cnd/asm/model/util/EmptyAsmState.java  |   0
 .../modules/cnd/asm/model/util/EmptyModel.java     |   0
 .../modules/cnd/asm/model/util/FakeRegister.java   |   0
 .../modules/cnd/asm/model/util/IntervalSet.java    |   0
 .../asm/model/xml/DefaultXMLBaseInstruction.java   |   0
 .../cnd/asm/model/xml/DefaultXMLBaseRegister.java  |   0
 .../cnd/asm/model/xml/ModelXMLAttributes.java      |   0
 .../modules/cnd/asm/model/xml/ModelXMLReader.java  |   0
 .../cnd/asm/model/xml/ModelXMLReaderException.java |   0
 .../cnd/asm/model/xml/ModelXMLRootContext.java     |   0
 .../netbeans/modules/cnd/asm/model/xml/Util.java   |   0
 .../cnd/asm/model/xml/XMLBaseInstruction.java      |   0
 .../modules/cnd/asm/model/xml/XMLBaseRegister.java |   0
 .../cnd/asm/model/xml/XMLInstructionArgs.java      |   0
 .../cnd/asm/model/xml/XMLReaderContext.java        |   0
 .../cnd/asm/core/assistance/MockLabelInstance.java |   0
 .../cnd/asm/core/assistance/MockRegister.java      |   0
 .../core/assistance/MockRegisterInfoAccessor.java  |   0
 .../core/assistance/RegisterUsageActionTest.java   |   0
 {cnd => contrib}/cnd.callgraph/build.xml           |   0
 {cnd => contrib}/cnd.callgraph/manifest.mf         |   0
 .../cnd.callgraph/nbproject/project.properties     |   0
 .../cnd.callgraph/nbproject/project.xml            |   0
 .../modules/cnd/callgraph/Bundle.properties        |   0
 .../callgraph/CallGraphTopComponentSettings.xml    |   0
 .../cnd/callgraph/CallGraphTopComponentWstcref.xml |   0
 .../netbeans/modules/cnd/callgraph/api/Call.java   |   0
 .../modules/cnd/callgraph/api/CallModel.java       |   0
 .../modules/cnd/callgraph/api/Function.java        |   0
 .../cnd/callgraph/api/ui/CallGraphAction.java      |   0
 .../api/ui/CallGraphActionEDTRunnable.java         |   0
 .../callgraph/api/ui/CallGraphModelFactory.java    |   0
 .../cnd/callgraph/api/ui/CallGraphPreferences.java |   0
 .../modules/cnd/callgraph/api/ui/CallGraphUI.java  |   0
 .../modules/cnd/callgraph/api/ui/Catalog.java      |   0
 .../modules/cnd/callgraph/impl/Bundle.properties   |   0
 .../modules/cnd/callgraph/impl/CallChildren.java   |   0
 .../cnd/callgraph/impl/CallGraphAction.java        |   0
 .../modules/cnd/callgraph/impl/CallGraphPanel.form |   0
 .../modules/cnd/callgraph/impl/CallGraphPanel.java |   0
 .../cnd/callgraph/impl/CallGraphPopupAction.java   |   0
 .../modules/cnd/callgraph/impl/CallGraphScene.java |   0
 .../modules/cnd/callgraph/impl/CallGraphState.java |   0
 .../cnd/callgraph/impl/CallGraphTopComponent.form  |   0
 .../cnd/callgraph/impl/CallGraphTopComponent.java  |   0
 .../modules/cnd/callgraph/impl/CallNode.java       |   0
 .../modules/cnd/callgraph/impl/DefaultCatalog.java |   0
 .../cnd/callgraph/impl/FunctionRootNode.java       |   0
 .../cnd/callgraph/impl/GoToOccurrenceAction.java   |   0
 .../cnd/callgraph/impl/GoToReferenceAction.java    |   0
 .../modules/cnd/callgraph/impl/LoadingNode.java    |   0
 .../cnd/callgraph/impl/RelativePathRouter.java     |   0
 .../org/netbeans/modules/cnd/callgraph/layer.xml   |   0
 .../modules/cnd/callgraph/resources/call_graph.png | Bin
 .../modules/cnd/callgraph}/resources/down_20.png   | Bin
 .../modules/cnd/callgraph}/resources/empty_20.png  | Bin
 .../modules/cnd/callgraph/resources/focus_on.png   | Bin
 .../modules/cnd/callgraph/resources/refresh.png    | Bin
 .../cnd/callgraph/resources/show_overriding.gif    | Bin
 .../modules/cnd/callgraph}/resources/up_8.png      | Bin
 .../modules/cnd/callgraph}/resources/waitNode.gif  | Bin
 .../modules/cnd/callgraph/resources/who_calls.png  | Bin
 .../cnd/callgraph/resources/who_is_called.png      | Bin
 .../cnd/callgraph/support/Bundle.properties        |   0
 .../cnd/callgraph/support/ExportAction.java        |   0
 .../cnd/callgraph/support/ExportXmlAction.java     |   0
 .../support/HorizontalHierarchicalLayout.java      |   0
 {cnd => contrib}/cnd.classview/build.xml           |   0
 {cnd => contrib}/cnd.classview/manifest.mf         |   0
 .../cnd.classview/nbproject/project.properties     |   0
 .../cnd.classview/nbproject/project.xml            |   0
 .../modules/cnd/classview/ChildrenUpdater.java     |   0
 .../netbeans/modules/cnd/classview/ClassView.java  |   0
 .../modules/cnd/classview/ClassViewInstaller.java  |   0
 .../modules/cnd/classview/ClassViewModel.java      |   0
 .../cnd/classview/ClassViewTopComponent.java       |   0
 .../modules/cnd/classview/ClassViewUpdater.java    |   0
 .../modules/cnd/classview/ClassifierKeyArray.java  |   0
 .../netbeans/modules/cnd/classview/Diagnostic.java |   0
 .../modules/cnd/classview/HostKeyArray.java        |   0
 .../netbeans/modules/cnd/classview/NameCache.java  |   0
 .../modules/cnd/classview/NamespaceKeyArray.java   |   0
 .../modules/cnd/classview/PersistentKey.java       |   0
 .../modules/cnd/classview/ProjectsKeyArray.java    |   0
 .../netbeans/modules/cnd/classview/RootNode.java   |   0
 .../modules/cnd/classview/SmartChangeEvent.java    |   0
 .../netbeans/modules/cnd/classview/SortedName.java |   0
 .../modules/cnd/classview/UpdatebleHost.java       |   0
 .../cnd/classview/actions/Bundle.properties        |   0
 .../cnd/classview/actions/ContextUtils.java        |   0
 .../classview/actions/GoToDeclarationAction.java   |   0
 .../cnd/classview/actions/MoreDeclarations.java    |   0
 .../classview/actions/SelectInClassesAction.java   |   0
 .../classview/actions/ShowHideClassViewAction.java |   0
 .../modules/cnd/classview/model/BaseNode.java      |   0
 .../modules/cnd/classview/model/CVUtil.java        |   0
 .../modules/cnd/classview/model/ClassNode.java     |   0
 .../cnd/classview/model/ClassifierNode.java        |   0
 .../modules/cnd/classview/model/EnumNode.java      |   0
 .../cnd/classview/model/EnumeratorNode.java        |   0
 .../cnd/classview/model/ForwardClassNode.java      |   0
 .../cnd/classview/model/FriendClassNode.java       |   0
 .../cnd/classview/model/FriendFunctionNode.java    |   0
 .../cnd/classview/model/GlobalFuncNode.java        |   0
 .../modules/cnd/classview/model/GlobalVarNode.java |   0
 .../modules/cnd/classview/model/LoadingNode.java   |   0
 .../modules/cnd/classview/model/MemberNode.java    |   0
 .../modules/cnd/classview/model/NPNode.java        |   0
 .../modules/cnd/classview/model/NamespaceNode.java |   0
 .../modules/cnd/classview/model/ObjectNode.java    |   0
 .../cnd/classview/model/ProjectLibsNode.java       |   0
 .../modules/cnd/classview/model/ProjectNode.java   |   0
 .../modules/cnd/classview/model/TypedefNode.java   |   0
 .../cnd/classview/resources/Bundle.properties      |   0
 .../modules/cnd/classview/resources/I18n.java      |   0
 .../modules/cnd/classview/resources/class_view.png | Bin
 .../cnd/classview/resources/class_view24.png       | Bin
 .../cnd/classview/resources/classview.wstcref      |   0
 .../cnd/classview/resources/component.settings     |   0
 .../modules/cnd/classview/resources/layer.xml      |   0
 .../cnd/classview/resources/libraries_folder.gif   | Bin
 .../modules/cnd/classview}/resources/waitNode.gif  | Bin
 .../cnd/classview/QuoteTestCase/quote.cc.dat       |   0
 .../cnd/classview/QuoteTestCase/quote.cc.err       |   0
 .../modules/cnd/classview/QuoteTestCase}/cpu.cc    |   0
 .../modules/cnd/classview/QuoteTestCase}/cpu.h     |   0
 .../cnd/classview/QuoteTestCase}/customer.cc       |   0
 .../cnd/classview/QuoteTestCase}/customer.h        |   0
 .../modules/cnd/classview/QuoteTestCase}/disk.cc   |   0
 .../modules/cnd/classview/QuoteTestCase}/disk.h    |   0
 .../modules/cnd/classview/QuoteTestCase}/memory.cc |   0
 .../modules/cnd/classview/QuoteTestCase}/memory.h  |   0
 .../modules/cnd/classview/QuoteTestCase}/module.cc |   0
 .../modules/cnd/classview/QuoteTestCase}/module.h  |   0
 .../modules/cnd/classview/QuoteTestCase/quote.cc   |   0
 .../modules/cnd/classview/QuoteTestCase}/system.cc |   0
 .../modules/cnd/classview/QuoteTestCase}/system.h  |   0
 .../cnd/classview/QuoteTestCase/typedef_test.h     |   0
 ...dules.editor.settings.storage.spi.StorageFilter |   0
 .../modules/cnd/classview/BaseTestCase.java        |   0
 .../modules/cnd/classview/ClassviewTest.java       |   0
 .../modules/cnd/classview/QuoteTestCase.java       |   0
 {cnd => contrib}/cnd.cncppunit/build.xml           |   0
 {cnd => contrib}/cnd.cncppunit/manifest.mf         |   0
 .../cnd.cncppunit/nbproject/project.properties     |   0
 .../cnd.cncppunit/nbproject/project.xml            |   0
 .../modules/cnd/cncppunit/Bundle.properties        |   0
 .../cnd/cncppunit/CnCppUnitTestHandlerFactory.java |   0
 .../CnCppUnitTestHandlerFactoryProvider.java       |   0
 .../modules/cnd/cncppunit/LibraryChecker.java      |   0
 .../cnd/cncppunit/MultilineOutputHandler.java      |   0
 .../codegeneration/CUnitCodeGenerator.java         |   0
 .../codegeneration/CppUnitCodeGenerator.java       |   0
 .../editor/filecreation/Bundle.properties          |   0
 .../editor/filecreation/NewTestCUnitPanel.java     |   0
 .../editor/filecreation/NewTestCUnitPanelGUI.form  |   0
 .../editor/filecreation/NewTestCUnitPanelGUI.java  |   0
 .../editor/filecreation/NewTestCppUnitPanel.java   |   0
 .../filecreation/NewTestCppUnitPanelGUI.form       |   0
 .../filecreation/NewTestCppUnitPanelGUI.java       |   0
 .../editor/filecreation/TestCUnitIterator.java     |   0
 .../editor/filecreation/TestCppUnitIterator.java   |   0
 .../editor/filecreation/TestLibChecker.java        |   0
 .../org/netbeans/modules/cnd/cncppunit/layer.xml   |   0
 .../cnd/cncppunit/resources/Bundle.properties      |   0
 .../cnd/cncppunit/resources/cppunitrunner.html     |   0
 .../cnd/cncppunit/resources/cppunittest.html       |   0
 .../cnd/cncppunit/resources/cunittest-c.html       |   0
 .../cnd/cncppunit/resources/test-cppunit.html      |   0
 .../cnd/cncppunit/resources/test-cunit.html        |   0
 .../modules/cnd/cncppunit/resources/testCUnit.png  | Bin
 .../cnd/cncppunit/resources/testCppUnit.png        | Bin
 .../cnd/cncppunit}/resources/testFiles.html        |   0
 .../templates/cpp/cppunitrunner-cc.template        |   0
 .../templates/cpp/cppunittest-cc.template          |   0
 .../cncppunit/templates/cpp/cppunittest-h.template |   0
 .../cnd/cncppunit/templates/cpp/cppunittest.group  |   0
 .../cpp/test-cppunit-class-file-cpp.template       |   0
 .../cpp/test-cppunit-class-file-h.template         |   0
 .../cpp/test-cppunit-runner-file-cpp.template      |   0
 .../modules/cnd/cncppunit/LibraryCheckerTest.java  |   0
 {cnd => contrib}/cnd.completion/build.xml          |   0
 {cnd => contrib}/cnd.completion/manifest.mf        |   0
 .../cnd.completion/nbproject/project.properties    |   0
 .../cnd.completion/nbproject/project.xml           |   0
 .../cnd/completion/cplusplus/Bundle.properties     |   0
 .../cplusplus/CCGoToDeclarationAction.java         |   0
 .../cplusplus/CCGoToImplementationAction.java      |   0
 .../cplusplus/CsmCodeTemplateFilter.java           |   0
 .../cplusplus/CsmCompletionProvider.java           |   0
 .../completion/cplusplus/CsmCompletionUtils.java   |   0
 .../cplusplus/CsmExpressionResolverImpl.java       |   0
 .../cnd/completion/cplusplus/CsmFinderFactory.java |   0
 .../cnd/completion/cplusplus/CsmFinderImpl.java    |   0
 .../completion/cplusplus/NbCsmCompletionQuery.java |   0
 .../cnd/completion/cplusplus/NbCsmResultItem.java  |   0
 .../cnd/completion/cplusplus/ext/Bundle.properties |   0
 .../cplusplus/ext/CompletionSupport.java           |   0
 .../completion/cplusplus/ext/CsmCompletion.java    |   0
 .../cplusplus/ext/CsmCompletionExpression.java     |   0
 .../cplusplus/ext/CsmCompletionQuery.java          |   0
 .../cplusplus/ext/CsmCompletionTokenProcessor.java |   0
 .../cplusplus/ext/CsmExpandedTokenProcessor.java   |   0
 .../cnd/completion/cplusplus/ext/CsmFinder.java    |   0
 .../completion/cplusplus/ext/CsmResultItem.java    |   0
 .../completion/cplusplus/ext/MacroCallback.java    |   0
 .../cplusplus/hyperlink/Bundle.properties          |   0
 .../hyperlink/CsmAbstractHyperlinkProvider.java    |   0
 .../hyperlink/CsmDefineHyperlinkProvider.java      |   0
 .../cplusplus/hyperlink/CsmHyperlinkProvider.java  |   0
 .../hyperlink/CsmIncludeHyperlinkProvider.java     |   0
 .../cplusplus/hyperlink/LineHyperlinkProvider.java |   0
 .../cnd/completion/cplusplus/resources/back.gif    | Bin
 .../cnd/completion/cplusplus/resources/forward.gif | Bin
 .../completion/cplusplus/resources/gotosource.gif  | Bin
 .../completion/cplusplus/resources/htmlView.gif    | Bin
 .../cnd/completion/csm/CompletionResolver.java     |   0
 .../cnd/completion/csm/CompletionResolverImpl.java |   0
 .../cnd/completion/csm/CompletionUtilities.java    |   0
 .../modules/cnd/completion/csm/CsmContext.java     |   0
 .../cnd/completion/csm/CsmContextUtilities.java    |   0
 .../cnd/completion/csm/CsmDeclarationResolver.java |   0
 .../cnd/completion/csm/CsmOffsetResolver.java      |   0
 .../cnd/completion/csm/CsmOffsetUtilities.java     |   0
 .../completion/csm/CsmProjectContentResolver.java  |   0
 .../cnd/completion/csm/CsmStatementResolver.java   |   0
 .../completion/debugger/CsmAutosProviderImpl.java  |   0
 .../debugger/CsmFunctionCallsProviderImpl.java     |   0
 .../completion/doxygensupport/Bundle.properties    |   0
 .../CompletionDocumentationProviderImpl.java       |   0
 .../doxygensupport/DoxygenDocumentation.java       |   0
 .../cnd/completion/doxygensupport/Man2HTML.java    |   0
 .../doxygensupport/ManDocumentation.java           |   0
 .../completion/impl/xref/DocOffsPositionImpl.java  |   0
 .../completion/impl/xref/DocOffsetableImpl.java    |   0
 .../impl/xref/FileReferencesContext.java           |   0
 .../completion/impl/xref/FileReferencesImpl.java   |   0
 .../completion/impl/xref/ReferenceContextImpl.java |   0
 .../cnd/completion/impl/xref/ReferenceImpl.java    |   0
 .../impl/xref/ReferenceResolverImpl.java           |   0
 .../cnd/completion/impl/xref/ReferencesCache.java  |   0
 .../completion/impl/xref/ReferencesSupport.java    |   0
 .../cnd/completion/impl/xref/SymTabCache.java      |   0
 .../completion/impl/xref/ThisReferenceImpl.java    |   0
 .../includes/CsmIncludeCompletionItem.java         |   0
 .../includes/CsmIncludeCompletionProvider.java     |   0
 .../includes/CsmIncludeCompletionQuery.java        |   0
 .../keywords/CsmKeywordCompletionItem.java         |   0
 .../keywords/CsmKeywordsCompletionProvider.java    |   0
 .../cnd/completion/options/Bundle.properties       |   0
 .../completion/options/CodeCompletionPanel.form    |   0
 .../completion/options/CodeCompletionPanel.java    |   0
 .../CsmPreprocessorDirectiveCompletionItem.java    |   0
 ...CsmPreprocessorDirectiveCompletionProvider.java |   0
 .../cnd/completion/resources/Bundle.properties     |   0
 .../completion/resources/DefaultKeyBindings.xml    |   0
 .../completion/resources/enable-doc-completion.xml |   0
 .../modules/cnd/completion/resources/layer.xml     |   0
 .../services/CsmOverloadingResolverImpl.java       |   0
 .../cnd/completion/spi/dynhelp/CCHelpManager.java  |   0
 .../cnd/completion/templates/Bundle.properties     |   0
 .../templates/CppCodeTemplateProcessor.java        |   0
 .../cnd.completion/test/popular-commands.sh        |   0
 .../completion/AutosTestCase/testAutosArrays.ref   |   0
 .../completion/AutosTestCase/testAutosArrays2.ref  |   0
 .../cnd/completion/AutosTestCase/testAutosBody.ref |   0
 .../completion/AutosTestCase/testAutosComment.ref  |   0
 .../AutosTestCase/testAutosCompoundLine1.ref       |   0
 .../AutosTestCase/testAutosCompoundLine2.ref       |   0
 .../AutosTestCase/testAutosCompoundLine3.ref       |   0
 .../AutosTestCase/testAutosEmptyLine.ref           |   0
 .../completion/AutosTestCase/testAutosFirst.ref    |   0
 .../completion/AutosTestCase/testAutosIfEnd.ref    |   0
 .../completion/AutosTestCase/testAutosInFor.ref    |   0
 .../AutosTestCase/testAutosInFunction.ref          |   0
 .../AutosTestCase/testAutosInStatement.ref         |   0
 .../cnd/completion/AutosTestCase/testAutosMain.ref |   0
 .../AutosTestCase/testAutosMultiLine.ref           |   0
 .../AutosTestCase/testAutosNoCodeModel.ref         |   0
 .../completion/AutosTestCase/testAutosScope.ref    |   0
 .../AutosTestCase/testAutosStatement.ref           |   0
 .../completion/AutosTestCase/testAutosWrong.ref    |   0
 .../CCBasicCompletionTestCase/test142903_1.ref     |   0
 .../CCBasicCompletionTestCase/test142903_2.ref     |   0
 .../CCBasicCompletionTestCase/test208053.ref       |   0
 .../CCBasicCompletionTestCase/testBug188804.ref    |   0
 .../CCBasicCompletionTestCase/testBug188804_2.ref  |   0
 .../CCBasicCompletionTestCase/testBug206234.ref    |   0
 .../CCBasicCompletionTestCase/testBug214650.ref    |   0
 .../testBug235102_cc_1.ref                         |   0
 .../testBug235102_cc_2.ref                         |   0
 .../CCBasicCompletionTestCase/testCast1.ref        |   0
 .../CCBasicCompletionTestCase/testCast2.ref        |   0
 .../CCBasicCompletionTestCase/testCast3.ref        |   0
 .../CCBasicCompletionTestCase/testCast4.ref        |   0
 .../testCompletionAfterSpace.ref                   |   0
 .../testCompletionAfterSpace2.ref                  |   0
 .../testCompletionForStaticFunctions1.ref          |   0
 .../testCompletionForStaticFunctions2.ref          |   0
 .../testCompletionForStaticFunctions3.ref          |   0
 .../testCompletionForStaticFunctions4.ref          |   0
 .../testCompletionInConstructor.ref                |   0
 .../testCompletionInEmptyFile.ref                  |   0
 .../testCompletionInEmptySysInclude.ref            |   0
 .../testCompletionInEmptyUsrInclude.ref            |   0
 .../testCompletionInsideChar.ref                   |   0
 .../testCompletionInsideInclude.ref                |   0
 .../testCompletionInsideString.ref                 |   0
 .../testCompletionOnEmptyInClassFunction.ref       |   0
 .../testCompletionOnEmptyInGlobFunction.ref        |   0
 .../testCompletionOnEmptyInGlobal.ref              |   0
 .../testEmptyDerefCompletion_1.ref                 |   0
 .../testEmptyDerefCompletion_2.ref                 |   0
 .../testEmptyDerefCompletion_3.ref                 |   0
 .../testEmptyPtrCompletion_1.ref                   |   0
 .../testEmptyPtrCompletion_2.ref                   |   0
 .../testEmptyPtrCompletion_3.ref                   |   0
 .../testErrorCompletion1.ref                       |   0
 .../testErrorCompletion10.ref                      |   0
 .../testErrorCompletion2.ref                       |   0
 .../testErrorCompletion3.ref                       |   0
 .../testErrorCompletion4.ref                       |   0
 .../testErrorCompletion5.ref                       |   0
 .../testErrorCompletion6.ref                       |   0
 .../testErrorCompletion7.ref                       |   0
 .../testErrorCompletion8.ref                       |   0
 .../testErrorCompletion9.ref                       |   0
 .../testErrorCompletionInFun1.ref                  |   0
 .../testErrorCompletionInFun2.ref                  |   0
 .../testErrorCompletionInFun3.ref                  |   0
 .../testErrorCompletionInFun4.ref                  |   0
 .../testErrorCompletionInFun5.ref                  |   0
 .../testErrorCompletionInFun6.ref                  |   0
 .../testErrorCompletionInFun7.ref                  |   0
 .../testExtraDeclarationOnTypeInsideFun.ref        |   0
 .../testGlobalCompletionInClassFunction.ref        |   0
 .../testGlobalCompletionInGlobFunction.ref         |   0
 .../testGlobalCompletionInGlobal.ref               |   0
 .../testGlobalMethodByScopePrefix.ref              |   0
 .../CCBasicCompletionTestCase/testIZ109010.ref     |   0
 .../CCBasicCompletionTestCase/testIZ119041.ref     |   0
 .../CCBasicCompletionTestCase/testIZ131283.ref     |   0
 .../CCBasicCompletionTestCase/testIZ131568.ref     |   0
 .../CCBasicCompletionTestCase/testIZ159423.ref     |   0
 .../CCBasicCompletionTestCase/testIZ159424_1.ref   |   0
 .../CCBasicCompletionTestCase/testIZ159424_2.ref   |   0
 .../CCBasicCompletionTestCase/testIZ166620.ref     |   0
 .../CCBasicCompletionTestCase/testIZ173049.ref     |   0
 .../testLocalEnumerators.ref                       |   0
 .../testNoAbbrevInCompletion.ref                   |   0
 .../testProtectedMethodByClassPrefix.ref           |   0
 .../testRecoveryBeforeFoo.ref                      |   0
 .../testRestrictPointers1.ref                      |   0
 .../testRestrictPointers2.ref                      |   0
 .../testSpecializationQualifiers_0.ref             |   0
 .../testStringLiteral.ref                          |   0
 ...aseVarsAfterCompoundAndNotCompoundInDefault.ref |   0
 .../testSwitchCaseVarsInCompound.ref               |   0
 .../testSwitchCaseVarsNotIncCompound.ref           |   0
 .../CamelCaseCompletionTestCase/testAllCapital.ref |   0
 .../testFirstCapitalCamelCase.ref                  |   0
 .../testFirstLowCamelCase.ref                      |   0
 .../CamelCaseCompletionTestCase/testUnderscore.ref |   0
 .../testUnderscoreCompound.ref                     |   0
 .../testCompletionAfterNew.ref                     |   0
 .../testCompletionAfterNewWithClassPrefix.ref      |   0
 .../testCompletionOnUnfinishedConstructor1.ref     |   0
 .../testCompletionOnUnfinishedConstructor2.ref     |   0
 .../testConstructorDefinition.ref                  |   0
 .../testConstructorDereference.ref                 |   0
 .../testDefaultConstructorWithNew.ref              |   0
 .../testDefaultConstructorWithoutNew.ref           |   0
 .../ClassContentTestCase/testDestructor.ref        |   0
 .../testDestructorByClassPrefix.ref                |   0
 .../testDestructorByClassPrefixAndTilda.ref        |   0
 .../ClassContentTestCase/testDestructorTilda.ref   |   0
 .../ClassContentTestCase/testNewDConstructor.ref   |   0
 .../testStaticUnnamedUnions.ref                    |   0
 .../testUnnamedDefinitions.ref                     |   0
 .../ClassContentTestCase/testUnnamedEnums.ref      |   0
 .../testDotToArrowAutoFix_1.ref                    |   0
 .../testDotToArrowAutoFix_2.ref                    |   0
 .../testDotToArrowAutoFix_3.ref                    |   0
 .../testDotToArrowAutoFix_4.ref                    |   0
 .../testDotToArrowAutoFix_5.ref                    |   0
 .../testDotToArrowAutoFix_6.ref                    |   0
 .../testDotToArrowAutoFix_7.ref                    |   0
 .../testDotToArrowAutoFix_8.ref                    |   0
 .../completion/EnumTestC_Case/testBug216764.ref    |   0
 .../cnd/completion/EnumTestCase/testBug228519.ref  |   0
 .../completion/EnumTestCase/testClassAEnumFun.ref  |   0
 .../EnumTestCase/testClassAEnumeratorsInFun.ref    |   0
 .../completion/EnumTestCase/testClassAaPubFun.ref  |   0
 .../cnd/completion/EnumTestCase/testEnumInFun.ref  |   0
 .../completion/EnumTestCase/testVarAaPubFun.ref    |   0
 .../FriendTestCase/testInFriendCClassVarA.ref      |   0
 .../FriendTestCase/testInFriendCClassVarASt.ref    |   0
 .../FriendTestCase/testInFriendCClassVarB.ref      |   0
 .../FriendTestCase/testInFriendCClassVarBSt.ref    |   0
 .../FriendTestCase/testInFriendCClassVarE.ref      |   0
 .../FriendTestCase/testInFriendCClassVarESt.ref    |   0
 .../FriendTestCase/testInFriendFuncVarA.ref        |   0
 .../FriendTestCase/testInFriendFuncVarASt.ref      |   0
 .../FriendTestCase/testInFriendFuncVarB.ref        |   0
 .../FriendTestCase/testInFriendFuncVarBSt.ref      |   0
 .../FriendTestCase/testInFriendFuncVarD.ref        |   0
 .../FriendTestCase/testInFriendFuncVarDSt.ref      |   0
 .../testFunctionCallsArguments.ref                 |   0
 .../testFunctionCallsMultiple.ref                  |   0
 .../testFunctionCallsNoStd.ref                     |   0
 .../testFunctionCallsNone.ref                      |   0
 .../testFunctionCallsWrong.ref                     |   0
 .../GlobalCompletionTestCase/testBug251256.ref     |   0
 .../testClassAaPubFunClassA.ref                    |   0
 .../InheritanceTestCase/testClassAaPubFunVarA.ref  |   0
 .../InheritanceTestCase/testClassAaPubFunVarB.ref  |   0
 .../InheritanceTestCase/testClassAaPubFunVarC.ref  |   0
 .../InheritanceTestCase/testClassAaPubFunVarD.ref  |   0
 .../InheritanceTestCase/testClassAaPubFunVarE.ref  |   0
 .../testClassBbProtFunClassA.ref                   |   0
 .../testClassBbProtFunClassB.ref                   |   0
 .../InheritanceTestCase/testClassBbProtFunVarA.ref |   0
 .../InheritanceTestCase/testClassBbProtFunVarB.ref |   0
 .../InheritanceTestCase/testClassBbProtFunVarC.ref |   0
 .../InheritanceTestCase/testClassBbProtFunVarD.ref |   0
 .../InheritanceTestCase/testClassBbProtFunVarE.ref |   0
 .../testClassCcPrivFunClassC.ref                   |   0
 .../InheritanceTestCase/testClassCcPrivFunVarA.ref |   0
 .../InheritanceTestCase/testClassCcPrivFunVarB.ref |   0
 .../InheritanceTestCase/testClassCcPrivFunVarC.ref |   0
 .../InheritanceTestCase/testClassCcPrivFunVarD.ref |   0
 .../InheritanceTestCase/testClassCcPrivFunVarE.ref |   0
 .../testClassDdPubFunClassA.ref                    |   0
 .../testClassDdPubFunClassB.ref                    |   0
 .../testClassDdPubFunClassC.ref                    |   0
 .../testClassDdPubFunClassD.ref                    |   0
 .../InheritanceTestCase/testClassDdPubFunVarA.ref  |   0
 .../InheritanceTestCase/testClassDdPubFunVarB.ref  |   0
 .../InheritanceTestCase/testClassDdPubFunVarC.ref  |   0
 .../InheritanceTestCase/testClassDdPubFunVarD.ref  |   0
 .../InheritanceTestCase/testClassDdPubFunVarE.ref  |   0
 .../testClassEePubFunClassC.ref                    |   0
 .../testClassEePubFunClassE.ref                    |   0
 .../InheritanceTestCase/testClassEePubFunVarA.ref  |   0
 .../InheritanceTestCase/testClassEePubFunVarB.ref  |   0
 .../InheritanceTestCase/testClassEePubFunVarC.ref  |   0
 .../InheritanceTestCase/testClassEePubFunVarD.ref  |   0
 .../InheritanceTestCase/testClassEePubFunVarE.ref  |   0
 .../LibrariesContentTestCase/test202486_NS1.ref    |   0
 .../LibrariesContentTestCase/test202486_NS2.ref    |   0
 .../LibrariesContentTestCase/test202486_NS3.ref    |   0
 .../LibrariesContentTestCase/test202486_NS4.ref    |   0
 .../LibrariesContentTestCase/test202486_NS5.ref    |   0
 .../LibrariesContentTestCase/test202486_NS51.ref   |   0
 .../LibrariesContentTestCase/testBug254671_1.ref   |   0
 .../LibrariesContentTestCase/testBug254671_2.ref   |   0
 .../LibrariesContentTestCase/testBug254671_3.ref   |   0
 .../testGlobalFunsWithPrefix_1.ref                 |   0
 .../testGlobalFunsWithPrefix_2.ref                 |   0
 .../testLibraryClassStaticFunctions_1.ref          |   0
 .../testLibraryClassStaticFunctions_2.ref          |   0
 .../testMergeOfLibrariesNamespaces.ref             |   0
 .../LibrariesContentTestCase/testStdSizeT.ref      |   0
 .../testInClassMethod.ref                          |   0
 .../testInNamespaceMethod.ref                      |   0
 .../testInNamespaceMethod2.ref                     |   0
 .../NamespaceUsingTestCase/testInFunc.ref          |   0
 .../NamespaceUsingTestCase/testInUsing.ref         |   0
 .../completion/NamespacesTestCase/test231548.ref   |   0
 .../completion/NamespacesTestCase/testIZ146962.ref |   0
 .../NamespacesTestCase/testInFunction.ref          |   0
 .../NamespacesTestCase/testInFunctionAliasesS1.ref |   0
 .../NamespacesTestCase/testInFunctionAliasesS2.ref |   0
 .../testInFunctionNsS1AsPrefix.ref                 |   0
 .../testInFunctionNsS1S2AsPrefix.ref               |   0
 .../NamespacesTestCase/testInnerNSElems1.ref       |   0
 .../NamespacesTestCase/testInnerNSElems2.ref       |   0
 .../NamespacesTestCase/testInnerNSFunc1.ref        |   0
 .../NamespacesTestCase/testInnerNSFunc2.ref        |   0
 .../NamespacesTestCase/testInnerNSFunc3.ref        |   0
 .../NamespacesTestCase/testNs1StructVariable.ref   |   0
 .../cnd/completion/NamespacesTestCase/testNs2.ref  |   0
 .../NamespacesTestCase/testStaticMembers1.ref      |   0
 .../NamespacesTestCase/testStaticMembers2.ref      |   0
 .../NamespacesTestCase/testStaticMembers3.ref      |   0
 .../NamespacesTestCase/testStaticMembers4.ref      |   0
 .../NamespacesTestCase/testStaticMembers5.ref      |   0
 .../NonGlobalCompletionTestCase/testIZ184085.ref   |   0
 .../OverloadedOperatorTestCase/testBug254273.ref   |   0
 .../OverloadedOperatorTestCase/testBug268930_1.ref |   0
 .../OverloadedOperatorTestCase/testBug268930_2.ref |   0
 .../OverloadedOperatorTestCase/testBug268930_3.ref |   0
 .../OverloadedOperatorTestCase/testBug268930_4.ref |   0
 .../OverloadedOperatorTestCase/testBug268930_5.ref |   0
 .../testInstantiationOverloadedArrayOnC.ref        |   0
 .../testInstantiationOverloadedArrowArrayOnC.ref   |   0
 .../testInstantiationOverloadedArrowOnB.ref        |   0
 .../testInstantiationOverloadedArrowOnC.ref        |   0
 .../testInstantiationOverloadedArrowOnPtrB.ref     |   0
 .../testInstantiationOverloadedArrowOnPtrC.ref     |   0
 .../testNextLevelArrow.ref                         |   0
 .../testOverloadedArrayOnC.ref                     |   0
 .../testOverloadedArrowArrayOnC.ref                |   0
 .../testOverloadedArrowOnB.ref                     |   0
 .../testOverloadedArrowOnC.ref                     |   0
 .../testOverloadedArrowOnPtrB.ref                  |   0
 .../testOverloadedArrowOnPtrC.ref                  |   0
 .../PreprocDirectivesTestCase/testIZ142591.ref     |   0
 .../testCCAfterSemicolon.ref                       |   0
 .../testClassesInParameters.ref                    |   0
 .../testInCpuComputeSupportMetricImplInCase.ref    |   0
 .../testInCpuComputeSupportMetricImplInExpr.ref    |   0
 ...stInCpuComputeSupportMetricImplInMethodCall.ref |   0
 ...puComputeSupportMetricImplInMethodCallParam.ref |   0
 .../testInCpuComputeSupportMetricImplInSwitch.ref  |   0
 .../testInCpuConstructorImpl.ref                   |   0
 .../StaticMembersTestCase/testMainStaticClassA.ref |   0
 .../testStaticClassAaPubFunVarA.ref                |   0
 .../testStaticClassAaPubFunVarB.ref                |   0
 .../testStaticClassAaPubFunVarC.ref                |   0
 .../testStaticClassAaPubFunVarD.ref                |   0
 .../testStaticClassAaPubFunVarE.ref                |   0
 .../testStaticClassDaPubFunClassA.ref              |   0
 .../testStaticClassDaPubFunClassB.ref              |   0
 .../testStaticClassDaPubFunClassC.ref              |   0
 .../testStaticClassDaPubFunClassD.ref              |   0
 .../testStaticClassDaPubFunClassE.ref              |   0
 .../TemplateCompletionTestCase/testIZ150843.ref    |   0
 .../testTemplateFunInstDeref.ref                   |   0
 .../TemplateCompletionTestCase/testTemplates1.ref  |   0
 .../TemplateCompletionTestCase/testTemplates10.ref |   0
 .../TemplateCompletionTestCase/testTemplates2.ref  |   0
 .../TemplateCompletionTestCase/testTemplates3.ref  |   0
 .../TemplateCompletionTestCase/testTemplates4.ref  |   0
 .../TemplateCompletionTestCase/testTemplates5.ref  |   0
 .../TemplateCompletionTestCase/testTemplates6.ref  |   0
 .../TemplateCompletionTestCase/testTemplates7.ref  |   0
 .../TemplateCompletionTestCase/testTemplates8.ref  |   0
 .../TemplateCompletionTestCase/testTemplates9.ref  |   0
 .../TemplateInstantiationTestCase/test1.ref        |   0
 .../TemplateInstantiationTestCase/test2.ref        |   0
 .../TemplateInstantiationTestCase/test3.ref        |   0
 .../TemplateInstantiationTestCase/test4.ref        |   0
 .../TemplateInstantiationTestCase/testBoo1_1.ref   |   0
 .../TemplateInstantiationTestCase/testBoo1_2.ref   |   0
 .../TemplateInstantiationTestCase/testFoo1_1.ref   |   0
 .../TemplateInstantiationTestCase/testFoo1_2.ref   |   0
 .../TemplateInstantiationTestCase/testFoo1_3.ref   |   0
 .../testPointerDepthInSimpleInstantiation.ref      |   0
 .../testDirectIteratorVariableDeref.ref            |   0
 .../testInFunctionAfterUnderscore.ref              |   0
 .../testIteratorVisibilityGlobal.ref               |   0
 .../testTypedefIteratorVariableDeref.ref           |   0
 .../TemplateSubstitutionTestCase/testBug223934.ref |   0
 .../cnd/completion/TooltipTestCase/testTooltip.ref |   0
 .../completion/TooltipTestCase/testTooltip2.ref    |   0
 .../TypedefTestCase/testTypedefInTypedef.ref       |   0
 .../TypedefTestCase/testTypedefMembers.ref         |   0
 .../impl/xref/ReferencesTestCase/testCpuCC.ref     |   0
 .../impl/xref/ReferencesTestCase/testCpuH.ref      |   0
 .../xref/ReferencesTestCase/testCustomerCC.ref     |   0
 .../impl/xref/ReferencesTestCase/testCustomerH.ref |   0
 .../impl/xref/ReferencesTestCase/testDiskCC.ref    |   0
 .../impl/xref/ReferencesTestCase/testDiskH.ref     |   0
 .../impl/xref/ReferencesTestCase/testMemoryCC.ref  |   0
 .../impl/xref/ReferencesTestCase/testMemoryH.ref   |   0
 .../impl/xref/ReferencesTestCase/testModuleCC.ref  |   0
 .../impl/xref/ReferencesTestCase/testModuleH.ref   |   0
 .../impl/xref/ReferencesTestCase/testQuoteCC.ref   |   0
 .../impl/xref/ReferencesTestCase/testSystemCC.ref  |   0
 .../impl/xref/ReferencesTestCase/testSystemH.ref   |   0
 .../testMacroInInclude.ref                         |   0
 .../CCIncludesCompletionTestCase/testEmtpy.ref     |   0
 .../CCIncludesCompletionTestCase/testEmtpySys.ref  |   0
 .../CCIncludesCompletionTestCase/testEmtpyUsr.ref  |   0
 .../CCIncludesCompletionTestCase/testInclWoExt.ref |   0
 .../CCIncludesCompletionTestCase/testNothing.ref   |   0
 .../CCIncludesCompletionTestCase/testPrefix1.ref   |   0
 .../CCIncludesCompletionTestCase/testPrefix2.ref   |   0
 .../CCIncludesCompletionTestCase/testSmthSys.ref   |   0
 .../CCIncludesCompletionTestCase/testSmthUsr.ref   |   0
 .../modules/cnd/completion/AutosTestCase/file.cc   |   0
 .../CCBasicCompletionTestCase/bug188804.cpp        |   0
 .../CCBasicCompletionTestCase/bug206234.cpp        |   0
 .../CCBasicCompletionTestCase/bug214650.cpp        |   0
 .../CCBasicCompletionTestCase/bug235102_cc.cpp     |   0
 .../completion/CCBasicCompletionTestCase/cast.cc   |   0
 .../CCBasicCompletionTestCase/check_macro.cpp      |   0
 .../completion/CCBasicCompletionTestCase/empty.cc  |   0
 .../completion/CCBasicCompletionTestCase/file.cc   |   0
 .../completion/CCBasicCompletionTestCase/file.h    |   0
 .../CCBasicCompletionTestCase/iz131568.cc          |   0
 .../CCBasicCompletionTestCase/iz148011.cc          |   0
 .../CCBasicCompletionTestCase/iz166620.cc          |   0
 .../CCBasicCompletionTestCase/iz173049.cc          |   0
 .../CCBasicCompletionTestCase/local_enumerators.cc |   0
 .../CCBasicCompletionTestCase/restrict.c           |   0
 .../CCBasicCompletionTestCase/restrict.cc          |   0
 .../CCBasicCompletionTestCase/spec_quals_cc_0.cpp  |   0
 .../completion/CCBasicCompletionTestCase/static.cc |   0
 .../CCBasicCompletionTestCase/test208053.cpp       |   0
 .../completion/CamelCaseCompletionTestCase/file.cc |   0
 .../cnd/completion/ClassContentTestCase/file.cc    |   0
 .../cnd/completion/ClassContentTestCase/file.h     |   0
 .../cnd/completion/ClassContentTestCase/file2.cc   |   0
 .../DotArrowSubstitutionTestCase/bug230101.cpp     |   0
 .../DotArrowSubstitutionTestCase/bug97120.cc       |   0
 .../cnd/completion/EnumTestC_Case/bug216764.c      |   0
 .../cnd/completion/EnumTestCase/bug228519.cpp      |   0
 .../modules/cnd/completion/EnumTestCase/file.cc    |   0
 .../modules/cnd/completion/FriendTestCase/file.cc  |   0
 .../modules/cnd/completion/FriendTestCase/file.h   |   0
 .../cnd/completion/FunctionCallsTestCase/file.cc   |   0
 .../GlobalCompletionTestCase/bug251256.cpp         |   0
 .../cnd/completion/InheritanceTestCase/file.cc     |   0
 .../cnd/completion/InheritanceTestCase/file.h      |   0
 .../cnd/completion/InheritanceTestCase/main.cc     |   0
 .../LibrariesContentTestCase/src/bug254671.cpp     |   0
 .../src/include_sys1_file.h                        |   0
 .../src/include_sys2_file.h                        |   0
 .../LibrariesContentTestCase/src/iz202486.cc       |   0
 .../LibrariesContentTestCase/src/main.cc           |   0
 .../LibrariesContentTestCase/src/main202486.h      |   0
 .../sys_include/include1.h                         |   0
 .../sys_include/inlined_ns_config.h                |   0
 .../sys_include/ns1ns2_202486.h                    |   0
 .../sys_include/sys1_incl_sys2.h                   |   0
 .../sys_include2/include2.h                        |   0
 .../sys_include2/inlined_ns_usage.h                |   0
 .../sys_include2/ns1ns3_202486.h                   |   0
 .../LibrariesContentTestCase/sys_include2/sys2.h   |   0
 .../NamespaceFunctionsTestCase/ns_functions.cc     |   0
 .../cnd/completion/NamespaceUsingTestCase/file.cc  |   0
 .../cnd/completion/NamespacesTestCase/231548.cc    |   0
 .../cnd/completion/NamespacesTestCase/file.cc      |   0
 .../cnd/completion/NamespacesTestCase/file.h       |   0
 .../cnd/completion/NamespacesTestCase/file2.cc     |   0
 .../cnd/completion/NamespacesTestCase/iz146962.cc  |   0
 .../cnd/completion/NamespacesTestCase/iz146962.h   |   0
 .../NonGlobalCompletionTestCase/iz184085.cc        |   0
 .../OverloadedOperatorTestCase/bug254273.cpp       |   0
 .../OverloadedOperatorTestCase/bug268930_cc.cpp    |   0
 .../completion/OverloadedOperatorTestCase/file.cc  |   0
 .../completion/OverloadedOperatorTestCase/file.h   |   0
 .../PreprocDirectivesTestCase/iz142591.cc          |   0
 .../cnd/completion/StaticMembersTestCase/file.cc   |   0
 .../cnd/completion/StaticMembersTestCase/file.h    |   0
 .../cnd/completion/StaticMembersTestCase/main.cc   |   0
 .../TemplateCompletionTestCase/template.cc         |   0
 .../TemplateInstantiationTestCase/instantiation.cc |   0
 .../TemplateInstantiationTestCase/instantiation.h  |   0
 .../pointerDepthInSimpleInstantiation.cpp          |   0
 .../TemplateSpecializationTestCase/file.cc         |   0
 .../TemplateSpecializationTestCase/mapIterator.cc  |   0
 .../TemplateSubstitutionTestCase/bug223934.cc      |   0
 .../cnd/completion/TooltipTestCase/file.cpp        |   0
 .../modules/cnd/completion/TypedefTestCase/file.cc |   0
 .../modules/cnd/completion/TypedefTestCase/file.h  |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ131555.c    |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ131625.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ132903.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ136146.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ136167.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ136730.c    |   0
 .../IZ136731_local_extern_function.cc              |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ137897.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ138683.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ138833.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ138905.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ139056.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ139058.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ139141.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ139143.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ139409.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ139618.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ139693.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ139784.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ140111.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ140589.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ140757.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ140795.cc   |   0
 .../IZ141601_static_fun_in_hdr.c                   |   0
 .../IZ141601_static_fun_in_hdr.h                   |   0
 .../IZ141765_static_const_in_nsp.cc                |   0
 .../IZ141765_static_const_in_nsp.h                 |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ141842.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ143226.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ144154.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ144360.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ144363.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ144535.c    |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ145071.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ145071_2.cc |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ145286.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ146464.c    |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ147627.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ147632.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ150884.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ151045.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ151588.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ151705.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ152875.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ153761.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ154779.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ155577.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ155577.h    |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ158816.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ161901.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ165961.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ165976.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ169750.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ173311.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ175123.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ175877.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ182152.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ186780.c    |   0
 .../hyperlink/BasicHyperlinkTestCase/IZ186780.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug141302.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug151199.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug159328.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug161749.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug188270.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug188305.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug188925.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug189039.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug189838.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug190127.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug190127.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug190885.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug191081.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug191083.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug191198.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug191200.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug191314.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug192967.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug194453.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug195307.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug196966.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug198823.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug200115.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug200140.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug200141.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug200171.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug200675.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug201237.cpp |   0
 .../BasicHyperlinkTestCase/bug201237_2.cpp         |   0
 .../hyperlink/BasicHyperlinkTestCase/bug207843.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug210186.cpp |   0
 .../BasicHyperlinkTestCase/bug210186_2.cpp         |   0
 .../hyperlink/BasicHyperlinkTestCase/bug210996.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug211265.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug211534.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug211971.cc  |   0
 .../hyperlink/BasicHyperlinkTestCase/bug216965.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug220310.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug220680.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug223298.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug223298.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug228953.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug233280.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug233836.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug235462.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug238041.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug239348.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug239348.h   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug239739.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug240446.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug240482.c   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug242284.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug243594.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug246684.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug248502.cpp |   0
 .../BasicHyperlinkTestCase/bug249752_1.cpp         |   0
 .../hyperlink/BasicHyperlinkTestCase/bug255900.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug255900.h   |   0
 .../hyperlink/BasicHyperlinkTestCase/bug256296.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug257031.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug257647.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug258143.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug258511.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug267275.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug267382.cpp |   0
 .../hyperlink/BasicHyperlinkTestCase/bug76172.cpp  |   0
 .../hyperlink/BasicHyperlinkTestCase/const.cc      |   0
 .../BasicHyperlinkTestCase/fun_macro_and_name.c    |   0
 .../hyperlink/BasicHyperlinkTestCase/iz146392.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/iz151061.c    |   0
 .../hyperlink/BasicHyperlinkTestCase/iz191446.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/iz191446.h    |   0
 .../hyperlink/BasicHyperlinkTestCase/iz191446_2.cc |   0
 .../hyperlink/BasicHyperlinkTestCase/iz191457.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/iz192897.cc   |   0
 .../hyperlink/BasicHyperlinkTestCase/iz192897.h    |   0
 .../hyperlink/BasicHyperlinkTestCase/iz229003.cpp  |   0
 .../hyperlink/BasicHyperlinkTestCase/iz239814.cpp  |   0
 .../BasicHyperlinkTestCase/iz_145553_namesakes.cc  |   0
 .../hyperlink/BasicHyperlinkTestCase/kr.c          |   0
 .../hyperlink/BasicHyperlinkTestCase/kr.h          |   0
 .../hyperlink/BasicHyperlinkTestCase/labels.cc     |   0
 .../hyperlink/BasicHyperlinkTestCase/main.cc       |   0
 .../parensInFunctionParameters.cpp                 |   0
 .../BasicHyperlinkTestCase/static_function.c       |   0
 .../BasicHyperlinkTestCase/static_variable.c       |   0
 .../BasicHyperlinkTestCase/static_variable.h       |   0
 .../string_in_macro_params.cc                      |   0
 .../BasicHyperlinkTestCase/template_parameter.cc   |   0
 .../BasicHyperlinkTestCase/template_parameter2.cc  |   0
 .../hyperlink/BasicHyperlinkTestCase/twoMacros1.c  |   0
 .../hyperlink/BasicHyperlinkTestCase/twoMacros1.h  |   0
 .../hyperlink/BasicHyperlinkTestCase/twoMacros2.c  |   0
 .../hyperlink/BasicHyperlinkTestCase/twoMacros2.h  |   0
 .../ClassMembersHyperlinkTestCase/ClassA.cc        |   0
 .../ClassMembersHyperlinkTestCase/ClassA.h         |   0
 .../ClassMembersHyperlinkTestCase/ClassB.cc        |   0
 .../ClassMembersHyperlinkTestCase/ClassB.h         |   0
 .../ClassNameAfterDeref.cc                         |   0
 .../ClassMembersHyperlinkTestCase/IZ125760.cpp     |   0
 .../ClassMembersHyperlinkTestCase/IZ136102.cc      |   0
 .../ClassMembersHyperlinkTestCase/IZ136140.cc      |   0
 .../IZ141105_std_vector.cc                         |   0
 .../IZ143285_nested_classifiers.cc                 |   0
 .../ClassMembersHyperlinkTestCase/IZ144050.cc      |   0
 .../ClassMembersHyperlinkTestCase/IZ144062.cc      |   0
 .../ClassMembersHyperlinkTestCase/IZ144679.cc      |   0
 .../IZ145037_conversion_operators.cc               |   0
 .../ClassMembersHyperlinkTestCase/IZ145071.cc      |   0
 .../ClassMembersHyperlinkTestCase/IZ147795.cc      |   0
 .../ClassMembersHyperlinkTestCase/IZ148022.cc      |   0
 .../ClassMembersHyperlinkTestCase/accessMember.cc  |   0
 .../ClassMembersHyperlinkTestCase/bug158905.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug187254.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug187272.cc     |   0
 .../ClassMembersHyperlinkTestCase/bug191026.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug197394.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug200673.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug203212.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug206220.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug206460.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug207148.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug210299.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug211033.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug212145.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug217994.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug224062.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug232033.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug234667.cpp    |   0
 .../bug235102_3_AAA.cpp                            |   0
 .../bug235102_3_BBB.cpp                            |   0
 .../bug235102_3_body.h                             |   0
 .../ClassMembersHyperlinkTestCase/bug240016.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug242417.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug242719.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug244524.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug246680.c      |   0
 .../ClassMembersHyperlinkTestCase/bug252581.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug255328.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug255898.c      |   0
 .../ClassMembersHyperlinkTestCase/bug255898.h      |   0
 .../ClassMembersHyperlinkTestCase/bug255903.c      |   0
 .../ClassMembersHyperlinkTestCase/bug257821.c      |   0
 .../ClassMembersHyperlinkTestCase/bug257822.c      |   0
 .../ClassMembersHyperlinkTestCase/bug262407.cpp    |   0
 .../ClassMembersHyperlinkTestCase/bug269201.c      |   0
 .../checkPtrOperator.cc                            |   0
 .../ClassMembersHyperlinkTestCase/iz104943.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz104945.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz136975.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz142674.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz145077.cc      |   0
 .../iz147312_operators_in_base_cls.cc              |   0
 .../ClassMembersHyperlinkTestCase/iz148035.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz148929.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz149685.cpp     |   0
 .../ClassMembersHyperlinkTestCase/iz149783.c       |   0
 .../ClassMembersHyperlinkTestCase/iz151043.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz151583.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz151584.cpp     |   0
 .../ClassMembersHyperlinkTestCase/iz151591.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz151592.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz151763.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz151765.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz151955.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz154112.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz154594.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz154775.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz154778.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz154781.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz154789.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz154792.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz155578.cpp     |   0
 .../ClassMembersHyperlinkTestCase/iz156123.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz157786.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz159156.cpp     |   0
 .../ClassMembersHyperlinkTestCase/iz159307.cpp     |   0
 .../ClassMembersHyperlinkTestCase/iz159422.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz160637.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz160677.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz165597.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz166897.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz169305.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz174581.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz175231.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz179373.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz184315.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz223046.cpp     |   0
 .../ClassMembersHyperlinkTestCase/iz231328.cc      |   0
 .../ClassMembersHyperlinkTestCase/iz241212.cpp     |   0
 .../ClassMembersHyperlinkTestCase/iz241651.cpp     |   0
 .../iz_223966_overloads_template_spec.cpp          |   0
 .../ClassMembersHyperlinkTestCase/main.cc          |   0
 .../operators_hyperlink.cpp                        |   0
 .../templateMethods.cc                             |   0
 .../useenumerators.cc                              |   0
 .../Cpp11TemplatesTestCase/bug238847_1.cpp         |   0
 .../Cpp11TemplatesTestCase/bug238847_3.cpp         |   0
 .../hyperlink/Cpp11TemplatesTestCase/bug238889.cpp |   0
 .../hyperlink/Cpp11TemplatesTestCase/bug239901.cpp |   0
 .../hyperlink/Cpp11TemplatesTestCase/bug246517.cpp |   0
 .../Cpp11TemplatesTestCase/bug246517_2.cpp         |   0
 .../Cpp11TemplatesTestCase/bug246548_1.cpp         |   0
 .../Cpp11TemplatesTestCase/bug246548_2.cpp         |   0
 .../hyperlink/Cpp11TemplatesTestCase/bug246683.cpp |   0
 .../hyperlink/Cpp11TemplatesTestCase/bug248747.cpp |   0
 .../hyperlink/Cpp11TemplatesTestCase/bug249833.cpp |   0
 .../hyperlink/Cpp11TemplatesTestCase/bug252597.cpp |   0
 .../hyperlink/Cpp11TemplatesTestCase/bug262801.cpp |   0
 .../hyperlink/Cpp11TemplatesTestCase/bug267502.cpp |   0
 .../cplusplus/hyperlink/Cpp11TestCase/auto.cpp     |   0
 .../hyperlink/Cpp11TestCase/bug210019.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug210191.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug210192.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug210194.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug210257.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug210291.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug210303.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug214111.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug215662.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug218848.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug224031.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug224032.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug224399.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug225611.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug229025.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug232383.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug234640.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug235044.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug235076.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug235120.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug235120_2.cpp        |   0
 .../hyperlink/Cpp11TestCase/bug235229.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug238413.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug238688.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug238847_2.cpp        |   0
 .../hyperlink/Cpp11TestCase/bug238913.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug240723_c.cpp        |   0
 .../hyperlink/Cpp11TestCase/bug243171.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug243598.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug243600.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug244177.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug244177_2.cpp        |   0
 .../hyperlink/Cpp11TestCase/bug244177_2.h          |   0
 .../hyperlink/Cpp11TestCase/bug246349.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug247031.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug247751.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug248624.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug249463.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug250270.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug251181.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug251305.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug255064.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug256058.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug256739.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug257616.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug268930_adjacent.cpp |   0
 .../Cpp11TestCase/bug268930_hyperlink.cpp          |   0
 .../hyperlink/Cpp11TestCase/bug269199.cpp          |   0
 .../hyperlink/Cpp11TestCase/decltypes1.cpp         |   0
 .../hyperlink/Cpp11TestCase/decltypes2.cpp         |   0
 .../cplusplus/hyperlink/Cpp11TestCase/enum.cpp     |   0
 .../cplusplus/hyperlink/Cpp11TestCase/iz212124.cpp |   0
 .../cplusplus/hyperlink/Cpp11TestCase/iz212843.cpp |   0
 .../cplusplus/hyperlink/Cpp11TestCase/rangefor.cpp |   0
 .../hyperlink/Cpp11TooltipsTestCase/bug247751.cpp  |   0
 .../hyperlink/Cpp11TooltipsTestCase/bug250845.cpp  |   0
 .../hyperlink/Cpp11TooltipsTestCase/bug257827.cpp  |   0
 .../hyperlink/Cpp11TooltipsTestCase/bug261006.cpp  |   0
 .../hyperlink/Cpp11TooltipsTestCase/bug261517.cpp  |   0
 .../hyperlink/Cpp14TestCase/bug268671.cpp          |   0
 .../hyperlink/Cpp14TestCase/bug269290.cpp          |   0
 .../hyperlink/Cpp14TestCase/bug269292.cpp          |   0
 .../InstantiationHyperlinkTestCase/bug199079.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug203374.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug209746.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug209929.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug209950.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug211983.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug213282.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug228146.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug230079.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug230570.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug232530.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug235447.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug243083.cpp   |   0
 .../InstantiationHyperlinkTestCase/bug243083_1.cpp |   0
 .../InstantiationHyperlinkTestCase/classForward.h  |   0
 .../cyclic_typedef.cc                              |   0
 .../deepNestedTemplateEntities.cpp                 |   0
 .../InstantiationHyperlinkTestCase/iz144079.cpp    |   0
 .../InstantiationHyperlinkTestCase/iz144869.cpp    |   0
 .../InstantiationHyperlinkTestCase/iz144869_2.cpp  |   0
 .../InstantiationHyperlinkTestCase/iz146697.cc     |   0
 .../InstantiationHyperlinkTestCase/iz147518.cpp    |   0
 .../InstantiationHyperlinkTestCase/iz147518_2.cpp  |   0
 .../InstantiationHyperlinkTestCase/iz151194.cpp    |   0
 .../InstantiationHyperlinkTestCase/iz151619.cpp    |   0
 .../InstantiationHyperlinkTestCase/iz153986.cc     |   0
 .../InstantiationHyperlinkTestCase/iz154777.cpp    |   0
 .../InstantiationHyperlinkTestCase/iz154792.cpp    |   0
 .../InstantiationHyperlinkTestCase/iz159054.cc     |   0
 .../InstantiationHyperlinkTestCase/iz159068.cc     |   0
 .../InstantiationHyperlinkTestCase/iz159679.cpp    |   0
 .../InstantiationHyperlinkTestCase/iz161875.cpp    |   0
 .../InstantiationHyperlinkTestCase/iz171848.cpp    |   0
 .../InstantiationHyperlinkTestCase/iz172419.cpp    |   0
 .../src/audio_format.h                             |   0
 .../src/bug179048.cpp                              |   0
 .../src/bug229990.cpp                              |   0
 .../src/bug229990.h                                |   0
 .../src/bug244777.cpp                              |   0
 .../src/bug257028.cpp                              |   0
 .../src/bug257032.cpp                              |   0
 .../src/bug267668.cpp                              |   0
 .../src/common_tds.h                               |   0
 .../LibrariesContentHyperlinkTestCase/src/dup1.h   |   0
 .../src/format1.c                                  |   0
 .../src/format2.c                                  |   0
 .../src/include.h                                  |   0
 .../src/iz140787_cout.cc                           |   0
 .../src/iz140787_cout.h                            |   0
 .../src/iz154851.cc                                |   0
 .../src/iz154851.h                                 |   0
 .../src/iz160829.cc                                |   0
 .../src/iz167200.h                                 |   0
 .../src/iz175505.cc                                |   0
 .../src/macro_def.cc                               |   0
 .../src/macro_incl_err.h                           |   0
 .../src/macro_incl_ok.h                            |   0
 .../LibrariesContentHyperlinkTestCase/src/main.cc  |   0
 .../LibrariesContentHyperlinkTestCase/src/main2.cc |   0
 .../src/net_internal.h                             |   0
 .../LibrariesContentHyperlinkTestCase/src/outer.h  |   0
 .../src/qt_usage.cc                                |   0
 .../src/qt_usage.h                                 |   0
 .../src/testDup1.cc                                |   0
 .../src/testSys1Dup.cc                             |   0
 .../src/testSys2Dup.cc                             |   0
 .../src/testTdClassFwdResolve.cc                   |   0
 .../src/testTdClassFwdResolve1.c                   |   0
 .../src/testTdClassFwdResolve2.c                   |   0
 .../src/vs_internal.h                              |   0
 .../sys_include/bug179048.h                        |   0
 .../sys_include/bug244777.h                        |   0
 .../sys_include/bug257028_1.h                      |   0
 .../sys_include/bug257032.h                        |   0
 .../sys_include/include1.h                         |   0
 .../sys_include/iz154851_2.h                       |   0
 .../sys_include/iz160829_2.h                       |   0
 .../sys_include/iz175505.h                         |   0
 .../sys_include/sys1dup.h                          |   0
 .../sys_include/sys_stat_h.h                       |   0
 .../sys_include2/bug257028_2.h                     |   0
 .../sys_include2/bug267668.h                       |   0
 .../sys_include2/include2.h                        |   0
 .../sys_include2/iz160829.h                        |   0
 .../sys_include2/sys2dup.h                         |   0
 .../MetaprogrammingTestCase/bug172419.cpp          |   0
 .../MetaprogrammingTestCase/bug172419_2.cpp        |   0
 .../MetaprogrammingTestCase/bug172419_3.cpp        |   0
 .../MetaprogrammingTestCase/bug172419_4.cpp        |   0
 .../MetaprogrammingTestCase/bug172419_5.cpp        |   0
 .../MetaprogrammingTestCase/bug240929.cpp          |   0
 .../MetaprogrammingTestCase/bug246068.cpp          |   0
 .../MetaprogrammingTestCase/template_calc.cpp      |   0
 .../template_static_calc.cpp                       |   0
 .../hyperlink/MultiParseHyperlinkTestCase/shared.h |   0
 .../MultiParseHyperlinkTestCase/shared_ns.h        |   0
 .../hyperlink/MultiParseHyperlinkTestCase/source.c |   0
 .../MultiParseHyperlinkTestCase/source.cpp         |   0
 .../NamespacesHyperlinkTestCase/231548.cc          |   0
 .../NamespacesHyperlinkTestCase/IZ145071.cc        |   0
 .../boost_in_type_after_scope.cpp                  |   0
 .../NamespacesHyperlinkTestCase/bug199689.cpp      |   0
 .../NamespacesHyperlinkTestCase/bug201811.cpp      |   0
 .../NamespacesHyperlinkTestCase/bug219546.cpp      |   0
 .../NamespacesHyperlinkTestCase/bug220614.cpp      |   0
 .../NamespacesHyperlinkTestCase/bug226516.cpp      |   0
 .../NamespacesHyperlinkTestCase/bug227045.cpp      |   0
 .../NamespacesHyperlinkTestCase/bug228949.cpp      |   0
 .../NamespacesHyperlinkTestCase/bug228949.h        |   0
 .../bug228949StdHeader.h                           |   0
 .../bug228950_Included.h                           |   0
 .../bug228950_Not_Included.h                       |   0
 .../NamespacesHyperlinkTestCase/bug235102_ns.cpp   |   0
 .../NamespacesHyperlinkTestCase/bug235102_ns_2.cpp |   0
 .../NamespacesHyperlinkTestCase/bug235102_ns_2.hpp |   0
 .../NamespacesHyperlinkTestCase/bug243087.cpp      |   0
 .../NamespacesHyperlinkTestCase/bug249613.cpp      |   0
 .../NamespacesHyperlinkTestCase/bug251256.cpp      |   0
 .../NamespacesHyperlinkTestCase/bug254671.cpp      |   0
 .../NamespacesHyperlinkTestCase/bug256058_2.cpp    |   0
 .../NamespacesHyperlinkTestCase/bug257187.cpp      |   0
 .../NamespacesHyperlinkTestCase/child_ns.cc        |   0
 .../hyperlink/NamespacesHyperlinkTestCase/file.cc  |   0
 .../hyperlink/NamespacesHyperlinkTestCase/file.h   |   0
 .../NamespacesHyperlinkTestCase/iz145142.cc        |   0
 .../NamespacesHyperlinkTestCase/iz150915_1.cc      |   0
 .../NamespacesHyperlinkTestCase/iz150915_2.cc      |   0
 .../NamespacesHyperlinkTestCase/iz155148.cc        |   0
 .../NamespacesHyperlinkTestCase/iz159242.cc        |   0
 .../NamespacesHyperlinkTestCase/iz159243.cc        |   0
 .../NamespacesHyperlinkTestCase/iz172596.cc        |   0
 .../NamespacesHyperlinkTestCase/iz207841.cpp       |   0
 .../NamespacesHyperlinkTestCase/iz228950.cpp       |   0
 .../hyperlink/NamespacesHyperlinkTestCase/main.cc  |   0
 .../NamespacesHyperlinkTestCase/nsaliasfail.cpp    |   0
 .../NamespacesHyperlinkTestCase/typeid.cpp         |   0
 .../NamespacesHyperlinkTestCase/typeinfo.h         |   0
 .../NamespacesHyperlinkTestCase/unnamed.cc         |   0
 .../NamespacesHyperlinkTestCase/unnamed.h          |   0
 .../NamespacesHyperlinkTestCase/using_in_ns.cpp    |   0
 .../TemplateSpecializationsTestCase/bug180828.cpp  |   0
 .../TemplateSpecializationsTestCase/bug185045.cpp  |   0
 .../TemplateSpecializationsTestCase/bug186388.cpp  |   0
 .../TemplateSpecializationsTestCase/bug187258.cpp  |   0
 .../TemplateSpecializationsTestCase/bug190668.cpp  |   0
 .../TemplateSpecializationsTestCase/bug195283.cpp  |   0
 .../TemplateSpecializationsTestCase/bug196157.cpp  |   0
 .../TemplateSpecializationsTestCase/bug209513.cpp  |   0
 .../TemplateSpecializationsTestCase/bug210303.cpp  |   0
 .../bug210303_2.cpp                                |   0
 .../TemplateSpecializationsTestCase/bug216095.cpp  |   0
 .../TemplateSpecializationsTestCase/bug230585.cpp  |   0
 .../TemplateSpecializationsTestCase/bug230589.cpp  |   0
 .../TemplateSpecializationsTestCase/bug234973.cpp  |   0
 .../TemplateSpecializationsTestCase/bug235399.cpp  |   0
 .../TemplateSpecializationsTestCase/bug235829.cpp  |   0
 .../TemplateSpecializationsTestCase/bug235829.h    |   0
 .../TemplateSpecializationsTestCase/bug240123.cpp  |   0
 .../TemplateSpecializationsTestCase/bug246332.cpp  |   0
 .../bug246332_1.cpp                                |   0
 .../TemplateSpecializationsTestCase/bug246463.cpp  |   0
 .../TemplateSpecializationsTestCase/bug246643.cpp  |   0
 .../TemplateSpecializationsTestCase/bug246803.cpp  |   0
 .../TemplateSpecializationsTestCase/bug255475.cpp  |   0
 .../TemplateSpecializationsTestCase/bug256700.cpp  |   0
 .../TemplateSpecializationsTestCase/bug262586.cpp  |   0
 .../TemplateSpecializationsTestCase/bug269272.cpp  |   0
 .../explicit_specializations.cpp                   |   0
 .../iz103462_first_and_second_1.cc                 |   0
 .../iz143611_inherited_spec_field.cc               |   0
 .../TemplateSpecializationsTestCase/iz143977_0.cc  |   0
 .../TemplateSpecializationsTestCase/iz143977_1.cc  |   0
 .../TemplateSpecializationsTestCase/iz143977_2.cc  |   0
 .../TemplateSpecializationsTestCase/iz143977_3.cc  |   0
 .../TemplateSpecializationsTestCase/iz157359.cc    |   0
 .../TemplateSpecializationsTestCase/iz160659.cc    |   0
 .../TemplateSpecializationsTestCase/iz172227.cc    |   0
 .../template_fun_spec.cc                           |   0
 .../hyperlink/UnnamedEnumTestCase/newfile.cc       |   0
 .../hyperlink/UnnamedEnumTestCase/newfile.h        |   0
 .../UnnamedEnumTestCase/unnamedTypedefEnum.cc      |   0
 .../doctest.c                                      |   0
 .../impl/xref/ReferencesTestCase}/cpu.cc           |   0
 .../completion/impl/xref/ReferencesTestCase}/cpu.h |   0
 .../impl/xref/ReferencesTestCase}/customer.cc      |   0
 .../impl/xref/ReferencesTestCase/customer.h        |   0
 .../impl/xref/ReferencesTestCase}/disk.cc          |   0
 .../impl/xref/ReferencesTestCase}/disk.h           |   0
 .../impl/xref/ReferencesTestCase}/memory.cc        |   0
 .../impl/xref/ReferencesTestCase}/memory.h         |   0
 .../impl/xref/ReferencesTestCase/module.cc         |   0
 .../impl/xref/ReferencesTestCase/module.h          |   0
 .../impl/xref/ReferencesTestCase}/quote.cc         |   0
 .../impl/xref/ReferencesTestCase/system.cc         |   0
 .../impl/xref/ReferencesTestCase/system.h          |   0
 .../SimpleReferencesTestCase/macro_in_include.cc   |   0
 .../SimpleReferencesTestCase/macro_in_include.h    |   0
 .../includes/CCIncludesCompletionTestCase/file.cc  |   0
 .../CCIncludesCompletionTestCase/include1.h        |   0
 .../CCIncludesCompletionTestCase/include2.h        |   0
 .../usr_incl/inner_include1.h                      |   0
 .../usr_incl/inner_include2.h                      |   0
 .../usr_incl/no_ext_header                         |   0
 .../modules/cnd/completion/AutosTestCase.java      |   0
 .../cnd/completion/CCBasicCompletionTestCase.java  |   0
 .../modules/cnd/completion/CCCompletion2Test.java  |   0
 .../modules/cnd/completion/CCCompletion3Test.java  |   0
 .../modules/cnd/completion/CCCompletion4Test.java  |   0
 .../modules/cnd/completion/CCCompletionTest.java   |   0
 .../cnd/completion/CCCompletionTestFailed.java     |   0
 .../cnd/completion/CCSmartCompletionTest.java      |   0
 .../completion/CamelCaseCompletionTestCase.java    |   0
 .../modules/cnd/completion/CheckModelTestCase.java |   0
 .../cnd/completion/ClassContentTestCase.java       |   0
 .../completion/DotArrowSubstitutionTestCase.java   |   0
 .../modules/cnd/completion/EnumTestC_Case.java     |   0
 .../modules/cnd/completion/EnumTestCase.java       |   0
 .../modules/cnd/completion/FriendTestCase.java     |   0
 .../cnd/completion/FunctionCallsTestCase.java      |   0
 .../cnd/completion/GlobalCompletionTestCase.java   |   0
 .../cnd/completion/InheritanceTestCase.java        |   0
 .../cnd/completion/LibrariesContentTestCase.java   |   0
 .../cnd/completion/NamespaceFunctionsTestCase.java |   0
 .../cnd/completion/NamespaceUsingTestCase.java     |   0
 .../modules/cnd/completion/NamespacesTestCase.java |   0
 .../completion/NonGlobalCompletionTestCase.java    |   0
 .../cnd/completion/OverloadedOperatorTestCase.java |   0
 .../cnd/completion/PreprocDirectivesTestCase.java  |   0
 .../completion/SmartCompletionInQuoteTestCase.java |   0
 .../cnd/completion/StaticMembersTestCase.java      |   0
 .../cnd/completion/TemplateCompletionTestCase.java |   0
 .../completion/TemplateInstantiationTestCase.java  |   0
 .../completion/TemplateSpecializationTestCase.java |   0
 .../completion/TemplateSubstitutionTestCase.java   |   0
 .../modules/cnd/completion/TooltipTestCase.java    |   0
 .../modules/cnd/completion/TypedefTestCase.java    |   0
 .../cplusplus/ext/CompletionBaseTestCase.java      |   0
 .../cplusplus/ext/CompletionTestPerformer.java     |   0
 .../cplusplus/ext/CompletionTestResultItem.java    |   0
 .../hyperlink/BasicHyperlinkTestCase.java          |   0
 .../hyperlink/ClassMembersHyperlinkTestCase.java   |   0
 .../hyperlink/Cpp11TemplatesTestCase.java          |   0
 .../cplusplus/hyperlink/Cpp11TestCase.java         |   0
 .../cplusplus/hyperlink/Cpp11TooltipsTestCase.java |   0
 .../cplusplus/hyperlink/Cpp14TestCase.java         |   0
 .../cplusplus/hyperlink/CsmHyperlink2Test.java     |   0
 .../cplusplus/hyperlink/CsmHyperlinkTest.java      |   0
 .../hyperlink/CsmHyperlinkTestFailed.java          |   0
 .../cplusplus/hyperlink/HyperlinkBaseTestCase.java |   0
 .../hyperlink/InstantiationHyperlinkTestCase.java  |   0
 .../LibrariesContentHyperlinkTestCase.java         |   0
 .../cplusplus/hyperlink/MetaprogrammingTest.java   |   0
 .../hyperlink/MetaprogrammingTestCase.java         |   0
 .../hyperlink/MultiParseHyperlinkTestCase.java     |   0
 .../hyperlink/NamespacesHyperlinkTestCase.java     |   0
 .../hyperlink/TemplateSpecializationsTestCase.java |   0
 .../cplusplus/hyperlink/TooltipsBaseTestCase.java  |   0
 .../cplusplus/hyperlink/UnnamedEnumTestCase.java   |   0
 .../BasicDocumentationTextGenerationTestCase.java  |   0
 .../doxygensupport/DocumentationTest.java          |   0
 .../DocumentationTextGenerationBaseTestCase.java   |   0
 .../doxygensupport/DoxygenDocumentationTest.java   |   0
 .../completion/impl/xref/ExceptionsTestCase.java   |   0
 .../impl/xref/ReferencesBaseTestCase.java          |   0
 .../cnd/completion/impl/xref/ReferencesTest.java   |   0
 .../completion/impl/xref/ReferencesTestCase.java   |   0
 .../impl/xref/SimpleReferencesTestCase.java        |   0
 .../completion/includes/CCIncludesAuxTestCase.java |   0
 .../includes/CCIncludesCompletionTest.java         |   0
 .../includes/CCIncludesCompletionTestCase.java     |   0
 .../includes/IncludesCompletionBaseTestCase.java   |   0
 .../includes/IncludesCompletionTestPerformer.java  |   0
 {cnd => contrib}/cnd.debugger.common2/build.xml    |   0
 {cnd => contrib}/cnd.debugger.common2/manifest.mf  |   0
 .../nbproject/project.properties                   |   0
 .../cnd.debugger.common2/nbproject/project.xml     |   0
 ....netbeans.spi.viewmodel.AsynchronousModelFilter |   0
 ...org.netbeans.spi.viewmodel.CheckNodeModelFilter |   0
 .../org.netbeans.spi.viewmodel.ColumnModel         |   0
 ...etbeans.spi.viewmodel.NodeActionsProviderFilter |   0
 .../org.netbeans.spi.viewmodel.NodeModelFilter     |   0
 .../org.netbeans.spi.viewmodel.TableModelFilter    |   0
 .../org.netbeans.spi.viewmodel.TreeExpansionModel  |   0
 .../org.netbeans.spi.viewmodel.TreeModelFilter     |   0
 .../org.netbeans.spi.debugger.ui.BreakpointType    |   0
 .../modules/cnd/debugger/common2/APIAccessor.java  |   0
 .../modules/cnd/debugger/common2/Bundle.properties |   0
 .../cnd/debugger/common2/DbgActionHandler.java     |   0
 .../debugger/common2/DbgActionHandlerFactory.java  |   0
 .../debugger/common2/DbgAttachActionHandler.java   |   0
 .../common2/DbgAttachActionHandlerFactory.java     |   0
 .../modules/cnd/debugger/common2/DbgGuiModule.java |   0
 .../common2/NativeDebuggerManagerAccessor.java     |   0
 .../cnd/debugger/common2/ProcessListAccessor.java  |   0
 .../common2/capture/AbstractExternalStart.java     |   0
 .../cnd/debugger/common2/capture/Bundle.properties |   0
 .../cnd/debugger/common2/capture/CaptureInfo.java  |   0
 .../common2/capture/CaptureListenAction.java       |   0
 .../cnd/debugger/common2/capture/CapturePanel.java |   0
 .../cnd/debugger/common2/capture/Catalog.java      |   0
 .../debugger/common2/capture/ExternalStart.java    |   0
 .../common2/capture/ExternalStartManager.java      |   0
 .../common2/capture/ExternalStartProvider.java     |   0
 .../modules/cnd/debugger/common2/capture/Log.java  |   0
 .../common2/debugger/AbstractColumnModel.java      |   0
 .../debugger/common2/debugger/ActionEnabler.java   |   0
 .../cnd/debugger/common2/debugger/Address.java     |   0
 .../cnd/debugger/common2/debugger/Autos.java       |   0
 .../debugger/common2/debugger/Bundle.properties    |   0
 .../cnd/debugger/common2/debugger/Catalog.java     |   0
 .../cnd/debugger/common2/debugger/Constants.java   |   0
 .../common2/debugger/DebuggerAnnotation.java       |   0
 .../common2/debugger/DebuggerSettings.java         |   0
 .../common2/debugger/DebuggerSettingsBridge.java   |   0
 .../debugger/common2/debugger/DialogManager.java   |   0
 .../debugger/common2/debugger/EditorBridge.java    |   0
 .../common2/debugger/EditorContextBridge.java      |   0
 .../cnd/debugger/common2/debugger/Error.java       |   0
 .../debugger/common2/debugger/EvalAnnotation.java  |   0
 .../common2/debugger/EvaluationWindow.java         |   0
 .../cnd/debugger/common2/debugger/Frame.java       |   0
 .../cnd/debugger/common2/debugger/LocalModel.java  |   0
 .../cnd/debugger/common2/debugger/Location.java    |   0
 .../modules/cnd/debugger/common2/debugger/Log.java |   0
 .../debugger/common2/debugger/MacroSupport.java    |   0
 .../common2/debugger/ModelChangeDelegator.java     |   0
 .../common2/debugger/ModelListenerSupport.java     |   0
 .../debugger/common2/debugger/NativeDebugger.java  |   0
 .../common2/debugger/NativeDebuggerImpl.java       |   0
 .../common2/debugger/NativeDebuggerInfo.java       |   0
 .../common2/debugger/NativeDebuggerManager.java    |   0
 .../common2/debugger/NativeEngineProvider.java     |   0
 .../debugger/NativePinWatchValueProvider.java      |   0
 .../debugger/common2/debugger/NativeSession.java   |   0
 .../common2/debugger/NativeSessionProvider.java    |   0
 .../cnd/debugger/common2/debugger/NativeWatch.java |   0
 .../debugger/common2/debugger/ProgressManager.java |   0
 .../debugger/common2/debugger/RoutingToken.java    |   0
 .../common2/debugger/SessionColumnModels.java      |   0
 .../debugger/common2/debugger/SessionFilter.java   |   0
 .../debugger/common2/debugger/SignalDialog.java    |   0
 .../common2/debugger/StackColumnModels.java        |   0
 .../cnd/debugger/common2/debugger/StackModel.java  |   0
 .../cnd/debugger/common2/debugger/State.java       |   0
 .../debugger/common2/debugger/StateListener.java   |   0
 .../cnd/debugger/common2/debugger/Thread.java      |   0
 .../common2/debugger/ThreadColumnModels.java       |   0
 .../cnd/debugger/common2/debugger/ThreadModel.java |   0
 .../cnd/debugger/common2/debugger/ToolTipView.java |   0
 .../debugger/common2/debugger/VarContinuation.java |   0
 .../cnd/debugger/common2/debugger/Variable.java    |   0
 .../common2/debugger/VariableColumnModels.java     |   0
 .../debugger/common2/debugger/VariableModel.java   |   0
 .../common2/debugger/VariablesViewButtons.java     |   0
 .../cnd/debugger/common2/debugger/WatchBag.java    |   0
 .../cnd/debugger/common2/debugger/WatchModel.java  |   0
 .../debugger/common2/debugger/WatchVariable.java   |   0
 .../debugger/common2/debugger/WatchXMLCodec.java   |   0
 .../debugger/common2/debugger/WatchXMLReader.java  |   0
 .../debugger/common2/debugger/WatchXMLWriter.java  |   0
 .../debugger/common2/debugger/WatchesXMLCodec.java |   0
 .../common2/debugger/actions/AddWatchAction.java   |   0
 .../actions/AttachOutputActionProvider.java        |   0
 .../common2/debugger/actions/AttachPanel.java      |   0
 .../debugger/actions/AttachPanelProvider.java      |   0
 .../common2/debugger/actions/Bundle.properties     |   0
 .../debugger/common2/debugger/actions/Catalog.java |   0
 .../debugger/actions/CompileDebugAction.java       |   0
 .../debugger/actions/ConsoleWindowAction.java      |   0
 .../debugger/actions/ContinueActionProvider.java   |   0
 .../common2/debugger/actions/ContinueAtAction.java |   0
 .../common2/debugger/actions/DebugCoreAction.java  |   0
 .../debugger/actions/DebugCoreNodeAction.java      |   0
 .../common2/debugger/actions/DebugCorePanel.java   |   0
 .../debugger/actions/DebuggerLogAction.java        |   0
 .../common2/debugger/actions/DetachAction.java     |   0
 .../debugger/actions/DisassemblerWindowAction.java |   0
 .../debugger/actions/EditHostListAction.java       |   0
 .../debugger/actions/EditMaxFramePanel.java        |   0
 .../debugger/actions/EditMaxObjectPanel.java       |   0
 .../common2/debugger/actions/EditWatchPanel.java   |   0
 .../common2/debugger/actions/EvaluateAction.java   |   0
 .../debugger/actions/EvaluationWindowAction.java   |   0
 .../debugger/actions/FixActionProvider.java        |   0
 .../common2/debugger/actions/GoToSourceAction.java |   0
 .../debugger/actions/KillActionProvider.java       |   0
 .../cnd/debugger/common2/debugger/actions/Log.java |   0
 .../actions/MakeCalleeCurrentActionProvider.java   |   0
 .../actions/MakeCallerCurrentActionProvider.java   |   0
 .../common2/debugger/actions/MaxFrameAction.java   |   0
 .../common2/debugger/actions/MaxObjectAction.java  |   0
 .../debugger/actions/MemoryWindowAction.java       |   0
 .../debugger/actions/NativeActionsProvider.java    |   0
 .../debugger/actions/NewBreakpointAction.java      |   0
 .../debugger/actions/PauseActionProvider.java      |   0
 .../common2/debugger/actions/PioWindowAction.java  |   0
 .../actions/PopLastDebuggerCallAction.java         |   0
 .../debugger/actions/PopToCurrentFrameAction.java  |   0
 .../actions/PopTopmostCallActionProvider.java      |   0
 .../common2/debugger/actions/ProjectSupport.java   |   0
 .../debugger/actions/RegistersWindowAction.java    |   0
 .../common2/debugger/actions/RerunAction.java      |   0
 .../actions/RunIntoMethodActionProvider.java       |   0
 .../actions/RunToCursorActionProvider.java         |   0
 .../debugger/actions/RunToCursorInstAction.java    |   0
 .../debugger/actions/RunToFunctionAction.java      |   0
 .../actions/ShowCurrentDisStatementAction.java     |   0
 .../common2/debugger/actions/StepInstAction.java   |   0
 .../debugger/actions/StepIntoActionProvider.java   |   0
 .../debugger/actions/StepOutActionProvider.java    |   0
 .../debugger/actions/StepOutInstAction.java        |   0
 .../debugger/actions/StepOverActionProvider.java   |   0
 .../debugger/actions/StepOverInstAction.java       |   0
 .../debugger/actions/TerminateProcessAction.java   |   0
 .../actions/ToggleBreakpointActionProvider.java    |   0
 .../common2/debugger/api/EngineCapability.java     |   0
 .../common2/debugger/api/EngineDescriptor.java     |   0
 .../debugger/common2/debugger/api/EngineType.java  |   0
 .../common2/debugger/api/EngineTypeManager.java    |   0
 .../common2/debugger/assembly/BreakpointModel.java |   0
 .../common2/debugger/assembly/Bundle.properties    |   0
 .../common2/debugger/assembly/Catalog.java         |   0
 .../common2/debugger/assembly/Controller.java      |   0
 .../common2/debugger/assembly/DisFragModel.java    |   0
 .../common2/debugger/assembly/DisInfoPanel.java    |   0
 .../debugger/assembly/DisProgressPanel.form        |   0
 .../debugger/assembly/DisProgressPanel.java        |   0
 .../common2/debugger/assembly/DisView.java         |   0
 .../debugger/assembly/DisassemblerWindow.java      |   0
 .../common2/debugger/assembly/Disassembly.java     |   0
 .../debugger/assembly/DisassemblyUtils.java        |   0
 .../common2/debugger/assembly/FormatOption.java    |   0
 .../debugger/common2/debugger/assembly/Log.java    |   0
 .../common2/debugger/assembly/MemoryWindow.java    |   0
 .../common2/debugger/assembly/RegistersWindow.java |   0
 .../common2/debugger/assembly/StateModel.java      |   0
 ...DisassemblyFileEncodingQueryImplementation.java |   0
 .../debugger/breakpoints/BreakpointBag.java        |   0
 .../breakpoints/BreakpointColumnModels.java        |   0
 .../debugger/breakpoints/BreakpointFilter.java     |   0
 .../debugger/breakpoints/BreakpointManager.java    |   0
 .../debugger/breakpoints/BreakpointPanel.java      |   0
 .../debugger/breakpoints/BreakpointProvider.java   |   0
 .../breakpoints/BreakpointTreeExpansionModel.java  |   0
 .../debugger/breakpoints/BreakpointXMLCodec.java   |   0
 .../debugger/breakpoints/BreakpointXMLReader.java  |   0
 .../debugger/breakpoints/BreakpointXMLWriter.java  |   0
 .../debugger/breakpoints/BreakpointsXMLCodec.java  |   0
 .../common2/debugger/breakpoints/Bundle.properties |   0
 .../common2/debugger/breakpoints/Catalog.java      |   0
 .../common2/debugger/breakpoints/Context.java      |   0
 .../debugger/breakpoints/ControllerProvider.java   |   0
 .../debugger/breakpoints/EditBreakpointPanel.java  |   0
 .../debugger/common2/debugger/breakpoints/Gen.java |   0
 .../common2/debugger/breakpoints/Handler.java      |   0
 .../debugger/breakpoints/HandlerCommand.java       |   0
 .../debugger/breakpoints/HandlerExpert.java        |   0
 .../debugger/common2/debugger/breakpoints/Log.java |   0
 .../debugger/breakpoints/NativeBreakpoint.java     |   0
 .../breakpoints/NativeBreakpointBeanInfo.java      |   0
 .../breakpoints/NativeBreakpointCustomizer.java    |   0
 .../debugger/breakpoints/NativeBreakpointType.java |   0
 .../NativeBreakpointsActivationProvider.java       |   0
 .../breakpoints/SubBreakpointsXMLCodec.java        |   0
 .../common2/debugger/breakpoints/SystemInfo.java   |   0
 .../breakpoints/props/AccessBAProperty.java        |   0
 .../debugger/breakpoints/props/ActionProperty.java |   0
 .../breakpoints/props/ContextProperty.java         |   0
 .../breakpoints/props/CountLimitProperty.java      |   0
 .../breakpoints/props/DebuggerEventProperty.java   |   0
 .../breakpoints/props/DlEventProperty.java         |   0
 .../breakpoints/props/ExceptionSpecProperty.java   |   0
 .../props/FunctionSubEventProperty.java            |   0
 .../breakpoints/props/ProcessEventProperty.java    |   0
 .../breakpoints/props/SysCallEEProperty.java       |   0
 .../debugger/breakpoints/types/Bundle.properties   |   0
 .../debugger/breakpoints/types/Catalog.java        |   0
 .../breakpoints/types/ExceptionBreakpoint.java     |   0
 .../types/ExceptionBreakpointPanel.java            |   0
 .../breakpoints/types/ExceptionBreakpointType.java |   0
 .../breakpoints/types/FallbackBreakpoint.java      |   0
 .../breakpoints/types/FallbackBreakpointPanel.java |   0
 .../breakpoints/types/FallbackBreakpointType.java  |   0
 .../breakpoints/types/FunctionBreakpoint.java      |   0
 .../breakpoints/types/FunctionBreakpointPanel.java |   0
 .../breakpoints/types/FunctionBreakpointType.java  |   0
 .../breakpoints/types/InstructionBreakpoint.java   |   0
 .../types/InstructionBreakpointPanel.java          |   0
 .../types/InstructionBreakpointType.java           |   0
 .../debugger/breakpoints/types/LineBreakpoint.java |   0
 .../breakpoints/types/LineBreakpointPanel.java     |   0
 .../breakpoints/types/LineBreakpointType.java      |   0
 .../breakpoints/types/SysCallBreakpoint.java       |   0
 .../breakpoints/types/SysCallBreakpointPanel.java  |   0
 .../breakpoints/types/SysCallBreakpointType.java   |   0
 .../breakpoints/types/VariableBreakpoint.java      |   0
 .../breakpoints/types/VariableBreakpointPanel.java |   0
 .../breakpoints/types/VariableBreakpointType.java  |   0
 .../debugging/DebuggingNodeActionsProvider.java    |   0
 .../debugger/debugging/DebuggingNodeModel.java     |   0
 .../debugger/debugging/DebuggingViewModel.java     |   0
 .../debugger/debugging/NativeDVSupportImpl.java    |   0
 .../common2/debugger/debugtarget/Catalog.java      |   0
 .../common2/debugger/debugtarget/DebugTarget.java  |   0
 .../debugger/debugtarget/DebugTargetList.java      |   0
 .../debugger/debugtarget/DebugTargetXMLCodec.java  |   0
 .../debugger/debugtarget/DebugTargetsXMLCodec.java |   0
 .../debugtarget/DebugTargetsXMLReader.java         |   0
 .../debugtarget/DebugTargetsXMLWriter.java         |   0
 .../NativeDebuggerAuxObjectFactory.java            |   0
 .../debugger/common2/debugger/io/Bundle.properties |   0
 .../cnd/debugger/common2/debugger/io/Catalog.java  |   0
 .../common2/debugger/io/ConsoleTopComponent.form   |   0
 .../common2/debugger/io/ConsoleTopComponent.java   |   0
 .../debugger/io/DebuggerExternalTerminal.java      |   0
 .../common2/debugger/io/ExternalTerminalPack.java  |   0
 .../cnd/debugger/common2/debugger/io/IOPack.java   |   0
 .../cnd/debugger/common2/debugger/io/IOProxy.java  |   0
 .../common2/debugger/io/InternalTerminalPack.java  |   0
 .../common2/debugger/io/NewTermComponent.java      |   0
 .../debugger/common2/debugger/io/OutputPack.java   |   0
 .../cnd/debugger/common2/debugger/io/PioPack.java  |   0
 .../common2/debugger/io/PioTopComponent.form       |   0
 .../common2/debugger/io/PioTopComponent.java       |   0
 .../common2/debugger/io/TermComponent.java         |   0
 .../common2/debugger/io/TermComponentFactory.java  |   0
 .../common2/debugger/options/Bundle.properties     |   0
 .../debugger/common2/debugger/options/Catalog.java |   0
 .../common2/debugger/options/DbgProfile.java       |   0
 .../debugger/options/DbgProfileNodeProvider.java   |   0
 .../debugger/options/DbgProfileXMLCodec.java       |   0
 .../common2/debugger/options/DebuggerOption.java   |   0
 .../common2/debugger/options/EngineNodeProp.java   |   0
 .../common2/debugger/options/EngineProfile.java    |   0
 .../debugger/options/EngineProfileProvider.java    |   0
 .../debugger/options/EngineProfileXMLCodec.java    |   0
 .../common2/debugger/options/Exceptions.java       |   0
 .../debugger/options/ExceptionsNodeProp.java       |   0
 .../common2/debugger/options/ExceptionsPanel.java  |   0
 .../debugger/options/GlobalAdvancedOption.java     |   0
 .../common2/debugger/options/GlobalOptionSet.java  |   0
 .../debugger/options/GlobalOptionsPanel.java       |   0
 .../debugger/options/GlobalOptionsSubPanel.java    |   0
 .../debugger/common2/debugger/options/Pathmap.java |   0
 .../common2/debugger/options/PathmapNodeProp.java  |   0
 .../common2/debugger/options/PathmapPanel.java     |   0
 .../common2/debugger/options/ProfileCategory.java  |   0
 .../common2/debugger/options/ProfileOptionSet.java |   0
 .../common2/debugger/options/ProfileSupport.java   |   0
 .../common2/debugger/options/SignalTableModel.java |   0
 .../debugger/common2/debugger/options/Signals.java |   0
 .../common2/debugger/options/SignalsNodeProp.java  |   0
 .../common2/debugger/options/SignalsPanel.java     |   0
 .../options/ToolsPanelGlobalCustomizerImpl.java    |   0
 .../debugger/processlist/api/ProcessInfo.java      |   0
 .../processlist/api/ProcessInfoDescriptor.java     |   0
 .../debugger/processlist/api/ProcessList.java      |   0
 .../common2/debugger/remote/Bundle.properties      |   0
 .../debugger/common2/debugger/remote/Catalog.java  |   0
 .../common2/debugger/remote/CndRemote.java         |   0
 .../common2/debugger/remote/CustomizableHost.java  |   0
 .../debugger/remote/CustomizableHostList.java      |   0
 .../debugger/common2/debugger/remote/ExecHost.java |   0
 .../cnd/debugger/common2/debugger/remote/Host.java |   0
 .../common2/debugger/remote/HostListEditor.java    |   0
 .../common2/debugger/remote/HostListXMLCodec.java  |   0
 .../common2/debugger/remote/HostListXMLReader.java |   0
 .../common2/debugger/remote/HostListXMLWriter.java |   0
 .../common2/debugger/remote/HostOption.java        |   0
 .../common2/debugger/remote/HostOptionSet.java     |   0
 .../common2/debugger/remote/HostPanel.java         |   0
 .../cnd/debugger/common2/debugger/remote/Log.java  |   0
 .../debugger/common2/debugger/remote/Platform.java |   0
 .../common2/debugger/remote/SecuritySettings.java  |   0
 .../common2/debugger/spi/AttachPanelFactory.java   |   0
 .../debugger/spi/DebuggerToolRecognizer.java       |   0
 .../debugger/spi/EngineCapabilityProvider.java     |   0
 .../common2/debugger/spi/UserAttachAction.java     |   0
 .../common2/debugger/spi/UserDebugCoreAction.java  |   0
 .../modules/cnd/debugger/common2/icons/Bpt.gif     | Bin
 .../modules/cnd/debugger/common2/icons/Bpt.png     | Bin
 .../cnd/debugger/common2/icons/Bpt_broken.gif      | Bin
 .../cnd/debugger/common2/icons/Bpt_broken.png      | Bin
 .../cnd/debugger/common2/icons/Bpt_broken_dis.gif  | Bin
 .../cnd/debugger/common2/icons/Bpt_broken_dis.png  | Bin
 .../cnd/debugger/common2/icons/Bpt_cmpx.gif        | Bin
 .../cnd/debugger/common2/icons/Bpt_cmpx.png        | Bin
 .../cnd/debugger/common2/icons/Bpt_cmpx_broken.gif | Bin
 .../cnd/debugger/common2/icons/Bpt_cmpx_broken.png | Bin
 .../debugger/common2/icons/Bpt_cmpx_broken_dis.gif | Bin
 .../debugger/common2/icons/Bpt_cmpx_broken_dis.png | Bin
 .../cnd/debugger/common2/icons/Bpt_cmpx_dis.gif    | Bin
 .../cnd/debugger/common2/icons/Bpt_cmpx_dis.png    | Bin
 .../cnd/debugger/common2/icons/Bpt_cmpx_hit.gif    | Bin
 .../cnd/debugger/common2/icons/Bpt_cmpx_hit.png    | Bin
 .../debugger/common2/icons/Bpt_cmpx_hit_broken.gif | Bin
 .../debugger/common2/icons/Bpt_cmpx_hit_broken.png | Bin
 .../common2/icons/Bpt_cmpx_hit_broken_dis.gif      | Bin
 .../common2/icons/Bpt_cmpx_hit_broken_dis.png      | Bin
 .../debugger/common2/icons/Bpt_cmpx_hit_dis.gif    | Bin
 .../debugger/common2/icons/Bpt_cmpx_hit_dis.png    | Bin
 .../modules/cnd/debugger/common2/icons/Bpt_dis.gif | Bin
 .../modules/cnd/debugger/common2/icons/Bpt_dis.png | Bin
 .../modules/cnd/debugger/common2/icons/Bpt_hit.gif | Bin
 .../modules/cnd/debugger/common2/icons/Bpt_hit.png | Bin
 .../cnd/debugger/common2/icons/Bpt_hit_broken.gif  | Bin
 .../cnd/debugger/common2/icons/Bpt_hit_broken.png  | Bin
 .../debugger/common2/icons/Bpt_hit_broken_dis.gif  | Bin
 .../debugger/common2/icons/Bpt_hit_broken_dis.png  | Bin
 .../cnd/debugger/common2/icons/Bpt_hit_dis.gif     | Bin
 .../cnd/debugger/common2/icons/Bpt_hit_dis.png     | Bin
 .../cnd/debugger/common2/icons/Bpt_mult.gif        | Bin
 .../cnd/debugger/common2/icons/Bpt_mult.png        | Bin
 .../cnd/debugger/common2/icons/Bpt_mult_broken.gif | Bin
 .../cnd/debugger/common2/icons/Bpt_mult_broken.png | Bin
 .../debugger/common2/icons/Bpt_mult_broken_dis.gif | Bin
 .../debugger/common2/icons/Bpt_mult_broken_dis.png | Bin
 .../cnd/debugger/common2/icons/Bpt_mult_dis.gif    | Bin
 .../cnd/debugger/common2/icons/Bpt_mult_dis.png    | Bin
 .../cnd/debugger/common2/icons/Bpt_mult_hit.gif    | Bin
 .../cnd/debugger/common2/icons/Bpt_mult_hit.png    | Bin
 .../debugger/common2/icons/Bpt_mult_hit_broken.gif | Bin
 .../debugger/common2/icons/Bpt_mult_hit_broken.png | Bin
 .../common2/icons/Bpt_mult_hit_broken_dis.gif      | Bin
 .../common2/icons/Bpt_mult_hit_broken_dis.png      | Bin
 .../debugger/common2/icons/Bpt_mult_hit_dis.gif    | Bin
 .../debugger/common2/icons/Bpt_mult_hit_dis.png    | Bin
 .../cnd/debugger/common2/icons/Bpt_nonline.gif     | Bin
 .../cnd/debugger/common2/icons/Bpt_nonline.png     | Bin
 .../cnd/debugger/common2/icons/Bpt_nonline_dis.gif | Bin
 .../cnd/debugger/common2/icons/Bpt_nonline_dis.png | Bin
 .../debugger/common2/icons/BrokenBreakpoint.gif    | Bin
 .../cnd/debugger/common2/icons/Pointing_arrow.gif  | Bin
 .../cnd/debugger/common2/icons/Pointing_arrow.png  | Bin
 .../modules/cnd/debugger/common2/icons/Save.png    | Bin
 .../modules/cnd/debugger/common2/icons/autos.png   | Bin
 .../cnd/debugger/common2/icons/configure.png       | Bin
 .../cnd/debugger/common2/icons/configure24.png     | Bin
 .../debugger/common2/icons/continue-at-line.png    | Bin
 .../debugger/common2/icons/continue-at-line24.png  | Bin
 .../cnd/debugger/common2/icons/debug_core_file.png | Bin
 .../debugger/common2/icons/debug_core_file24.png   | Bin
 .../debugger/common2/icons/debug_executable.png    | Bin
 .../debugger/common2/icons/debug_executable24.png  | Bin
 .../debugger/common2/icons/debug_most_recent.png   | Bin
 .../debugger/common2/icons/debug_most_recent24.png | Bin
 .../debugger/common2/icons/debugger_console.png    | Bin
 .../debugger/common2/icons/detach_from_process.png | Bin
 .../common2/icons/detach_from_process24.png        | Bin
 .../cnd/debugger/common2/icons/disassambler.png    | Bin
 .../modules/cnd/debugger/common2/icons/empty.gif   | Bin
 .../debugger/common2/icons/evaluate_expression.png | Bin
 .../common2/icons/evaluate_expression24.png        | Bin
 .../modules/cnd/debugger/common2/icons/extras.gif  | Bin
 .../modules/cnd/debugger/common2/icons/field.gif   | Bin
 .../cnd/debugger/common2/icons/field_pointer.gif   | Bin
 .../cnd/debugger/common2/icons/field_static.gif    | Bin
 .../common2/icons/field_static_pointer.gif         | Bin
 .../cnd/debugger/common2/icons/list-toggle16.png   | Bin
 .../cnd/debugger/common2/icons/list-toggle24.png   | Bin
 .../modules/cnd/debugger/common2/icons/local.gif   | Bin
 .../cnd/debugger/common2/icons/local_pointer.gif   | Bin
 .../cnd/debugger/common2/icons/local_static.gif    | Bin
 .../common2/icons/local_static_pointer.gif         | Bin
 .../cnd/debugger/common2/icons/memory_browser.png  | Bin
 .../modules/cnd/debugger/common2/icons/pop2cur.gif | Bin
 .../common2/icons/pop_last_debugger_call.gif       | Bin
 .../common2/icons/pop_last_debugger_call24.gif     | Bin
 .../modules/cnd/debugger/common2/icons/popcall.gif | Bin
 .../cnd/debugger/common2/icons/process_io.png      | Bin
 .../modules/cnd/debugger/common2/icons/refresh.png | Bin
 .../cnd/debugger/common2/icons/refresh24.png       | Bin
 .../cnd/debugger/common2/icons/refresh_1.png       | Bin
 .../cnd/debugger/common2/icons/registers.png       | Bin
 .../modules/cnd/debugger/common2/icons/restart.png | Bin
 .../cnd/debugger/common2/icons/restart24.png       | Bin
 .../modules/cnd/debugger/common2/icons/run.png     | Bin
 .../modules/cnd/debugger/common2/icons/run24.png   | Bin
 .../common2/icons/run_to_cursor_instruction.png    | Bin
 .../common2/icons/run_to_cursor_instruction24.png  | Bin
 .../common2/icons/run_to_last_function.png         | Bin
 .../common2/icons/run_to_last_function24.png       | Bin
 .../debugger/common2/icons/runtime_checking.png    | Bin
 .../common2/icons/signal_handler_frame.gif         | Bin
 .../common2/icons/step_into_instruction.png        | Bin
 .../common2/icons/step_into_instruction24.png      | Bin
 .../common2/icons/step_out_instruction.png         | Bin
 .../common2/icons/step_out_instruction24.png       | Bin
 .../common2/icons/step_over_instruction.png        | Bin
 .../common2/icons/step_over_instruction24.png      | Bin
 .../debugger/common2/icons/step_to_function.png    | Bin
 .../debugger/common2/icons/step_to_function24.png  | Bin
 .../debugger/common2/icons/terminate_process.png   | Bin
 .../debugger/common2/icons/terminate_process24.png | Bin
 .../modules/cnd/debugger/common2/icons/thread.png  | Bin
 .../cnd/debugger/common2/icons/thread_current.png  | Bin
 .../debugger/common2/icons/thread_current_hit.png  | Bin
 .../cnd/debugger/common2/icons/thread_hit.png      | Bin
 .../cnd/debugger/common2/icons/tree-toggle16.png   | Bin
 .../cnd/debugger/common2/icons/tree-toggle24.png   | Bin
 .../cnd/debugger/common2/icons/treeview.png        | Bin
 .../cnd/debugger/common2/icons/user_call_frame.gif | Bin
 .../cnd/debugger/common2/icons}/waitNode.gif       | Bin
 .../cnd/debugger/common2/icons/watch_type1.gif     | Bin
 .../debugger/common2/icons/watch_type1_pointer.gif | Bin
 .../cnd/debugger/common2/icons/watch_type2.gif     | Bin
 .../debugger/common2/icons/watch_type2_pointer.gif | Bin
 .../common2/resources/annotations/Dbx_Bpt.xml      |   0
 .../resources/annotations/Dbx_Bpt_broken.xml       |   0
 .../resources/annotations/Dbx_Bpt_broken_dis.xml   |   0
 .../common2/resources/annotations/Dbx_Bpt_cmpx.xml |   0
 .../resources/annotations/Dbx_Bpt_cmpx_broken.xml  |   0
 .../annotations/Dbx_Bpt_cmpx_broken_dis.xml        |   0
 .../resources/annotations/Dbx_Bpt_cmpx_dis.xml     |   0
 .../resources/annotations/Dbx_Bpt_cmpx_hit.xml     |   0
 .../annotations/Dbx_Bpt_cmpx_hit_broken.xml        |   0
 .../annotations/Dbx_Bpt_cmpx_hit_broken_dis.xml    |   0
 .../resources/annotations/Dbx_Bpt_cmpx_hit_dis.xml |   0
 .../resources/annotations/Dbx_Bpt_compound.xml     |   0
 .../resources/annotations/Dbx_Bpt_compound_hit.xml |   0
 .../common2/resources/annotations/Dbx_Bpt_dis.xml  |   0
 .../resources/annotations/Dbx_Bpt_diverse.xml      |   0
 .../common2/resources/annotations/Dbx_Bpt_hit.xml  |   0
 .../resources/annotations/Dbx_Bpt_hit_broken.xml   |   0
 .../annotations/Dbx_Bpt_hit_broken_dis.xml         |   0
 .../resources/annotations/Dbx_Bpt_hit_dis.xml      |   0
 .../resources/annotations/Dbx_Bpt_multi.xml        |   0
 .../resources/annotations/Dbx_Bpt_multi_broken.xml |   0
 .../annotations/Dbx_Bpt_multi_broken_dis.xml       |   0
 .../resources/annotations/Dbx_Bpt_multi_cmpx.xml   |   0
 .../annotations/Dbx_Bpt_multi_cmpx_broken.xml      |   0
 .../annotations/Dbx_Bpt_multi_cmpx_broken_dis.xml  |   0
 .../annotations/Dbx_Bpt_multi_cmpx_dis.xml         |   0
 .../resources/annotations/Dbx_Bpt_multi_dis.xml    |   0
 .../common2/resources/annotations/Dbx_PC.xml       |   0
 .../cnd/debugger/common2/resources/blank.gif       | Bin
 .../components/ConsoleTopComponentSettings.xml     |   0
 .../components/DisassemblerWindow.settings         |   0
 .../resources/components/EvaluationWindow.settings |   0
 .../resources/components/MemoryWindow.settings     |   0
 .../components/PioTopComponentSettings.xml         |   0
 .../resources/components/RegistersWindow.settings  |   0
 .../common2/resources/debugconfiguration-1_0.dtd   |   0
 .../common2/resources/debugoptions-1_0.dtd         |   0
 .../debugger/common2/resources/filesystems.wstcref |   0
 .../cnd/debugger/common2/resources/general.gif     | Bin
 .../groups/debugger/DisassemblerWindow.wstcgrp     |   0
 .../groups/debugger/EvaluationWindow.wstcgrp       |   0
 .../resources/groups/debugger/MemoryWindow.wstcgrp |   0
 .../groups/debugger/RegistersWindow.wstcgrp        |   0
 .../cnd/debugger/common2/resources/helpctx.xml     |   0
 .../cnd/debugger/common2/resources/layer.xml       |   0
 .../common2/resources/modes/breakpoints.wsmode     |   0
 .../modes/debugger/EvaluationWindow.wstcref        |   0
 .../resources/modes/debugger/MemoryWindow.wstcref  |   0
 .../modes/debugger/RegistersWindow.wstcref         |   0
 .../modes/editor/DisassemblerWindow.wstcref        |   0
 .../modes/output/ConsoleTopComponentWstcref.xml    |   0
 .../modes/output/PioTopComponentWstcref.xml        |   0
 .../resources/modes/output/callstack.wstcref       |   0
 .../common2/resources/modes/output/locals.wstcref  |   0
 .../resources/modes/output/navigatorTC.wstcref     |   0
 .../resources/modes/output/sessions.wstcref        |   0
 .../common2/resources/modes/output/threads.wstcref |   0
 .../common2/resources/modes/output/watches.wstcref |   0
 .../cnd/debugger/common2/ui/AttachPanelImpl.java   |   0
 .../common2/ui/AttachPanelImplFactory.java         |   0
 .../cnd/debugger/common2/ui/Bundle.properties      |   0
 .../modules/cnd/debugger/common2/ui/Catalog.java   |   0
 .../common2/ui/ExecutableProjectPanel.java         |   0
 .../processlist/AttachToProcessPanelFactory.java   |   0
 .../processlist/AttachToProcessTopComponent.form   |   0
 .../processlist/AttachToProcessTopComponent.java   |   0
 .../common2/ui/processlist/Bundle.properties       |   0
 .../debugger/common2/ui/processlist/Catalog.java   |   0
 .../common2/ui/processlist/LoadingNode.java        |   0
 .../common2/ui/processlist/ProcessFilter.java      |   0
 .../common2/ui/processlist/ProcessInfoPanel.form   |   0
 .../common2/ui/processlist/ProcessInfoPanel.java   |   0
 .../common2/ui/processlist/ProcessListPanel.form   |   0
 .../common2/ui/processlist/ProcessListPanel.java   |   0
 .../ui/processlist/ProcessListTreeModel.java       |   0
 .../common2/ui/processlist/ProcessNode.java        |   0
 .../ui/processlist/ProcessPanelCustomizer.java     |   0
 .../common2/ui/processlist/ProcessesRootNode.java  |   0
 .../cnd/debugger/common2/utils/Bundle.properties   |   0
 .../cnd/debugger/common2/utils/Catalog.java        |   0
 .../cnd/debugger/common2/utils/CorefileFilter.java |   0
 .../common2/utils/DebuggerErrorsTopComponent.form  |   0
 .../common2/utils/DebuggerErrorsTopComponent.java  |   0
 .../common2/utils/DebuggerLoggerSupport.java       |   0
 .../common2/utils/ExecutableFileFilter.java        |   0
 .../cnd/debugger/common2/utils/Executor.java       |   0
 .../cnd/debugger/common2/utils/ExecutorCND.java    |   0
 .../cnd/debugger/common2/utils/FileMapper.java     |   0
 .../debugger/common2/utils/FlyweightAction.java    |   0
 .../common2/utils/FlyweightBooleanStateAction.java |   0
 .../cnd/debugger/common2/utils/InfoPanel.java      |   0
 .../cnd/debugger/common2/utils/IpeUtils.java       |   0
 .../debugger/common2/utils/ItemSelectorDialog.java |   0
 .../debugger/common2/utils/ItemSelectorResult.java |   0
 .../cnd/debugger/common2/utils/LastLocation.java   |   0
 .../cnd/debugger/common2/utils/ListMap.java        |   0
 .../cnd/debugger/common2/utils/ListMapItem.java    |   0
 .../cnd/debugger/common2/utils/ListTableModel.java |   0
 .../modules/cnd/debugger/common2/utils/ListUI.java |   0
 .../modules/cnd/debugger/common2/utils/Log.java    |   0
 .../cnd/debugger/common2/utils/LogSupport.java     |   0
 .../debugger/common2/utils/MRUComboBoxModel.java   |   0
 .../common2/utils/NotifyingInputSteam.java         |   0
 .../cnd/debugger/common2/utils/PhasedProgress.java |   0
 .../debugger/common2/utils/ProcessListSupport.java |   0
 .../common2/utils/ProjectComboBoxSupport.java      |   0
 .../cnd/debugger/common2/utils/PsProvider.java     |   0
 .../cnd/debugger/common2/utils/StackHistory.java   |   0
 .../cnd/debugger/common2/utils/StopWatch.java      |   0
 .../cnd/debugger/common2/utils/UserdirFile.java    |   0
 .../modules/cnd/debugger/common2/utils/comment.gif | Bin
 .../utils/masterdetail/AbstractRecordList.java     |   0
 .../common2/utils/masterdetail/Bundle.properties   |   0
 .../common2/utils/masterdetail/Catalog.java        |   0
 .../common2/utils/masterdetail/DetailView.java     |   0
 .../common2/utils/masterdetail/DummyNode.java      |   0
 .../utils/masterdetail/DummyPropertySheet.java     |   0
 .../debugger/common2/utils/masterdetail/Log.java   |   0
 .../utils/masterdetail/MasterDetailView.java       |   0
 .../common2/utils/masterdetail/MasterView.java     |   0
 .../common2/utils/masterdetail/Record.java         |   0
 .../common2/utils/masterdetail/RecordEvent.java    |   0
 .../common2/utils/masterdetail/RecordList.java     |   0
 .../utils/masterdetail/RecordListEvent.java        |   0
 .../utils/masterdetail/RecordListListener.java     |   0
 .../common2/utils/masterdetail/RecordListener.java |   0
 .../common2/utils/masterdetail/Validator.java      |   0
 .../common2/utils/options/Bundle.properties        |   0
 .../debugger/common2/utils/options/Catalog.java    |   0
 .../common2/utils/options/CatalogDynamic.java      |   0
 .../common2/utils/options/CheckBoxOptionUI.java    |   0
 .../common2/utils/options/ComboBoxOptionUI.java    |   0
 .../common2/utils/options/DirectoryOptionUI.java   |   0
 .../cnd/debugger/common2/utils/options/Option.java |   0
 .../common2/utils/options/OptionClient.java        |   0
 .../utils/options/OptionCustomizerNode.java        |   0
 .../utils/options/OptionCustomizerPanel.java       |   0
 .../utils/options/OptionDirectoriesEditor.java     |   0
 .../utils/options/OptionDirectoryEditor.java       |   0
 .../common2/utils/options/OptionEnumEditor.java    |   0
 .../common2/utils/options/OptionLayers.java        |   0
 .../utils/options/OptionPropertySupport.java       |   0
 .../debugger/common2/utils/options/OptionSet.java  |   0
 .../common2/utils/options/OptionSetOwner.java      |   0
 .../common2/utils/options/OptionSetSupport.java    |   0
 .../common2/utils/options/OptionSetXMLCodec.java   |   0
 .../debugger/common2/utils/options/OptionUI.java   |   0
 .../common2/utils/options/OptionValue.java         |   0
 .../common2/utils/options/RadioButtonOptionUI.java |   0
 .../common2/utils/options/SubcategoryOptionUI.java |   0
 .../common2/utils/options/TextFieldOptionUI.java   |   0
 .../cnd/debugger/common2/utils/options/UISet.java  |   0
 .../debugger/common2/utils/options/Validity.java   |   0
 .../common2/utils/props/BooleanProperty.java       |   0
 .../debugger/common2/utils/props/EnumProperty.java |   0
 .../common2/utils/props/FloatProperty.java         |   0
 .../common2/utils/props/IntegerProperty.java       |   0
 .../cnd/debugger/common2/utils/props/Property.java |   0
 .../common2/utils/props/PropertyOwner.java         |   0
 .../common2/utils/props/PropertyOwnerSupport.java  |   0
 .../common2/utils/props/StringProperty.java        |   0
 .../modules/cnd/debugger/common2/values/AId.java   |   0
 .../cnd/debugger/common2/values/AccessBA.java      |   0
 .../debugger/common2/values/AccessBAEditor.java    |   0
 .../cnd/debugger/common2/values/Action.java        |   0
 .../cnd/debugger/common2/values/ActionEditor.java  |   0
 .../cnd/debugger/common2/values/AsyncEditor.java   |   0
 .../cnd/debugger/common2/values/Bundle.properties  |   0
 .../cnd/debugger/common2/values/Catalog.java       |   0
 .../cnd/debugger/common2/values/CountLimit.java    |   0
 .../debugger/common2/values/CountLimitEditor.java  |   0
 .../cnd/debugger/common2/values/DebuggerEvent.java |   0
 .../cnd/debugger/common2/values/DlEvent.java       |   0
 .../cnd/debugger/common2/values/EditUndo.java      |   0
 .../cnd/debugger/common2/values/EditUndoable.java  |   0
 .../common2/values/EnhancedAsyncEditor.java        |   0
 .../modules/cnd/debugger/common2/values/Enum.java  |   0
 .../cnd/debugger/common2/values/EnumEditor.java    |   0
 .../cnd/debugger/common2/values/ExceptionSpec.java |   0
 .../debugger/common2/values/FunctionSubEvent.java  |   0
 .../cnd/debugger/common2/values/LwpIdEditor.java   |   0
 .../cnd/debugger/common2/values/PidEditor.java     |   0
 .../cnd/debugger/common2/values/ProcessEvent.java  |   0
 .../cnd/debugger/common2/values/StringEditor.java  |   0
 .../cnd/debugger/common2/values/SysCallEE.java     |   0
 .../debugger/common2/values/ThreadIdEditor.java    |   0
 .../cnd/debugger/common2/values/VariableValue.java |   0
 .../common2/values/VariableValueEditor.java        |   0
 .../BreakpointsCodecTest/Breakpoints_new.xml       |   0
 .../BreakpointsCodecTest/Breakpoints_old.xml       |   0
 .../BreakpointsCodecTest/Breakpoints_saved.xml     |   0
 .../DebugTargetListTest/debugtargets_saved.xml     |   0
 .../DebugTargetListTest/debugtargets_v1.xml        |   0
 .../DebugTargetListTest/debugtargets_v2.xml        |   0
 ...dules.editor.settings.storage.spi.StorageFilter |   0
 .../org.netbeans.spi.debugger.ui.BreakpointType    |   0
 .../common2/debugger/EvalAnnotationTest.java       |   0
 .../debugger/breakpoints/BreakpointsCodecTest.java |   0
 .../debugger/debugtarget/DebugTargetListTest.java  |   0
 .../common2/debugger/test/CndBaseTestCase.java     |   0
 .../common2/debugger/test/CndCoreTestUtils.java    |   0
 .../cnd/debugger/common2/utils/PsProviderTest.java |   0
 .../cnd.debugger.common2/windows/GdbKillProc.c     |   0
 .../cnd.debugger.common2/windows/Makefile          |   0
 {cnd => contrib}/cnd.debugger.gdb2/build.xml       |   0
 {cnd => contrib}/cnd.debugger.gdb2/manifest.mf     |   0
 .../cnd.debugger.gdb2/nbproject/project.properties |   0
 .../cnd.debugger.gdb2/nbproject/project.xml        |   0
 .../org.netbeans.spi.viewmodel.ColumnModel         |   0
 .../org.netbeans.spi.viewmodel.NodeActionsProvider |   0
 .../org.netbeans.spi.viewmodel.NodeModel           |   0
 .../org.netbeans.spi.viewmodel.TableModel          |   0
 .../org.netbeans.spi.viewmodel.TreeModel           |   0
 .../LocalsView}/javax.swing.AbstractButton         |   0
 ....netbeans.spi.viewmodel.AsynchronousModelFilter |   0
 .../org.netbeans.spi.viewmodel.ColumnModel         |   0
 .../org.netbeans.spi.viewmodel.NodeActionsProvider |   0
 .../org.netbeans.spi.viewmodel.NodeModelFilter     |   0
 .../org.netbeans.spi.viewmodel.TableModel          |   0
 .../org.netbeans.spi.viewmodel.TreeExpansionModel  |   0
 .../org.netbeans.spi.viewmodel.TreeModel           |   0
 .../org.netbeans.spi.viewmodel.ColumnModel         |   0
 ...etbeans.spi.viewmodel.NodeActionsProviderFilter |   0
 .../org.netbeans.spi.viewmodel.NodeModelFilter     |   0
 .../org.netbeans.spi.viewmodel.TableModelFilter    |   0
 .../org.netbeans.spi.viewmodel.TreeModelFilter     |   0
 .../org.netbeans.spi.viewmodel.ColumnModel         |   0
 .../org.netbeans.spi.viewmodel.NodeActionsProvider |   0
 .../org.netbeans.spi.viewmodel.NodeModel           |   0
 .../org.netbeans.spi.viewmodel.TableModel          |   0
 .../org.netbeans.spi.viewmodel.TreeModel           |   0
 .../ToolTipView}/javax.swing.AbstractButton        |   0
 ....netbeans.spi.viewmodel.AsynchronousModelFilter |   0
 .../org.netbeans.spi.viewmodel.ColumnModel         |   0
 .../org.netbeans.spi.viewmodel.NodeActionsProvider |   0
 .../org.netbeans.spi.viewmodel.NodeModelFilter     |   0
 .../org.netbeans.spi.viewmodel.TableModel          |   0
 .../org.netbeans.spi.viewmodel.TreeExpansionModel  |   0
 .../org.netbeans.spi.viewmodel.TreeModel           |   0
 ....netbeans.spi.viewmodel.AsynchronousModelFilter |   0
 .../org.netbeans.spi.viewmodel.ColumnModel         |   0
 .../org.netbeans.spi.viewmodel.NodeActionsProvider |   0
 .../org.netbeans.spi.viewmodel.NodeModelFilter     |   0
 .../org.netbeans.spi.viewmodel.TableModel          |   0
 .../org.netbeans.spi.viewmodel.TreeExpansionModel  |   0
 .../org.netbeans.spi.viewmodel.TreeModel           |   0
 ...es.cnd.debugger.common2.debugger.NativeDebugger |   0
 ...beans.modules.cnd.debugger.gdb2.GdbDebuggerImpl |   0
 .../org.netbeans.spi.debugger.ActionsProvider      |   0
 .../org.netbeans.spi.debugger.SessionProvider      |   0
 ...les.cnd.debugger.common2.debugger.NativeSession |   0
 ...rg.netbeans.spi.debugger.DebuggerEngineProvider |   0
 .../modules/cnd/debugger/gdb2/Bundle.properties    |   0
 .../modules/cnd/debugger/gdb2/Catalog.java         |   0
 .../gdb2/DebuggerToolRecognizerGdbImpl.java        |   0
 .../netbeans/modules/cnd/debugger/gdb2/Gdb.java    |   0
 .../gdb2/GdbBreakpointsActivationProvider.java     |   0
 .../modules/cnd/debugger/gdb2/GdbDebuggerImpl.java |   0
 .../modules/cnd/debugger/gdb2/GdbDebuggerInfo.java |   0
 .../cnd/debugger/gdb2/GdbDebuggerInfoAccessor.java |   0
 .../cnd/debugger/gdb2/GdbDebuggerSettings.java     |   0
 .../debugger/gdb2/GdbDebuggerSettingsBridge.java   |   0
 .../modules/cnd/debugger/gdb2/GdbDisassembly.java  |   0
 .../debugger/gdb2/GdbEngineCapabilityProvider.java |   0
 .../cnd/debugger/gdb2/GdbEngineProvider.java       |   0
 .../modules/cnd/debugger/gdb2/GdbError.java        |   0
 .../modules/cnd/debugger/gdb2/GdbFrame.java        |   0
 .../cnd/debugger/gdb2/GdbHandlerCommand.java       |   0
 .../cnd/debugger/gdb2/GdbHandlerExpert.java        |   0
 .../modules/cnd/debugger/gdb2/GdbLocal.java        |   0
 .../modules/cnd/debugger/gdb2/GdbLogger.java       |   0
 .../modules/cnd/debugger/gdb2/GdbMemoryFormat.java |   0
 .../debugger/gdb2/GdbPinWatchValueProvider.java    |   0
 .../cnd/debugger/gdb2/GdbSessionProvider.java      |   0
 .../modules/cnd/debugger/gdb2/GdbThread.java       |   0
 .../modules/cnd/debugger/gdb2/GdbUtils.java        |   0
 .../modules/cnd/debugger/gdb2/GdbVariable.java     |   0
 .../cnd/debugger/gdb2/GdbVersionPeculiarity.java   |   0
 .../modules/cnd/debugger/gdb2/GdbWatch.java        |   0
 .../modules/cnd/debugger/gdb2/KeyProcessing.java   |   0
 .../netbeans/modules/cnd/debugger/gdb2/Log.java    |   0
 .../netbeans/modules/cnd/debugger/gdb2/Tap.java    |   0
 .../modules/cnd/debugger/gdb2/ValuePresenter.java  |   0
 .../modules/cnd/debugger/gdb2/VariableBag.java     |   0
 .../cnd/debugger/gdb2/actions/Bundle.properties    |   0
 .../modules/cnd/debugger/gdb2/actions/Catalog.java |   0
 .../cnd/debugger/gdb2/actions/GdbAttachType.java   |   0
 .../gdb2/actions/GdbStartActionProvider.java       |   0
 .../debugger/gdb2/debugging/GdbDVSupportImpl.java  |   0
 .../debugging/GdbDebuggingNodeActionsProvider.java |   0
 .../gdb2/debugging/GdbDebuggingNodeModel.java      |   0
 .../gdb2/debugging/GdbDebuggingViewModel.java      |   0
 .../netbeans/modules/cnd/debugger/gdb2/mi/Log.java |   0
 .../modules/cnd/debugger/gdb2/mi/MICommand.java    |   0
 .../cnd/debugger/gdb2/mi/MICommandInjector.java    |   0
 .../cnd/debugger/gdb2/mi/MICommandManager.java     |   0
 .../modules/cnd/debugger/gdb2/mi/MIConst.java      |   0
 .../modules/cnd/debugger/gdb2/mi/MIParser.java     |   0
 .../modules/cnd/debugger/gdb2/mi/MIProxy.java      |   0
 .../modules/cnd/debugger/gdb2/mi/MIRecord.java     |   0
 .../modules/cnd/debugger/gdb2/mi/MIResult.java     |   0
 .../modules/cnd/debugger/gdb2/mi/MITList.java      |   0
 .../modules/cnd/debugger/gdb2/mi/MITListItem.java  |   0
 .../cnd/debugger/gdb2/mi/MIUserInteraction.java    |   0
 .../modules/cnd/debugger/gdb2/mi/MIValue.java      |   0
 .../modules/cnd/debugger/gdb2/mi/package.html      |   0
 .../cnd/debugger/gdb2/options/Bundle.properties    |   0
 .../gdb2/options/GdbDebuggerInfoFactory.java       |   0
 .../cnd/debugger/gdb2/options/GdbProfile.java      |   0
 .../debugger/gdb2/options/GdbProfileProvider.java  |   0
 .../debugger/gdb2/options/GdbProfileXMLCodec.java  |   0
 .../cnd/debugger/gdb2/resources/Bundle.properties  |   0
 .../modules/cnd/debugger/gdb2/resources/layer.xml  |   0
 .../modules/cnd/debugger/gdb2/GdbUnitTest.java     |   0
 .../cnd/debugger/gdb2/MemParserTestCase.java       |   0
 .../cnd/debugger/gdb2/PidParserTestCase.java       |   0
 .../cnd/debugger/gdb2/RedirectionPathTestCase.java |   0
 .../cnd/debugger/gdb2/mi/MIParserTestCase.java     |   0
 .../cnd/debugger/gdb2/mi/TestMICommand.java        |   0
 .../modules/cnd/debugger/gdb2/mi/TestMIRecord.java |   0
 .../gdb2/peculiarity/PeculiarityTestCase.java      |   0
 {cnd => contrib}/cnd.discovery/build.xml           |   0
 .../cnd.discovery/createOpenSourceProjects.bash    |   0
 {cnd => contrib}/cnd.discovery/manifest.mf         |   0
 .../cnd.discovery/nbproject/project.properties     |   0
 .../cnd.discovery/nbproject/project.xml            |   0
 .../modules/cnd/discovery/Bundle.properties        |   0
 .../modules/cnd/discovery/api/ApplicableImpl.java  |   0
 .../cnd/discovery/api/BuildTraceSupport.java       |   0
 .../modules/cnd/discovery/api/Configuration.java   |   0
 .../discovery/api/DiscoveryExtensionInterface.java |   0
 .../cnd/discovery/api/DiscoveryProvider.java       |   0
 .../discovery/api/DiscoveryProviderFactory.java    |   0
 .../modules/cnd/discovery/api/DiscoveryUtils.java  |   0
 .../modules/cnd/discovery/api/DriverFactory.java   |   0
 .../modules/cnd/discovery/api/FolderImpl.java      |   0
 .../cnd/discovery/api/FolderProperties.java        |   0
 .../modules/cnd/discovery/api/ItemProperties.java  |   0
 .../modules/cnd/discovery/api/KnownProject.java    |   0
 .../modules/cnd/discovery/api/Progress.java        |   0
 .../modules/cnd/discovery/api/ProjectImpl.java     |   0
 .../cnd/discovery/api/ProjectProperties.java       |   0
 .../modules/cnd/discovery/api/ProjectProxy.java    |   0
 .../cnd/discovery/api/ProviderProperty.java        |   0
 .../cnd/discovery/api/ProviderPropertyType.java    |   0
 .../modules/cnd/discovery/api/QtInfoProvider.java  |   0
 .../cnd/discovery/api/SourceFileProperties.java    |   0
 .../cnd/discovery/api/SourcesVisibilityQuery.java  |   0
 .../buildsupport/BuildProjectActionHandler.java    |   0
 .../BuildProjectActionHandlerFactory.java          |   0
 .../cnd/discovery/buildsupport/Bundle.properties   |   0
 .../cnd/discovery/buildsupport/CompileSupport.java |   0
 .../buildsupport/ToolsWrapperUtility.java          |   0
 .../org/netbeans/modules/cnd/discovery/layer.xml   |   0
 .../cnd/discovery/performance/AnalyzeStat.java     |   0
 .../cnd/discovery/performance/Bundle.properties    |   0
 .../discovery/performance/FileSystemChecker.java   |   0
 .../discovery/performance/MakeProjectLifeImpl.java |   0
 .../performance/NotifyProjectProblem.form          |   0
 .../performance/NotifyProjectProblem.java          |   0
 .../performance/PerformanceIssueDetector.java      |   0
 .../performance/PerformanceStatisticAction.java    |   0
 .../cnd/discovery/performance/StatisticPanel.form  |   0
 .../cnd/discovery/performance/StatisticPanel.java  |   0
 .../cnd/discovery/performance}/exclamation.gif     | Bin
 .../cnd/discovery/projectimport/Bundle.properties  |   0
 .../projectimport/CreateDependencies.java          |   0
 .../cnd/discovery/projectimport/DoubleFile.java    |   0
 .../discovery/projectimport/ExecuteCommand.java    |   0
 .../cnd/discovery/projectimport/FollowUp.form      |   0
 .../cnd/discovery/projectimport/FollowUp.java      |   0
 .../discovery/projectimport/ImportExecutable.java  |   0
 .../cnd/discovery/projectimport/ImportProject.java |   0
 .../discovery/projectimport/RfsListenerImpl.java   |   0
 .../discovery/services/DiscoveryManagerImpl.java   |   0
 .../services/UserOptionsProviderImpl.java          |   0
 .../wizard/AdditionalLibrariesListPanel.java       |   0
 .../discovery/wizard/BuildActionsProviderImpl.java |   0
 .../modules/cnd/discovery/wizard/Bundle.properties |   0
 .../cnd/discovery/wizard/DiscoveryExtension.java   |   0
 .../discovery/wizard/DiscoveryWizardAction.java    |   0
 .../wizard/DiscoveryWizardDescriptor.java          |   0
 .../discovery/wizard/DiscoveryWizardIterator.java  |   0
 .../wizard/ExpandableEditableComboBox.java         |   0
 .../cnd/discovery/wizard/ProviderControl.java      |   0
 .../discovery/wizard/SelectConfigurationPanel.form |   0
 .../discovery/wizard/SelectConfigurationPanel.java |   0
 .../wizard/SelectConfigurationWizard.java          |   0
 .../discovery/wizard/SelectObjectFilesPanel.form   |   0
 .../discovery/wizard/SelectObjectFilesPanel.java   |   0
 .../discovery/wizard/SelectObjectFilesWizard.java  |   0
 .../cnd/discovery/wizard/SelectProviderPanel.form  |   0
 .../cnd/discovery/wizard/SelectProviderPanel.java  |   0
 .../cnd/discovery/wizard/SelectProviderWizard.java |   0
 .../discovery/wizard/api/ConfigurationFactory.java |   0
 .../wizard/api/ConsolidationStrategy.java          |   0
 .../discovery/wizard/api/DiscoveryDescriptor.java  |   0
 .../discovery/wizard/api/FileConfiguration.java    |   0
 .../discovery/wizard/api/FolderConfiguration.java  |   0
 .../discovery/wizard/api/NodeConfiguration.java    |   0
 .../discovery/wizard/api/ProjectConfiguration.java |   0
 .../discovery/wizard/api/support/Bundle.properties |   0
 .../api/support/DiscoveryProjectGenerator.java     |   0
 .../wizard/api/support/ProjectBridge.java          |   0
 .../discovery/wizard/checkedtree/AbstractRoot.java |   0
 .../cnd/discovery/wizard/checkedtree/Root.java     |   0
 .../wizard/checkedtree/UnusedFactory.java          |   0
 .../cnd/discovery/wizard/resources/check.png       | Bin
 .../cnd/discovery/wizard/resources/configure.png   | Bin
 .../cnd/discovery/wizard/resources/error.png       | Bin
 .../cnd/discovery/wizard/resources/info.png        | Bin
 .../cnd/discovery/wizard/resources}/waitNode.gif   | Bin
 .../wizard/support/impl/Bundle.properties          |   0
 .../impl/DiscoveryProjectGeneratorImpl.java        |   0
 .../discovery/wizard/support/impl/MacroMap.java    |   0
 .../wizard/tree/FileConfigurationImpl.java         |   0
 .../wizard/tree/FileConfigurationNode.java         |   0
 .../wizard/tree/FolderConfigurationImpl.java       |   0
 .../wizard/tree/FolderConfigurationNode.java       |   0
 .../discovery/wizard/tree/IncludesListModel.java   |   0
 .../cnd/discovery/wizard/tree/MacrosListModel.java |   0
 .../wizard/tree/NodeConfigurationImpl.java         |   0
 .../wizard/tree/ProjectConfigurationImpl.java      |   0
 .../wizard/tree/ProjectConfigurationNode.java      |   0
 ...ns.modules.project.uiapi.OpenProjectsTrampoline |   0
 .../cnd/discovery/project/MakeProjectTestBase.java |   0
 .../project/cases/CMakeExampleTestCase.java        |   0
 .../discovery/project/cases/LiteSqlTestCase.java   |   0
 .../discovery/project/cases/PkgConfigTestCase.java |   0
 .../discovery/project/cases/QT_QLifeTestCase.java  |   0
 .../project/cases/RemotePkgConfigTestCase.java     |   0
 .../project/cases/SimpleScriptTestCase.java        |   0
 .../discovery/project/cases/SimpleTestCase.java    |   0
 .../project/tests/CMakeDiscoverySuiteTest.java     |   0
 .../tests/Configure1DiscoverySuiteTest.java        |   0
 .../tests/Configure2DiscoverySuiteTest.java        |   0
 .../project/tests/QMakeDiscoverySuiteTest.java     |   0
 .../project/tests/Remote1DiscoverySuiteTest.java   |   0
 .../cnd.discovery/tools/BuildTrace/Makefile        |   0
 .../cnd.discovery/tools/BuildTrace/compile.bash    |   0
 .../cnd.discovery/tools/BuildTrace/execint.c       |   0
 .../nbproject/Makefile-Linux-sparc_64.mk           |   0
 .../BuildTrace/nbproject/Makefile-Linux-x86.mk     |   0
 .../BuildTrace/nbproject/Makefile-Linux-x86_64.mk  |   0
 .../BuildTrace/nbproject/Makefile-MacOSX-x86.mk    |   0
 .../BuildTrace/nbproject/Makefile-MacOSX-x86_64.mk |   0
 .../BuildTrace/nbproject/Makefile-SunOS-Previse.mk |   0
 .../nbproject/Makefile-SunOS-Previse_64.mk         |   0
 .../BuildTrace/nbproject/Makefile-SunOS-sparc.mk   |   0
 .../nbproject/Makefile-SunOS-sparc_64.mk           |   0
 .../BuildTrace/nbproject/Makefile-SunOS-x86.mk     |   0
 .../BuildTrace/nbproject/Makefile-SunOS-x86_64.mk  |   0
 .../tools/BuildTrace/nbproject/Makefile-impl.mk    |   0
 .../BuildTrace/nbproject/Makefile-variables.mk     |   0
 .../nbproject/Package-Linux-sparc_64.bash          |   0
 .../BuildTrace/nbproject/Package-Linux-x86.bash    |   0
 .../BuildTrace/nbproject/Package-Linux-x86_64.bash |   0
 .../BuildTrace/nbproject/Package-MacOSX-x86.bash   |   0
 .../nbproject/Package-MacOSX-x86_64.bash           |   0
 .../nbproject/Package-SunOS-Previse.bash           |   0
 .../nbproject/Package-SunOS-Previse_64.bash        |   0
 .../BuildTrace/nbproject/Package-SunOS-sparc.bash  |   0
 .../nbproject/Package-SunOS-sparc_64.bash          |   0
 .../BuildTrace/nbproject/Package-SunOS-x86.bash    |   0
 .../BuildTrace/nbproject/Package-SunOS-x86_64.bash |   0
 .../tools/BuildTrace/nbproject/configurations.xml  |   0
 .../tools/BuildTrace/nbproject/launcher.properties |   0
 .../tools/BuildTrace/nbproject/project.properties  |   0
 .../tools/BuildTrace/nbproject/project.xml         |   0
 .../cnd.discovery/tools/BuildTrace/test.awk        |   0
 .../cnd.discovery/tools/BuildTrace/test.bash       |   0
 .../cnd.discovery/tools/ToolsWrapperUnix/wrapper   |   0
 .../tools/ToolsWrapperWidows/Makefile              |   0
 .../tools/ToolsWrapperWidows/ReadMe.txt            |   0
 .../nbproject/Makefile-Unix_64.mk                  |   0
 .../nbproject/Makefile-Windows_32.mk               |   0
 .../ToolsWrapperWidows/nbproject/Makefile-impl.mk  |   0
 .../nbproject/Makefile-variables.mk                |   0
 .../nbproject/Package-Unix_64.bash                 |   0
 .../nbproject/Package-Windows_32.bash              |   0
 .../nbproject/configurations.xml                   |   0
 .../nbproject/launcher.properties                  |   0
 .../tools/ToolsWrapperWidows/nbproject/project.xml |   0
 .../tools/ToolsWrapperWidows/src/args.c            |   0
 {cnd => contrib}/cnd.dwarfdiscovery/build.xml      |   0
 {cnd => contrib}/cnd.dwarfdiscovery/manifest.mf    |   0
 .../nbproject/project.properties                   |   0
 .../cnd.dwarfdiscovery/nbproject/project.xml       |   0
 .../modules/cnd/dwarfdiscovery/Bundle.properties   |   0
 .../cnd/dwarfdiscovery/RemoteJavaExecution.java    |   0
 .../dwarfdiscovery/provider/AnalyzeExecLog.java    |   0
 .../dwarfdiscovery/provider/AnalyzeExecutable.java |   0
 .../cnd/dwarfdiscovery/provider/AnalyzeFolder.java |   0
 .../dwarfdiscovery/provider/AnalyzeMakeLog.java    |   0
 .../dwarfdiscovery/provider/BaseDwarfProvider.java |   0
 .../cnd/dwarfdiscovery/provider/BaseProvider.java  |   0
 .../cnd/dwarfdiscovery/provider/Bundle.properties  |   0
 .../provider/CompileLineStorage.java               |   0
 .../dwarfdiscovery/provider/CompilerSettings.java  |   0
 .../provider/DiscoveryProviderFactoryImpl.java     |   0
 .../cnd/dwarfdiscovery/provider/DwarfSource.java   |   0
 .../cnd/dwarfdiscovery/provider/ExecLogReader.java |   0
 .../cnd/dwarfdiscovery/provider/FSImpl.java        |   0
 .../cnd/dwarfdiscovery/provider/MakeLogReader.java |   0
 .../cnd/dwarfdiscovery/provider/PathCache.java     |   0
 .../cnd/dwarfdiscovery/provider/Relocatable.java   |   0
 .../dwarfdiscovery/provider/RelocatableImpl.java   |   0
 .../provider/RelocatablePathMapper.java            |   0
 .../provider/RelocatablePathMapperImpl.java        |   0
 .../provider/CompileLineServiceTest.java           |   0
 .../provider/DwarfDiscoveryTest.java               |   0
 .../provider/DwarfSourceReaderTest.java            |   0
 .../dwarfdiscovery/provider/LddServiceTest.java    |   0
 .../dwarfdiscovery/provider/PathMapperTest.java    |   0
 .../provider/support/RemoteJarServiceProvider.java |   0
 {cnd => contrib}/cnd.gotodeclaration/build.xml     |   0
 {cnd => contrib}/cnd.gotodeclaration/manifest.mf   |   0
 .../nbproject/project.properties                   |   0
 .../cnd.gotodeclaration/nbproject/project.xml      |   0
 .../file/LibraryFileProviderFactory.java           |   0
 .../gotodeclaration/resources/Bundle.properties    |   0
 .../cnd/gotodeclaration/symbol/Bundle.properties   |   0
 .../symbol/CppSymbolDescriptor.java                |   0
 .../gotodeclaration/symbol/CppSymbolProvider.java  |   0
 .../cnd/gotodeclaration/type/Bundle.properties     |   0
 .../gotodeclaration/type/CppTypeDescriptor.java    |   0
 .../cnd/gotodeclaration/type/CppTypeProvider.java  |   0
 .../type/TracingTypeDescriptor.java                |   0
 .../cnd/gotodeclaration/util/ContextUtil.java      |   0
 .../cnd/gotodeclaration/util/EmptyIcon.java        |   0
 .../testFuncVarAllRegexp.ref                       |   0
 .../testFuncVarCamelCase.ref                       |   0
 .../testFuncVarCaseInsensitiveExactName.ref        |   0
 .../testFuncVarCaseInsensitivePrefix.ref           |   0
 .../testFuncVarCaseInsensitiveRegexp.ref           |   0
 .../testFuncVarDotRegexp.ref                       |   0
 .../testFuncVarExactName.ref                       |   0
 .../testFuncVarPrefix.ref                          |   0
 .../testMacroCamelCase.ref                         |   0
 .../testMacroCaseInsensitiveExactName.ref          |   0
 .../testMacroCaseInsensitivePrefix.ref             |   0
 .../testMacroCaseInsensitiveRegexp.ref             |   0
 .../testMacroDotRegexp.ref                         |   0
 .../testMacroExactName.ref                         |   0
 .../testMacroPrefix.ref                            |   0
 ...dules.editor.settings.storage.spi.StorageFilter |   0
 .../element/providers/CppSymbolBaseTestCase.java   |   0
 .../element/providers/ElementProvidersTest.java    |   0
 .../providers/FuncVarElementProviderTestCase.java  |   0
 .../SymbolProviderContextAndResultFactory.java     |   0
 {cnd => contrib}/cnd.highlight/build.xml           |   0
 {cnd => contrib}/cnd.highlight/manifest.mf         |   0
 .../cnd.highlight/nbproject/project.properties     |   0
 .../cnd.highlight/nbproject/project.xml            |   0
 .../modules/cnd/highlight/Bundle.properties        |   0
 .../modules/cnd/highlight/CndTodoScanner.java      |   0
 .../cnd/highlight/CppHighlightsLayerFactory.java   |   0
 .../modules/cnd/highlight/HighlightInstaller.java  |   0
 .../modules/cnd/highlight/error/BadgeProvider.java |   0
 .../cnd/highlight/error/BadgeProviderUpdater.java  |   0
 .../cnd/highlight/error/BigFileValidator.java      |   0
 .../cnd/highlight/error/BrokenProjectService.java  |   0
 .../modules/cnd/highlight/error/Bundle.properties  |   0
 .../error/CodeAssistanceHintProvider.java          |   0
 .../highlight/error/CppUpToDateStatusProvider.java |   0
 .../error/CppUpToDateStatusProviderFactory.java    |   0
 .../cnd/highlight/error/HighlightProvider.java     |   0
 .../error/HighlightProviderTaskFactory.java        |   0
 .../highlight/error/IdentifierErrorProvider.java   |   0
 .../cnd/highlight/error/IncludeErrorProvider.java  |   0
 .../highlight/error/StandaloneFileValidator.java   |   0
 .../cnd/highlight/error/includes/Bundle.properties |   0
 .../highlight/error/includes/ErrorFilesModel.java  |   0
 .../error/includes/ErrorIncludeDialog.java         |   0
 .../error/includes/ErrorIncludesModel.java         |   0
 .../error/includes/FailedIncludesAction.java       |   0
 .../modules/cnd/highlight/hints/Bundle.properties  |   0
 .../cnd/highlight/hints/CsmHintProvider.java       |   0
 .../cnd/highlight/hints/DisableHintFix.java        |   0
 .../modules/cnd/highlight/hints/ErrorInfoImpl.java |   0
 .../modules/cnd/highlight/hints/FixProvider.java   |   0
 .../hints/FunctionUsedBeforDeclaration.java        |   0
 .../cnd/highlight/hints/HintAnalyzerImpl.java      |   0
 .../highlight/hints/MethodDeclarationMissed.java   |   0
 .../cnd/highlight/hints/MissingGuardBlock.java     |   0
 .../cnd/highlight/hints/MissingMethodOverride.java |   0
 .../cnd/highlight/hints/NoMatchingConstructor.java |   0
 .../cnd/highlight/hints/NonVirtualDestructor.java  |   0
 .../cnd/highlight/hints/NonVirtualMethod.java      |   0
 .../cnd/highlight/hints/NotFirstInclude.java       |   0
 .../modules/cnd/highlight/hints/SafeFix.java       |   0
 .../highlight/hints/formatstring/Bundle.properties |   0
 .../highlight/hints/formatstring/FormatError.java  |   0
 .../hints/formatstring/FormatStringAudit.java      |   0
 .../hints/formatstring/FormattedPrintFunction.java |   0
 .../highlight/hints/formatstring/Parameter.java    |   0
 .../highlight/hints/formatstring/Utilities.java    |   0
 .../cnd/highlight/resources/Bundle.properties      |   0
 .../cnd/highlight/resources/DefaultKeyBindings.xml |   0
 .../modules/cnd/highlight/resources/bugs.png       | Bin
 .../cnd/highlight/resources/error-glyph.gif        | Bin
 .../modules/cnd/highlight/resources/layer.xml      |   0
 .../highlight/resources/occurrence_annotation.xml  |   0
 .../highlight/resources/parser_annotation_err.xml  |   0
 .../cnd/highlight/resources/security_err.xml       |   0
 .../cnd/highlight/resources/security_warn.xml      |   0
 .../cnd/highlight/security/Bundle.properties       |   0
 .../cnd/highlight/security/FunctionUsageAudit.java |   0
 .../highlight/security/FunctionsXmlService.java    |   0
 .../highlight/security/SecurityAnalyzerImpl.java   |   0
 .../highlight/security/SecurityCheckProvider.java  |   0
 .../security/resources/C_Lib_Functions.xml         |   0
 .../highlight/security/resources/security_err.png  | Bin
 .../highlight/security/resources/security_warn.png | Bin
 .../cnd/highlight/semantic/Bundle.properties       |   0
 .../cnd/highlight/semantic/HighlighterBase.java    |   0
 .../semantic/MarkOccurrencesHighlighter.java       |   0
 .../MarkOccurrencesHighlighterFactory.java         |   0
 .../modules/cnd/highlight/semantic/ModelUtils.java |   0
 .../semantic/OccurrencesMarkProvider.java          |   0
 .../semantic/OccurrencesMarkProviderCreator.java   |   0
 .../cnd/highlight/semantic/ReferenceCollector.java |   0
 .../semantic/SemanticEntitiesProvider.java         |   0
 .../cnd/highlight/semantic/SemanticEntity.java     |   0
 .../highlight/semantic/SemanticHighlighter.java    |   0
 .../semantic/SemanticHighlighterFactory.java       |   0
 .../highlight/semantic/actions/Bundle.properties   |   0
 .../semantic/actions/GotoNextOccurrenceAction.java |   0
 .../semantic/actions/GotoPrevOccurrenceAction.java |   0
 .../highlight/semantic/actions/SemanticUtils.java  |   0
 .../highlight/semantic/debug/InterrupterImpl.java  |   0
 .../semantic/debug/TestSemanticHighlighting.java   |   0
 .../highlight/semantic/options/Bundle.properties   |   0
 .../options/SemanticHighlightingOptions.java       |   0
 .../options/SemanticHighlightingOptionsPanel.form  |   0
 .../options/SemanticHighlightingOptionsPanel.java  |   0
 ...SemanticHighlightingOptionsPanelController.java |   0
 .../missed_semicolon_after_class.cc.dat            |   0
 .../fifth_fifth.cpp.dat                            |   0
 .../first_first.cpp.dat                            |   0
 .../forth_forth.cpp.dat                            |   0
 .../includedLibrary_lib_header.h.dat               |   0
 .../otherLibrary_other_lib_header.h.dat            |   0
 .../second_second.cpp.dat                          |   0
 .../third_third.cpp.dat                            |   0
 .../error/UnexpectedTokenTest/bug178766.c.dat      |   0
 .../bug217470.cpp.dat                              |   0
 .../arrow_deref_of_this.cpp.dat                    |   0
 .../UnresolvedIdentifierTest/attributes.cpp.dat    |   0
 .../UnresolvedIdentifierTest/bug186638.cpp.dat     |   0
 .../UnresolvedIdentifierTest/bug201258.cpp.dat     |   0
 .../UnresolvedIdentifierTest/bug210983_1.cpp.dat   |   0
 .../UnresolvedIdentifierTest/bug210983_2.cpp.dat   |   0
 .../UnresolvedIdentifierTest/bug211143_1.cpp.dat   |   0
 .../UnresolvedIdentifierTest/bug211143_2.cpp.dat   |   0
 .../UnresolvedIdentifierTest/bug212905.cpp.dat     |   0
 .../UnresolvedIdentifierTest/bug248749.cpp.dat     |   0
 .../UnresolvedIdentifierTest/bug257030.cpp.dat     |   0
 .../UnresolvedIdentifierTest/ddd_errors.cpp.dat    |   0
 .../forward_class_decl.cpp.dat                     |   0
 .../UnresolvedIdentifierTest/inc210983_1.h.dat     |   0
 .../UnresolvedIdentifierTest/inc210983_2.h.dat     |   0
 .../error/UnresolvedIdentifierTest/inc211143.h.dat |   0
 .../UnresolvedIdentifierTest/iz142674.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz143044.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz144537.cpp.dat      |   0
 .../error/UnresolvedIdentifierTest/iz145280.cc.dat |   0
 .../UnresolvedIdentifierTest/iz148236.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz149285.cpp.dat      |   0
 .../error/UnresolvedIdentifierTest/iz149285.h.dat  |   0
 .../UnresolvedIdentifierTest/iz150827.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz151054.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz151909.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz155054.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz155112.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz155459.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz158216.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz158280.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz158730.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz158831.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz158873.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz159615.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz160542.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz161565.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz163135.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz171453.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz172227.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz175231.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz175782.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz175782_2.cpp.dat    |   0
 .../UnresolvedIdentifierTest/iz191336.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz191515.cpp.dat      |   0
 .../error/UnresolvedIdentifierTest/iz191610.cc.dat |   0
 .../UnresolvedIdentifierTest/iz212841.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz218303.cpp.dat      |   0
 .../UnresolvedIdentifierTest/iz_144873.cpp.dat     |   0
 .../UnresolvedIdentifierTest/iz_145118.cpp.dat     |   0
 .../error/UnresolvedIdentifierTest/macros.cpp.dat  |   0
 .../error/UnresolvedIdentifierTest/simple.cpp.dat  |   0
 .../UnresolvedIdentifierTest/skipBlocks.cpp.dat    |   0
 .../template_class_enums.cpp.dat                   |   0
 .../template_parameter_ancestor.cpp.dat            |   0
 .../UnresolvedIdentifierTest/templates.cpp.dat     |   0
 .../UnresolvedIdentifierTest/typedef_templ.cpp.dat |   0
 .../unnamed_enum_typedef.cpp.dat                   |   0
 .../FormatStringTest/src_bug254476.c.dat           |   0
 .../FormatStringTest/src_bug257545.c.dat           |   0
 .../FormatStringTest/src_bug267505.cpp.dat         |   0
 .../src_general_negative_test.cpp.dat              |   0
 .../testClassFieldsInItsMethodsBody.ref            |   0
 .../testClassFieldsInItsMethodsBody.ref            |   0
 .../semantic/InactiveCodeTest/testDefines.ref      |   0
 .../semantic/InactiveCodeTest/testElifCluster.ref  |   0
 .../semantic/MacroUsagesTest/testMacroUsages.ref   |   0
 .../testMacroUsagesWithKeywords.ref                |   0
 .../semantic/MarkOccurrencesTest/test206416_1.ref  |   0
 .../semantic/MarkOccurrencesTest/test206416_2.ref  |   0
 .../semantic/MarkOccurrencesTest/test206416_3.ref  |   0
 .../semantic/MarkOccurrencesTest/test231272_1.ref  |   0
 .../semantic/MarkOccurrencesTest/test231272_2.ref  |   0
 .../testAddSymbolMoreParams.ref                    |   0
 .../MarkOccurrencesTest/testAddSymbolOneParam.ref  |   0
 .../MarkOccurrencesTest/testAddSymbolTwoParams.ref |   0
 .../testAddSymbolZeroParams.ref                    |   0
 .../MarkOccurrencesTest/testCharLiterals.ref       |   0
 .../semantic/MarkOccurrencesTest/testClassName.ref |   0
 .../testConstAndNonConstMethods.ref                |   0
 .../semantic/MarkOccurrencesTest/testCtor.ref      |   0
 .../semantic/MarkOccurrencesTest/testCtor2.ref     |   0
 .../semantic/MarkOccurrencesTest/testField.ref     |   0
 .../MarkOccurrencesTest/testGlobalVariable.ref     |   0
 .../semantic/MarkOccurrencesTest/testIZ175700.ref  |   0
 .../MarkOccurrencesTest/testLocalVariable.ref      |   0
 .../semantic/MarkOccurrencesTest/testMacro.ref     |   0
 .../semantic/MarkOccurrencesTest/testPreproc1.ref  |   0
 .../semantic/MarkOccurrencesTest/testPreproc5.ref  |   0
 .../semantic/MarkOccurrencesTest/testPreproc6.ref  |   0
 .../testSeveralDeclarations.ref                    |   0
 .../MarkOccurrencesTest/testStringLiterals.ref     |   0
 .../semantic/TypedefTest/testTypedefs.ref          |   0
 .../semantic/UnusedVariablesTest/testUnused.ref    |   0
 .../missed_semicolon_after_class.cc                |   0
 .../missed_semicolon_simple_1.cc                   |   0
 .../missed_semicolon_simple_2.cc                   |   0
 .../error/MissingGuardBlockTest/bug257048.h        |   0
 .../fifth/fifth.cpp                                |   0
 .../first/first.cpp                                |   0
 .../forth/forth.cpp                                |   0
 .../includedLibrary/lib_header.h                   |   0
 .../otherLibrary/other_lib_header.h                |   0
 .../second/second.cpp                              |   0
 .../third/third.cpp                                |   0
 .../error/UnexpectedTokenTest/bug178766.c          |   0
 .../UnresolvedCpp11IdentifierTest/bug214184.cpp    |   0
 .../UnresolvedCpp11IdentifierTest/bug214185.cpp    |   0
 .../UnresolvedCpp11IdentifierTest/bug214864.cpp    |   0
 .../UnresolvedCpp11IdentifierTest/bug217052.cpp    |   0
 .../UnresolvedCpp11IdentifierTest/bug217067.cpp    |   0
 .../UnresolvedCpp11IdentifierTest/bug217470.cpp    |   0
 .../UnresolvedCpp11IdentifierTest/bug217827.cpp    |   0
 .../UnresolvedCpp11IdentifierTest/bug217858.cpp    |   0
 .../UnresolvedCpp11IdentifierTest/bug220307.cpp    |   0
 .../UnresolvedCpp11IdentifierTest/bug220527.cpp    |   0
 .../UnresolvedCpp11IdentifierTest/bug222553.cpp    |   0
 .../UnresolvedCpp11IdentifierTest/bug222884.cpp    |   0
 .../UnresolvedCpp11IdentifierTest/bug222886.cpp    |   0
 .../arrow_deref_of_this.cpp                        |   0
 .../error/UnresolvedIdentifierTest/attributes.cpp  |   0
 .../error/UnresolvedIdentifierTest/bug186638.cpp   |   0
 .../error/UnresolvedIdentifierTest/bug201258.cpp   |   0
 .../error/UnresolvedIdentifierTest/bug210983_1.cpp |   0
 .../error/UnresolvedIdentifierTest/bug210983_2.cpp |   0
 .../error/UnresolvedIdentifierTest/bug211143_1.cpp |   0
 .../error/UnresolvedIdentifierTest/bug211143_2.cpp |   0
 .../error/UnresolvedIdentifierTest/bug212905.cpp   |   0
 .../error/UnresolvedIdentifierTest/bug215225.cpp   |   0
 .../error/UnresolvedIdentifierTest/bug215225_2.cpp |   0
 .../error/UnresolvedIdentifierTest/bug217798.cpp   |   0
 .../error/UnresolvedIdentifierTest/bug218192.cpp   |   0
 .../error/UnresolvedIdentifierTest/bug218759.cpp   |   0
 .../error/UnresolvedIdentifierTest/bug222883.cpp   |   0
 .../error/UnresolvedIdentifierTest/bug223298.cpp   |   0
 .../error/UnresolvedIdentifierTest/bug227266.cpp   |   0
 .../error/UnresolvedIdentifierTest/bug248749.cpp   |   0
 .../error/UnresolvedIdentifierTest/bug257030.cpp   |   0
 .../error/UnresolvedIdentifierTest/ddd_errors.cpp  |   0
 .../error/UnresolvedIdentifierTest/ddd_errors.h    |   0
 .../forward_class_decl.cpp                         |   0
 .../error/UnresolvedIdentifierTest/inc210983_1.h   |   0
 .../error/UnresolvedIdentifierTest/inc210983_2.h   |   0
 .../error/UnresolvedIdentifierTest/inc211143.h     |   0
 .../error/UnresolvedIdentifierTest/iz142674.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz143044.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz144537.cpp    |   0
 .../error/UnresolvedIdentifierTest}/iz145280.cc    |   0
 .../error/UnresolvedIdentifierTest/iz148236.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz149285.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz149285.h      |   0
 .../error/UnresolvedIdentifierTest/iz150827.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz151054.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz151909.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz155054.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz155112.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz155459.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz158216.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz158280.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz158730.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz158831.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz158873.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz159615.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz160542.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz161565.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz163135.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz171453.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz172227.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz175231.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz175782.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz175782_2.cpp  |   0
 .../error/UnresolvedIdentifierTest/iz191336.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz191515.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz191610.cc     |   0
 .../error/UnresolvedIdentifierTest/iz212841.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz218303.cpp    |   0
 .../error/UnresolvedIdentifierTest/iz_144873.cpp   |   0
 .../error/UnresolvedIdentifierTest/iz_145118.cpp   |   0
 .../error/UnresolvedIdentifierTest/macros.cpp      |   0
 .../UnresolvedIdentifierTest/namespace234573.cpp   |   0
 .../UnresolvedIdentifierTest/namespace234573.h     |   0
 .../error/UnresolvedIdentifierTest/simple.cpp      |   0
 .../error/UnresolvedIdentifierTest/skipBlocks.cpp  |   0
 .../template_parameter_ancestor.cpp                |   0
 .../error/UnresolvedIdentifierTest/templates.cpp   |   0
 .../UnresolvedIdentifierTest/typedef_templ.cpp     |   0
 .../unnamed_enum_typedef.cpp                       |   0
 .../formatstring/FormatStringTest/src/bug254435.c  |   0
 .../FormatStringTest/src/bug254469.cpp             |   0
 .../formatstring/FormatStringTest/src/bug254472.c  |   0
 .../FormatStringTest/src/bug254475.cpp             |   0
 .../formatstring/FormatStringTest/src/bug254476.c  |   0
 .../formatstring/FormatStringTest/src/bug254500.c  |   0
 .../formatstring/FormatStringTest/src/bug254508.c  |   0
 .../formatstring/FormatStringTest/src/bug254545.c  |   0
 .../formatstring/FormatStringTest/src/bug254580.c  |   0
 .../FormatStringTest/src/bug254803.cpp             |   0
 .../formatstring/FormatStringTest/src/bug255083.c  |   0
 .../formatstring/FormatStringTest/src/bug255270.c  |   0
 .../formatstring/FormatStringTest/src/bug255378.c  |   0
 .../formatstring/FormatStringTest/src/bug255693.c  |   0
 .../formatstring/FormatStringTest/src/bug256254.c  |   0
 .../formatstring/FormatStringTest/src/bug256321.c  |   0
 .../formatstring/FormatStringTest/src/bug257545.c  |   0
 .../FormatStringTest/src/bug259130.cpp             |   0
 .../FormatStringTest/src/bug267505.cpp             |   0
 .../FormatStringTest/src/general_negative_test.cpp |   0
 .../FormatStringTest/src/general_positive_test.cpp |   0
 .../FormatStringTest/sys_includes/stdio.h          |   0
 .../highlight/semantic/ClassFieldsTest/welcome.cc  |   0
 .../highlight/semantic/ClassFieldsTest/welcome.h   |   0
 .../FunctionsHighlightingTest/functions_hl.cpp     |   0
 .../highlight/semantic/InactiveCodeTest/defines.c  |   0
 .../highlight/semantic/InactiveCodeTest/elif.cc    |   0
 .../highlight/semantic/MacroUsagesTest/keyword.cc  |   0
 .../highlight/semantic/MacroUsagesTest/macros.cc   |   0
 .../semantic/MarkOccurrencesTest/markocc.cc        |   0
 .../semantic/MarkOccurrencesTest/newfile1.cpp      |   0
 .../cnd/highlight/semantic/TypedefTest/welcome.cc  |   0
 .../semantic/UnusedVariablesTest/unused.cc         |   0
 .../modules/cnd/highlight/HighlightingTests.java   |   0
 .../cnd/highlight/HighlightingTestsFailed.java     |   0
 .../cnd/highlight/error/BaseErrorMaker.java        |   0
 .../error/ErrorHighlightingBaseTestCase.java       |   0
 .../modules/cnd/highlight/error/ErrorMaker.java    |   0
 .../error/MissedSemicolonsErrorMaker.java          |   0
 .../error/MissedSemicolonsInQuoteTestCase.java     |   0
 .../highlight/error/MissedSemicolonsTestCase.java  |   0
 .../cnd/highlight/error/MissingGuardBlockTest.java |   0
 .../error/MultiProjectsErrorHighlightingTest.java  |   0
 .../highlight/error/SimpleDeletingErrorMaker.java  |   0
 .../cnd/highlight/error/UnexpectedTokenTest.java   |   0
 .../error/UnresolvedCpp11IdentifierTest.java       |   0
 .../error/UnresolvedIdentifierFailed.java          |   0
 .../highlight/error/UnresolvedIdentifierTest.java  |   0
 .../hints/formatstring/FormatStringTest.java       |   0
 .../security/ValidateFunctionsXmlTestCase.java     |   0
 .../cnd/highlight/security/unreliablefunctions.xsd |   0
 .../cnd/highlight/semantic/ClassFieldsTest.java    |   0
 .../semantic/FunctionsHighlightingTest.java        |   0
 .../cnd/highlight/semantic/InactiveCodeTest.java   |   0
 .../cnd/highlight/semantic/MacroUsagesTest.java    |   0
 .../highlight/semantic/MarkOccurrencesTest.java    |   0
 .../semantic/SemanticHighlightingNewTestBase.java  |   0
 .../semantic/SemanticHighlightingTestBase.java     |   0
 .../cnd/highlight/semantic/TypedefTest.java        |   0
 .../highlight/semantic/UnusedVariablesTest.java    |   0
 {cnd => contrib}/cnd.indexing/build.xml            |   0
 {cnd => contrib}/cnd.indexing/manifest.mf          |   0
 .../cnd.indexing/nbproject/project.properties      |   0
 .../cnd.indexing/nbproject/project.xml             |   0
 .../modules/cnd/indexing/Bundle.properties         |   0
 .../modules/cnd/indexing/api/CndTextIndex.java     |   0
 .../modules/cnd/indexing/api/CndTextIndexKey.java  |   0
 .../cnd/indexing/impl/CndTextIndexImpl.java        |   0
 .../cnd/indexing/impl/DiskTextIndexLayer.java      |   0
 .../indexing/impl/DistTextIndexLayerFactory.java   |   0
 .../cnd/indexing/impl/TextIndexStorage.java        |   0
 .../cnd/indexing/impl/TextIndexStorageManager.java |   0
 .../cnd/indexing/impl/TextLayerProvider.java       |   0
 .../modules/cnd/indexing/spi/TextIndexLayer.java   |   0
 .../cnd/indexing/spi/TextIndexLayerFactory.java    |   0
 {cnd => contrib}/cnd.model.jclank.bridge/build.xml |   0
 .../cnd.model.jclank.bridge/manifest.mf            |   0
 .../nbproject/project.properties                   |   0
 .../cnd.model.jclank.bridge/nbproject/project.xml  |   0
 .../model/jclank/bridge/CsmJClankSerivices.java    |   0
 .../jclank/bridge/impl/CsmJClankCompilationDB.java |   0
 .../jclank/bridge/impl/CsmJClankSerivicesImpl.java |   0
 .../jclank/bridge/resources/Bundle.properties      |   0
 .../trace/JClankDiagnosticAbstractProvider.java    |   0
 .../jclank/bridge/trace/JClankPreprocessFile.java  |   0
 .../jclank/bridge/trace/JClankProgressHandler.java |   0
 .../trace/JClankTraceCompilationDBAction.java      |   0
 .../trace/JClankTracePreprocessorAction.java       |   0
 .../trace/JClankTraceProjectAbstractAction.java    |   0
 {cnd => contrib}/cnd.model.services/build.xml      |   0
 {cnd => contrib}/cnd.model.services/manifest.mf    |   0
 .../nbproject/project.properties                   |   0
 .../cnd.model.services/nbproject/project.xml       |   0
 .../cnd/api/model/services/CsmCacheManager.java    |   0
 .../cnd/api/model/services/CsmCacheMap.java        |   0
 .../cnd/api/model/services/CsmCompilationUnit.java |   0
 .../api/model/services/CsmExpressionEvaluator.java |   0
 .../api/model/services/CsmExpressionResolver.java  |   0
 .../cnd/api/model/services/CsmFileInfoQuery.java   |   0
 .../cnd/api/model/services/CsmFileReferences.java  |   0
 .../cnd/api/model/services/CsmFriendResolver.java  |   0
 .../services/CsmFunctionDefinitionResolver.java    |   0
 .../cnd/api/model/services/CsmIncludeResolver.java |   0
 .../model/services/CsmInheritanceUtilities.java    |   0
 .../model/services/CsmInstantiationProvider.java   |   0
 .../cnd/api/model/services/CsmMacroExpansion.java  |   0
 .../model/services/CsmObjectAttributeQuery.java    |   0
 .../model/services/CsmOperatorKindResolver.java    |   0
 .../api/model/services/CsmOverloadingResolver.java |   0
 .../api/model/services/CsmReferenceContext.java    |   0
 .../cnd/api/model/services/CsmResolveContext.java  |   0
 .../modules/cnd/api/model/services/CsmSelect.java  |   0
 .../model/services/CsmStandaloneFileProvider.java  |   0
 .../model/services/CsmStatementKindResolver.java   |   0
 .../cnd/api/model/services/CsmSymbolResolver.java  |   0
 .../cnd/api/model/services/CsmUsingResolver.java   |   0
 .../api/model/services/CsmVirtualInfoQuery.java    |   0
 .../cnd/api/model/services/CsmVisibilityQuery.java |   0
 .../cnd/api/model/syntaxerr/AbstractCodeAudit.java |   0
 .../cnd/api/model/syntaxerr/AuditPreferences.java  |   0
 .../modules/cnd/api/model/syntaxerr/CodeAudit.java |   0
 .../cnd/api/model/syntaxerr/CodeAuditFactory.java  |   0
 .../api/model/syntaxerr/CodeAuditListFactory.java  |   0
 .../cnd/api/model/syntaxerr/CodeAuditProvider.java |   0
 .../cnd/api/model/syntaxerr/CsmErrorInfo.java      |   0
 .../model/syntaxerr/CsmErrorInfoHintProvider.java  |   0
 .../cnd/api/model/syntaxerr/CsmErrorProvider.java  |   0
 .../model/xref/CsmIncludeHierarchyResolver.java    |   0
 .../cnd/api/model/xref/CsmLabelResolver.java       |   0
 .../modules/cnd/api/model/xref/CsmReference.java   |   0
 .../cnd/api/model/xref/CsmReferenceKind.java       |   0
 .../cnd/api/model/xref/CsmReferenceRepository.java |   0
 .../cnd/api/model/xref/CsmReferenceResolver.java   |   0
 .../cnd/api/model/xref/CsmReferenceSupport.java    |   0
 .../xref/CsmTemplateBasedReferencedObject.java     |   0
 .../api/model/xref/CsmTypeHierarchyResolver.java   |   0
 .../modules/cnd/model/services/Bundle.properties   |   0
 .../model/services/CsmCodeAssistanceProvider.java  |   0
 .../modules/cnd/model/tasks/CndParser.java         |   0
 .../cnd/model/tasks/CndParserImplementation.java   |   0
 .../cnd/spi/model/services/AutosProvider.java      |   0
 .../model/services/CodeModelProblemResolver.java   |   0
 .../cnd/spi/model/services/CsmDocProvider.java     |   0
 .../services/CsmExpressionEvaluatorProvider.java   |   0
 .../CsmExpressionResolverImplementation.java       |   0
 .../services/CsmInlcudeHierachyViewProvider.java   |   0
 .../services/CsmMacroExpansionDocProvider.java     |   0
 .../services/CsmMacroExpansionViewProvider.java    |   0
 .../CsmOverloadingResolverImplementation.java      |   0
 .../spi/model/services/CsmReferenceStorage.java    |   0
 .../cnd/spi/model/services/CsmSelectProvider.java  |   0
 .../services/CsmSymbolResolverImplementation.java  |   0
 .../model/services/CsmVisibilityQueryProvider.java |   0
 .../spi/model/services/FunctionCallsProvider.java  |   0
 .../modules/cnd/xref/impl/ObjectReferenceImpl.java |   0
 .../cnd/xref/impl/ReferenceSupportImpl.java        |   0
 {cnd => contrib}/cnd.modeldiscovery/build.xml      |   0
 {cnd => contrib}/cnd.modeldiscovery/manifest.mf    |   0
 .../nbproject/project.properties                   |   0
 .../cnd.modeldiscovery/nbproject/project.xml       |   0
 .../modules/cnd/modeldiscovery/Bundle.properties   |   0
 .../cnd/modeldiscovery/provider/AnalyzeModel.java  |   0
 .../cnd/modeldiscovery/provider/Bundle.properties  |   0
 .../provider/DiscoveryProviderFactoryImpl.java     |   0
 .../cnd/modeldiscovery/provider/ModelSource.java   |   0
 .../cnd/modeldiscovery/provider/PkgConfigImpl.java |   0
 .../provider/PkgConfigManagerImpl.java             |   0
 .../cnd/modeldiscovery/provider/DiscoveryTest.java |   0
 .../provider/PackageConfigTestCase.java            |   0
 {cnd => contrib}/cnd.modelimpl/build.sh            |   0
 {cnd => contrib}/cnd.modelimpl/build.xml           |   0
 .../cnd.modelimpl/copy_failed_as_etalons.sh        |   0
 .../cnd.modelimpl/copy_failed_tests_data.sh        |   0
 .../cnd.modelimpl/drd/config/config.xml            |   0
 .../cnd.modelimpl/drd/config/hb-config.xml         |   0
 {cnd => contrib}/cnd.modelimpl/drd/drd.properties  |   0
 .../cnd.modelimpl/external/binaries-list           |   0
 .../open-fortran-parser-0.7.1.2-license.txt        |   0
 {cnd => contrib}/cnd.modelimpl/manifest.mf         |   0
 .../cnd.modelimpl/nbproject/pmd.settings           |   0
 .../cnd.modelimpl/nbproject/project.properties     |   0
 .../cnd.modelimpl/nbproject/project.xml            |   0
 {cnd => contrib}/cnd.modelimpl/run.sh              |   0
 .../modules/cnd/modelimpl/Bundle.properties        |   0
 .../netbeans/modules/cnd/modelimpl/Installer.java  |   0
 .../accessors/CsmCorePackageAccessor.java          |   0
 .../modelimpl/accessors/CsmPackageAccessor.java    |   0
 .../cnd/modelimpl/cache/impl/CacheUtil.java        |   0
 .../cnd/modelimpl/cache/impl/WeakContainer.java    |   0
 .../modelimpl/content/file/FakeIncludePair.java    |   0
 .../cnd/modelimpl/content/file/FileComponent.java  |   0
 .../content/file/FileComponentDeclarations.java    |   0
 .../content/file/FileComponentIncludes.java        |   0
 .../content/file/FileComponentInstantiations.java  |   0
 .../content/file/FileComponentMacros.java          |   0
 .../content/file/FileComponentReferences.java      |   0
 .../cnd/modelimpl/content/file/FileContent.java    |   0
 .../content/file/FileContentSignature.java         |   0
 .../modelimpl/content/file/ReferencesIndex.java    |   0
 .../content/project/ClassifierContainer.java       |   0
 .../content/project/DeclarationContainer.java      |   0
 .../project/DeclarationContainerNamespace.java     |   0
 .../project/DeclarationContainerProject.java       |   0
 .../modelimpl/content/project/FileContainer.java   |   0
 .../modelimpl/content/project/GraphContainer.java  |   0
 .../content/project/IncludedFileContainer.java     |   0
 .../content/project/ProjectComponent.java          |   0
 .../modules/cnd/modelimpl/csm/AccessorImpl.java    |   0
 .../cnd/modelimpl/csm/AstRendererException.java    |   0
 .../modules/cnd/modelimpl/csm/BuiltinTypes.java    |   0
 .../modules/cnd/modelimpl/csm/CastUtils.java       |   0
 .../modules/cnd/modelimpl/csm/ClassEnumBase.java   |   0
 .../modelimpl/csm/ClassForwardDeclarationImpl.java |   0
 .../modules/cnd/modelimpl/csm/ClassImpl.java       |   0
 .../csm/ClassImplFunctionSpecialization.java       |   0
 .../cnd/modelimpl/csm/ClassImplSpecialization.java |   0
 .../cnd/modelimpl/csm/ConstructorDDImpl.java       |   0
 .../modelimpl/csm/ConstructorDefinitionImpl.java   |   0
 .../modules/cnd/modelimpl/csm/ConstructorImpl.java |   0
 .../cnd/modelimpl/csm/CsmObjectBuilder.java        |   0
 .../modules/cnd/modelimpl/csm/DeclTypeImpl.java    |   0
 .../cnd/modelimpl/csm/DeclarationsContainer.java   |   0
 .../cnd/modelimpl/csm/DestructorDDImpl.java        |   0
 .../modelimpl/csm/DestructorDefinitionImpl.java    |   0
 .../modules/cnd/modelimpl/csm/DestructorImpl.java  |   0
 .../modelimpl/csm/EnumForwardDeclarationImpl.java  |   0
 .../modules/cnd/modelimpl/csm/EnumImpl.java        |   0
 .../modules/cnd/modelimpl/csm/EnumeratorImpl.java  |   0
 ...ExpressionBasedSpecializationParameterImpl.java |   0
 .../modules/cnd/modelimpl/csm/FieldImpl.java       |   0
 .../modules/cnd/modelimpl/csm/ForwardClass.java    |   0
 .../modules/cnd/modelimpl/csm/ForwardEnum.java     |   0
 .../modules/cnd/modelimpl/csm/FriendClassImpl.java |   0
 .../cnd/modelimpl/csm/FriendFunctionDDImpl.java    |   0
 .../csm/FriendFunctionDefinitionImpl.java          |   0
 .../cnd/modelimpl/csm/FriendFunctionImpl.java      |   0
 .../cnd/modelimpl/csm/FriendFunctionImplEx.java    |   0
 .../modules/cnd/modelimpl/csm/FunctionDDImpl.java  |   0
 .../cnd/modelimpl/csm/FunctionDefinitionImpl.java  |   0
 .../modules/cnd/modelimpl/csm/FunctionImpl.java    |   0
 .../modules/cnd/modelimpl/csm/FunctionImplEx.java  |   0
 .../modelimpl/csm/FunctionInstantiationImpl.java   |   0
 .../modelimpl/csm/FunctionParameterListImpl.java   |   0
 .../modules/cnd/modelimpl/csm/IncludeImpl.java     |   0
 .../modules/cnd/modelimpl/csm/InheritanceImpl.java |   0
 .../modules/cnd/modelimpl/csm/Instantiation.java   |   0
 .../modules/cnd/modelimpl/csm/LambdaFunction.java  |   0
 .../modules/cnd/modelimpl/csm/MacroImpl.java       |   0
 .../modules/cnd/modelimpl/csm/MethodDDImpl.java    |   0
 .../modules/cnd/modelimpl/csm/MethodImpl.java      |   0
 .../modelimpl/csm/MethodImplSpecialization.java    |   0
 .../csm/MutableDeclarationsContainer.java          |   0
 .../modules/cnd/modelimpl/csm/NameHolder.java      |   0
 .../cnd/modelimpl/csm/NamespaceAliasImpl.java      |   0
 .../cnd/modelimpl/csm/NamespaceDefinitionImpl.java |   0
 .../modules/cnd/modelimpl/csm/NamespaceImpl.java   |   0
 .../modules/cnd/modelimpl/csm/NestedType.java      |   0
 .../netbeans/modules/cnd/modelimpl/csm/NoType.java |   0
 .../cnd/modelimpl/csm/ParameterEllipsisImpl.java   |   0
 .../modules/cnd/modelimpl/csm/ParameterImpl.java   |   0
 .../cnd/modelimpl/csm/ParameterListImpl.java       |   0
 .../modelimpl/csm/SpecializationDescriptor.java    |   0
 .../modules/cnd/modelimpl/csm/SystemMacroImpl.java |   0
 .../cnd/modelimpl/csm/TemplateDescriptor.java      |   0
 .../cnd/modelimpl/csm/TemplateParameterImpl.java   |   0
 .../modelimpl/csm/TemplateParameterTypeImpl.java   |   0
 .../modules/cnd/modelimpl/csm/TemplateUtils.java   |   0
 .../modules/cnd/modelimpl/csm/TypeAliasImpl.java   |   0
 .../csm/TypeBasedSpecializationParameterImpl.java  |   0
 .../modules/cnd/modelimpl/csm/TypeFactory.java     |   0
 .../modules/cnd/modelimpl/csm/TypeFunPtrImpl.java  |   0
 .../modules/cnd/modelimpl/csm/TypeImpl.java        |   0
 .../modules/cnd/modelimpl/csm/TypedefImpl.java     |   0
 .../cnd/modelimpl/csm/UsingDeclarationImpl.java    |   0
 .../cnd/modelimpl/csm/UsingDirectiveImpl.java      |   0
 .../cnd/modelimpl/csm/VariableDefinitionImpl.java  |   0
 .../modules/cnd/modelimpl/csm/VariableImpl.java    |   0
 .../csm/VariadicSpecializationParameterImpl.java   |   0
 .../cnd/modelimpl/csm/core/AbstractFileBuffer.java |   0
 .../cnd/modelimpl/csm/core/AccessorImpl.java       |   0
 .../cnd/modelimpl/csm/core/AstRenderer.java        |   0
 .../modules/cnd/modelimpl/csm/core/AstUtil.java    |   0
 .../cnd/modelimpl/csm/core/Bundle.properties       |   0
 .../cnd/modelimpl/csm/core/ChangeEventImpl.java    |   0
 .../cnd/modelimpl/csm/core/CreateFilesWorker.java  |   0
 .../cnd/modelimpl/csm/core/CsmIdentifiable.java    |   0
 .../cnd/modelimpl/csm/core/CsmObjectFactory.java   |   0
 .../csm/core/CsmStandaloneFileProviderImpl.java    |   0
 .../cnd/modelimpl/csm/core/DeepReparsingUtils.java |   0
 .../modules/cnd/modelimpl/csm/core/Disposable.java |   0
 .../cnd/modelimpl/csm/core/ErrorDirectiveImpl.java |   0
 .../modelimpl/csm/core/FakeRegistrationWorker.java |   0
 .../modules/cnd/modelimpl/csm/core/FileBuffer.java |   0
 .../cnd/modelimpl/csm/core/FileBufferFile.java     |   0
 .../cnd/modelimpl/csm/core/FileBufferSnapshot.java |   0
 .../modules/cnd/modelimpl/csm/core/FileImpl.java   |   0
 .../csm/core/FilePreprocessorConditionState.java   |   0
 .../cnd/modelimpl/csm/core/FileSnapshot.java       |   0
 .../cnd/modelimpl/csm/core/FileStateCache.java     |   0
 .../modelimpl/csm/core/FileTokenStreamCache.java   |   0
 .../modelimpl/csm/core/LazyOffsPositionImpl.java   |   0
 .../cnd/modelimpl/csm/core/LibProjectImpl.java     |   0
 .../cnd/modelimpl/csm/core/LibraryManager.java     |   0
 .../cnd/modelimpl/csm/core/Line2Offset.java        |   0
 .../csm/core/LineColOffsPositionImpl.java          |   0
 .../cnd/modelimpl/csm/core/ListenersImpl.java      |   0
 .../modules/cnd/modelimpl/csm/core/ModelImpl.java  |   0
 .../modelimpl/csm/core/NativeFileContainer.java    |   0
 .../csm/core/NativeProjectListenerImpl.java        |   0
 .../cnd/modelimpl/csm/core/Notificator.java        |   0
 .../modules/cnd/modelimpl/csm/core/Offsetable.java |   0
 .../cnd/modelimpl/csm/core/OffsetableBase.java     |   0
 .../csm/core/OffsetableDeclarationBase.java        |   0
 .../csm/core/OffsetableIdentifiableBase.java       |   0
 .../modelimpl/csm/core/ParseFinishNotificator.java |   0
 .../cnd/modelimpl/csm/core/ParseStatistics.java    |   0
 .../cnd/modelimpl/csm/core/ParserQueue.java        |   0
 .../cnd/modelimpl/csm/core/ParserThread.java       |   0
 .../modelimpl/csm/core/ParserThreadManager.java    |   0
 .../cnd/modelimpl/csm/core/PersistentKey.java      |   0
 .../cnd/modelimpl/csm/core/PositionManager.java    |   0
 .../modelimpl/csm/core/PreprocessorStatePair.java  |   0
 .../cnd/modelimpl/csm/core/ProgressSupport.java    |   0
 .../cnd/modelimpl/csm/core/ProjectBase.java        |   0
 .../modelimpl/csm/core/ProjectBaseWithEditing.java |   0
 .../cnd/modelimpl/csm/core/ProjectImpl.java        |   0
 .../modules/cnd/modelimpl/csm/core/RawNamable.java |   0
 .../modelimpl/csm/core/SimpleOffsetableImpl.java   |   0
 .../modelimpl/csm/core/SourceRootContainer.java    |   0
 .../modules/cnd/modelimpl/csm/core/Unresolved.java |   0
 .../modules/cnd/modelimpl/csm/core/Utils.java      |   0
 .../cnd/modelimpl/csm/deep/CaseStatementImpl.java  |   0
 .../modelimpl/csm/deep/CompoundStatementImpl.java  |   0
 .../csm/deep/ConditionDeclarationImpl.java         |   0
 .../csm/deep/ConditionExpressionImpl.java          |   0
 .../csm/deep/DeclarationStatementImpl.java         |   0
 .../modules/cnd/modelimpl/csm/deep/DeepUtil.java   |   0
 .../csm/deep/EmptyCompoundStatementImpl.java       |   0
 .../modelimpl/csm/deep/ExceptionHandlerImpl.java   |   0
 .../modelimpl/csm/deep/ExpandedExpressionBase.java |   0
 .../cnd/modelimpl/csm/deep/ExpressionBase.java     |   0
 .../csm/deep/ExpressionStatementImpl.java          |   0
 .../cnd/modelimpl/csm/deep/ExpressionsFactory.java |   0
 .../cnd/modelimpl/csm/deep/ForStatementImpl.java   |   0
 .../cnd/modelimpl/csm/deep/GotoStatementImpl.java  |   0
 .../cnd/modelimpl/csm/deep/IfStatementImpl.java    |   0
 .../modules/cnd/modelimpl/csm/deep/LabelImpl.java  |   0
 .../csm/deep/LazyCompoundStatementImpl.java        |   0
 .../cnd/modelimpl/csm/deep/LazyStatementImpl.java  |   0
 .../csm/deep/LazyTryCatchStatementImpl.java        |   0
 .../cnd/modelimpl/csm/deep/LoopStatementImpl.java  |   0
 .../modelimpl/csm/deep/ReturnStatementImpl.java    |   0
 .../cnd/modelimpl/csm/deep/StatementBase.java      |   0
 .../modelimpl/csm/deep/SwitchStatementImpl.java    |   0
 .../modelimpl/csm/deep/TryCatchStatementImpl.java  |   0
 .../cnd/modelimpl/csm/deep/UniversalStatement.java |   0
 .../cnd/modelimpl/csm/resolver/Context.java        |   0
 .../modelimpl/csm/resolver/FileMapsCollector.java  |   0
 .../cnd/modelimpl/csm/resolver/Resolver.java       |   0
 .../cnd/modelimpl/csm/resolver/Resolver3.java      |   0
 .../modelimpl/csm/resolver/ResolverFactory.java    |   0
 .../modules/cnd/modelimpl/debug/Diagnostic.java    |   0
 .../cnd/modelimpl/debug/DiagnosticExceptoins.java  |   0
 .../cnd/modelimpl/debug/DiagnosticUnresolved.java  |   0
 .../debug/IllegalRepositoryStateException.java     |   0
 .../modules/cnd/modelimpl/debug/Terminator.java    |   0
 .../modules/cnd/modelimpl/debug/TraceFlags.java    |   0
 .../cnd/modelimpl/fsm/DummyParameterImpl.java      |   0
 .../cnd/modelimpl/fsm/DummyParametersListImpl.java |   0
 .../modules/cnd/modelimpl/fsm/ModuleImpl.java      |   0
 .../modules/cnd/modelimpl/fsm/ProgramImpl.java     |   0
 .../modules/cnd/modelimpl/fsm/SubroutineImpl.java  |   0
 .../cnd/modelimpl/fsm/core/DataRenderer.java       |   0
 .../impl/services/BaseUtilitiesProviderImpl.java   |   0
 .../impl/services/ClassifierResolverImpl.java      |   0
 .../impl/services/CsmCodeBlockProviderImpl.java    |   0
 .../services/CsmDisplayUtilitiesProviderImpl.java  |   0
 .../impl/services/CsmDocGeneratorProviderImpl.java |   0
 .../impl/services/CsmObjectAttributeQueryImpl.java |   0
 .../impl/services/CsmReferenceStorageImpl.java     |   0
 .../impl/services/CsmSymbolResolverImpl.java       |   0
 .../impl/services/CsmTypedefResolver.java          |   0
 .../services/DeclarationReferenceResolverImpl.java |   0
 .../impl/services/ExpressionEvaluator.java         |   0
 .../impl/services/FileElementsCollector.java       |   0
 .../modelimpl/impl/services/FileInfoQueryImpl.java |   0
 .../impl/services/FileSearchProviderImpl.java      |   0
 .../impl/services/FriendResolverImpl.java          |   0
 .../services/FunctionDefinitionResolverImpl.java   |   0
 .../services/IncludeHierarchyResolverImpl.java     |   0
 .../impl/services/IncludeResolverImpl.java         |   0
 .../impl/services/InstantiationProviderImpl.java   |   0
 .../modelimpl/impl/services/LabelResolverImpl.java |   0
 .../services/MacroExpansionDocProviderImpl.java    |   0
 .../impl/services/MemberResolverImpl.java          |   0
 .../impl/services/ReferenceRepositoryImpl.java     |   0
 .../cnd/modelimpl/impl/services/SelectImpl.java    |   0
 .../impl/services/TypeHierarchyResolverImpl.java   |   0
 .../modelimpl/impl/services/TypesProviderImpl.java |   0
 .../cnd/modelimpl/impl/services/UIDFilter.java     |   0
 .../modelimpl/impl/services/UsingResolverImpl.java |   0
 .../services/evaluator/ShiftedTokenStream.java     |   0
 .../impl/services/evaluator/VariableProvider.java  |   0
 .../impl/services/evaluator/parser/Evaluator.g     |   0
 .../cnd/modelimpl/memory/LowMemoryEvent.java       |   0
 .../cnd/modelimpl/memory/LowMemoryListener.java    |   0
 .../cnd/modelimpl/memory/LowMemoryNotifier.java    |   0
 .../modelimpl/memory/LowMemoryNotifierImpl.java    |   0
 .../cnd/modelimpl/parser/CPPStraightParserEx.java  |   0
 .../modules/cnd/modelimpl/parser/CXXParser.g       |   0
 .../cnd/modelimpl/parser/CXXParserAction.java      |   0
 .../cnd/modelimpl/parser/CXXParserActionEx.java    |   0
 .../cnd/modelimpl/parser/CXXParserActionImpl.java  |   0
 .../modules/cnd/modelimpl/parser/CXXParserEx.java  |   0
 .../cnd/modelimpl/parser/CppParserAction.java      |   0
 .../cnd/modelimpl/parser/CppParserActionEx.java    |   0
 .../cnd/modelimpl/parser/CppParserActionImpl.java  |   0
 .../modelimpl/parser/CppParserActionTracer.java    |   0
 .../modelimpl/parser/CppParserBuilderContext.java  |   0
 .../modelimpl/parser/CppParserEmptyActionImpl.java |   0
 .../modules/cnd/modelimpl/parser/CsmAST.java       |   0
 .../modules/cnd/modelimpl/parser/Enum.java         |   0
 .../modules/cnd/modelimpl/parser/FakeAST.java      |   0
 .../cnd/modelimpl/parser/FortranParserEx.java      |   0
 .../modules/cnd/modelimpl/parser/FortranUtils.java |   0
 .../modules/cnd/modelimpl/parser/NamedFakeAST.java |   0
 .../cnd/modelimpl/parser/OffsetableAST.java        |   0
 .../cnd/modelimpl/parser/OffsetableFakeAST.java    |   0
 .../cnd/modelimpl/parser/ParserProviderImpl.java   |   0
 .../cnd/modelimpl/parser/PreprocessorAction.java   |   0
 .../modules/cnd/modelimpl/parser/Printf.java       |   0
 .../cnd/modelimpl/parser/TokenBasedAST.java        |   0
 .../cnd/modelimpl/parser/TokenBasedFakeAST.java    |   0
 .../parser/apt/APTBasedPCStateBuilder.java         |   0
 .../parser/apt/APTFileInfoQuerySupport.java        |   0
 .../modelimpl/parser/apt/APTFindMacrosWalker.java  |   0
 .../modelimpl/parser/apt/APTParseFileWalker.java   |   0
 .../parser/apt/APTProjectFileBasedWalker.java      |   0
 .../parser/apt/APTRestorePreprocStateWalker.java   |   0
 .../cnd/modelimpl/parser/apt/APTSelfWalker.java    |   0
 .../parser/apt/APTTokenStreamProducer.java         |   0
 .../cnd/modelimpl/parser/apt/GuardBlockWalker.java |   0
 .../parser/apt/StopOnOffsetParseFileWalker.java    |   0
 .../cnd/modelimpl/parser/clank/Bundle.properties   |   0
 .../parser/clank/ClankFileInfoQuerySupport.java    |   0
 .../modelimpl/parser/clank/ClankToCsmSupport.java  |   0
 .../parser/clank/ClankTokenStreamProducer.java     |   0
 .../clank/ClankTokenStreamProducerParameters.java  |   0
 .../parser/clank/MacroDeclarationReference.java    |   0
 .../cnd/modelimpl/parser/clank/MacroReference.java |   0
 .../modelimpl/parser/spi/CsmParserProvider.java    |   0
 .../modelimpl/parser/spi/TokenStreamProducer.java  |   0
 .../cnd/modelimpl/parser/symtab/CPPDictionary.java |   0
 .../cnd/modelimpl/parser/symtab/CPPSymbol.java     |   0
 .../cnd/modelimpl/parser/symtab/Dictionary.java    |   0
 .../modelimpl/parser/symtab/DictionaryEntry.java   |   0
 .../cnd/modelimpl/parser/symtab/SymTab.java        |   0
 .../cnd/modelimpl/parser/symtab/SymTabEntry.java   |   0
 .../modelimpl/parser/symtab/SymTabEntryKey.java    |   0
 .../cnd/modelimpl/parser/symtab/SymTabStack.java   |   0
 .../modelimpl/platform/APTBuffersProviderImpl.java |   0
 .../cnd/modelimpl/platform/Bundle.properties       |   0
 .../modules/cnd/modelimpl/platform/CndIndexer.java |   0
 .../cnd/modelimpl/platform/CndParserFactory.java   |   0
 .../cnd/modelimpl/platform/CndParserImpl.java      |   0
 .../cnd/modelimpl/platform/CndParserResult.java    |   0
 .../modules/cnd/modelimpl/platform/CsmEvent.java   |   0
 .../cnd/modelimpl/platform/CsmEventDispatcher.java |   0
 .../cnd/modelimpl/platform/CsmEventListener.java   |   0
 .../modelimpl/platform/ExternalUpdateListener.java |   0
 .../cnd/modelimpl/platform/FileBufferDoc.java      |   0
 .../cnd/modelimpl/platform/FileBufferImpl.java     |   0
 .../modelimpl/platform/FileBufferSnapshot2.java    |   0
 .../cnd/modelimpl/platform/ModelSupport.java       |   0
 .../cnd/modelimpl/platform/ParsingProgress.java    |   0
 .../modelimpl/platform/ProgressListenerImpl.java   |   0
 .../cnd/modelimpl/repository/AbstractKey.java      |   0
 .../repository/ClassifierContainerKey.java         |   0
 .../cnd/modelimpl/repository/FileContainerKey.java |   0
 .../modelimpl/repository/FileDeclarationsKey.java  |   0
 .../cnd/modelimpl/repository/FileIncludesKey.java  |   0
 .../repository/FileInstantiationsKey.java          |   0
 .../modules/cnd/modelimpl/repository/FileKey.java  |   0
 .../cnd/modelimpl/repository/FileMacrosKey.java    |   0
 .../modelimpl/repository/FileReferencesKey.java    |   0
 .../modelimpl/repository/GraphContainerKey.java    |   0
 .../cnd/modelimpl/repository/IncludeKey.java       |   0
 .../repository/IncludedFileStorageKey.java         |   0
 .../cnd/modelimpl/repository/InheritanceKey.java   |   0
 .../cnd/modelimpl/repository/InstantiationKey.java |   0
 .../cnd/modelimpl/repository/KeyHolder.java        |   0
 .../cnd/modelimpl/repository/KeyManager.java       |   0
 .../cnd/modelimpl/repository/KeyObjectFactory.java |   0
 .../repository/KeyPresentationFactoryImpl.java     |   0
 .../cnd/modelimpl/repository/KeyUtilities.java     |   0
 .../repository/LayerDescriptorProviderImpl.java    |   0
 .../modules/cnd/modelimpl/repository/MacroKey.java |   0
 .../cnd/modelimpl/repository/NamespaceBaseKey.java |   0
 .../NamespaceDeclarationContainerKey.java          |   0
 .../cnd/modelimpl/repository/NamespaceKey.java     |   0
 .../repository/OffsetableDeclarationKey.java       |   0
 .../cnd/modelimpl/repository/OffsetableKey.java    |   0
 .../cnd/modelimpl/repository/ParamListKey.java     |   0
 .../cnd/modelimpl/repository/PersistentUtils.java  |   0
 .../modelimpl/repository/ProjectContainerKey.java  |   0
 .../repository/ProjectDeclarationContainerKey.java |   0
 .../repository/ProjectFileNameBasedKey.java        |   0
 .../cnd/modelimpl/repository/ProjectKey.java       |   0
 .../modelimpl/repository/ProjectNameBasedKey.java  |   0
 .../modelimpl/repository/ReferencesIndexKey.java   |   0
 .../repository/RepositoryListenerImpl.java         |   0
 .../repository/RepositoryMapperProvider.java       |   0
 .../cnd/modelimpl/repository/RepositoryUtils.java  |   0
 .../cnd/modelimpl/resources/Bundle.properties      |   0
 .../modules/cnd/modelimpl/resources/layer.xml      |   0
 .../cnd/modelimpl/spi/LowMemoryAlerter.java        |   0
 .../modelimpl/syntaxerr/BaseParserErrorFilter.java |   0
 .../cnd/modelimpl/syntaxerr/Bundle.properties      |   0
 .../modelimpl/syntaxerr/ParserErrorProvider.java   |   0
 .../cnd/modelimpl/syntaxerr/SimpleErrorInfo.java   |   0
 .../syntaxerr/TransparentParserErrorFilter.java    |   0
 .../modelimpl/syntaxerr/spi/ParserErrorFilter.java |   0
 .../syntaxerr/spi/ReadOnlyTokenBuffer.java         |   0
 .../cnd/modelimpl/textcache/DefaultCache.java      |   0
 .../cnd/modelimpl/textcache/FileNameCache.java     |   0
 .../modules/cnd/modelimpl/textcache/NameCache.java |   0
 .../cnd/modelimpl/textcache/ProjectNameCache.java  |   0
 .../modelimpl/textcache/QualifiedNameCache.java    |   0
 .../cnd/modelimpl/textcache/UniqueNameCache.java   |   0
 .../modules/cnd/modelimpl/trace/APTWalkerTest.java |   0
 .../modules/cnd/modelimpl/trace/ASTFrameEx.java    |   0
 .../cnd/modelimpl/trace/CodeModelDiagnostic.java   |   0
 .../modules/cnd/modelimpl/trace/LineDiff.java      |   0
 .../cnd/modelimpl/trace/NativeProjectProvider.java |   0
 .../cnd/modelimpl/trace/OffsetToPositionFrame.java |   0
 .../modules/cnd/modelimpl/trace/TraceFactory.java  |   0
 .../modules/cnd/modelimpl/trace/TraceModel.java    |   0
 .../cnd/modelimpl/trace/TraceModelBase.java        |   0
 .../cnd/modelimpl/trace/TraceModelFileFilter.java  |   0
 .../trace/TraceProjectLookupProvider.java          |   0
 .../modules/cnd/modelimpl/trace/TraceUtils.java    |   0
 .../modules/cnd/modelimpl/trace/TraceXRef.java     |   0
 .../modules/cnd/modelimpl/trace/XRefResultSet.java |   0
 .../modules/cnd/modelimpl/uid/KeyBasedUID.java     |   0
 .../cnd/modelimpl/uid/LazyCsmCollection.java       |   0
 .../modules/cnd/modelimpl/uid/ObjectBasedUID.java  |   0
 .../modules/cnd/modelimpl/uid/UIDCsmConverter.java |   0
 .../modules/cnd/modelimpl/uid/UIDManager.java      |   0
 .../cnd/modelimpl/uid/UIDObjectFactory.java        |   0
 .../modules/cnd/modelimpl/uid/UIDProviderIml.java  |   0
 .../modules/cnd/modelimpl/uid/UIDUtilities.java    |   0
 .../modules/cnd/modelimpl/util/MapHierarchy.java   |   0
 .../modules/cnd/modelimpl/util/WeakList.java       |   0
 .../cnd.modelimpl/test/popular-commands.sh         |   0
 .../cnd.modelimpl/test/scripts/_measure_project.sh |   0
 .../cnd.modelimpl/test/scripts/_parse_project.sh   |   0
 .../cnd.modelimpl/test/scripts/measure_clucene.sh  |   0
 .../cnd.modelimpl/test/scripts/measure_ddd.sh      |   0
 .../cnd.modelimpl/test/scripts/measure_mysql.sh    |   0
 .../cnd.modelimpl/test/scripts/parse_clucene.sh    |   0
 .../cnd.modelimpl/test/scripts/parse_ddd.sh        |   0
 .../cnd.modelimpl/test/scripts/parse_mysql.sh      |   0
 .../cnd.modelimpl/test/scripts/repository.sh       |   0
 .../cnd.modelimpl/test/scripts/usr_include.sh      |   0
 .../test/unit/data/common/quote_nosyshdr}/cpu.cc   |   0
 .../test/unit/data/common/quote_nosyshdr}/cpu.h    |   0
 .../unit/data/common/quote_nosyshdr}/customer.cc   |   0
 .../unit/data/common/quote_nosyshdr}/customer.h    |   0
 .../test/unit/data/common/quote_nosyshdr}/disk.cc  |   0
 .../test/unit/data/common/quote_nosyshdr}/disk.h   |   0
 .../unit/data/common/quote_nosyshdr}/memory.cc     |   0
 .../test/unit/data/common/quote_nosyshdr}/memory.h |   0
 .../unit/data/common/quote_nosyshdr}/module.cc     |   0
 .../test/unit/data/common/quote_nosyshdr}/module.h |   0
 .../test/unit/data/common/quote_nosyshdr}/quote.cc |   0
 .../unit/data/common/quote_nosyshdr}/system.cc     |   0
 .../test/unit/data/common/quote_nosyshdr}/system.h |   0
 .../test/unit/data/common/quote_syshdr}/cpu.cc     |   0
 .../test/unit/data/common/quote_syshdr}/cpu.h      |   0
 .../unit/data/common/quote_syshdr}/customer.cc     |   0
 .../test/unit/data/common/quote_syshdr/customer.h  |   0
 .../test/unit/data/common/quote_syshdr}/disk.cc    |   0
 .../test/unit/data/common/quote_syshdr}/disk.h     |   0
 .../test/unit/data/common/quote_syshdr}/memory.cc  |   0
 .../test/unit/data/common/quote_syshdr}/memory.h   |   0
 .../test/unit/data/common/quote_syshdr/module.cc   |   0
 .../test/unit/data/common/quote_syshdr/module.h    |   0
 .../test/unit/data/common/quote_syshdr/namelist.cc |   0
 .../test/unit/data/common/quote_syshdr/namelist.h  |   0
 .../test/unit/data/common/quote_syshdr/quote.cc    |   0
 .../test/unit/data/common/quote_syshdr/system.cc   |   0
 .../test/unit/data/common/quote_syshdr/system.h    |   0
 .../test/unit/data/common/recovery/class/class.cc  |   0
 .../common/recovery/declarations/undefined_type.cc |   0
 .../unit/data/common/recovery/friend/friend.cc     |   0
 .../unit/data/common/recovery/member/customer.cc   |   0
 .../unit/data/common/recovery/member/customer.h    |   0
 .../data/common/recovery/namespace/namespace.cc    |   0
 .../unit/data/common/recovery/template/template.cc |   0
 .../unit/data/common/recovery/typedef/typedef.cc   |   0
 .../elif_else_simple.cc.clank.err                  |   0
 .../SmartParseHeaderTest/elif_else_simple.cc.dat   |   0
 .../elif_else_simple_model.clank.err               |   0
 .../elif_else_simple_model.dat                     |   0
 .../core/SmartParseHeaderTest/mixed_1.clank.err    |   0
 .../csm/core/SmartParseHeaderTest/mixed_1.dat      |   0
 .../smart_headers_simple_1_multy.dat               |   0
 .../smart_headers_simple_1a.cc.dat                 |   0
 .../smart_headers_simple_1b.cc.dat                 |   0
 .../smart_headers_simple_1c.cc.dat                 |   0
 .../smart_headers_simple_1d.cc.dat                 |   0
 .../smart_headers_simple_1e.cc.dat                 |   0
 .../smart_headers_simple_1f.cc.dat                 |   0
 .../testIncludeResolverInHeader1HOnExternVar       |   0
 .../testIncludeResolverInHeader1HOnLocalVar        |   0
 .../testIncludeResolverInHeader2H                  |   0
 .../testIncludeResolverInHeader2HOnExternVar       |   0
 .../testIncludeResolverInLocalCC                   |   0
 .../testIncludeResolverInMainCC                    |   0
 .../testIncludeResolverInMainCCOnExternVar         |   0
 .../testIncludeResolverInMainCCOnFunction          |   0
 .../testIncludeResolverInMainCCOnLocalVar          |   0
 .../MacroExpansionExpandTestCase/testCodeExpansion |   0
 .../testCodeWithCommentExpansion                   |   0
 .../services/MacroExpansionExpandTestCase/testDoc1 |   0
 .../MacroExpansionExpandTestCase/testDoc1_2        |   0
 .../MacroExpansionExpandTestCase/testFile1         |   0
 .../MacroExpansionExpandTestCase/testFile1_2       |   0
 .../MacroExpansionExpandTestCase/testIZ175801      |   0
 .../MacroExpansionNextPrevMacroTestCase/testFile1  |   0
 .../testFile1_2                                    |   0
 .../MacroExpansionOffsetsTestCase/testFile1        |   0
 .../MacroExpansionOffsetsTestCase/testFile1_2      |   0
 .../services/MacroExpansionSpanTestCase/testFile1  |   0
 .../services/MacroExpansionSpanTestCase/testFile2  |   0
 .../MacroExpansionTablesTestCase/testFile1         |   0
 .../MacroExpansionTablesTestCase/testFile1_2       |   0
 .../MacroExpansionUsagesTestCase/testFile1         |   0
 .../macro_refs_headers_parse.h.dat                 |   0
 .../MacroUsagesTestCase/macro_refs_simple.cc.dat   |   0
 .../testCpuClassRefs.res                           |   0
 .../smart_headers_parse_1.h.dat                    |   0
 .../smart_headers_parse_2.h.dat                    |   0
 .../unused_blocks_simple.cc.dat                    |   0
 .../testNSOneAndNsTwoAreVisible.decl               |   0
 .../testNSOneAndNsTwoAreVisible.nsp                |   0
 .../testNSOneAndNsTwoAreVisibleInMain.decl         |   0
 .../testNSOneAndNsTwoAreVisibleInMain.nsp          |   0
 .../testNSOneIsVisible.decl                        |   0
 .../testNSOneIsVisible.nsp                         |   0
 .../testNSOneIsVisibleNsTwoIsUsedInFun.decl        |   0
 .../testNSOneIsVisibleNsTwoIsUsedInFun.nsp         |   0
 .../testNSOneIsVisibleNsTwoNotYetInFun.decl        |   0
 .../testNSOneIsVisibleNsTwoNotYetInFun.nsp         |   0
 .../testOnlyGlobalIsVisible.decl                   |   0
 .../testOnlyGlobalIsVisible.nsp                    |   0
 .../testOuterIsVisble.decl                         |   0
 .../testOuterIsVisble.nsp                          |   0
 .../testUnnamedIsVisble.decl                       |   0
 .../testUnnamedIsVisble.nsp                        |   0
 .../trace/FileModel2Test/bug195338.cpp.dat         |   0
 .../trace/FileModel2Test/bug195338.cpp.err         |   0
 .../trace/FileModel2Test/bug198460.cpp.dat         |   0
 .../trace/FileModel2Test/bug198460.cpp.err         |   0
 .../trace/FileModel2Test/bug204497.cpp.dat         |   0
 .../trace/FileModel2Test/bug204497.cpp.err         |   0
 .../trace/FileModel2Test/bug205292.cpp.dat         |   0
 .../trace/FileModel2Test/bug205292.cpp.err         |   0
 .../trace/FileModel2Test/bug209947.cpp.dat         |   0
 .../trace/FileModel2Test/bug209947.cpp.err         |   0
 .../trace/FileModel2Test/bug215605.cpp.dat         |   0
 .../trace/FileModel2Test/bug215605.cpp.err         |   0
 .../trace/FileModel2Test/bug217390.cpp.dat         |   0
 .../trace/FileModel2Test/bug217390.cpp.err         |   0
 .../trace/FileModel2Test/bug224027.cpp.dat         |   0
 .../trace/FileModel2Test/bug224027.cpp.err         |   0
 .../modelimpl/trace/FileModel2Test/bug229069.c.dat |   0
 .../modelimpl/trace/FileModel2Test/bug229069.c.err |   0
 .../modelimpl/trace/FileModel2Test/bug238041.c.dat |   0
 .../trace/FileModel2Test/bug243262.cpp.dat         |   0
 .../trace/FileModel2Test/bug243508.cpp.dat         |   0
 .../trace/FileModel2Test/bug243560.cpp.dat         |   0
 .../trace/FileModel2Test/bug245802.cpp.dat         |   0
 .../trace/FileModel2Test/bug246693.cpp.dat         |   0
 .../trace/FileModel2Test/bug248661_2.cpp.dat       |   0
 .../trace/FileModel2Test/bug254698.cpp.dat         |   0
 .../modelimpl/trace/FileModel2Test/bug255724.c.dat |   0
 .../trace/FileModel2Test/bug256281.cpp.dat         |   0
 .../modelimpl/trace/FileModel2Test/bug256516.c.dat |   0
 .../trace/FileModel2Test/bug256516.cpp.dat         |   0
 .../trace/FileModel2Test/bug257152.cpp.dat         |   0
 .../trace/FileModel2Test/bug257152c.c.dat          |   0
 .../modelimpl/trace/FileModel2Test/bug258327.c.dat |   0
 .../trace/FileModel2Test/bug260774.cpp.dat         |   0
 .../trace/FileModel2Test/bug267668Enums.cpp.dat    |   0
 .../trace/FileModel2Test/bug267668Enums.cpp.err    |   0
 .../modelimpl/trace/FileModel2Test/bug268930.c.dat |   0
 .../modelimpl/trace/FileModel2Test/bug269245.c.dat |   0
 .../trace/FileModel2Test/c_namespaces.c.dat        |   0
 .../trace/FileModel2Test/c_namespaces.c.err        |   0
 .../FileModel2Test/explicit_specialization.cc.dat  |   0
 .../FileModel2Test/explicit_specialization.cc.err  |   0
 .../FileModel2Test/function_returning_enum.cpp.dat |   0
 .../iz103462_first_and_second_1.cc.dat             |   0
 .../iz103462_first_and_second_1.cc.err             |   0
 .../modelimpl/trace/FileModel2Test/iz134182.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz134182.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz136887.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz142674.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz142674.cc.err |   0
 .../trace/FileModel2Test/iz143977_0.cc.dat         |   0
 .../trace/FileModel2Test/iz143977_0.cc.err         |   0
 .../trace/FileModel2Test/iz143977_1.cc.dat         |   0
 .../trace/FileModel2Test/iz143977_1.cc.err         |   0
 .../trace/FileModel2Test/iz143977_2.cc.dat         |   0
 .../trace/FileModel2Test/iz143977_2.cc.err         |   0
 .../trace/FileModel2Test/iz143977_3.cc.dat         |   0
 .../trace/FileModel2Test/iz143977_3.cc.err         |   0
 .../modelimpl/trace/FileModel2Test/iz145280.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz145280.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz146560.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz146560.cc.err |   0
 .../FileModel2Test/iz147284_is_defined.cc.dat      |   0
 .../modelimpl/trace/FileModel2Test/iz147574.c.dat  |   0
 .../modelimpl/trace/FileModel2Test/iz147574.c.err  |   0
 .../modelimpl/trace/FileModel2Test/iz148014.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz148014.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz149225.c.dat  |   0
 .../modelimpl/trace/FileModel2Test/iz149225.c.err  |   0
 .../modelimpl/trace/FileModel2Test/iz149505.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz149525.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz149525.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz151621.c.dat  |   0
 .../modelimpl/trace/FileModel2Test/iz151621.c.err  |   0
 .../FileModel2Test/iz151957_namespace_alias.cc.dat |   0
 .../FileModel2Test/iz151957_namespace_alias.cc.err |   0
 .../iz152872_initializer_in_expression.c.dat       |   0
 .../iz152872_initializer_in_expression.c.err       |   0
 .../modelimpl/trace/FileModel2Test/iz154196.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz154276.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz154349.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz154349.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz156004.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz156004.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz156009.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz156009.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz156061.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz156061.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz156696.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz156696.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz157603.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz157836.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz157836.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz158124.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz158124.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz158615.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz158615.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz158684.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz158684.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz158872.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz158872.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz159238.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz159238.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz159324.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz159324.cc.err |   0
 .../FileModel2Test/iz162280_friend_fwd_cls.cpp.dat |   0
 .../trace/FileModel2Test/iz164583.cpp.dat          |   0
 .../trace/FileModel2Test/iz164583.cpp.err          |   0
 .../modelimpl/trace/FileModel2Test/iz165038.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz165038.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz166165.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz166165.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz167547.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz167547.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz168253.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz168253.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz174256.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz174256.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz175324.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz175324.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz175653.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz175653.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz176530.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz176530.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz182510.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz189777.c.dat  |   0
 .../modelimpl/trace/FileModel2Test/iz189777.c.err  |   0
 .../trace/FileModel2Test/iz190413.c.clank.err      |   0
 .../modelimpl/trace/FileModel2Test/iz190413.c.dat  |   0
 .../modelimpl/trace/FileModel2Test/iz190413.c.err  |   0
 .../modelimpl/trace/FileModel2Test/iz190710.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz190710.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz190782.c.dat  |   0
 .../modelimpl/trace/FileModel2Test/iz190782.c.err  |   0
 .../modelimpl/trace/FileModel2Test/iz190821.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz190821.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz191085.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz191085.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz191446.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz191446.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz191598.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz191598.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz191799.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz191799.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz195560.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz195560.cc.err |   0
 .../trace/FileModel2Test/iz197997.cc.clank.err     |   0
 .../modelimpl/trace/FileModel2Test/iz197997.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz197997.cc.err |   0
 .../modelimpl/trace/FileModel2Test/iz199899.c.dat  |   0
 .../modelimpl/trace/FileModel2Test/iz199899.c.err  |   0
 .../modelimpl/trace/FileModel2Test/iz205270.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz205270.cc.err |   0
 .../trace/FileModel2Test/iz215640.cpp.dat          |   0
 .../modelimpl/trace/FileModel2Test/iz217089.c.dat  |   0
 .../trace/FileModel2Test/iz217711.h.clank.err      |   0
 .../modelimpl/trace/FileModel2Test/iz217711.h.dat  |   0
 .../modelimpl/trace/FileModel2Test/iz222800.cc.dat |   0
 .../modelimpl/trace/FileModel2Test/iz227479.pc.dat |   0
 .../trace/FileModel2Test/iz229003.cpp.dat          |   0
 .../modelimpl/trace/FileModel2Test/iz231216.cc.dat |   0
 .../FileModel2Test/iz_145553_namesakes.cc.dat      |   0
 .../FileModel2Test/iz_145553_namesakes.cc.err      |   0
 .../trace/FileModel2Test/preproc_directives.cc.dat |   0
 .../sharp_pp_directives.cc.clank.err               |   0
 .../FileModel2Test/sharp_pp_directives.cc.dat      |   0
 .../FileModel2Test/testHeaderWithCKeywords.c.dat   |   0
 .../FileModel2Test/testHeaderWithCKeywords.c.err   |   0
 .../trace/FileModel3Test/align_local_assert.c.dat  |   0
 .../trace/FileModel3Test/align_local_assert.c.err  |   0
 .../modelimpl/trace/FileModel3Test/atomic.c.dat    |   0
 .../modelimpl/trace/FileModel3Test/atomic.c.err    |   0
 .../modelimpl/trace/FileModel3Test/const.cpp.dat   |   0
 .../modelimpl/trace/FileModel3Test/const.cpp.err   |   0
 .../FileModel3Test/cross_inclusionA.h.clank.dat    |   0
 .../FileModel3Test/cross_inclusionA.h.clank.err    |   0
 .../trace/FileModel3Test/cross_inclusionA.h.dat    |   0
 .../trace/FileModel3Test/cross_inclusionA.h.err    |   0
 .../FileModel3Test/cross_inclusionB.h.clank.dat    |   0
 .../FileModel3Test/cross_inclusionB.h.clank.err    |   0
 .../trace/FileModel3Test/cross_inclusionB.h.dat    |   0
 .../trace/FileModel3Test/cross_inclusionB.h.err    |   0
 .../trace/FileModel3Test/delay.c.clank.dat         |   0
 .../cnd/modelimpl/trace/FileModel3Test/delay.c.dat |   0
 .../cnd/modelimpl/trace/FileModel3Test/delay.c.err |   0
 .../FileModel3Test/fun_macro_ellipsis.cc.clank.dat |   0
 .../FileModel3Test/fun_macro_ellipsis.cc.clank.err |   0
 .../trace/FileModel3Test/fun_macro_ellipsis.cc.dat |   0
 .../trace/FileModel3Test/fun_macro_ellipsis.cc.err |   0
 .../trace/FileModel3Test/ifdef_guard.cpp.dat       |   0
 .../trace/FileModel3Test/ifdef_guard.cpp.err       |   0
 .../trace/FileModel3Test/init_array.cpp.dat        |   0
 .../trace/FileModel3Test/init_array.cpp.err        |   0
 .../trace/FileModel3Test/lexer_dollar.cc.dat       |   0
 .../trace/FileModel3Test/lexer_dollar.cc.err       |   0
 .../FileModel3Test/lexer_dots_at_eval.cc.clank.err |   0
 .../trace/FileModel3Test/lexer_dots_at_eval.cc.dat |   0
 .../trace/FileModel3Test/lexer_dots_at_eval.cc.err |   0
 .../trace/FileModel3Test/operators.cc.dat          |   0
 .../trace/FileModel3Test/operators.cc.err          |   0
 .../modelimpl/trace/FileModel3Test/operators.h.dat |   0
 .../modelimpl/trace/FileModel3Test/operators.h.err |   0
 .../trace/FileModel3Test/ppExpression.cpp.dat      |   0
 .../trace/FileModel3Test/ppExpression.cpp.err      |   0
 .../trace/FileModel3Test/preproc.cpp.clank.dat     |   0
 .../modelimpl/trace/FileModel3Test/preproc.cpp.dat |   0
 .../modelimpl/trace/FileModel3Test/preproc.cpp.err |   0
 .../FileModel3Test/preproc_concat.cc.clank.dat     |   0
 .../trace/FileModel3Test/preproc_concat.cc.dat     |   0
 .../preproc_concat_error.cc.clank.dat              |   0
 .../preproc_concat_error.cc.clank.err              |   0
 .../FileModel3Test/preproc_concat_error.cc.dat     |   0
 .../FileModel3Test/preproc_concat_error.cc.err     |   0
 .../trace/FileModel3Test/preproc_endif.cpp.dat     |   0
 .../trace/FileModel3Test/preproc_endif.cpp.err     |   0
 .../preproc_include_with_macro.cpp.clank.dat       |   0
 .../preproc_include_with_macro.cpp.clank.err       |   0
 .../preproc_include_with_macro.cpp.dat             |   0
 .../preproc_include_with_macro.cpp.err             |   0
 .../preproc_incomplete_if_directives.cpp.clank.err |   0
 .../preproc_incomplete_if_directives.cpp.dat       |   0
 .../preproc_incomplete_if_directives.cpp.err       |   0
 .../preproc_multi_line_macro_param.cpp.dat         |   0
 .../preproc_multi_line_macro_param.cpp.err         |   0
 .../FileModel3Test/recurse_define.h.clank.dat      |   0
 .../trace/FileModel3Test/recurse_define.h.dat      |   0
 .../trace/FileModel3Test/recurse_define.h.err      |   0
 .../FileModel3Test/resolver_typedef_s_e_c_u.cc.dat |   0
 .../FileModel3Test/resolver_typedef_s_e_c_u.cc.err |   0
 .../trace/FileModel3Test/va_arg_using.cpp.dat      |   0
 .../trace/FileModel3Test/va_arg_using.cpp.err      |   0
 .../trace/FileModelCpp11Test/bug216084.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug224666.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug224666.cpp.err     |   0
 .../trace/FileModelCpp11Test/bug225045.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug225102.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug226562.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug235968.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug236535.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug240723_m.cpp.dat   |   0
 .../trace/FileModelCpp11Test/bug241017.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug242729.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug243510.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug243513.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug243514.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug243515.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug243518.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug243522.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug243523.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug243524.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug243525.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug243527.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug243528.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug243940.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug244199.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug246170.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug246534.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug251214.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug251329.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug252513.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug254133.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug255545.cpp.dat     |   0
 .../trace/FileModelCpp11Test/bug270231.cpp.dat     |   0
 .../FileModelCpp11Test/classMemberFwdEnum.cpp.dat  |   0
 .../FileModelCpp11Test/classMemberFwdEnum.cpp.err  |   0
 .../trace/FileModelCpp11Test/cpp11.cpp.dat         |   0
 .../trace/FileModelCpp11Test/cpp11.cpp.err         |   0
 .../trace/FileModelCpp14Test/bug268671.cpp.dat     |   0
 .../FileModelIncludeBodyTest/bug252660.cpp.dat     |   0
 .../includer_file.cpp.clank.err                    |   0
 .../FileModelIncludeBodyTest/includer_file.cpp.dat |   0
 .../FileModelIncludeBodyTest/includer_file.cpp.err |   0
 .../accessModifiers.cpp.dat                        |   0
 .../accessModifiers.cpp.err                        |   0
 .../FileModelNewGrammarTest/bitFields.cpp.dat      |   0
 .../FileModelNewGrammarTest/bitFields.cpp.err      |   0
 .../classForwardScope.cpp.dat                      |   0
 .../classForwardScope.cpp.err                      |   0
 .../clearingImportedSymbols.cpp.dat                |   0
 .../clearingImportedSymbols.cpp.err                |   0
 .../FileModelNewGrammarTest/constMethod.cpp.dat    |   0
 .../FileModelNewGrammarTest/constMethod.cpp.err    |   0
 .../constructorImportSymbols.cpp.dat               |   0
 .../constructorImportSymbols.cpp.err               |   0
 .../constructorInitializerListScope.cpp.dat        |   0
 .../constructorInitializerListScope.cpp.err        |   0
 .../FileModelNewGrammarTest/destructor.cpp.dat     |   0
 .../FileModelNewGrammarTest/destructor.cpp.err     |   0
 .../FileModelNewGrammarTest/friendFunction.cpp.dat |   0
 .../FileModelNewGrammarTest/friendFunction.cpp.err |   0
 .../functionParametersInFunctionBody.cpp.dat       |   0
 .../functionParametersInFunctionBody.cpp.err       |   0
 .../multipleDeclarativeRegions.cpp.dat             |   0
 .../multipleDeclarativeRegions.cpp.err             |   0
 .../nestedClassScope.cpp.dat                       |   0
 .../nestedClassScope.cpp.err                       |   0
 .../FileModelNewGrammarTest/parameters.cpp.dat     |   0
 .../FileModelNewGrammarTest/parameters.cpp.err     |   0
 .../FileModelNewGrammarTest/typedefEnum.cpp.dat    |   0
 .../FileModelNewGrammarTest/typedefEnum.cpp.err    |   0
 .../cnd/modelimpl/trace/FileModelTest/0x01.c.dat   |   0
 .../cnd/modelimpl/trace/FileModelTest/0x01.c.err   |   0
 .../cnd/modelimpl/trace/FileModelTest/0x16.cc.dat  |   0
 .../cnd/modelimpl/trace/FileModelTest/0x16.cc.err  |   0
 .../trace/FileModelTest/10000parameters.c.dat      |   0
 .../trace/FileModelTest/10000parameters.c.err      |   0
 .../modelimpl/trace/FileModelTest/IZ138320.cc.dat  |   0
 .../modelimpl/trace/FileModelTest/IZ138320.cc.err  |   0
 .../modelimpl/trace/FileModelTest/IZ138551.cc.dat  |   0
 .../modelimpl/trace/FileModelTest/IZ138551.cc.err  |   0
 .../modelimpl/trace/FileModelTest/IZ144009.cc.dat  |   0
 .../modelimpl/trace/FileModelTest/IZ144009.cc.err  |   0
 .../modelimpl/trace/FileModelTest/IZ144276.cc.dat  |   0
 .../modelimpl/trace/FileModelTest/IZ144276.cc.err  |   0
 .../modelimpl/trace/FileModelTest/IZ144968.cc.dat  |   0
 .../modelimpl/trace/FileModelTest/IZ144968.cc.err  |   0
 .../modelimpl/trace/FileModelTest/IZ146150.cc.dat  |   0
 .../modelimpl/trace/FileModelTest/IZ146150.cc.err  |   0
 .../cnd/modelimpl/trace/FileModelTest/array.cc.dat |   0
 .../cnd/modelimpl/trace/FileModelTest/array.cc.err |   0
 .../trace/FileModelTest/array_cast.cc.dat          |   0
 .../trace/FileModelTest/array_cast.cc.err          |   0
 .../FileModelTest/attribute_in_constructor.cc.dat  |   0
 .../FileModelTest/attribute_in_constructor.cc.err  |   0
 .../FileModelTest/attributes_aligned_class.cc.dat  |   0
 .../FileModelTest/attributes_aligned_class.cc.err  |   0
 .../modelimpl/trace/FileModelTest/bitFields.cc.dat |   0
 .../modelimpl/trace/FileModelTest/bitFields.cc.err |   0
 .../trace/FileModelTest/branches_1.cc.dat          |   0
 .../trace/FileModelTest/branches_1.cc.err          |   0
 .../trace/FileModelTest/bug233263.cpp.dat          |   0
 .../trace/FileModelTest/bug234768.cpp.dat          |   0
 .../trace/FileModelTest/bug242674.cpp.dat          |   0
 .../trace/FileModelTest/bug242861.cpp.dat          |   0
 .../trace/FileModelTest/bug243546.cpp.dat          |   0
 .../trace/FileModelTest/bug248661.cpp.dat          |   0
 .../trace/FileModelTest/bug249746.cpp.dat          |   0
 .../trace/FileModelTest/bug250243.cpp.dat          |   0
 .../trace/FileModelTest/bug250270.cpp.dat          |   0
 .../trace/FileModelTest/bug250324.cpp.dat          |   0
 .../trace/FileModelTest/bug250325.cpp.dat          |   0
 .../trace/FileModelTest/bug251621.cpp.dat          |   0
 .../trace/FileModelTest/bug252425.cpp.dat          |   0
 .../trace/FileModelTest/bug252427.cpp.dat          |   0
 .../modelimpl/trace/FileModelTest/bug252875.c.dat  |   0
 .../trace/FileModelTest/bug252875_1.c.dat          |   0
 .../cnd/modelimpl/trace/FileModelTest/cast.cc.dat  |   0
 .../cnd/modelimpl/trace/FileModelTest/cast.cc.err  |   0
 .../cdecl_and_poniter_return_type.cc.dat           |   0
 .../cdecl_and_poniter_return_type.cc.err           |   0
 .../modelimpl/trace/FileModelTest/check.true.c.dat |   0
 .../trace/FileModelTest/check.true.cc.dat          |   0
 .../trace/FileModelTest/check.true.studio.cc.dat   |   0
 .../trace/FileModelTest/class_body_included.cc.dat |   0
 .../trace/FileModelTest/class_body_included.cc.err |   0
 .../trace/FileModelTest/class_qualifiers.cc.dat    |   0
 .../trace/FileModelTest/class_qualifiers.cc.err    |   0
 .../class_template_method_call.cc.dat              |   0
 .../class_template_method_call.cc.err              |   0
 .../cnd/modelimpl/trace/FileModelTest/cnav.c.dat   |   0
 .../cnd/modelimpl/trace/FileModelTest/cnav.c.err   |   0
 .../modelimpl/trace/FileModelTest/complex.c.dat    |   0
 .../modelimpl/trace/FileModelTest/complex.c.err    |   0
 .../cnd/modelimpl/trace/FileModelTest/const.cc.dat |   0
 .../cnd/modelimpl/trace/FileModelTest/const.cc.err |   0
 .../constructors_and_fun_no_ret_types.cc.dat       |   0
 .../constructors_and_fun_no_ret_types.cc.err       |   0
 .../trace/FileModelTest/conversion_operator.cc.dat |   0
 .../trace/FileModelTest/conversion_operator.cc.err |   0
 .../modelimpl/trace/FileModelTest/declspec.cc.dat  |   0
 .../modelimpl/trace/FileModelTest/declspec.cc.err  |   0
 .../trace/FileModelTest/define_macro.cc.dat        |   0
 .../trace/FileModelTest/define_macro.cc.err        |   0
 .../cnd/modelimpl/trace/FileModelTest/dummy.cc.dat |   0
 .../cnd/modelimpl/trace/FileModelTest/dummy.cc.err |   0
 .../FileModelTest/elaboratedTypeForwards.cpp.dat   |   0
 .../FileModelTest/elaboratedTypeForwards.cpp.err   |   0
 .../FileModelTest/empty_array_initializer.cc.dat   |   0
 .../FileModelTest/empty_array_initializer.cc.err   |   0
 .../trace/FileModelTest/empty_long_hex.c.dat       |   0
 .../trace/FileModelTest/empty_long_hex.c.err       |   0
 .../FileModelTest/error_directive.cc.clank.err     |   0
 .../trace/FileModelTest/error_directive.cc.dat     |   0
 .../trace/FileModelTest/error_directive.cc.err     |   0
 .../trace/FileModelTest/expand_dollar.cc.dat       |   0
 .../trace/FileModelTest/expressions.cc.dat         |   0
 .../trace/FileModelTest/expressions.cc.err         |   0
 .../trace/FileModelTest/extensions.cc.dat          |   0
 .../trace/FileModelTest/extensions.cc.err          |   0
 .../FileModelTest/forward_declarations.cc.dat      |   0
 .../FileModelTest/forward_declarations.cc.err      |   0
 .../modelimpl/trace/FileModelTest/friend.cc.dat    |   0
 .../modelimpl/trace/FileModelTest/friend.cc.err    |   0
 .../func_decl_prefix_attributes.cc.dat             |   0
 .../func_decl_prefix_attributes.cc.err             |   0
 .../function_declaration_as_parameter.cc.dat       |   0
 .../function_declaration_as_parameter.cc.err       |   0
 .../function_expanded_unnamed_params.cc.dat        |   0
 .../function_expanded_unnamed_params.cc.err        |   0
 .../function_pointer_as_param_type.cc.dat          |   0
 .../function_pointer_as_param_type.cc.err          |   0
 .../function_pointer_as_return_type.cc.dat         |   0
 .../function_pointer_as_return_type.cc.err         |   0
 .../function_pointer_as_template_parameter.cc.dat  |   0
 .../function_pointer_as_template_parameter.cc.err  |   0
 .../function_pointer_as_type_cast.cc.dat           |   0
 .../function_pointer_as_type_cast.cc.err           |   0
 .../function_pointer_as_var_type.cc.dat            |   0
 .../function_pointer_as_var_type.cc.err            |   0
 .../FileModelTest/function_pointer_misc.cc.dat     |   0
 .../FileModelTest/function_pointer_misc.cc.err     |   0
 .../FileModelTest/functions_and_variables.cc.dat   |   0
 .../FileModelTest/functions_and_variables.cc.err   |   0
 .../trace/FileModelTest/gcc_attribute.c.dat        |   0
 .../trace/FileModelTest/gcc_attribute.c.err        |   0
 .../FileModelTest/include_macro_expanding.cc.dat   |   0
 .../FileModelTest/include_macro_expanding.cc.err   |   0
 .../FileModelTest/incomplete_string.cc.clank.err   |   0
 .../trace/FileModelTest/incomplete_string.cc.dat   |   0
 .../trace/FileModelTest/incomplete_string.cc.err   |   0
 .../modelimpl/trace/FileModelTest/infinite1.cc.dat |   0
 .../modelimpl/trace/FileModelTest/infinite1.cc.err |   0
 .../modelimpl/trace/FileModelTest/infinite2.cc.dat |   0
 .../modelimpl/trace/FileModelTest/infinite2.cc.err |   0
 .../modelimpl/trace/FileModelTest/infinite3.cc.dat |   0
 .../modelimpl/trace/FileModelTest/infinite3.cc.err |   0
 .../inline_dtor_definition_name.cc.dat             |   0
 .../inline_dtor_definition_name.cc.err             |   0
 .../trace/FileModelTest/int_static_field.cc.dat    |   0
 .../trace/FileModelTest/int_static_field.cc.err    |   0
 .../trace/FileModelTest/iz201806.cc.clank.dat      |   0
 .../trace/FileModelTest/iz201806.cc.clank.err      |   0
 .../modelimpl/trace/FileModelTest/iz201806.cc.dat  |   0
 .../modelimpl/trace/FileModelTest/iz201806.cc.err  |   0
 .../trace/FileModelTest/k_and_r_params.c.dat       |   0
 .../trace/FileModelTest/k_and_r_params.c.err       |   0
 .../trace/FileModelTest/local_variables.cc.dat     |   0
 .../trace/FileModelTest/local_variables.cc.err     |   0
 .../trace/FileModelTest/lparenAfterPPKwds.cc.dat   |   0
 .../trace/FileModelTest/lparenAfterPPKwds.cc.err   |   0
 .../modelimpl/trace/FileModelTest/macrodef.cc.dat  |   0
 .../modelimpl/trace/FileModelTest/macrodef.cc.err  |   0
 .../methods_with_function_as_return_type.cc.dat    |   0
 .../methods_with_function_as_return_type.cc.err    |   0
 .../FileModelTest/named_member_enum_typedef.cc.dat |   0
 .../FileModelTest/named_member_enum_typedef.cc.err |   0
 .../trace/FileModelTest/namespace_attrib.cc.dat    |   0
 .../trace/FileModelTest/namespace_attrib.cc.err    |   0
 .../nested_classes_and_enums_1.cc.dat              |   0
 .../nested_classes_and_enums_1.cc.err              |   0
 .../trace/FileModelTest/parser_recover.cc.dat      |   0
 .../trace/FileModelTest/parser_recover.cc.err      |   0
 .../FileModelTest/partial_specializations.cc.dat   |   0
 .../FileModelTest/partial_specializations.cc.err   |   0
 .../ppExpressionAndEmptyBodyMacro.cc.clank.err     |   0
 .../ppExpressionAndEmptyBodyMacro.cc.dat           |   0
 .../ppExpressionAndEmptyBodyMacro.cc.err           |   0
 .../preproc_defined_keyword.cc.clank.err           |   0
 .../FileModelTest/preproc_defined_keyword.cc.dat   |   0
 .../FileModelTest/preproc_defined_keyword.cc.err   |   0
 .../FileModelTest/resolver_class_string.cc.dat     |   0
 .../FileModelTest/resolver_class_string.cc.err     |   0
 .../trace/FileModelTest/resolver_ns_general.cc.dat |   0
 .../trace/FileModelTest/resolver_ns_general.cc.err |   0
 .../resolver_ns_using_declaration.cc.dat           |   0
 .../resolver_ns_using_declaration.cc.err           |   0
 .../FileModelTest/resolver_typedef_string.cc.dat   |   0
 .../FileModelTest/resolver_typedef_string.cc.err   |   0
 .../resolver_using_declaration_in_class.cc.dat     |   0
 .../resolver_using_declaration_in_class.cc.err     |   0
 .../trace/FileModelTest/stackoverflow.cc.dat       |   0
 .../trace/FileModelTest/stackoverflow.cc.err       |   0
 .../trace/FileModelTest/static_function.cc.dat     |   0
 .../trace/FileModelTest/static_function.cc.err     |   0
 .../trace/FileModelTest/static_struct.cc.dat       |   0
 .../trace/FileModelTest/static_struct.cc.err       |   0
 .../trace/FileModelTest/stringize_macro.cc.dat     |   0
 .../trace/FileModelTest/stringize_macro.cc.err     |   0
 .../trace/FileModelTest/struct_initializer.c.dat   |   0
 .../trace/FileModelTest/struct_initializer.c.err   |   0
 .../trace/FileModelTest/templateParams.h.dat       |   0
 .../trace/FileModelTest/templateParams.h.err       |   0
 .../trace/FileModelTest/template_destructor.cc.dat |   0
 .../trace/FileModelTest/template_destructor.cc.err |   0
 .../FileModelTest/template_dtor_definition.cc.dat  |   0
 .../FileModelTest/template_dtor_definition.cc.err  |   0
 .../template_explicit_instantiation.cc.dat         |   0
 .../template_explicit_instantiation.cc.err         |   0
 .../template_fun_in_template_class.cc.dat          |   0
 .../template_fun_in_template_class.cc.err          |   0
 .../trace/FileModelTest/template_fun_spec.cc.dat   |   0
 .../trace/FileModelTest/template_fun_spec.cc.err   |   0
 .../template_inner_class_dtor_definition.cc.dat    |   0
 .../template_inner_class_dtor_definition.cc.err    |   0
 .../FileModelTest/template_method_call.cc.dat      |   0
 .../FileModelTest/template_method_call.cc.err      |   0
 .../template_pointer_to_method.cc.dat              |   0
 .../template_pointer_to_method.cc.err              |   0
 .../FileModelTest/template_spec_inherited_1.cc.dat |   0
 .../FileModelTest/template_spec_inherited_1.cc.err |   0
 .../template_type_cast_operators.cc.dat            |   0
 .../template_type_cast_operators.cc.err            |   0
 .../trace/FileModelTest/ternary_operator.cc.dat    |   0
 .../trace/FileModelTest/ternary_operator.cc.err    |   0
 .../FileModelTest/test_include_correcteness.cc.dat |   0
 .../FileModelTest/test_include_correcteness.cc.err |   0
 .../trace/FileModelTest/throw_const.cc.dat         |   0
 .../trace/FileModelTest/throw_const.cc.err         |   0
 .../typedef_enum_in_class_scope.cc.dat             |   0
 .../typedef_enum_in_class_scope.cc.err             |   0
 .../trace/FileModelTest/typedef_inside_func.cc.dat |   0
 .../trace/FileModelTest/typedef_inside_func.cc.err |   0
 .../typedef_pointer_to_static_member.cc.dat        |   0
 .../typedef_pointer_to_static_member.cc.err        |   0
 .../modelimpl/trace/FileModelTest/typename.cc.dat  |   0
 .../modelimpl/trace/FileModelTest/typename.cc.err  |   0
 .../FileModelTest/unresolved_persistence.cc.dat    |   0
 .../FileModelTest/unresolved_persistence.cc.err    |   0
 .../trace/FileModelTest/using_extern.h.dat         |   0
 .../trace/FileModelTest/using_extern.h.err         |   0
 .../trace/FileModelTest/variable_definition.cc.dat |   0
 .../trace/FileModelTest/variable_definition.cc.err |   0
 .../FileModelTest/variable_initializer.cc.dat      |   0
 .../FileModelTest/variable_initializer.cc.err      |   0
 .../trace/FortranFileModelTest/bug182520.f.dat     |   0
 .../trace/FortranFileModelTest/bug182520.f.err     |   0
 .../trace/FortranFileModelTest/bug182702.f.dat     |   0
 .../trace/FortranFileModelTest/bug182702.f.err     |   0
 .../trace/FortranFileModelTest/bug182945.f.dat     |   0
 .../trace/FortranFileModelTest/bug182945.f.err     |   0
 .../trace/FortranFileModelTest/bug183073.f.dat     |   0
 .../trace/FortranFileModelTest/bug183073.f.err     |   0
 .../trace/FortranFileModelTest/bug183086.f.dat     |   0
 .../trace/FortranFileModelTest/bug183086.f.err     |   0
 .../trace/FortranFileModelTest/bug183152.f.dat     |   0
 .../trace/FortranFileModelTest/bug183152.f.err     |   0
 .../trace/FortranFileModelTest/bug184997.f.dat     |   0
 .../trace/FortranFileModelTest/bug184997.f.err     |   0
 .../trace/FortranFileModelTest/bug185624.f.dat     |   0
 .../trace/FortranFileModelTest/bug185624.f.err     |   0
 .../trace/FortranFileModelTest/bug186251.f.dat     |   0
 .../trace/FortranFileModelTest/bug186251.f.err     |   0
 .../trace/FortranFileModelTest/bug205526.f.dat     |   0
 .../trace/FortranFileModelTest/bug205526.f.err     |   0
 .../trace/FortranFileModelTest/bug207573.f.dat     |   0
 .../trace/FortranFileModelTest/bug207573.f.err     |   0
 .../trace/FortranFileModelTest/bug207681.f.dat     |   0
 .../trace/FortranFileModelTest/bug207681.f.err     |   0
 .../trace/FortranFileModelTest/bug208927.f.dat     |   0
 .../trace/FortranFileModelTest/bug208927.f.err     |   0
 .../trace/FortranFileModelTest/bug212602.f.dat     |   0
 .../trace/FortranFileModelTest/bug212602.f.err     |   0
 .../trace/FortranFileModelTest/bug228631.f.dat     |   0
 .../trace/FortranFileModelTest/bug228631.f.err     |   0
 .../trace/FortranFileModelTest/file1.f.dat         |   0
 .../trace/FortranFileModelTest/file1.f.err         |   0
 .../trace/FortranFileModelTest/file2.f.dat         |   0
 .../trace/FortranFileModelTest/file2.f.err         |   0
 .../MultiParseModelTest/iz164017.cpp.clank.err     |   0
 .../trace/MultiParseModelTest/iz164017.cpp.dat     |   0
 .../trace/MultiParseModelTest/iz164017.cpp.err     |   0
 .../iz164017_shared_header.h.dat                   |   0
 .../iz164017_shared_header.h.err                   |   0
 .../csm/container/FriendTestCase/friend.cc         |   0
 .../csm/core/FileImplOffsetsTest/dummy.cc          |   0
 ...ification_testOwnIncludedStorageInvalidation.cc |   0
 .../testOwnIncludedStorageInvalidation.h           |   0
 .../ModifyDocumentTestCaseBase/fileWithDeadCode.cc |   0
 .../fileWithoutDeadCode.cc                         |   0
 .../fileToBeChecked.cc                             |   0
 .../headerForModification.h                        |   0
 .../nbproject/configurations.xml                   |   0
 .../nbproject/project.xml                          |   0
 .../fileForModification.cc                         |   0
 .../multiIncludedFileForModification.h             |   0
 .../nbproject/configurations.xml                   |   0
 .../nbproject/project.xml                          |   0
 .../libraryFolder/hello1.cpp                       |   0
 .../libraryFolder/hello1.h                         |   0
 .../mainSources/main.cpp                           |   0
 .../secondLibrary/secondLib.h                      |   0
 .../secondLibrary/secondLibImpl1.cpp               |   0
 .../secondLibrary/secondLibImpl2.cpp               |   0
 .../secondProject/secondMain.cpp                   |   0
 .../core/ModifyUndoTestCase/fileForModification.cc |   0
 .../nbproject/configurations.xml                   |   0
 .../core/ModifyUndoTestCase}/nbproject/project.xml |   0
 .../cnd/modelimpl/csm/core/ParserQueueTest/a.c     |   0
 .../cnd/modelimpl/csm/core/ParserQueueTest/b.c     |   0
 .../cnd/modelimpl/csm/core/ParserQueueTest/c.c     |   0
 .../cnd/modelimpl/csm/core/ParserQueueTest/d.c     |   0
 .../csm/core/RestoreHandlerTestCase/iz_255449.c    |   0
 .../csm/core/RestoreHandlerTestCase/iz_255449_a.h  |   0
 .../csm/core/RestoreHandlerTestCase/iz_255449_b.h  |   0
 .../core/SmartParseHeaderTest/elif_else_simple.cc  |   0
 .../core/SmartParseHeaderTest/elif_else_simple.h   |   0
 .../csm/core/SmartParseHeaderTest/mixed_c.c        |   0
 .../csm/core/SmartParseHeaderTest/mixed_cpp.cc     |   0
 .../csm/core/SmartParseHeaderTest/mixed_header.h   |   0
 .../SmartParseHeaderTest/smart_headers_simple_1.h  |   0
 .../smart_headers_simple_1a.cc                     |   0
 .../smart_headers_simple_1b.cc                     |   0
 .../smart_headers_simple_1c.cc                     |   0
 .../smart_headers_simple_1d.cc                     |   0
 .../smart_headers_simple_1e.cc                     |   0
 .../smart_headers_simple_1f.cc                     |   0
 .../modelimpl/csm/guard/GuardDefTestCase/argc.cc   |   0
 .../modelimpl/csm/guard/GuardDefTestCase/cstdlib.h |   0
 .../csm/guard/GuardDefTestCase/iostream.h          |   0
 .../csm/guard/GuardNotDefTestCase/argc.cc          |   0
 .../csm/guard/GuardNotDefTestCase/cstdlib.h        |   0
 .../csm/guard/GuardNotDefTestCase/iostream.h       |   0
 .../OverrideFwdDeclClassTestCase/override.cc       |   0
 .../csm/typehierarchy/TypeTestCase/type.cc         |   0
 .../simple_symbol_resolver_test.cpp                |   0
 .../solaris_test_case.cpp                          |   0
 .../templates_symbol_resolver_test.cpp             |   0
 .../services/IncludeResolverImplTestCase/header1.h |   0
 .../services/IncludeResolverImplTestCase/header2.h |   0
 .../services/IncludeResolverImplTestCase/local.cc  |   0
 .../services/IncludeResolverImplTestCase/main.cc   |   0
 .../MacroExpansionExpandTestCase}/file1.cc         |   0
 .../services/MacroExpansionExpandTestCase}/file1.h |   0
 .../MacroExpansionExpandTestCase/iz175801.cc       |   0
 .../MacroExpansionNextPrevMacroTestCase}/file1.cc  |   0
 .../MacroExpansionNextPrevMacroTestCase}/file1.h   |   0
 .../MacroExpansionOffsetsTestCase}/file1.cc        |   0
 .../MacroExpansionOffsetsTestCase}/file1.h         |   0
 .../services/MacroExpansionSpanTestCase/file1.cc   |   0
 .../services/MacroExpansionSpanTestCase}/file1.h   |   0
 .../MacroExpansionTablesTestCase}/file1.cc         |   0
 .../services/MacroExpansionTablesTestCase}/file1.h |   0
 .../services/MacroExpansionUsagesTestCase/file1.cc |   0
 .../services/MacroExpansionUsagesTestCase}/file1.h |   0
 .../MacroUsagesTestCase/macro_refs_headers_parse.h |   0
 .../MacroUsagesTestCase/macro_refs_parse_1.cc      |   0
 .../MacroUsagesTestCase/macro_refs_parse_2.cc      |   0
 .../MacroUsagesTestCase/macro_refs_simple.cc       |   0
 .../smart_headers_parse_1.cc                       |   0
 .../smart_headers_parse_1.h                        |   0
 .../smart_headers_parse_2.cc                       |   0
 .../smart_headers_parse_2.h                        |   0
 .../unused_blocks_simple.cc                        |   0
 .../services/UsingResolverImplTestCase/fileNs1.h   |   0
 .../services/UsingResolverImplTestCase/fileNs2.h   |   0
 .../UsingResolverImplTestCase/fileUsing.cc         |   0
 .../services/UsingResolverImplTestCase/fileUsing.h |   0
 .../services/UsingResolverImplTestCase/main.cc     |   0
 .../UsingResolverImplTestCase/unnamedNs.cc         |   0
 .../modelimpl/trace/FileModel2Test/bug195338.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug198460.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug204497.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug205292.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug209947.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug217390.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug224027.cpp   |   0
 .../cnd/modelimpl/trace/FileModel2Test/bug229069.c |   0
 .../cnd/modelimpl/trace/FileModel2Test/bug238041.c |   0
 .../modelimpl/trace/FileModel2Test/bug243262.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug243508.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug243560.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug245802.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug246693.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug248661_2.cpp |   0
 .../modelimpl/trace/FileModel2Test/bug254698.cpp   |   0
 .../cnd/modelimpl/trace/FileModel2Test/bug255724.c |   0
 .../modelimpl/trace/FileModel2Test/bug256281.cpp   |   0
 .../cnd/modelimpl/trace/FileModel2Test/bug256516.c |   0
 .../modelimpl/trace/FileModel2Test/bug256516.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug257152.cpp   |   0
 .../modelimpl/trace/FileModel2Test/bug257152c.c    |   0
 .../cnd/modelimpl/trace/FileModel2Test/bug258327.c |   0
 .../modelimpl/trace/FileModel2Test/bug260774.cpp   |   0
 .../trace/FileModel2Test/bug267668Enums.cpp        |   0
 .../trace/FileModel2Test/bug267668Enums.inc        |   0
 .../cnd/modelimpl/trace/FileModel2Test/bug268930.c |   0
 .../cnd/modelimpl/trace/FileModel2Test/bug269245.c |   0
 .../modelimpl/trace/FileModel2Test/c_namespaces.c  |   0
 .../FileModel2Test/explicit_specialization.cc      |   0
 .../FileModel2Test/function_returning_enum.cpp     |   0
 .../FileModel2Test/iz103462_first_and_second_1.cc  |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz134182.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz136887.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz142674.cc |   0
 .../modelimpl/trace/FileModel2Test/iz143977_0.cc   |   0
 .../modelimpl/trace/FileModel2Test/iz143977_1.cc   |   0
 .../modelimpl/trace/FileModel2Test/iz143977_2.cc   |   0
 .../modelimpl/trace/FileModel2Test/iz143977_3.cc   |   0
 .../modelimpl/trace/FileModel2Test}/iz145280.cc    |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz146560.cc |   0
 .../trace/FileModel2Test/iz147284_is_defined.cc    |   0
 .../trace/FileModel2Test/iz147284_is_defined.h     |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz147574.c  |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz148014.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz149225.c  |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz149505.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz149525.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz151621.c  |   0
 .../FileModel2Test/iz151957_namespace_alias.cc     |   0
 .../iz152872_initializer_in_expression.c           |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz154196.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz154276.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz154349.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz156004.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz156009.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz156061.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz156696.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz157603.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz157836.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz158124.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz158615.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz158684.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz158872.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz159238.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz159324.cc |   0
 .../FileModel2Test/iz162280_friend_fwd_cls.cpp     |   0
 .../modelimpl/trace/FileModel2Test/iz164583.cpp    |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz164583.h  |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz165038.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz166165.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz167547.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz168253.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz174256.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz175324.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz175653.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz176530.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz189777.c  |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz190413.c  |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz190710.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz190782.c  |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz190821.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz191085.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz191446.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz191446.h  |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz191598.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz191799.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz195560.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz197997.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz199899.c  |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz205270.cc |   0
 .../modelimpl/trace/FileModel2Test/iz215640.cpp    |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz217089.c  |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz217711.h  |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz222800.cc |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz227479.pc |   0
 .../modelimpl/trace/FileModel2Test/iz229003.cpp    |   0
 .../cnd/modelimpl/trace/FileModel2Test/iz231216.cc |   0
 .../trace/FileModel2Test/iz_145553_namesakes.cc    |   0
 .../trace/FileModel2Test/preproc_directives.cc     |   0
 .../trace/FileModel2Test/sharp_pp_directives.cc    |   0
 .../trace/FileModel2Test/testHeaderWithCKeywords.c |   0
 .../trace/FileModel2Test/testHeaderWithCKeywords.h |   0
 .../trace/FileModel3Test/align_local_assert.c      |   0
 .../cnd/modelimpl/trace/FileModel3Test/atomic.c    |   0
 .../cnd/modelimpl/trace/FileModel3Test/atomic_2.c  |   0
 .../cnd/modelimpl/trace/FileModel3Test/const.cpp   |   0
 .../trace/FileModel3Test/cross_inclusionA.h        |   0
 .../trace/FileModel3Test/cross_inclusionB.h        |   0
 .../trace/FileModel3Test/fun_macro_ellipsis.cc     |   0
 .../modelimpl/trace/FileModel3Test/ifdef_guard.cpp |   0
 .../modelimpl/trace/FileModel3Test/init_array.cpp  |   0
 .../modelimpl/trace/FileModel3Test/lexer_dollar.cc |   0
 .../trace/FileModel3Test/lexer_dots_at_eval.cc     |   0
 .../modelimpl/trace/FileModel3Test/operators.cc    |   0
 .../cnd/modelimpl/trace/FileModel3Test/operators.h |   0
 .../trace/FileModel3Test/ppExpression.cpp          |   0
 .../cnd/modelimpl/trace/FileModel3Test/preproc.cpp |   0
 .../trace/FileModel3Test/preproc_concat_error.cc   |   0
 .../trace/FileModel3Test/preproc_endif.cpp         |   0
 .../preproc_incomplete_if_directives.cpp           |   0
 .../preproc_multi_line_macro_param.cpp             |   0
 .../preproc_test_include_with_macro.h              |   0
 .../preproc_test_include_with_macro2               |   0
 .../trace/FileModel3Test/recurse_define.h          |   0
 .../FileModel3Test/resolver_typedef_s_e_c_u.cc     |   0
 .../trace/FileModel3Test/va_arg_using.cpp          |   0
 .../trace/FileModelCpp11Test/bug216084.cpp         |   0
 .../trace/FileModelCpp11Test/bug224666.cpp         |   0
 .../trace/FileModelCpp11Test/bug225045.cpp         |   0
 .../trace/FileModelCpp11Test/bug225102.cpp         |   0
 .../trace/FileModelCpp11Test/bug226562.cpp         |   0
 .../trace/FileModelCpp11Test/bug235968.cpp         |   0
 .../trace/FileModelCpp11Test/bug236535.cpp         |   0
 .../trace/FileModelCpp11Test/bug240723_m.cpp       |   0
 .../trace/FileModelCpp11Test/bug241017.cpp         |   0
 .../trace/FileModelCpp11Test/bug242729.cpp         |   0
 .../trace/FileModelCpp11Test/bug243510.cpp         |   0
 .../trace/FileModelCpp11Test/bug243513.cpp         |   0
 .../trace/FileModelCpp11Test/bug243514.cpp         |   0
 .../trace/FileModelCpp11Test/bug243515.cpp         |   0
 .../trace/FileModelCpp11Test/bug243518.cpp         |   0
 .../trace/FileModelCpp11Test/bug243522.cpp         |   0
 .../trace/FileModelCpp11Test/bug243523.cpp         |   0
 .../trace/FileModelCpp11Test/bug243524.cpp         |   0
 .../trace/FileModelCpp11Test/bug243525.cpp         |   0
 .../trace/FileModelCpp11Test/bug243527.cpp         |   0
 .../trace/FileModelCpp11Test/bug243528.cpp         |   0
 .../trace/FileModelCpp11Test/bug243940.cpp         |   0
 .../trace/FileModelCpp11Test/bug244199.cpp         |   0
 .../trace/FileModelCpp11Test/bug246170.cpp         |   0
 .../trace/FileModelCpp11Test/bug246534.cpp         |   0
 .../trace/FileModelCpp11Test/bug251214.cpp         |   0
 .../trace/FileModelCpp11Test/bug251329.cpp         |   0
 .../trace/FileModelCpp11Test/bug252513.cpp         |   0
 .../trace/FileModelCpp11Test/bug254133.cpp         |   0
 .../trace/FileModelCpp11Test/bug255545.cpp         |   0
 .../trace/FileModelCpp11Test/bug270231.cpp         |   0
 .../FileModelCpp11Test/classMemberFwdEnum.cpp      |   0
 .../modelimpl/trace/FileModelCpp11Test/cpp11.cpp   |   0
 .../trace/FileModelCpp14Test/bug268671.cpp         |   0
 .../trace/FileModelIncludeBodyTest/bug252660.cpp   |   0
 .../trace/FileModelIncludeBodyTest/bug252660.h     |   0
 .../trace/FileModelIncludeBodyTest/deepbody.h      |   0
 .../trace/FileModelIncludeBodyTest/enumbody.h      |   0
 .../FileModelIncludeBodyTest/includer_file.cpp     |   0
 .../trace/FileModelIncludeBodyTest/innerbody.h     |   0
 .../trace/FileModelIncludeBodyTest/innernsbody.h   |   0
 .../trace/FileModelIncludeBodyTest/methodbody.h    |   0
 .../trace/FileModelIncludeBodyTest/outerbody.h     |   0
 .../trace/FileModelIncludeBodyTest/outernsbody.h   |   0
 .../FileModelNewGrammarTest/accessModifiers.cpp    |   0
 .../trace/FileModelNewGrammarTest/bitFields.cpp    |   0
 .../FileModelNewGrammarTest/classForwardScope.cpp  |   0
 .../clearingImportedSymbols.cpp                    |   0
 .../trace/FileModelNewGrammarTest/constMethod.cpp  |   0
 .../constructorImportSymbols.cpp                   |   0
 .../constructorInitializerListScope.cpp            |   0
 .../trace/FileModelNewGrammarTest/destructor.cpp   |   0
 .../FileModelNewGrammarTest/friendFunction.cpp     |   0
 .../functionParametersInFunctionBody.cpp           |   0
 .../multipleDeclarativeRegions.cpp                 |   0
 .../FileModelNewGrammarTest/nestedClassScope.cpp   |   0
 .../trace/FileModelNewGrammarTest/parameters.cpp   |   0
 .../trace/FileModelNewGrammarTest/typedefEnum.cpp  |   0
 .../cnd/modelimpl/trace/FileModelTest/0x01.c       |   0
 .../cnd/modelimpl/trace/FileModelTest/0x16.cc      |   0
 .../trace/FileModelTest/10000parameters.c          |   0
 .../cnd/modelimpl/trace/FileModelTest/IZ138320.cc  |   0
 .../cnd/modelimpl/trace/FileModelTest/IZ138551.cc  |   0
 .../cnd/modelimpl/trace/FileModelTest/IZ144009.cc  |   0
 .../cnd/modelimpl/trace/FileModelTest/IZ144276.cc  |   0
 .../cnd/modelimpl/trace/FileModelTest/IZ144968.cc  |   0
 .../cnd/modelimpl/trace/FileModelTest/IZ146150.cc  |   0
 .../cnd/modelimpl/trace/FileModelTest/array.cc     |   0
 .../modelimpl/trace/FileModelTest/array_cast.cc    |   0
 .../FileModelTest/attribute_in_constructor.cc      |   0
 .../FileModelTest/attributes_aligned_class.cc      |   0
 .../cnd/modelimpl/trace/FileModelTest/bitFields.cc |   0
 .../modelimpl/trace/FileModelTest/branches_1.cc    |   0
 .../cnd/modelimpl/trace/FileModelTest/branches_1.h |   0
 .../modelimpl/trace/FileModelTest/bug233263.cpp    |   0
 .../modelimpl/trace/FileModelTest/bug234768.cpp    |   0
 .../modelimpl/trace/FileModelTest/bug242674.cpp    |   0
 .../modelimpl/trace/FileModelTest/bug242861.cpp    |   0
 .../modelimpl/trace/FileModelTest/bug243546.cpp    |   0
 .../modelimpl/trace/FileModelTest/bug248661.cpp    |   0
 .../cnd/modelimpl/trace/FileModelTest/bug248661.h  |   0
 .../modelimpl/trace/FileModelTest/bug249746.cpp    |   0
 .../modelimpl/trace/FileModelTest/bug250243.cpp    |   0
 .../modelimpl/trace/FileModelTest/bug250270.cpp    |   0
 .../modelimpl/trace/FileModelTest/bug250324.cpp    |   0
 .../modelimpl/trace/FileModelTest/bug250325.cpp    |   0
 .../modelimpl/trace/FileModelTest/bug251621.cpp    |   0
 .../modelimpl/trace/FileModelTest/bug252425.cpp    |   0
 .../modelimpl/trace/FileModelTest/bug252427.cpp    |   0
 .../cnd/modelimpl/trace/FileModelTest/bug252875.c  |   0
 .../modelimpl/trace/FileModelTest/bug252875_1.c    |   0
 .../cnd/modelimpl/trace/FileModelTest/cast.cc      |   0
 .../FileModelTest/cdecl_and_poniter_return_type.cc |   0
 .../cnd/modelimpl/trace/FileModelTest/check.true.c |   0
 .../modelimpl/trace/FileModelTest/check.true.cc    |   0
 .../trace/FileModelTest/check.true.studio.cc       |   0
 .../trace/FileModelTest/class_body_included.cc     |   0
 .../trace/FileModelTest/class_body_included.h      |   0
 .../trace/FileModelTest/class_qualifiers.cc        |   0
 .../FileModelTest/class_template_method_call.cc    |   0
 .../cnd/modelimpl/trace/FileModelTest/cnav.c       |   0
 .../cnd/modelimpl/trace/FileModelTest/complex.c    |   0
 .../cnd/modelimpl/trace/FileModelTest/const.cc     |   0
 .../constructors_and_fun_no_ret_types.cc           |   0
 .../trace/FileModelTest/conversion_operator.cc     |   0
 .../cnd/modelimpl/trace/FileModelTest/declspec.cc  |   0
 .../modelimpl/trace/FileModelTest/define_macro.cc  |   0
 .../cnd/modelimpl/trace/FileModelTest/dummy.cc     |   0
 .../trace/FileModelTest/elaboratedTypeForwards.cpp |   0
 .../trace/FileModelTest/empty_array_initializer.cc |   0
 .../modelimpl/trace/FileModelTest/empty_long_hex.c |   0
 .../trace/FileModelTest/error_directive.cc         |   0
 .../modelimpl/trace/FileModelTest/expand_dollar.cc |   0
 .../modelimpl/trace/FileModelTest/expressions.cc   |   0
 .../modelimpl/trace/FileModelTest/extensions.cc    |   0
 .../trace/FileModelTest/forward_declarations.cc    |   0
 .../cnd/modelimpl/trace/FileModelTest/friend.cc    |   0
 .../cnd/modelimpl/trace/FileModelTest/friend.h     |   0
 .../function_declaration_as_parameter.cc           |   0
 .../function_expanded_unnamed_params.cc            |   0
 .../function_pointer_as_param_type.cc              |   0
 .../function_pointer_as_return_type.cc             |   0
 .../function_pointer_as_template_parameter.cc      |   0
 .../FileModelTest/function_pointer_as_type_cast.cc |   0
 .../FileModelTest/function_pointer_as_var_type.cc  |   0
 .../trace/FileModelTest/function_pointer_misc.cc   |   0
 .../trace/FileModelTest/functions_and_variables.cc |   0
 .../modelimpl/trace/FileModelTest/gcc_attribute.c  |   0
 .../trace/FileModelTest/include_macro_expanding.cc |   0
 .../trace/FileModelTest/incomplete_string.cc       |   0
 .../cnd/modelimpl/trace/FileModelTest/infinite1.cc |   0
 .../cnd/modelimpl/trace/FileModelTest/infinite2.cc |   0
 .../cnd/modelimpl/trace/FileModelTest/infinite3.cc |   0
 .../FileModelTest/inline_dtor_definition_name.cc   |   0
 .../trace/FileModelTest/int_static_field.cc        |   0
 .../cnd/modelimpl/trace/FileModelTest/iz201806.cc  |   0
 .../modelimpl/trace/FileModelTest/k_and_r_params.c |   0
 .../trace/FileModelTest/local_variables.cc         |   0
 .../trace/FileModelTest/lparenAfterPPKwds.cc       |   0
 .../cnd/modelimpl/trace/FileModelTest/macrodef.cc  |   0
 .../cnd/modelimpl/trace/FileModelTest/macrodef.h   |   0
 .../methods_with_function_as_return_type.cc        |   0
 .../FileModelTest/named_member_enum_typedef.cc     |   0
 .../trace/FileModelTest/namespace_attrib.cc        |   0
 .../FileModelTest/nested_classes_and_enums_1.cc    |   0
 .../trace/FileModelTest/parser_recover.cc          |   0
 .../trace/FileModelTest/partial_specializations.cc |   0
 .../FileModelTest/ppExpressionAndEmptyBodyMacro.cc |   0
 .../trace/FileModelTest/preproc_defined_keyword.cc |   0
 .../trace/FileModelTest/resolver_class_string.cc   |   0
 .../trace/FileModelTest/resolver_class_string.h    |   0
 .../trace/FileModelTest/resolver_ns_general.cc     |   0
 .../FileModelTest/resolver_ns_using_declaration.cc |   0
 .../trace/FileModelTest/resolver_typedef_string.cc |   0
 .../trace/FileModelTest/resolver_typedef_string.h  |   0
 .../resolver_using_declaration_in_class.cc         |   0
 .../modelimpl/trace/FileModelTest/stackoverflow.cc |   0
 .../trace/FileModelTest/static_function.cc         |   0
 .../modelimpl/trace/FileModelTest/static_struct.cc |   0
 .../trace/FileModelTest/stringize_macro.cc         |   0
 .../trace/FileModelTest/struct_initializer.c       |   0
 .../modelimpl/trace/FileModelTest/templateParams.h |   0
 .../trace/FileModelTest/template_destructor.cc     |   0
 .../FileModelTest/template_dtor_definition.cc      |   0
 .../template_explicit_instantiation.cc             |   0
 .../template_fun_in_template_class.cc              |   0
 .../trace/FileModelTest/template_fun_spec.cc       |   0
 .../template_inner_class_dtor_definition.cc        |   0
 .../trace/FileModelTest/template_method_call.cc    |   0
 .../FileModelTest/template_pointer_to_method.cc    |   0
 .../FileModelTest/template_spec_inherited_1.cc     |   0
 .../FileModelTest/template_type_cast_operators.cc  |   0
 .../trace/FileModelTest/ternary_operator.cc        |   0
 .../FileModelTest/test_include_correcteness.cc     |   0
 .../FileModelTest/test_include_correcteness.h      |   0
 .../test_include_correcteness_deleg1.h             |   0
 .../test_include_correcteness_deleg2.h             |   0
 .../modelimpl/trace/FileModelTest/throw_const.cc   |   0
 .../FileModelTest/typedef_enum_in_class_scope.cc   |   0
 .../trace/FileModelTest/typedef_inside_func.cc     |   0
 .../typedef_pointer_to_static_member.cc            |   0
 .../cnd/modelimpl/trace/FileModelTest/typename.cc  |   0
 .../trace/FileModelTest/unresolved_persistence.cc  |   0
 .../modelimpl/trace/FileModelTest/using_extern.h   |   0
 .../trace/FileModelTest/variable_definition.cc     |   0
 .../trace/FileModelTest/variable_initializer.cc    |   0
 .../trace/FortranFileModelTest/bug182520.f         |   0
 .../trace/FortranFileModelTest/bug182702.f         |   0
 .../trace/FortranFileModelTest/bug182945.f         |   0
 .../trace/FortranFileModelTest/bug183073.f         |   0
 .../trace/FortranFileModelTest/bug183086.f         |   0
 .../trace/FortranFileModelTest/bug183152.f         |   0
 .../trace/FortranFileModelTest/bug184997.f         |   0
 .../trace/FortranFileModelTest/bug205526.f         |   0
 .../trace/FortranFileModelTest/bug207573.f         |   0
 .../trace/FortranFileModelTest/bug207681.f         |   0
 .../trace/FortranFileModelTest/bug208927.f         |   0
 .../trace/FortranFileModelTest/bug212602.f         |   0
 .../trace/FortranFileModelTest/bug228631.f         |   0
 .../modelimpl/trace/FortranFileModelTest/file1.f   |   0
 .../modelimpl/trace/FortranFileModelTest/file2.f   |   0
 .../trace/MultiParseModelTest/iz164017.cpp         |   0
 .../MultiParseModelTest/iz164017_shared_header.h   |   0
 .../cnd/modelimpl/csm/container/FriendTest.java    |   0
 .../modelimpl/csm/container/FriendTestCase.java    |   0
 .../csm/core/DocumentModificationTest.java         |   0
 .../csm/core/ExternalModificationTest.java         |   0
 .../modelimpl/csm/core/FakeRegistrationTest1.java  |   0
 .../modelimpl/csm/core/FileImplOffsetsTest.java    |   0
 .../core/FilePreprocessorConditionStateTest.java   |   0
 .../csm/core/IncludeStorageValidationTestCase.java |   0
 .../csm/core/InsertDeadBlockTestCase.java          |   0
 .../cnd/modelimpl/csm/core/ModelImplTest.java      |   0
 .../csm/core/ModifyDocumentTestCaseBase.java       |   0
 .../csm/core/ModifyIncludedHeaderTestCase.java     |   0
 .../core/ModifyMultiIncludedHeaderTestCase.java    |   0
 .../ModifyMultiIncludedLibraryHeaderTestCase.java  |   0
 .../csm/core/ModifyUndo191307TestCase.java         |   0
 .../csm/core/ModifyUndoRedo190950TestCase.java     |   0
 .../cnd/modelimpl/csm/core/MyCharSequenceTest.java |   0
 .../cnd/modelimpl/csm/core/ParserQueueTest.java    |   0
 .../csm/core/RemoveAndInsertDeadBlockTestCase.java |   0
 .../csm/core/RemoveDeadBlockTestCase.java          |   0
 .../modelimpl/csm/core/RestoreHandlerTestCase.java |   0
 .../modelimpl/csm/core/SmartParseHeaderTest.java   |   0
 .../csm/core/SmartParseHeaderTestFailed.java       |   0
 .../csm/core/TypeSafeLazyCollectionsTest.java      |   0
 .../modules/cnd/modelimpl/csm/core/UtilTest.java   |   0
 .../cnd/modelimpl/csm/guard/GuardDefTestCase.java  |   0
 .../modelimpl/csm/guard/GuardNotDefTestCase.java   |   0
 .../modules/cnd/modelimpl/csm/guard/GuardTest.java |   0
 .../cnd/modelimpl/csm/guard/GuardTestBase.java     |   0
 .../OverrideFwdDeclClassTestCase.java              |   0
 .../cnd/modelimpl/csm/typehierarchy/TypeTest.java  |   0
 .../modelimpl/csm/typehierarchy/TypeTestCase.java  |   0
 .../impl/services/CsmSymbolResolverTestCase.java   |   0
 .../impl/services/IncludeResolverImplTestCase.java |   0
 .../MacroExpansionDocProviderImplBaseTestCase.java |   0
 .../services/MacroExpansionExpandTestCase.java     |   0
 .../MacroExpansionNextPrevMacroTestCase.java       |   0
 .../services/MacroExpansionOffsetsTestCase.java    |   0
 .../impl/services/MacroExpansionSpanTestCase.java  |   0
 .../services/MacroExpansionTablesTestCase.java     |   0
 .../services/MacroExpansionUsagesTestCase.java     |   0
 .../impl/services/MacroUsagesTestCase.java         |   0
 .../services/ReferenceRepositoryImplTestCase.java  |   0
 .../impl/services/SelectModelTestCase.java         |   0
 .../impl/services/SelectQuoteTestCase.java         |   0
 .../modelimpl/impl/services/SelectTestBase.java    |   0
 .../cnd/modelimpl/impl/services/ServicesTest.java  |   0
 .../impl/services/UnusedCodeBlocksTestCase.java    |   0
 .../impl/services/UsingResolverImplTestCase.java   |   0
 .../FilePreprocessorDeadConditionStateTest.java    |   0
 .../cnd/modelimpl/recovery/ClassTestCase.java      |   0
 .../modelimpl/recovery/DeclarationsTestCase.java   |   0
 .../cnd/modelimpl/recovery/FriendTestCase.java     |   0
 .../cnd/modelimpl/recovery/MemberTestCase.java     |   0
 .../cnd/modelimpl/recovery/NamespaceTestCase.java  |   0
 .../cnd/modelimpl/recovery/RecoverySuiteTest.java  |   0
 .../cnd/modelimpl/recovery/TemplateTestCase.java   |   0
 .../cnd/modelimpl/recovery/TypedefTestCase.java    |   0
 .../modules/cnd/modelimpl/recovery/base/Diff.java  |   0
 .../modules/cnd/modelimpl/recovery/base/Diffs.java |   0
 .../cnd/modelimpl/recovery/base/Golden.java        |   0
 .../cnd/modelimpl/recovery/base/Grammar.java       |   0
 .../cnd/modelimpl/recovery/base/Grammars.java      |   0
 .../recovery/base/RecoverySuiteTestBase.java       |   0
 .../recovery/base/RecoveryTestCaseBase.java        |   0
 .../cnd/modelimpl/test/ModelBasedTestCase.java     |   0
 .../cnd/modelimpl/test/ModelImplBaseTestCase.java  |   0
 .../cnd/modelimpl/test/ModelImplBaseTestSuite.java |   0
 .../cnd/modelimpl/test/ProjectBasedTestCase.java   |   0
 .../cnd/modelimpl/trace/FileModel2Test.java        |   0
 .../cnd/modelimpl/trace/FileModelCpp11Test.java    |   0
 .../cnd/modelimpl/trace/FileModelCpp14Test.java    |   0
 .../modelimpl/trace/FileModelIncludeBodyTest.java  |   0
 .../modelimpl/trace/FileModelNewGrammarTest.java   |   0
 .../modules/cnd/modelimpl/trace/FileModelTest.java |   0
 .../cnd/modelimpl/trace/FileModelTest3.java        |   0
 .../cnd/modelimpl/trace/FileModelTestFailed.java   |   0
 .../cnd/modelimpl/trace/FortranFileModelTest.java  |   0
 .../modules/cnd/modelimpl/trace/IOTestCase.java    |   0
 .../cnd/modelimpl/trace/MultiParseModelTest.java   |   0
 .../modules/cnd/modelimpl/trace/TestEndless.java   |   0
 .../cnd/modelimpl/trace/TestModelHelper.java       |   0
 .../cnd/modelimpl/trace/TraceModelTestBase.java    |   0
 .../cnd/modelimpl/trace/UnixEnvTestCase.java       |   0
 {cnd => contrib}/cnd.modelimpl/tracemodel.sh       |   0
 {cnd => contrib}/cnd.modelimpl/uniq-test.sh        |   0
 {cnd => contrib}/cnd.modelui/build.xml             |   0
 {cnd => contrib}/cnd.modelui/manifest.mf           |   0
 .../cnd.modelui/nbproject/project.properties       |   0
 {cnd => contrib}/cnd.modelui/nbproject/project.xml |   0
 .../netbeans/modules/cnd/modelui/Bundle.properties |   0
 .../modules/cnd/modelui/actions/Bundle.properties  |   0
 .../actions/CleanupCachePseudoOptionProcessor.java |   0
 .../modelui/actions/CodeModelDiagnosticAction.java |   0
 .../modelui/actions/ForceReparseProjectAction.java |   0
 .../cnd/modelui/actions/ProjectActionBase.java     |   0
 .../cnd/modelui/actions/ReparseProjectAction.java  |   0
 .../src/org/netbeans/modules/cnd/modelui/layer.xml |   0
 .../modules/cnd/modelui/parsing/Bundle.properties  |   0
 .../parsing/CodeModelProblemResolverImpl.java      |   0
 .../parsing/ParsingProblemDetectorImpl.java        |   0
 .../modelui/parsing/ParsingProblemResolver.form    |   0
 .../modelui/parsing/ParsingProblemResolver.java    |   0
 .../modules/cnd/modelui/parsing/exclamation.gif    | Bin
 .../modules/cnd/modelui/switcher/Bundle.properties |   0
 .../switcher/CodeAssistanceSubmenuAction.java      |   0
 .../cnd/modelui/switcher/SwitchProjectAction.java  |   0
 .../modules/cnd/modelui/trace/Bundle.properties    |   0
 .../modules/cnd/modelui/trace/ParserOptions.form   |   0
 .../modules/cnd/modelui/trace/ParserOptions.java   |   0
 .../cnd/modelui/trace/SwitchIndexAction.java       |   0
 .../modelui/trace/SwitchTraceGramaRulesAction.java |   0
 .../modelui/trace/TestErrorHighlightingAction.java |   0
 .../cnd/modelui/trace/TestFileContainerAction.java |   0
 .../modelui/trace/TestGraphContainerAction.java    |   0
 .../cnd/modelui/trace/TestProjectActionBase.java   |   0
 .../modelui/trace/TestProjectReferencesAction.java |   0
 .../cnd/modelui/trace/TestReferencePanel.form      |   0
 .../cnd/modelui/trace/TestReferencePanel.java      |   0
 .../cnd/modelui/trace/TestReparseAction.java       |   0
 .../trace/TestRepositoryDistributionAction.java    |   0
 .../trace/TestRepositoryStatisticsAction.java      |   0
 .../trace/TestSemanticHighlightingAction.java      |   0
 .../modelui/trace/TraceAPTDiagnosticAction.java    |   0
 .../cnd/modelui/impl/services/ServicesTest.java    |   0
 {cnd => contrib}/cnd.modelutil/build.xml           |   0
 {cnd => contrib}/cnd.modelutil/manifest.mf         |   0
 .../cnd.modelutil/nbproject/project.properties     |   0
 .../cnd.modelutil/nbproject/project.xml            |   0
 .../modules/cnd/modelutil/AbstractCsmNode.java     |   0
 .../modules/cnd/modelutil/Bundle.properties        |   0
 .../modules/cnd/modelutil/ClassifiersAntiLoop.java |   0
 .../modules/cnd/modelutil/CsmDisplayUtilities.java |   0
 .../modules/cnd/modelutil/CsmFontColorManager.java |   0
 .../modules/cnd/modelutil/CsmImageLoader.java      |   0
 .../modules/cnd/modelutil/CsmImageName.java        |   0
 .../netbeans/modules/cnd/modelutil/CsmNode.java    |   0
 .../modules/cnd/modelutil/CsmPaintComponent.java   |   0
 .../modules/cnd/modelutil/CsmUtilities.java        |   0
 .../modules/cnd/modelutil/ExceptionStr.java        |   0
 .../modules/cnd/modelutil/FontColorProvider.java   |   0
 .../modelutil/MethodParamsTipPaintComponent.java   |   0
 .../modules/cnd/modelutil/NbCsmPaintComponent.java |   0
 .../modules/cnd/modelutil/OverridesPopup.java      |   0
 .../netbeans/modules/cnd/modelutil/ParamStr.java   |   0
 .../org/netbeans/modules/cnd/modelutil/Tracer.java |   0
 .../cnd/modelutil/resources/Bundle.properties      |   0
 .../resources/CityLights-CCHL-fontsColors.xml      |   0
 .../modelutil/resources/Earth-CCHL-fontsColors.xml |   0
 .../resources/Netbeans-CCHL-fontsColors.xml        |   0
 .../resources/Norway-CCHL-fontsColors.xml          |   0
 .../modelutil/resources/base-template-badge.png    | Bin
 .../resources/is-overridden-badge-pseudo.png       | Bin
 .../modelutil/resources/is-overridden-badge.png    | Bin
 .../modules/cnd/modelutil/resources/layer.xml      |   0
 .../modelutil/resources/overrides-badge-pseudo.png | Bin
 .../cnd/modelutil/resources/overrides-badge.png    | Bin
 .../modelutil/resources/specialization-badge.png   | Bin
 .../modelutil/resources/types16x16/class_16.png    | Bin
 .../resources/types16x16/class_forward_decl.png    | Bin
 .../resources/types16x16/code_error_16.png         | Bin
 .../resources/types16x16/code_macro_16.png         | Bin
 .../resources/types16x16/const_private.png         | Bin
 .../resources/types16x16/const_protected.png       | Bin
 .../resources/types16x16/const_public.png          | Bin
 .../resources/types16x16/const_static_private.png  | Bin
 .../types16x16/const_static_protected.png          | Bin
 .../resources/types16x16/const_static_public.png   | Bin
 .../resources/types16x16/constructors.png          | Bin
 .../types16x16/constructors_container.png          | Bin
 .../resources/types16x16/constructors_private.png  | Bin
 .../types16x16/constructors_protected.png          | Bin
 .../modelutil/resources/types16x16/cppsource.gif   | Bin
 .../cnd/modelutil/resources/types16x16/csource.gif | Bin
 .../resources/types16x16/declaration_filter.png    | Bin
 .../resources/types16x16/deconstructors.png        | Bin
 .../types16x16/deconstructors_container.png        | Bin
 .../types16x16/deconstructors_private.png          | Bin
 .../types16x16/deconstructors_protected.png        | Bin
 .../modelutil/resources/types16x16/defaultNode.png | Bin
 .../resources/types16x16/enumeration_16.png        | Bin
 .../resources/types16x16/enumeration_fwd_16.png    | Bin
 .../resources/types16x16/enumeration_item_16.png   | Bin
 .../resources/types16x16/extern_variable_16.png    | Bin
 .../cnd/modelutil/resources/types16x16/fields.png  | Bin
 .../resources/types16x16/fields_container.png      | Bin
 .../resources/types16x16/fields_private.png        | Bin
 .../resources/types16x16/fields_protected.png      | Bin
 .../resources/types16x16/fields_static.png         | Bin
 .../resources/types16x16/fields_static_private.png | Bin
 .../types16x16/fields_static_protected.png         | Bin
 .../cnd/modelutil/resources/types16x16/fortran.gif | Bin
 .../resources/types16x16/friend_class.png          | Bin
 .../resources/types16x16/friend_method.png         | Bin
 .../resources/types16x16/friend_operator.png       | Bin
 .../resources/types16x16/global_constant.png       | Bin
 .../resources/types16x16/global_function.png       | Bin
 .../resources/types16x16/global_function_decl.png  | Bin
 .../resources/types16x16/global_operator.png       | Bin
 .../types16x16/global_operator_static.png          | Bin
 .../resources/types16x16/global_variable.png       | Bin
 .../cnd/modelutil/resources/types16x16/header.gif  | Bin
 .../resources/types16x16/include_sys_16.png        | Bin
 .../resources/types16x16/include_sys_folder_16.gif | Bin
 .../resources/types16x16/include_sys_folder_16.png | Bin
 .../resources/types16x16/include_user_16.png       | Bin
 .../resources/types16x16/include_usr_folder_16.gif | Bin
 .../resources/types16x16/include_usr_folder_16.png | Bin
 .../cnd/modelutil/resources/types16x16/keyword.png | Bin
 .../modelutil/resources/types16x16/libraries.png   | Bin
 .../resources/types16x16/local_constant.png        | Bin
 .../resources/types16x16/local_variable.png        | Bin
 .../cnd/modelutil/resources/types16x16/methods.png | Bin
 .../resources/types16x16/methods_container.png     | Bin
 .../resources/types16x16/methods_private.png       | Bin
 .../resources/types16x16/methods_protected.png     | Bin
 .../resources/types16x16/methods_static.png        | Bin
 .../types16x16/methods_static_private.png          | Bin
 .../types16x16/methods_static_protected.png        | Bin
 .../resources/types16x16/namespace_16.png          | Bin
 .../resources/types16x16/namespace_alias.png       | Bin
 .../resources/types16x16/operator_privat.png       | Bin
 .../resources/types16x16/operator_protected.png    | Bin
 .../resources/types16x16/operator_public.png       | Bin
 .../resources/types16x16/operator_static.png       | Bin
 .../types16x16/operator_static_privat.png          | Bin
 .../types16x16/operator_static_protected.png       | Bin
 .../cnd/modelutil/resources/types16x16/project.png | Bin
 .../resources/types16x16/project_open.png          | Bin
 .../resources/types16x16/scope_filter.png          | Bin
 .../resources/types16x16/static_function.png       | Bin
 .../resources/types16x16/static_variable.png       | Bin
 .../modelutil/resources/types16x16/struct_16.png   | Bin
 .../resources/types16x16/struct_forward_decl.png   | Bin
 .../resources/types16x16/system_macro_16.png       | Bin
 .../resources/types16x16/template_parameter_16.png | Bin
 .../modelutil/resources/types16x16/typedef_16.png  | Bin
 .../modelutil/resources/types16x16/union_16.png    | Bin
 .../resources/types16x16/using_declaration_16.png  | Bin
 .../resources/types16x16/using_namespace_16.png    | Bin
 .../modelutil/resources/types24x24/class_24.png    | Bin
 .../resources/types24x24/code_macro_24.png         | Bin
 .../modelutil/resources/types24x24/constant_24.png | Bin
 .../resources/types24x24/enumeration_24.png        | Bin
 .../resources/types24x24/enumeration_item_24.png   | Bin
 .../resources/types24x24/namespace_24.png          | Bin
 .../modelutil/resources/types24x24/operator_24.png | Bin
 .../resources/types24x24/operator_color_24.png     | Bin
 .../modelutil/resources/types24x24/struct_24.png   | Bin
 .../modelutil/resources/types24x24/typedef_24.png  | Bin
 .../modelutil/resources/types24x24/union_24.png    | Bin
 .../modules/cnd/modelutil/resources/wait.gif       | Bin
 .../modelutil/spi/CsmDisplayUtilitiesProvider.java |   0
 .../modules/cnd/modelutil/ui/CheckRenderer.java    |   0
 .../modules/cnd/modelutil/ui/CheckTreeView.java    |   0
 .../modules/cnd/modelutil/ui/ElementNode.java      |   0
 {cnd => contrib}/cnd.navigation/build.xml          |   0
 {cnd => contrib}/cnd.navigation/manifest.mf        |   0
 .../cnd.navigation/nbproject/project.properties    |   0
 .../cnd.navigation/nbproject/project.xml           |   0
 .../cnd/navigation/callgraph/Bundle.properties     |   0
 .../callgraph/CallGraphModelFactoryImpl.java       |   0
 .../modules/cnd/navigation/callgraph/CallImpl.java |   0
 .../cnd/navigation/callgraph/CallModelImpl.java    |   0
 .../cnd/navigation/callgraph/FunctionImpl.java     |   0
 .../cnd/navigation/callgraph/VariableImpl.java     |   0
 .../navigation/classhierarchy/Bundle.properties    |   0
 .../classhierarchy/ClassHierarchyPanel.form        |   0
 .../classhierarchy/ClassHierarchyPanel.java        |   0
 .../navigation/classhierarchy/GoToClassAction.java |   0
 .../classhierarchy/HierarchyChildren.java          |   0
 .../navigation/classhierarchy/HierarchyNode.java   |   0
 .../classhierarchy}/resources/direct_only.png      | Bin
 .../classhierarchy}/resources/refresh.png          | Bin
 .../classhierarchy/resources/subtypehierarchy.gif  | Bin
 .../resources/supertypehierarchy.gif               | Bin
 .../navigation/classhierarchy}/resources/tree.png  | Bin
 .../cnd/navigation/docview/DocViewAction.java      |   0
 .../docview/DocViewCaretAwareFactory.java          |   0
 .../cnd/navigation/docview/DocViewPanel.form       |   0
 .../cnd/navigation/docview/DocViewPanel.java       |   0
 .../navigation/docview/DocViewTopComponent.form    |   0
 .../navigation/docview/DocViewTopComponent.java    |   0
 .../cnd/navigation/hierarchy/Bundle.properties     |   0
 .../cnd/navigation/hierarchy/ContextUtils.java     |   0
 .../cnd/navigation/hierarchy/HierarchyAction.java  |   0
 .../hierarchy/HierarchyTopComponent.form           |   0
 .../hierarchy/HierarchyTopComponent.java           |   0
 .../hierarchy/InlcudeHierachyViewProviderImpl.java |   0
 .../cnd/navigation/hierarchy/LoadingNode.java      |   0
 .../hierarchy/ShowClassHierarchyAction.java        |   0
 .../hierarchy/ShowIncludeHierarchyAction.java      |   0
 .../cnd/navigation/includeview/Bundle.properties   |   0
 .../cnd/navigation/includeview/GoToFileAction.java |   0
 .../includeview/IncludeHierarchyPanel.form         |   0
 .../includeview/IncludeHierarchyPanel.java         |   0
 .../cnd/navigation/includeview/IncludeNode.java    |   0
 .../navigation/includeview/IncludedChildren.java   |   0
 .../includeview}/resources/direct_only.png         | Bin
 .../navigation/includeview}/resources/down_20.png  | Bin
 .../navigation/includeview}/resources/empty_20.png | Bin
 .../navigation/includeview}/resources/refresh.png  | Bin
 .../cnd/navigation/includeview}/resources/tree.png | Bin
 .../cnd/navigation/includeview}/resources/up_8.png | Bin
 .../navigation/includeview}/resources/waitNode.gif | Bin
 .../includeview/resources/who_includes.png         | Bin
 .../includeview/resources/who_is_included.png      | Bin
 .../cnd/navigation/macroview/Bundle.properties     |   0
 .../navigation/macroview/MacroExpansionAction.java |   0
 .../macroview/MacroExpansionCaretAwareFactory.java |   0
 .../navigation/macroview/MacroExpansionPanel.form  |   0
 .../navigation/macroview/MacroExpansionPanel.java  |   0
 .../macroview/MacroExpansionTopComponent.form      |   0
 .../macroview/MacroExpansionTopComponent.java      |   0
 .../macroview/MacroExpansionViewUtils.java         |   0
 .../macroview/ShowMacroExpansionAction.java        |   0
 .../services/MacroExpansionViewProviderImpl.java   |   0
 .../navigation/macroview/resources/declscope.png   | Bin
 .../navigation/macroview/resources/filescope.png   | Bin
 .../macroview/resources/macroexpansion.png         | Bin
 .../navigation/macroview/resources/nextmacro.png   | Bin
 .../navigation/macroview/resources/prevmacro.png   | Bin
 .../cnd/navigation/macroview/resources/sync.png    | Bin
 .../navigation/overrides/AnnotationsHolder.java    |   0
 .../cnd/navigation/overrides/BaseAnnotation.java   |   0
 .../cnd/navigation/overrides/Bundle.properties     |   0
 .../navigation/overrides/ComputeAnnotations.java   |   0
 .../navigation/overrides/InheritAnnotation.java    |   0
 .../navigation/overrides/OverrideAnnotation.java   |   0
 .../overrides/OverrideAnnotationAction.java        |   0
 .../navigation/overrides/OverrideTaskFactory.java  |   0
 .../cnd/navigation/resources/Bundle.properties     |   0
 .../navigation/resources/DefaultKeyBindings.xml    |   0
 .../resources/HierarchyTopComponentSettings.xml    |   0
 .../resources/HierarchyTopComponentWstcref.xml     |   0
 .../MacroExpansionTopComponentSettings.xml         |   0
 .../MacroExpansionTopComponentWstcref.xml          |   0
 .../cnd/navigation/resources/cnd_navigation.wsgrp  |   0
 .../cnd/navigation/resources/cnd_navigation.wsmode |   0
 .../navigation/resources/header_source_icon.png    | Bin
 .../modules/cnd/navigation/resources/layer.xml     |   0
 .../overrides/extended-is-specialized.png          | Bin
 .../overrides/extended-is-specialized.xml          |   0
 .../resources/overrides/extended-specializes.png   | Bin
 .../resources/overrides/extended-specializes.xml   |   0
 .../resources/overrides/is-overridden-pseudo.png   | Bin
 .../resources/overrides/is-overridden-pseudo.xml   |   0
 .../resources/overrides/is-overridden.png          | Bin
 .../resources/overrides/is-overridden.xml          |   0
 .../resources/overrides/is-specialized.png         | Bin
 .../resources/overrides/is-specialized.xml         |   0
 .../override-is-overridden-combined-pseudo.png     | Bin
 .../override-is-overridden-combined-pseudo.xml     |   0
 .../overrides/override-is-overridden-combined.png  | Bin
 .../overrides/override-is-overridden-combined.xml  |   0
 .../resources/overrides/overrides-pseudo.png       | Bin
 .../resources/overrides/overrides-pseudo.xml       |   0
 .../navigation/resources/overrides/overrides.png   | Bin
 .../navigation/resources/overrides/overrides.xml   |   0
 .../navigation/resources/overrides/specializes.png | Bin
 .../navigation/resources/overrides/specializes.xml |   0
 .../cnd/navigation/services/HierarchyActions.java  |   0
 .../cnd/navigation/services/HierarchyFactory.java  |   0
 .../cnd/navigation/services/HierarchyModel.java    |   0
 .../navigation/services/HierarchyModelImpl.java    |   0
 .../cnd/navigation/services/IncludedModel.java     |   0
 .../cnd/navigation/services/IncludedModelImpl.java |   0
 .../cnd/navigation/switchfiles/Bundle.properties   |   0
 .../navigation/switchfiles/CppSwitchAction.java    |   0
 .../bug252147.cpp.extends.ref                      |   0
 .../bug252147.cpp.overrides.ref                    |   0
 .../bug269823.cpp.extends.ref                      |   0
 .../bug269823.cpp.overrides.ref                    |   0
 .../primitive.cc.extends.ref                       |   0
 .../primitive.cc.overrides.ref                     |   0
 .../proper_parent_multy.cc.extends.ref             |   0
 .../proper_parent_multy.cc.overrides.ref           |   0
 .../proper_parent_single.cc.extends.ref            |   0
 .../proper_parent_single.cc.overrides.ref          |   0
 .../romb_half_virtual.cc.extends.ref               |   0
 .../romb_half_virtual.cc.overrides.ref             |   0
 .../single_inh_tree.cc.extends.ref                 |   0
 .../single_inh_tree.cc.overrides.ref               |   0
 .../switchfiles/CppSwitchTest/welcome.cc.dat       |   0
 .../switchfiles/CppSwitchTest/welcome.cc.err       |   0
 .../OverrideAnnotationsTest/bug252147.cpp          |   0
 .../OverrideAnnotationsTest/bug269823.cpp          |   0
 .../overrides/OverrideAnnotationsTest/primitive.cc |   0
 .../OverrideAnnotationsTest/proper_parent_multy.cc |   0
 .../proper_parent_single.cc                        |   0
 .../OverrideAnnotationsTest/romb_half_virtual.cc   |   0
 .../OverrideAnnotationsTest/single_inh_tree.cc     |   0
 .../switchfiles/CppSwitchTest/dir1/welcome.h       |   0
 .../switchfiles/CppSwitchTest/welcome.cc           |   0
 .../navigation/callgraph/CallGraphSuiteTest.java   |   0
 .../navigation/callgraph/CallGraphTestCase.java    |   0
 .../overrides/OverrideAnnotationsTest.java         |   0
 .../cnd/navigation/switchfiles/CppSwitchTest.java  |   0
 {cnd => contrib}/cnd.qnavigator/build.xml          |   0
 {cnd => contrib}/cnd.qnavigator/manifest.mf        |   0
 .../cnd.qnavigator/nbproject/project.properties    |   0
 .../cnd.qnavigator/nbproject/project.xml           |   0
 .../modules/cnd/qnavigator/Bundle.properties       |   0
 .../org/netbeans/modules/cnd/qnavigator/layer.xml  |   0
 .../qnavigator/navigator/BreadCrumbsFactory.java   |   0
 .../navigator/BreadcrumbsElementImpl.java          |   0
 .../cnd/qnavigator/navigator/Bundle.properties     |   0
 .../qnavigator/navigator/CppDeclarationNode.java   |   0
 .../cnd/qnavigator/navigator/CsmFileFilter.java    |   0
 .../cnd/qnavigator/navigator/CsmFileModel.java     |   0
 .../navigator/EnableCodeAssistanceAction.java      |   0
 .../navigator/GoToDeclarationAction.java           |   0
 .../qnavigator/navigator/GoToDefinitionAction.java |   0
 .../cnd/qnavigator/navigator/IndexOffsetNode.java  |   0
 .../cnd/qnavigator/navigator/LoadingNode.java      |   0
 .../qnavigator/navigator/NavigatorChildren.java    |   0
 .../qnavigator/navigator/NavigatorComponent.java   |   0
 .../cnd/qnavigator/navigator/NavigatorContent.java |   0
 .../cnd/qnavigator/navigator/NavigatorModel.java   |   0
 .../navigator/NavigatorNodeFactoryTask.java        |   0
 .../cnd/qnavigator/navigator/NavigatorPanelUI.form |   0
 .../cnd/qnavigator/navigator/NavigatorPanelUI.java |   0
 .../navigator/NavigatorSourceFactoryTask.java      |   0
 .../navigator/OpenContainingProjectAction.java     |   0
 .../cnd/qnavigator/navigator/StatementNode.java    |   0
 .../cnd/qnavigator/resources}/exclamation.gif      | Bin
 .../modules/cnd/qnavigator/resources/sortAlpha.png | Bin
 .../cnd/qnavigator/resources/sortPosition.png      | Bin
 .../modules/cnd/qnavigator}/resources/waitNode.gif | Bin
 {cnd => contrib}/cnd.refactoring/build.xml         |   0
 {cnd => contrib}/cnd.refactoring/manifest.mf       |   0
 .../cnd.refactoring/nbproject/project.properties   |   0
 .../cnd.refactoring/nbproject/project.xml          |   0
 .../modules/cnd/refactoring/Bundle.properties      |   0
 .../modules/cnd/refactoring/DefaultKeyBindings.xml |   0
 .../cnd/refactoring/actions/Bundle.properties      |   0
 .../actions/ChangeParametersAction.java            |   0
 .../actions/CsmActionsImplementationFactory.java   |   0
 .../actions/CsmRefactoringActionsProvider.java     |   0
 .../actions/CsmRefactoringGlobalAction.java        |   0
 .../actions/EncapsulateFieldsAction.java           |   0
 .../cnd/refactoring/actions/InlineAction.java      |   0
 .../refactoring/actions/InstantRenameAction.java   |   0
 .../actions/InstantRenamePerformer.java            |   0
 .../actions/RefactoringActionsProvider.java        |   0
 .../cnd/refactoring/actions/RefactoringKind.java   |   0
 .../refactoring/actions/SyncDocumentRegion.java    |   0
 .../api/ChangeParametersRefactoring.java           |   0
 .../modules/cnd/refactoring/api/CsmContext.java    |   0
 .../api/EncapsulateFieldRefactoring.java           |   0
 .../api/EncapsulateFieldsRefactoring.java          |   0
 .../cnd/refactoring/api/InlineRefactoring.java     |   0
 .../api/IntroduceMethodRefactoring.java            |   0
 .../refactoring/api/WhereUsedQueryConstants.java   |   0
 .../api/ui/CsmRefactoringActionsFactory.java       |   0
 .../cnd/refactoring/codegen/Bundle.properties      |   0
 .../refactoring/codegen/ConstructorGenerator.java  |   0
 .../cnd/refactoring/codegen/ContextProvider.java   |   0
 .../codegen/CopyConstructorGenerator.java          |   0
 .../codegen/DelegateMethodGenerator.java           |   0
 .../refactoring/codegen/GetterSetterGenerator.java |   0
 .../codegen/ImplementOverrideMethodGenerator.java  |   0
 .../cnd/refactoring/codegen/OperatorGenerator.java |   0
 .../cnd/refactoring/codegen/ui/Bundle.properties   |   0
 .../refactoring/codegen/ui/ConstructorPanel.form   |   0
 .../refactoring/codegen/ui/ConstructorPanel.java   |   0
 .../cnd/refactoring/codegen/ui/DelegatePanel.form  |   0
 .../cnd/refactoring/codegen/ui/DelegatePanel.java  |   0
 .../codegen/ui/ElementSelectorPanel.java           |   0
 .../refactoring/codegen/ui/GetterSetterPanel.form  |   0
 .../refactoring/codegen/ui/GetterSetterPanel.java  |   0
 .../codegen/ui/ImplementOverridePanel.form         |   0
 .../codegen/ui/ImplementOverridePanel.java         |   0
 .../cnd/refactoring/codegen/ui/OperatorsPanel.form |   0
 .../cnd/refactoring/codegen/ui/OperatorsPanel.java |   0
 .../codegen/ui/SuperConstructorSelectorPanel.java  |   0
 .../completion/delegate/Bundle.properties          |   0
 .../delegate/PopupDelegateCompletionItem.java      |   0
 .../delegate/PopupDelegateCompletionProvider.java  |   0
 .../completion/implmethod/Bundle.properties        |   0
 .../CsmImplementsMethodCompletionItem.java         |   0
 .../CsmImplementsMethodCompletionProvider.java     |   0
 .../completion/overridemethod/Bundle.properties    |   0
 .../CsmOverrideMethodCompletionItem.java           |   0
 .../CsmOverrideMethodCompletionProvider.java       |   0
 .../editor/HighlightsLayerFactoryImpl.java         |   0
 .../elements/CsmRefactoringElementImpl.java        |   0
 .../cnd/refactoring/elements/DiffElement.java      |   0
 .../elements/ReadWriteTokenProcessor.java          |   0
 .../refactoring/hints/AssignmentVariableFix.java   |   0
 .../cnd/refactoring/hints/Bundle.properties        |   0
 .../cnd/refactoring/hints/ExpressionFinder.java    |   0
 .../modules/cnd/refactoring/hints/InlineFix.java   |   0
 .../hints/IntroduceVariableBaseFix.java            |   0
 .../refactoring/hints/IntroduceVariableFix.java    |   0
 .../refactoring/hints/ReplaceWithPragmaOnce.java   |   0
 .../cnd/refactoring/hints/StatementFinder.java     |   0
 .../refactoring/hints/SuggestionFactoryTask.java   |   0
 .../cnd/refactoring/hints/SuggestionProvider.java  |   0
 .../cnd/refactoring/hints/SurroundWithIfndef.java  |   0
 .../hints/infrastructure/Bundle.properties         |   0
 .../hints/infrastructure/HintAction.java           |   0
 .../hints/infrastructure/Utilities.java            |   0
 .../cnd/refactoring/introduce/BodyFinder.java      |   0
 .../cnd/refactoring/introduce/Bundle.properties    |   0
 .../cnd/refactoring/introduce/ErrorLabel.java      |   0
 .../introduce/ExtendedAssignmentVariableFix.java   |   0
 .../introduce/ExtendedIntroduceVariableFix.java    |   0
 .../cnd/refactoring/introduce/IntroduceAction.java |   0
 .../refactoring/introduce/IntroduceFieldFix.java   |   0
 .../refactoring/introduce/IntroduceFieldPanel.form |   0
 .../refactoring/introduce/IntroduceFieldPanel.java |   0
 .../introduce/IntroduceMethodPanel.form            |   0
 .../introduce/IntroduceMethodPanel.java            |   0
 .../refactoring/introduce/IntroduceMethodUI.java   |   0
 .../introduce/IntroduceVariablePanel.form          |   0
 .../introduce/IntroduceVariablePanel.java          |   0
 .../org/netbeans/modules/cnd/refactoring/layer.xml |   0
 .../cnd/refactoring/plugins/Bundle.properties      |   0
 .../plugins/ChangeParametersPlugin.java            |   0
 .../plugins/CsmModificationRefactoringPlugin.java  |   0
 .../refactoring/plugins/CsmRefactoringPlugin.java  |   0
 .../plugins/CsmRefactoringsFactory.java            |   0
 .../plugins/CsmRenameRefactoringPlugin.java        |   0
 .../refactoring/plugins/CsmWhereUsedFilters.java   |   0
 .../plugins/CsmWhereUsedQueryPlugin.java           |   0
 .../plugins/EncapsulateFieldRefactoringPlugin.java |   0
 .../plugins/EncapsulateFieldsPlugin.java           |   0
 .../cnd/refactoring/plugins/InlinePlugin.java      |   0
 .../refactoring/plugins/IntroduceMethodPlugin.java |   0
 .../query/CsmRefactoringQuerySupport.java          |   0
 .../refactoring/resources/delegate_generate.png    | Bin
 .../cnd/refactoring}/resources/error-glyph.gif     | Bin
 .../refactoring/resources/found_item_comment.png   | Bin
 .../cnd/refactoring/resources/found_item_dead.png  | Bin
 .../cnd/refactoring/resources/found_item_read.png  | Bin
 .../refactoring/resources/found_item_readwrite.png | Bin
 .../cnd/refactoring/resources/found_item_write.png | Bin
 .../modules/cnd/refactoring/resources/generate.png | Bin
 .../cnd/refactoring/spi/CheckModificationHook.java |   0
 .../spi/CsmActionsImplementationProvider.java      |   0
 .../CsmChangeParametersExtraObjectsProvider.java   |   0
 .../spi/CsmInlineExtraObjectProvider.java          |   0
 .../spi/CsmRefactoringNameProvider.java            |   0
 .../spi/CsmRenameExtraObjectsProvider.java         |   0
 .../spi/CsmWhereUsedExtraObjectsProvider.java      |   0
 .../cnd/refactoring/support/Bundle.properties      |   0
 .../refactoring/support/CsmRefactoringUtils.java   |   0
 .../refactoring/support/DeclarationGenerator.java  |   0
 .../cnd/refactoring/support/ElementGrip.java       |   0
 .../refactoring/support/ElementGripFactory.java    |   0
 .../cnd/refactoring/support/GeneratorUtils.java    |   0
 .../cnd/refactoring/support/MemberInfo.java        |   0
 .../refactoring/support/ModificationResult.java    |   0
 .../cnd/refactoring/support/RefactoringModule.java |   0
 .../cnd/refactoring/support/RenameHandlerImpl.java |   0
 .../modules/cnd/refactoring/ui/Bundle.properties   |   0
 .../cnd/refactoring/ui/ChangeParametersPanel.form  |   0
 .../cnd/refactoring/ui/ChangeParametersPanel.java  |   0
 .../cnd/refactoring/ui/ChangeParametersUI.java     |   0
 .../cnd/refactoring/ui/EncapsulateFieldPanel.form  |   0
 .../cnd/refactoring/ui/EncapsulateFieldPanel.java  |   0
 .../cnd/refactoring/ui/EncapsulateFieldUI.java     |   0
 .../modules/cnd/refactoring/ui/InlinePanel.form    |   0
 .../modules/cnd/refactoring/ui/InlinePanel.java    |   0
 .../modules/cnd/refactoring/ui/InlineUI.java       |   0
 .../modules/cnd/refactoring/ui/InsertPoint.java    |   0
 .../modules/cnd/refactoring/ui/RenamePanel.form    |   0
 .../modules/cnd/refactoring/ui/RenamePanel.java    |   0
 .../cnd/refactoring/ui/RenameRefactoringUI.java    |   0
 .../modules/cnd/refactoring/ui/UIUtilities.java    |   0
 .../modules/cnd/refactoring/ui/WhereUsedPanel.form |   0
 .../modules/cnd/refactoring/ui/WhereUsedPanel.java |   0
 .../cnd/refactoring/ui/WhereUsedQueryUI.java       |   0
 .../ui/tree/ElementGripTreeElement.java            |   0
 .../cnd/refactoring/ui/tree/FileTreeElement.java   |   0
 .../cnd/refactoring/ui/tree/ParentTreeElement.java |   0
 .../refactoring/ui/tree/ProjectTreeElement.java    |   0
 .../ui/tree/RefactoringTreeElement.java            |   0
 .../ui/tree/TreeElementFactoryImpl.java            |   0
 .../testRenameOfModuleClass.ref                    |   0
 .../testCommentsFilterDeselected.ref               |   0
 .../testCommentsFilterSelected.ref                 |   0
 .../testDeadcodeFilterDeselected.ref               |   0
 .../testDeadcodeFilterSelected.ref                 |   0
 .../testDeclarationsFilterDefault.ref              |   0
 .../testDeclarationsFilterDeselected.ref           |   0
 .../testDeclarationsFilterSelected.ref             |   0
 .../testMacrosFilterDeselected.ref                 |   0
 .../testMacrosFilterSelected.ref                   |   0
 .../testRFilterSelected.ref                        |   0
 .../testRFilterSelected2.ref                       |   0
 .../testRWFilterSelected.ref                       |   0
 .../testRWFilterSelected2.ref                      |   0
 .../testWFilterSelected.ref                        |   0
 .../testWFilterSelected2.ref                       |   0
 .../WhereUsedInQuoteTestCase/testClassCustomer.ref |   0
 .../testComputeSupportMetric.ref                   |   0
 .../testCustomerGetName.ref                        |   0
 .../WhereUsedInQuoteTestCase/testIZ175700.ref      |   0
 .../testIncludeModuleH.ref                         |   0
 .../testMemoryGetTypeNoOverriden.ref               |   0
 .../testModuleAllSubtypes.ref                      |   0
 .../testModuleDirectSubtypes.ref                   |   0
 .../WhereUsedInQuoteTestCase/testModuleGetType.ref |   0
 .../testModuleGetTypeNoOverriden.ref               |   0
 .../testModuleGetTypeOverriden.ref                 |   0
 .../plugins/WhereUsedTestCase/test216130_1.ref     |   0
 .../plugins/WhereUsedTestCase/test216130_2.ref     |   0
 .../plugins/WhereUsedTestCase/test216130_3.ref     |   0
 .../plugins/WhereUsedTestCase/test216130_4.ref     |   0
 .../plugins/WhereUsedTestCase/test219526_1.ref     |   0
 .../plugins/WhereUsedTestCase/test219526_2.ref     |   0
 .../plugins/WhereUsedTestCase/test228094.ref       |   0
 .../plugins/WhereUsedTestCase/test268930_1.ref     |   0
 .../plugins/WhereUsedTestCase/test268930_2.ref     |   0
 .../plugins/WhereUsedTestCase/test268930_3.ref     |   0
 .../plugins/WhereUsedTestCase/testIZ211703_1.ref   |   0
 .../plugins/WhereUsedTestCase/testIZ211703_2.ref   |   0
 .../hints/IntroduceVariable2TestCase/Test2.cc      |   0
 .../WhereUsedFiltersTestCase/testFUFilters.c       |   0
 .../WhereUsedFiltersTestCase/testRWFilters.cpp     |   0
 .../WhereUsedFiltersTestCase/testRWFilters2.cpp    |   0
 .../plugins/WhereUsedTestCase/bug268930.cpp        |   0
 .../plugins/WhereUsedTestCase/iz211703_1.c         |   0
 .../plugins/WhereUsedTestCase/iz211703_2.c         |   0
 .../plugins/WhereUsedTestCase/iz216130.h           |   0
 .../plugins/WhereUsedTestCase/iz216130_1.c         |   0
 .../plugins/WhereUsedTestCase/iz216130_2.c         |   0
 .../plugins/WhereUsedTestCase/iz219526_1.cpp       |   0
 .../plugins/WhereUsedTestCase/iz219526_2.cpp       |   0
 .../plugins/WhereUsedTestCase/iz228094.cpp         |   0
 ...dules.editor.settings.storage.spi.StorageFilter |   0
 .../modules/cnd/refactoring/RefactoringTest.java   |   0
 .../actions/GlobalRenamePerformerTestCase.java     |   0
 .../actions/InstantRenamePerformerTestCase.java    |   0
 .../hints/IntroduceVariable2TestCase.java          |   0
 .../hints/IntroduceVariableTestCase.java           |   0
 .../CsmWhereUsedQueryPluginTestCaseBase.java       |   0
 .../plugins/WhereUsedFiltersTestCase.java          |   0
 .../plugins/WhereUsedInQuoteTestCase.java          |   0
 .../cnd/refactoring/plugins/WhereUsedTestCase.java |   0
 .../refactoring/test/RefactoringBaseTestCase.java  |   0
 {cnd => contrib}/cnd.repository.api/build.xml      |   0
 {cnd => contrib}/cnd.repository.api/manifest.mf    |   0
 .../nbproject/project.properties                   |   0
 .../cnd.repository.api/nbproject/project.xml       |   0
 .../modules/cnd/repository/api/Bundle.properties   |   0
 .../modules/cnd/repository/api/FilePath.java       |   0
 .../modules/cnd/repository/api/Repository.java     |   0
 .../cnd/repository/api/RepositoryException.java    |   0
 .../api/RepositoryExceptionListener.java           |   0
 .../cnd/repository/api/RepositoryExceptions.java   |   0
 .../cnd/repository/api/RepositoryListener.java     |   0
 .../repository/api/RepositoryListenersManager.java |   0
 .../modules/cnd/repository/api/UnitDescriptor.java |   0
 .../repository/impl/ShuttedDownRepositoryImpl.java |   0
 .../impl/UninitializedRepositoryImpl.java          |   0
 .../cnd/repository/impl/spi/FSConverter.java       |   0
 .../cnd/repository/impl/spi/FilePathConverter.java |   0
 .../modules/cnd/repository/impl/spi/Layer.java     |   0
 .../cnd/repository/impl/spi/LayerCapability.java   |   0
 .../impl/spi/LayerConvertersProvider.java          |   0
 .../cnd/repository/impl/spi/LayerDescriptor.java   |   0
 .../impl/spi/LayerDescriptorProvider.java          |   0
 .../cnd/repository/impl/spi/LayerFactory.java      |   0
 .../modules/cnd/repository/impl/spi/LayerKey.java  |   0
 .../cnd/repository/impl/spi/LayerListener.java     |   0
 .../cnd/repository/impl/spi/LayeringSupport.java   |   0
 .../repository/impl/spi/ReadLayerCapability.java   |   0
 .../impl/spi/RepositoryImplementation.java         |   0
 .../impl/spi/RepositoryImplementationFactory.java  |   0
 .../repository/impl/spi/UnitDescriptorsList.java   |   0
 .../cnd/repository/impl/spi/UnitsConverter.java    |   0
 .../repository/impl/spi/WriteLayerCapability.java  |   0
 .../netbeans/modules/cnd/repository/spi/Key.java   |   0
 .../cnd/repository/spi/KeyDataPresentation.java    |   0
 .../cnd/repository/spi/KeyPresentationFactory.java |   0
 .../modules/cnd/repository/spi/Persistent.java     |   0
 .../cnd/repository/spi/PersistentFactory.java      |   0
 .../cnd/repository/spi/RepositoryDataInput.java    |   0
 .../cnd/repository/spi/RepositoryDataOutput.java   |   0
 .../spi/RepositoryPathMapperImplementation.java    |   0
 .../spi/UnitDescriptorsMatcherImplementation.java  |   0
 .../repository/support/AbstractObjectFactory.java  |   0
 .../modules/cnd/repository/support/KeyFactory.java |   0
 .../support/KeyPresentationFactorySupport.java     |   0
 .../repository/support/RepositoryTestUtils.java    |   0
 .../cnd/repository/support/SelfPersistent.java     |   0
 {cnd => contrib}/cnd.repository/arch.xml           |   0
 {cnd => contrib}/cnd.repository/build.xml          |   0
 {cnd => contrib}/cnd.repository/manifest.mf        |   0
 .../cnd.repository/nbproject/project.properties    |   0
 .../cnd.repository/nbproject/project.xml           |   0
 .../cnd/repository/AsyncRepositoryWriter.java      |   0
 .../cnd/repository/AsyncRepositoryWriterImpl.java  |   0
 .../netbeans/modules/cnd/repository/Logger.java    |   0
 .../modules/cnd/repository/RemoveKeySupport.java   |   0
 .../modules/cnd/repository/RepositoryCache.java    |   0
 .../modules/cnd/repository/RepositoryImpl.java     |   0
 .../cnd/repository/RepositoryImplFactory.java      |   0
 .../cnd/repository/disk/BufferedRWAccess.java      |   0
 .../modules/cnd/repository/disk/Bundle.properties  |   0
 .../modules/cnd/repository/disk/DiskLayerImpl.java |   0
 .../cnd/repository/disk/DiskLayerImplDelegate.java |   0
 .../cnd/repository/disk/DiskLayerImplFactory.java  |   0
 .../cnd/repository/disk/DoubleFileStorage.java     |   0
 .../modules/cnd/repository/disk/FileRWAccess.java  |   0
 .../modules/cnd/repository/disk/FileStorage.java   |   0
 .../repository/disk/FilesAccessStrategyImpl.java   |   0
 .../cnd/repository/disk/IndexedStorageFile.java    |   0
 .../modules/cnd/repository/disk/LayerIndex.java    |   0
 .../cnd/repository/disk/RepositoryCacheMap.java    |   0
 .../cnd/repository/disk/RepositoryImplUtil.java    |   0
 .../cnd/repository/disk/SingleFileStorage.java     |   0
 .../repository/disk/UnitDescriptorsListImpl.java   |   0
 .../cnd/repository/disk/index/ChunkInfo.java       |   0
 .../repository/disk/index/CompactFileIndex.java    |   0
 .../cnd/repository/disk/index/FileIndex.java       |   0
 .../repository/disk/index/FileIndexFactory.java    |   0
 .../cnd/repository/disk/index/KeysListFile.java    |   0
 .../cnd/repository/disk/index/SimpleFileIndex.java |   0
 .../disk/index/SynchronizedFileIndex.java          |   0
 .../cnd/repository/resources/Bundle.properties     |   0
 .../repository/storage/FilePathsDictionary.java    |   0
 .../repository/storage/FilePathsDictionaryKey.java |   0
 .../FilePathsDictionaryPersistentFactory.java      |   0
 .../repository/storage/FileSystemsDictionary.java  |   0
 .../cnd/repository/storage/RepositoryMapper.java   |   0
 .../modules/cnd/repository/storage/Storage.java    |   0
 .../cnd/repository/storage/StorageManager.java     |   0
 .../storage/UnitDescriptorsDictionary.java         |   0
 .../storage/data/RepositoryDataInputStream.java    |   0
 .../storage/data/RepositoryDataOutputStream.java   |   0
 .../cnd/repository/testbench/BaseStatistics.java   |   0
 .../cnd/repository/testbench/FileStatistics.java   |   0
 .../cnd/repository/testbench/RangeStatistics.java  |   0
 .../cnd/repository/testbench/SimpleStatistics.java |   0
 .../modules/cnd/repository/testbench/Stats.java    |   0
 .../cnd/repository/testbench/WriteStatistics.java  |   0
 .../cnd/repository/util/IntToValueList.java        |   0
 .../modules/cnd/repository/util/LongHashMap.java   |   0
 .../cnd/repository/util/SlicedLongHashMap.java     |   0
 {cnd => contrib}/cnd.repository/test/debug.sh      |   0
 .../cnd.repository/test/mws-sample/results.xml     |   0
 {cnd => contrib}/cnd.repository/test/results.xsl   |   0
 {cnd => contrib}/cnd.repository/test/run           |   0
 {cnd => contrib}/cnd.repository/test/run.sh        |   0
 .../access/ChangingPropertiesTestCase.java         |   0
 .../access/CloseProjectWhenParsingLib.java         |   0
 .../access/FindFileWhileClosingProject.java        |   0
 .../modules/cnd/repository/access/HugeCaches.java  |   0
 .../cnd/repository/access/LibrariesAccess.java     |   0
 .../access/RepositoryAccessTestBase.java           |   0
 .../cnd/repository/disk/DefragmentationTest.java   |   0
 .../repository/disk/FilesAccessStrategyTest.java   |   0
 .../cnd/repository/disk/MemoryCacheTest.java       |   0
 .../disk/RepositoryFilesCacheStress.java           |   0
 .../repository/impl/CheckGetAfterRemoveTest.java   |   0
 .../cnd/repository/impl/CloseAndOpenTest.java      |   0
 .../cnd/repository/impl/GetPutTestBase.java        |   0
 .../impl/IncrementalParseRepositoryComposite.java  |   0
 .../IncrementalParseRepositoryValidationTest.java  |   0
 .../impl/KeyValidatorRepositoryTest.java           |   0
 .../impl/ReopenBrokenRepositoryComposite.java      |   0
 .../impl/ReopenBrokenRepositoryValidationTest.java |   0
 .../impl/ReopenRepositoryValidationFinal.java      |   0
 .../impl/ReopenRepositoryValidationTest.java       |   0
 .../repository/impl/RepositoryValidationBase.java  |   0
 .../repository/impl/RepositoryValidationFinal.java |   0
 .../impl/RepositoryValidationFirstParse.java       |   0
 .../impl/RepositoryValidationGoldens.java          |   0
 .../modules/cnd/repository/impl/TryGetTest.java    |   0
 .../repository/keys/PersistentFactoryListener.java |   0
 .../cnd/repository/keys/TestAbstractKey.java       |   0
 .../cnd/repository/keys/TestBaseKeyFactory.java    |   0
 .../modules/cnd/repository/keys/TestLargeKey.java  |   0
 .../modules/cnd/repository/keys/TestSmallKey.java  |   0
 .../modules/cnd/repository/keys/TestValue.java     |   0
 .../keys/TestValuePersistentFactory.java           |   0
 .../layering/RepositoryLayeringTest.java           |   0
 .../layering/RepositoryRelocationTest.java         |   0
 .../modules/cnd/repository/test/TestFactory.java   |   0
 .../modules/cnd/repository/test/TestKey.java       |   0
 .../modules/cnd/repository/test/TestObject.java    |   0
 .../cnd/repository/test/TestObjectCreator.java     |   0
 .../repository/util/RepositoryCacheMapTest.java    |   0
 .../cnd/repository/util/RepositoryTestSupport.java |   0
 {cnd => contrib}/cnd.search/build.xml              |   0
 {cnd => contrib}/cnd.search/manifest.mf            |   0
 .../cnd.search}/nbproject/project.properties       |   0
 {cnd => contrib}/cnd.search/nbproject/project.xml  |   0
 .../netbeans/modules/cnd/search/IconsCache.java    |   0
 .../modules/cnd/search/MatchingFileData.java       |   0
 .../netbeans/modules/cnd/search/SearchParams.java  |   0
 .../netbeans/modules/cnd/search/SearchResult.java  |   0
 .../org/netbeans/modules/cnd/search/Searcher.java  |   0
 .../modules/cnd/search/impl/Bundle.properties      |   0
 .../cnd/search/impl/SearchBrowseHostScope.java     |   0
 .../cnd/search/impl/UnixFindBasedSearcher.java     |   0
 .../modules/cnd/search/impl/spi/Bundle.properties  |   0
 .../cnd/search/impl/spi/CNDSearchComposition.java  |   0
 .../cnd/search/impl/spi/CNDSearchPresenter.java    |   0
 .../cnd/search/impl/spi/CNDSearchProvider.java     |   0
 .../modules/cnd/search/resources/Bundle.properties |   0
 .../modules/cnd/search/ui/Bundle.properties        |   0
 .../modules/cnd/search/ui/CNDSearchPanel.form      |   0
 .../modules/cnd/search/ui/CNDSearchPanel.java      |   0
 .../modules/cnd/search/ui/DirectoryChooser.form    |   0
 .../modules/cnd/search/ui/DirectoryChooser.java    |   0
 .../modules/cnd/search/ui/SearchResultNode.java    |   0
 .../cnd/search/ui/SearchResultPropertySet.java     |   0
 .../modules/cnd/search/util/OutlineSupport.java    |   0
 .../cnd/search/util/SearchScopeValidator.java      |   0
 {cnd => contrib}/cnd.simpleunit/build.xml          |   0
 {cnd => contrib}/cnd.simpleunit/licenseinfo.xml    |   0
 {cnd => contrib}/cnd.simpleunit/manifest.mf        |   0
 .../cnd.simpleunit/nbproject/project.properties    |   0
 .../cnd.simpleunit/nbproject/project.xml           |   0
 .../modules/cnd/simpleunit/Bundle.properties       |   0
 .../simpleunit/codegeneration/CodeGenerator.java   |   0
 .../editor/filecreation/Bundle.properties          |   0
 .../editor/filecreation/NewTestSimplePanel.java    |   0
 .../editor/filecreation/NewTestSimplePanelGUI.form |   0
 .../editor/filecreation/NewTestSimplePanelGUI.java |   0
 .../editor/filecreation/TestSimpleIterator.java    |   0
 .../org/netbeans/modules/cnd/simpleunit/layer.xml  |   0
 .../cnd/simpleunit/resources/Bundle.properties     |   0
 .../cnd/simpleunit/resources/simple-test-c.html    |   0
 .../cnd/simpleunit/resources/simple-test-cc.html   |   0
 .../cnd/simpleunit/resources/test-simple-c.html    |   0
 .../cnd/simpleunit/resources/test-simple-cpp.html  |   0
 .../cnd/simpleunit}/resources/testFiles.html       |   0
 .../cnd/simpleunit/resources/testSimpleC.png       | Bin
 .../cnd/simpleunit/resources/testSimpleCpp.png     | Bin
 .../spi/wizard/AbstractUnitTestIterator.java       |   0
 .../simpleunit/spi/wizard/UnitTestTemplates.java   |   0
 .../simpleunit/templates/c/simple-test-c.template  |   0
 .../templates/c/test-simple-file-c.template        |   0
 .../templates/cpp/simple-test-cc.template          |   0
 .../templates/cpp/test-simple-file-cpp.template    |   0
 .../cnd/simpleunit/utils/CodeGenerationUtils.java  |   0
 .../cnd/simpleunit/utils/MakefileUtils.java        |   0
 .../cnd/simpleunit/wizard/Bundle.properties        |   0
 .../simpleunit/wizard/FunctionSelectorPanel.java   |   0
 .../GenerateTestChooseElementsVisualPanel.form     |   0
 .../GenerateTestChooseElementsVisualPanel.java     |   0
 .../GenerateTestChooseElementsWizardPanel.java     |   0
 .../cnd.spellchecker.bindings/build.xml            |   0
 .../cnd.spellchecker.bindings/manifest.mf          |   0
 .../nbproject/project.properties                   |   0
 .../nbproject/project.xml                          |   0
 .../cnd/spellchecker/bindings/CndTokenList.java    |   0
 .../bindings/CndTokenListProvider.java             |   0
 .../bindings/ScriptAndMakeTokenList.java           |   0
 .../bindings/resources/Bundle.properties           |   0
 .../cnd/spellchecker/bindings/resources/layer.xml  |   0
 .../spellchecker/bindings/CndTokenListTest.java    |   0
 {cnd => contrib}/cnd.testrunner/build.xml          |   0
 {cnd => contrib}/cnd.testrunner/manifest.mf        |   0
 .../cnd.testrunner/nbproject/project.properties    |   0
 .../cnd.testrunner/nbproject/project.xml           |   0
 .../modules/cnd/testrunner/Bundle.properties       |   0
 .../cnd/testrunner/TestRunnerActionHandler.java    |   0
 .../testrunner/TestRunnerActionHandlerFactory.java |   0
 .../cnd/testrunner/spi/TestHandlerFactory.java     |   0
 .../testrunner/spi/TestHandlerFactoryProvider.java |   0
 .../cnd/testrunner/spi/TestRecognizerHandler.java  |   0
 .../testrunner/ui/BaseTestMethodNodeAction.java    |   0
 .../modules/cnd/testrunner/ui/Bundle.properties    |   0
 .../cnd/testrunner/ui/CndCallstackFrameNode.java   |   0
 .../cnd/testrunner/ui/CndTestMethodNode.java       |   0
 .../testrunner/ui/CndTestRunnerNodeFactory.java    |   0
 .../cnd/testrunner/ui/CndTestsuiteNode.java        |   0
 .../testrunner/ui/DisplayOutputForNodeAction.java  |   0
 .../cnd/testrunner/ui/JumpToCallStackAction.java   |   0
 .../cnd/testrunner/ui/JumpToTestAction.java        |   0
 .../modules/cnd/testrunner/ui/OutputUtils.java     |   0
 .../cnd/testrunner/ui/RunTestMethodAction.java     |   0
 .../cnd/testrunner/ui/RunTestSuiteAction.java      |   0
 .../ui/TestRunnerInputProcessorFactory.java        |   0
 .../cnd/testrunner/ui/TestRunnerLineConvertor.java |   0
 {cnd => contrib}/libs.antlr.cnd/build.xml          |   0
 {cnd => contrib}/libs.antlr.cnd/manifest.mf        |   0
 .../libs.antlr.cnd/nbproject/project.properties    |   0
 .../libs.antlr.cnd/nbproject/project.xml           |   0
 .../org/netbeans/libs/antlr/cnd/Bundle.properties  |   0
 {cnd => contrib}/libs.clank/build.xml              |   0
 {cnd => contrib}/libs.clank/external/binaries-list |   0
 .../libs.clank/external/clank_0.3.9-license.txt    |   0
 .../external/create_project_properties.sh          |   0
 {cnd => contrib}/libs.clank/manifest.mf            |   0
 .../libs.clank/nbproject/project.properties        |   0
 {cnd => contrib}/libs.clank/nbproject/project.xml  |   0
 .../src/org/netbeans/libs/clank/Bundle.properties  |   0
 nbbuild/cluster.properties                         |  35 +--------------------
 5704 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/cnd/cnd.classview/test/unit/data/goldenfiles/org/netbeans/modules/cnd/classview/QuoteTestCase/quote.cc.err b/cnd/cnd.classview/test/unit/data/goldenfiles/org/netbeans/modules/cnd/classview/QuoteTestCase/quote.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosFirst.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosFirst.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosIfEnd.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosIfEnd.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosWrong.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosWrong.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInEmptySysInclude.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInEmptySysInclude.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInEmptyUsrInclude.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInEmptyUsrInclude.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInsideChar.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInsideChar.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInsideInclude.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInsideInclude.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInsideString.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInsideString.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion1.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion1.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion10.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion10.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion2.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion2.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion3.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion3.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion4.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion4.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion5.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion5.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion6.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion6.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion7.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion7.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion8.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion8.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion9.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion9.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun1.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun1.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun2.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun2.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun3.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun3.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun4.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun4.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun5.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun5.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun6.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun6.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun7.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun7.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsNoStd.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsNoStd.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsNone.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsNone.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsWrong.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsWrong.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassA.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassA.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/includes/CCIncludesCompletionTestCase/testNothing.ref b/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/includes/CCIncludesCompletionTestCase/testNothing.ref
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/MultiProjectsErrorHighlightingTest/first_first.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/MultiProjectsErrorHighlightingTest/first_first.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/MultiProjectsErrorHighlightingTest/forth_forth.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/MultiProjectsErrorHighlightingTest/forth_forth.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/MultiProjectsErrorHighlightingTest/includedLibrary_lib_header.h.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/MultiProjectsErrorHighlightingTest/includedLibrary_lib_header.h.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/MultiProjectsErrorHighlightingTest/otherLibrary_other_lib_header.h.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/MultiProjectsErrorHighlightingTest/otherLibrary_other_lib_header.h.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/MultiProjectsErrorHighlightingTest/second_second.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/MultiProjectsErrorHighlightingTest/second_second.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/MultiProjectsErrorHighlightingTest/third_third.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/MultiProjectsErrorHighlightingTest/third_third.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/bug210983_1.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/bug210983_1.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/bug210983_2.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/bug210983_2.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/bug211143_1.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/bug211143_1.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/bug211143_2.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/bug211143_2.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/ddd_errors.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/ddd_errors.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/inc211143.h.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/inc211143.h.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz142674.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz142674.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz144537.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz144537.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz145280.cc.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz145280.cc.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz148236.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz148236.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz149285.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz149285.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz150827.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz150827.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz158216.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz158216.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz159615.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz159615.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz175231.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz175231.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz175782.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz175782.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz175782_2.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz175782_2.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz191336.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz191336.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz191610.cc.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz191610.cc.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz_144873.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/iz_144873.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/skipBlocks.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/skipBlocks.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/template_class_enums.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/template_class_enums.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/unnamed_enum_typedef.cpp.dat b/cnd/cnd.highlight/test/unit/data/goldenfiles/org/netbeans/modules/cnd/highlight/error/UnresolvedIdentifierTest/unnamed_enum_typedef.cpp.dat
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testNSOneAndNsTwoAreVisible.decl b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testNSOneAndNsTwoAreVisible.decl
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testNSOneAndNsTwoAreVisibleInMain.decl b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testNSOneAndNsTwoAreVisibleInMain.decl
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testNSOneIsVisible.decl b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testNSOneIsVisible.decl
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testNSOneIsVisibleNsTwoIsUsedInFun.decl b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testNSOneIsVisibleNsTwoIsUsedInFun.decl
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testNSOneIsVisibleNsTwoNotYetInFun.decl b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testNSOneIsVisibleNsTwoNotYetInFun.decl
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testOnlyGlobalIsVisible.decl b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testOnlyGlobalIsVisible.decl
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testOnlyGlobalIsVisible.nsp b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testOnlyGlobalIsVisible.nsp
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testOuterIsVisble.decl b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testOuterIsVisble.decl
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testUnnamedIsVisble.decl b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/impl/services/UsingResolverImplTestCase/testUnnamedIsVisble.decl
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug195338.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug195338.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug198460.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug198460.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug204497.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug204497.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug205292.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug205292.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug209947.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug209947.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug215605.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug215605.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug217390.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug217390.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug224027.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug224027.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug229069.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/bug229069.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/c_namespaces.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/c_namespaces.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/explicit_specialization.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/explicit_specialization.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz103462_first_and_second_1.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz103462_first_and_second_1.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz134182.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz134182.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz142674.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz142674.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz143977_0.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz143977_0.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz143977_1.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz143977_1.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz143977_2.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz143977_2.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz143977_3.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz143977_3.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz145280.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz145280.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz146560.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz146560.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz147574.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz147574.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz148014.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz148014.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz149225.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz149225.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz149525.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz149525.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz151621.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz151621.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz151957_namespace_alias.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz151957_namespace_alias.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz152872_initializer_in_expression.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz152872_initializer_in_expression.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz154349.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz154349.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz156004.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz156004.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz156009.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz156009.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz156061.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz156061.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz156696.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz156696.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz157836.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz157836.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz158124.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz158124.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz158615.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz158615.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz158684.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz158684.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz158872.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz158872.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz159238.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz159238.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz159324.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz159324.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz164583.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz164583.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz165038.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz165038.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz166165.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz166165.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz167547.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz167547.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz168253.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz168253.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz174256.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz174256.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz175324.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz175324.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz175653.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz175653.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz176530.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz176530.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz189777.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz189777.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz190413.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz190413.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz190710.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz190710.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz190782.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz190782.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz190821.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz190821.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz191085.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz191085.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz191446.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz191446.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz191598.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz191598.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz191799.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz191799.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz195560.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz195560.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz197997.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz197997.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz199899.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz199899.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz205270.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz205270.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz_145553_namesakes.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/iz_145553_namesakes.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/testHeaderWithCKeywords.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel2Test/testHeaderWithCKeywords.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/align_local_assert.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/align_local_assert.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/atomic.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/atomic.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/const.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/const.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/cross_inclusionA.h.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/cross_inclusionA.h.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/cross_inclusionB.h.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/cross_inclusionB.h.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/delay.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/delay.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/ifdef_guard.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/ifdef_guard.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/init_array.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/init_array.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/lexer_dollar.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/lexer_dollar.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/operators.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/operators.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/operators.h.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/operators.h.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/ppExpression.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/ppExpression.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/preproc_endif.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/preproc_endif.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/preproc_include_with_macro.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/preproc_include_with_macro.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/preproc_multi_line_macro_param.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/preproc_multi_line_macro_param.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/recurse_define.h.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/recurse_define.h.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/resolver_typedef_s_e_c_u.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/resolver_typedef_s_e_c_u.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/va_arg_using.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModel3Test/va_arg_using.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelCpp11Test/bug224666.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelCpp11Test/bug224666.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelCpp11Test/classMemberFwdEnum.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelCpp11Test/classMemberFwdEnum.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelCpp11Test/cpp11.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelCpp11Test/cpp11.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelIncludeBodyTest/includer_file.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelIncludeBodyTest/includer_file.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/accessModifiers.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/accessModifiers.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/bitFields.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/bitFields.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/classForwardScope.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/classForwardScope.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/clearingImportedSymbols.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/clearingImportedSymbols.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/constMethod.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/constMethod.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/constructorImportSymbols.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/constructorImportSymbols.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/constructorInitializerListScope.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/constructorInitializerListScope.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/destructor.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/destructor.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/friendFunction.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/friendFunction.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/functionParametersInFunctionBody.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/functionParametersInFunctionBody.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/multipleDeclarativeRegions.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/multipleDeclarativeRegions.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/nestedClassScope.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/nestedClassScope.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/parameters.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/parameters.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/typedefEnum.cpp.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelNewGrammarTest/typedefEnum.cpp.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/0x01.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/0x01.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/0x16.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/0x16.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/10000parameters.c.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/10000parameters.c.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/IZ138320.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/IZ138320.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/IZ138551.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/IZ138551.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/IZ144009.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/IZ144009.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/IZ144276.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/IZ144276.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/IZ144968.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/IZ144968.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/IZ146150.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/IZ146150.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/array.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/array.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/array_cast.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/array_cast.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/attribute_in_constructor.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/attribute_in_constructor.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/attributes_aligned_class.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/attributes_aligned_class.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/bitFields.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/bitFields.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/branches_1.cc.err b/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/branches_1.cc.err
deleted file mode 100644
index e69de29..0000000
diff --git a/cnd/cnd.analysis.api/build.xml b/contrib/cnd.analysis.api/build.xml
similarity index 100%
rename from cnd/cnd.analysis.api/build.xml
rename to contrib/cnd.analysis.api/build.xml
diff --git a/cnd/cnd.analysis.api/manifest.mf b/contrib/cnd.analysis.api/manifest.mf
similarity index 100%
rename from cnd/cnd.analysis.api/manifest.mf
rename to contrib/cnd.analysis.api/manifest.mf
diff --git a/cnd/cnd.search/nbproject/project.properties b/contrib/cnd.analysis.api/nbproject/project.properties
similarity index 100%
rename from cnd/cnd.search/nbproject/project.properties
rename to contrib/cnd.analysis.api/nbproject/project.properties
diff --git a/cnd/cnd.analysis.api/nbproject/project.xml b/contrib/cnd.analysis.api/nbproject/project.xml
similarity index 100%
rename from cnd/cnd.analysis.api/nbproject/project.xml
rename to contrib/cnd.analysis.api/nbproject/project.xml
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AbstractAnalyzer.java b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AbstractAnalyzer.java
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AbstractAnalyzer.java
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AbstractAnalyzer.java
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AbstractCustomizerProvider.java b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AbstractCustomizerProvider.java
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AbstractCustomizerProvider.java
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AbstractCustomizerProvider.java
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AbstractHintsPanel.java b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AbstractHintsPanel.java
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AbstractHintsPanel.java
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AbstractHintsPanel.java
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AnalyzerRequest.java b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AnalyzerRequest.java
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AnalyzerRequest.java
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AnalyzerRequest.java
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AnalyzerResponse.java b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AnalyzerResponse.java
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AnalyzerResponse.java
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/AnalyzerResponse.java
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/Bundle.properties b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/Bundle.properties
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/Bundle.properties
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/Bundle.properties
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/CodeAuditProviderImpl.java b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/CodeAuditProviderImpl.java
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/CodeAuditProviderImpl.java
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/CodeAuditProviderImpl.java
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/Line2Offset.java b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/Line2Offset.java
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/Line2Offset.java
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/Line2Offset.java
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/layer.xml b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/layer.xml
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/layer.xml
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/layer.xml
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/Bundle.properties b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/Bundle.properties
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/Bundle.properties
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/Bundle.properties
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsOptionsPanelController.java b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsOptionsPanelController.java
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsOptionsPanelController.java
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsOptionsPanelController.java
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsPanel.form b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsPanel.form
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsPanel.form
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsPanel.form
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsPanel.java b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsPanel.java
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsPanel.java
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsPanel.java
diff --git a/cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsPanelLogic.java b/contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsPanelLogic.java
similarity index 100%
rename from cnd/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsPanelLogic.java
rename to contrib/cnd.analysis.api/src/org/netbeans/modules/cnd/analysis/api/options/HintsPanelLogic.java
diff --git a/cnd/cnd.analysis.impl/build.xml b/contrib/cnd.analysis.impl/build.xml
similarity index 100%
rename from cnd/cnd.analysis.impl/build.xml
rename to contrib/cnd.analysis.impl/build.xml
diff --git a/cnd/cnd.analysis.impl/manifest.mf b/contrib/cnd.analysis.impl/manifest.mf
similarity index 100%
rename from cnd/cnd.analysis.impl/manifest.mf
rename to contrib/cnd.analysis.impl/manifest.mf
diff --git a/cnd/cnd.analysis.impl/nbproject/project.properties b/contrib/cnd.analysis.impl/nbproject/project.properties
similarity index 100%
rename from cnd/cnd.analysis.impl/nbproject/project.properties
rename to contrib/cnd.analysis.impl/nbproject/project.properties
diff --git a/cnd/cnd.analysis.impl/nbproject/project.xml b/contrib/cnd.analysis.impl/nbproject/project.xml
similarity index 100%
rename from cnd/cnd.analysis.impl/nbproject/project.xml
rename to contrib/cnd.analysis.impl/nbproject/project.xml
diff --git a/cnd/cnd.analysis.impl/src/org/netbeans/modules/cnd/analysis/impl/ScopeProvider.java b/contrib/cnd.analysis.impl/src/org/netbeans/modules/cnd/analysis/impl/ScopeProvider.java
similarity index 100%
rename from cnd/cnd.analysis.impl/src/org/netbeans/modules/cnd/analysis/impl/ScopeProvider.java
rename to contrib/cnd.analysis.impl/src/org/netbeans/modules/cnd/analysis/impl/ScopeProvider.java
diff --git a/cnd/cnd.analysis.impl/src/org/netbeans/modules/cnd/analysis/impl/resources/Bundle.properties b/contrib/cnd.analysis.impl/src/org/netbeans/modules/cnd/analysis/impl/resources/Bundle.properties
similarity index 100%
rename from cnd/cnd.analysis.impl/src/org/netbeans/modules/cnd/analysis/impl/resources/Bundle.properties
rename to contrib/cnd.analysis.impl/src/org/netbeans/modules/cnd/analysis/impl/resources/Bundle.properties
diff --git a/cnd/cnd.api.model/build.xml b/contrib/cnd.api.model/build.xml
similarity index 100%
rename from cnd/cnd.api.model/build.xml
rename to contrib/cnd.api.model/build.xml
diff --git a/cnd/cnd.api.model/manifest.mf b/contrib/cnd.api.model/manifest.mf
similarity index 100%
rename from cnd/cnd.api.model/manifest.mf
rename to contrib/cnd.api.model/manifest.mf
diff --git a/cnd/cnd.api.model/nbproject/project.properties b/contrib/cnd.api.model/nbproject/project.properties
similarity index 100%
rename from cnd/cnd.api.model/nbproject/project.properties
rename to contrib/cnd.api.model/nbproject/project.properties
diff --git a/cnd/cnd.api.model/nbproject/project.xml b/contrib/cnd.api.model/nbproject/project.xml
similarity index 100%
rename from cnd/cnd.api.model/nbproject/project.xml
rename to contrib/cnd.api.model/nbproject/project.xml
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmBuiltIn.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmBuiltIn.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmBuiltIn.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmBuiltIn.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmChangeEvent.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmChangeEvent.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmChangeEvent.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmChangeEvent.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClass.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClass.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClass.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClass.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClassForwardDeclaration.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClassForwardDeclaration.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClassForwardDeclaration.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClassForwardDeclaration.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClassifier.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClassifier.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClassifier.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClassifier.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClassifierBasedTemplateParameter.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClassifierBasedTemplateParameter.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClassifierBasedTemplateParameter.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClassifierBasedTemplateParameter.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClosureClassifier.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClosureClassifier.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClosureClassifier.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClosureClassifier.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClosureType.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClosureType.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClosureType.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmClosureType.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmCompoundClassifier.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmCompoundClassifier.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmCompoundClassifier.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmCompoundClassifier.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmConstructor.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmConstructor.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmConstructor.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmConstructor.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmDeclaration.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmDeclaration.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmDeclaration.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmDeclaration.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmDeclarationBasedTemplateParameter.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmDeclarationBasedTemplateParameter.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmDeclarationBasedTemplateParameter.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmDeclarationBasedTemplateParameter.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmEnum.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmEnum.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmEnum.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmEnum.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmEnumForwardDeclaration.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmEnumForwardDeclaration.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmEnumForwardDeclaration.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmEnumForwardDeclaration.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmEnumerator.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmEnumerator.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmEnumerator.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmEnumerator.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmErrorDirective.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmErrorDirective.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmErrorDirective.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmErrorDirective.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmExpressionBasedSpecializationParameter.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmExpressionBasedSpecializationParameter.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmExpressionBasedSpecializationParameter.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmExpressionBasedSpecializationParameter.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmField.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmField.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmField.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmField.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFile.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFile.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFile.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFile.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFriend.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFriend.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFriend.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFriend.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFriendClass.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFriendClass.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFriendClass.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFriendClass.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFriendFunction.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFriendFunction.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFriendFunction.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFriendFunction.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunction.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunction.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunction.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunction.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionDefinition.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionDefinition.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionDefinition.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionDefinition.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionInstantiation.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionInstantiation.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionInstantiation.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionInstantiation.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionParameterList.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionParameterList.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionParameterList.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionParameterList.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionPointerClassifier.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionPointerClassifier.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionPointerClassifier.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionPointerClassifier.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionPointerType.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionPointerType.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionPointerType.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctionPointerType.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctional.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctional.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctional.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmFunctional.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInclude.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInclude.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInclude.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInclude.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInheritance.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInheritance.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInheritance.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInheritance.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInitializerListContainer.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInitializerListContainer.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInitializerListContainer.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInitializerListContainer.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInstantiation.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInstantiation.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInstantiation.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmInstantiation.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmKnRName.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmKnRName.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmKnRName.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmKnRName.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmListeners.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmListeners.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmListeners.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmListeners.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMacro.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMacro.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMacro.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMacro.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMacroParameter.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMacroParameter.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMacroParameter.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMacroParameter.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMember.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMember.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMember.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMember.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMethod.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMethod.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMethod.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmMethod.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModel.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModel.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModel.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModel.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelAccessor.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelAccessor.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelAccessor.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelAccessor.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelListener.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelListener.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelListener.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelListener.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelState.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelState.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelState.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelState.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelStateListener.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelStateListener.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelStateListener.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModelStateListener.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModule.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModule.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModule.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmModule.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamedElement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamedElement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamedElement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamedElement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamespace.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamespace.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamespace.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamespace.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamespaceAlias.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamespaceAlias.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamespaceAlias.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamespaceAlias.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamespaceDefinition.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamespaceDefinition.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamespaceDefinition.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmNamespaceDefinition.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmObject.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmObject.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmObject.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmObject.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmOffsetable.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmOffsetable.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmOffsetable.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmOffsetable.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmOffsetableDeclaration.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmOffsetableDeclaration.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmOffsetableDeclaration.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmOffsetableDeclaration.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmOffsetableName.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmOffsetableName.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmOffsetableName.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmOffsetableName.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmParameter.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmParameter.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmParameter.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmParameter.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmParameterList.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmParameterList.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmParameterList.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmParameterList.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProgram.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProgram.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProgram.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProgram.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProgressAdapter.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProgressAdapter.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProgressAdapter.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProgressAdapter.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProgressListener.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProgressListener.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProgressListener.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProgressListener.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProject.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProject.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProject.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmProject.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmQualifiedNamedElement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmQualifiedNamedElement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmQualifiedNamedElement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmQualifiedNamedElement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmScope.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmScope.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmScope.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmScope.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmScopeElement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmScopeElement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmScopeElement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmScopeElement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmSpecializationParameter.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmSpecializationParameter.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmSpecializationParameter.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmSpecializationParameter.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTemplate.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTemplate.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTemplate.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTemplate.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTemplateParameter.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTemplateParameter.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTemplateParameter.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTemplateParameter.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTemplateParameterType.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTemplateParameterType.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTemplateParameterType.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTemplateParameterType.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmType.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmType.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmType.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmType.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTypeAlias.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTypeAlias.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTypeAlias.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTypeAlias.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTypeBasedSpecializationParameter.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTypeBasedSpecializationParameter.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTypeBasedSpecializationParameter.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTypeBasedSpecializationParameter.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTypedef.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTypedef.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTypedef.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmTypedef.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmUID.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmUID.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmUID.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmUID.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmUsingDeclaration.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmUsingDeclaration.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmUsingDeclaration.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmUsingDeclaration.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmUsingDirective.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmUsingDirective.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmUsingDirective.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmUsingDirective.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmValidable.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmValidable.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmValidable.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmValidable.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVariable.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVariable.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVariable.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVariable.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVariableDefinition.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVariableDefinition.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVariableDefinition.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVariableDefinition.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVariadicSpecializationParameter.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVariadicSpecializationParameter.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVariadicSpecializationParameter.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVariadicSpecializationParameter.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVisibility.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVisibility.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVisibility.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/CsmVisibility.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmCaseStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmCaseStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmCaseStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmCaseStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmCompoundStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmCompoundStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmCompoundStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmCompoundStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmCondition.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmCondition.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmCondition.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmCondition.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmDeclarationStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmDeclarationStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmDeclarationStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmDeclarationStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmExceptionHandler.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmExceptionHandler.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmExceptionHandler.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmExceptionHandler.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmExpression.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmExpression.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmExpression.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmExpression.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmExpressionStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmExpressionStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmExpressionStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmExpressionStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmForStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmForStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmForStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmForStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmGotoStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmGotoStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmGotoStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmGotoStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmIfStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmIfStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmIfStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmIfStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmLabel.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmLabel.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmLabel.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmLabel.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmLoopStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmLoopStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmLoopStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmLoopStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmRangeForStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmRangeForStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmRangeForStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmRangeForStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmReturnStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmReturnStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmReturnStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmReturnStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmSwitchStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmSwitchStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmSwitchStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmSwitchStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmTryCatchStatement.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmTryCatchStatement.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmTryCatchStatement.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/deep/CsmTryCatchStatement.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/resources/Bundle.properties b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/resources/Bundle.properties
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/resources/Bundle.properties
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/resources/Bundle.properties
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/support/CsmClassifierResolver.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/support/CsmClassifierResolver.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/support/CsmClassifierResolver.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/support/CsmClassifierResolver.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/support/CsmFileLanguageProvider.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/support/CsmFileLanguageProvider.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/support/CsmFileLanguageProvider.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/support/CsmFileLanguageProvider.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/support/CsmTypes.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/support/CsmTypes.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/support/CsmTypes.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/support/CsmTypes.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmBaseUtilities.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmBaseUtilities.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmBaseUtilities.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmBaseUtilities.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmKindUtilities.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmKindUtilities.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmKindUtilities.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmKindUtilities.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmSortUtilities.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmSortUtilities.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmSortUtilities.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmSortUtilities.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmTracer.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmTracer.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmTracer.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/CsmTracer.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/UIDs.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/UIDs.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/UIDs.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/api/model/util/UIDs.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/spi/model/CsmBaseUtilitiesProvider.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/spi/model/CsmBaseUtilitiesProvider.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/spi/model/CsmBaseUtilitiesProvider.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/spi/model/CsmBaseUtilitiesProvider.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/spi/model/TypesProvider.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/spi/model/TypesProvider.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/spi/model/TypesProvider.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/spi/model/TypesProvider.java
diff --git a/cnd/cnd.api.model/src/org/netbeans/modules/cnd/spi/model/UIDProvider.java b/contrib/cnd.api.model/src/org/netbeans/modules/cnd/spi/model/UIDProvider.java
similarity index 100%
rename from cnd/cnd.api.model/src/org/netbeans/modules/cnd/spi/model/UIDProvider.java
rename to contrib/cnd.api.model/src/org/netbeans/modules/cnd/spi/model/UIDProvider.java
diff --git a/cnd/cnd.apt/build.xml b/contrib/cnd.apt/build.xml
similarity index 100%
rename from cnd/cnd.apt/build.xml
rename to contrib/cnd.apt/build.xml
diff --git a/cnd/cnd.apt/manifest.mf b/contrib/cnd.apt/manifest.mf
similarity index 100%
rename from cnd/cnd.apt/manifest.mf
rename to contrib/cnd.apt/manifest.mf
diff --git a/cnd/cnd.apt/nbproject/project.properties b/contrib/cnd.apt/nbproject/project.properties
similarity index 100%
rename from cnd/cnd.apt/nbproject/project.properties
rename to contrib/cnd.apt/nbproject/project.properties
diff --git a/cnd/cnd.apt/nbproject/project.xml b/contrib/cnd.apt/nbproject/project.xml
similarity index 100%
rename from cnd/cnd.apt/nbproject/project.xml
rename to contrib/cnd.apt/nbproject/project.xml
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/Bundle.properties b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/Bundle.properties
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/Bundle.properties
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/Bundle.properties
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/debug/APTTraceFlags.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/debug/APTTraceFlags.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/debug/APTTraceFlags.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/debug/APTTraceFlags.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTBaseNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTBaseNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTBaseNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTBaseNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTBuilderImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTBuilderImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTBuilderImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTBuilderImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTContainerNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTContainerNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTContainerNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTContainerNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTDefineNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTDefineNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTDefineNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTDefineNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTElifNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTElifNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTElifNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTElifNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTElseNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTElseNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTElseNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTElseNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTEndifNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTEndifNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTEndifNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTEndifNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTErrorNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTErrorNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTErrorNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTErrorNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTFileNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTFileNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTFileNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTFileNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfConditionBaseNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfConditionBaseNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfConditionBaseNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfConditionBaseNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfdefConditionBaseNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfdefConditionBaseNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfdefConditionBaseNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfdefConditionBaseNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfdefNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfdefNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfdefNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfdefNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfndefNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfndefNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfndefNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIfndefNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIncludeBaseNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIncludeBaseNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIncludeBaseNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIncludeBaseNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIncludeNextNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIncludeNextNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIncludeNextNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIncludeNextNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIncludeNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIncludeNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIncludeNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTIncludeNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTMacroBaseNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTMacroBaseNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTMacroBaseNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTMacroBaseNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTNodeBuilder.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTNodeBuilder.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTNodeBuilder.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTNodeBuilder.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTPragmaNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTPragmaNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTPragmaNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTPragmaNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTStreamBaseNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTStreamBaseNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTStreamBaseNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTStreamBaseNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTStreamNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTStreamNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTStreamNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTStreamNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTTokenAndChildBasedNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTTokenAndChildBasedNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTTokenAndChildBasedNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTTokenAndChildBasedNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTTokenBasedNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTTokenBasedNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTTokenBasedNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTTokenBasedNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTUndefineNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTUndefineNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTUndefineNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTUndefineNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTUnknownNode.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTUnknownNode.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTUnknownNode.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/structure/APTUnknownNode.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTBaseMacroMap.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTBaseMacroMap.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTBaseMacroMap.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTBaseMacroMap.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTCommentToken.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTCommentToken.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTCommentToken.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTCommentToken.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTConstTextToken.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTConstTextToken.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTConstTextToken.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTConstTextToken.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTDriverImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTDriverImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTDriverImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTDriverImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTFileMacroMap.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTFileMacroMap.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTFileMacroMap.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTFileMacroMap.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTHandlersSupportImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTHandlersSupportImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTHandlersSupportImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTHandlersSupportImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTIncludeHandlerImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTIncludeHandlerImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTIncludeHandlerImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTIncludeHandlerImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTIncludeResolverImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTIncludeResolverImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTIncludeResolverImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTIncludeResolverImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTLiteConstTextToken.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTLiteConstTextToken.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTLiteConstTextToken.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTLiteConstTextToken.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTLiteIdToken.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTLiteIdToken.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTLiteIdToken.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTLiteIdToken.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTLiteLiteralToken.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTLiteLiteralToken.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTLiteLiteralToken.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTLiteLiteralToken.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroCache.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroCache.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroCache.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroCache.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroMapSnapshot.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroMapSnapshot.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroMapSnapshot.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroMapSnapshot.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroParamExpansion.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroParamExpansion.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroParamExpansion.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroParamExpansion.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTPredefinedMacroMap.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTPredefinedMacroMap.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTPredefinedMacroMap.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTPredefinedMacroMap.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTPreprocHandlerImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTPreprocHandlerImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTPreprocHandlerImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTPreprocHandlerImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTPreprocessorToken.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTPreprocessorToken.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTPreprocessorToken.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTPreprocessorToken.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTSystemMacroMap.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTSystemMacroMap.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTSystemMacroMap.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTSystemMacroMap.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTTestToken.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTTestToken.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTTestToken.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/APTTestToken.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/FileExistsSensitiveCacheDriver.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/FileExistsSensitiveCacheDriver.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/FileExistsSensitiveCacheDriver.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/FileExistsSensitiveCacheDriver.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/MacroExpandedToken.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/MacroExpandedToken.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/MacroExpandedToken.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/MacroExpandedToken.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/PathsCollectionIterator.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/PathsCollectionIterator.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/PathsCollectionIterator.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/PathsCollectionIterator.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/ResolverResultsCache.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/ResolverResultsCache.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/ResolverResultsCache.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/ResolverResultsCache.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/SnapshotHolderCache.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/SnapshotHolderCache.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/SnapshotHolderCache.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/SnapshotHolderCache.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/SplitShiftRightTokenFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/SplitShiftRightTokenFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/SplitShiftRightTokenFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/SplitShiftRightTokenFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/SupportAPIAccessor.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/SupportAPIAccessor.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/SupportAPIAccessor.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/SupportAPIAccessor.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptBigIntegerExpr.g b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptBigIntegerExpr.g
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptBigIntegerExpr.g
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptBigIntegerExpr.g
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptexpr.g b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptexpr.g
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptexpr.g
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptexpr.g
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptlexer.g b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptlexer.g
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptlexer.g
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/aptlexer.g
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/APTToClankCompilationDB.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/APTToClankCompilationDB.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/APTToClankCompilationDB.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/APTToClankCompilationDB.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankDriverImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankDriverImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankDriverImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankDriverImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankFileMacroMap.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankFileMacroMap.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankFileMacroMap.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankFileMacroMap.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankFileObjectBasedFileSystem.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankFileObjectBasedFileSystem.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankFileObjectBasedFileSystem.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankFileObjectBasedFileSystem.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankFileSystemProviderImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankFileSystemProviderImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankFileSystemProviderImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankFileSystemProviderImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankIncludeHandlerImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankIncludeHandlerImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankIncludeHandlerImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankIncludeHandlerImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMacroExpandedToken.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMacroExpandedToken.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMacroExpandedToken.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMacroExpandedToken.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMacroMap.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMacroMap.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMacroMap.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMacroMap.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMemoryBufferImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMemoryBufferImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMemoryBufferImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMemoryBufferImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMemoryBufferProviderImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMemoryBufferProviderImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMemoryBufferProviderImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankMemoryBufferProviderImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankPPCallback.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankPPCallback.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankPPCallback.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankPPCallback.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankSystemMacroMap.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankSystemMacroMap.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankSystemMacroMap.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankSystemMacroMap.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankToAPTToken.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankToAPTToken.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankToAPTToken.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankToAPTToken.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankToAPTUtils.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankToAPTUtils.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankToAPTUtils.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankToAPTUtils.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/FileExistsSensitiveClankCacheDriver.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/FileExistsSensitiveClankCacheDriver.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/FileExistsSensitiveClankCacheDriver.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/impl/support/clank/FileExistsSensitiveClankCacheDriver.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/layer.xml b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/layer.xml
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/layer.xml
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/layer.xml
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APT.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APT.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APT.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APT.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTDefine.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTDefine.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTDefine.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTDefine.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTElif.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTElif.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTElif.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTElif.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTElse.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTElse.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTElse.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTElse.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTEndif.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTEndif.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTEndif.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTEndif.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTError.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTError.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTError.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTError.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTFile.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTFile.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTFile.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTFile.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIf.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIf.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIf.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIf.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIfCondition.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIfCondition.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIfCondition.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIfCondition.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIfdef.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIfdef.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIfdef.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIfdef.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIfndef.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIfndef.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIfndef.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIfndef.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTInclude.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTInclude.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTInclude.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTInclude.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIncludeNext.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIncludeNext.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIncludeNext.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTIncludeNext.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTPragma.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTPragma.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTPragma.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTPragma.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTStream.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTStream.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTStream.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTStream.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTUndefine.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTUndefine.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTUndefine.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTUndefine.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTUnknown.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTUnknown.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTUnknown.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/structure/APTUnknown.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTAbstractWalker.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTAbstractWalker.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTAbstractWalker.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTAbstractWalker.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTBaseToken.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTBaseToken.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTBaseToken.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTBaseToken.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTBuilder.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTBuilder.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTBuilder.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTBuilder.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTConditionResolver.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTConditionResolver.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTConditionResolver.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTConditionResolver.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTDriver.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTDriver.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTDriver.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTDriver.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTExpandedStream.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTExpandedStream.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTExpandedStream.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTExpandedStream.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileBuffer.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileBuffer.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileBuffer.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileBuffer.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCache.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCache.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCache.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCache.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheEntry.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheManager.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheManager.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheManager.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileCacheManager.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileSearch.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileSearch.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileSearch.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTFileSearch.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTHandlersSupport.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTHandlersSupport.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTHandlersSupport.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTHandlersSupport.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludeFake.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludeFake.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludeFake.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludeFake.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludeHandler.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludeHandler.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludeHandler.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludeHandler.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludePathStorage.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludePathStorage.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludePathStorage.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludePathStorage.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludeResolver.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludeResolver.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludeResolver.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTIncludeResolver.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacro.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacro.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacro.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacro.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacroCallback.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacroCallback.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacroCallback.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacroCallback.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacroExpandedStream.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacroExpandedStream.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacroExpandedStream.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacroExpandedStream.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacroMap.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacroMap.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacroMap.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTMacroMap.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTPreprocHandler.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTPreprocHandler.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTPreprocHandler.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTPreprocHandler.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTSystemStorage.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTSystemStorage.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTSystemStorage.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTSystemStorage.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTToken.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTToken.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTToken.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTToken.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTTokenAbstact.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTTokenAbstact.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTTokenAbstact.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTTokenAbstact.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTTokenStream.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTTokenStream.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTTokenStream.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTTokenStream.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTTokenStreamBuilder.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTTokenStreamBuilder.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTTokenStreamBuilder.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTTokenStreamBuilder.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTWalker.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTWalker.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTWalker.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/APTWalker.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/AccessorImpl.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/AccessorImpl.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/AccessorImpl.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/AccessorImpl.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/ClankDriver.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/ClankDriver.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/ClankDriver.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/ClankDriver.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/IncludeDirEntry.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/IncludeDirEntry.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/IncludeDirEntry.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/IncludeDirEntry.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/PostIncludeData.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/PostIncludeData.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/PostIncludeData.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/PostIncludeData.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/ResolvedPath.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/ResolvedPath.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/ResolvedPath.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/ResolvedPath.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/PPIncludeHandler.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/PPIncludeHandler.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/PPIncludeHandler.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/PPIncludeHandler.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/PPMacroMap.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/PPMacroMap.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/PPMacroMap.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/PPMacroMap.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/PreprocHandler.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/PreprocHandler.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/PreprocHandler.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/PreprocHandler.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/StartEntry.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/StartEntry.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/StartEntry.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/api/StartEntry.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTBaseLanguageFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTBaseLanguageFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTBaseLanguageFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTBaseLanguageFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranEOSFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranEOSFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranEOSFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranEOSFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranFilterEx.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranFilterEx.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranFilterEx.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTFortranFilterEx.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCpp11Filter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCpp11Filter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCpp11Filter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCpp11Filter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCpp14Filter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCpp14Filter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCpp14Filter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCpp14Filter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCppFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCppFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCppFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTGnuCppFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTLanguageFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTLanguageFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTLanguageFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTLanguageFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTLanguageSupport.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTLanguageSupport.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTLanguageSupport.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTLanguageSupport.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTStdCFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTStdCFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTStdCFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTStdCFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTStdCppFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTStdCppFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTStdCppFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/lang/APTStdCppFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/APTBufferProvider.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/APTBufferProvider.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/APTBufferProvider.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/APTBufferProvider.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/APTFileSearchImplementation.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/APTFileSearchImplementation.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/APTFileSearchImplementation.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/APTFileSearchImplementation.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/APTProjectFileSearchProvider.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/APTProjectFileSearchProvider.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/APTProjectFileSearchProvider.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/APTProjectFileSearchProvider.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/CndTextIndexFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/CndTextIndexFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/CndTextIndexFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/support/spi/CndTextIndexFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTCommentsFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTCommentsFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTCommentsFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTCommentsFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTIncludeUtils.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTIncludeUtils.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTIncludeUtils.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTIncludeUtils.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTPreprocFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTPreprocFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTPreprocFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTPreprocFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTSerializeUtils.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTSerializeUtils.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTSerializeUtils.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTSerializeUtils.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTTraceFilter.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTTraceFilter.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTTraceFilter.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTTraceFilter.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTTraceUtils.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTTraceUtils.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTTraceUtils.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTTraceUtils.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTUtils.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTUtils.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTUtils.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/APTUtils.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/LinkedListBasedTokenStream.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/LinkedListBasedTokenStream.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/LinkedListBasedTokenStream.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/LinkedListBasedTokenStream.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/ListBasedTokenStream.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/ListBasedTokenStream.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/ListBasedTokenStream.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/ListBasedTokenStream.java
diff --git a/cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/TokenBasedTokenStream.java b/contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/TokenBasedTokenStream.java
similarity index 100%
rename from cnd/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/TokenBasedTokenStream.java
rename to contrib/cnd.apt/src/org/netbeans/modules/cnd/apt/utils/TokenBasedTokenStream.java
diff --git a/cnd/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroMapTest.java b/contrib/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroMapTest.java
similarity index 100%
rename from cnd/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroMapTest.java
rename to contrib/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/impl/support/APTMacroMapTest.java
diff --git a/cnd/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankToAPTTest.java b/contrib/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankToAPTTest.java
similarity index 100%
rename from cnd/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankToAPTTest.java
rename to contrib/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/impl/support/clank/ClankToAPTTest.java
diff --git a/cnd/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/APTConditionResolverTest.java b/contrib/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/APTConditionResolverTest.java
similarity index 100%
rename from cnd/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/APTConditionResolverTest.java
rename to contrib/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/APTConditionResolverTest.java
diff --git a/cnd/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/APTFileNodeTest.java b/contrib/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/APTFileNodeTest.java
similarity index 100%
rename from cnd/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/APTFileNodeTest.java
rename to contrib/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/APTFileNodeTest.java
diff --git a/cnd/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/DummyProjectKey.java b/contrib/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/DummyProjectKey.java
similarity index 100%
rename from cnd/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/DummyProjectKey.java
rename to contrib/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/DummyProjectKey.java
diff --git a/cnd/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/GuardDetectorTestCase.java b/contrib/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/GuardDetectorTestCase.java
similarity index 100%
rename from cnd/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/GuardDetectorTestCase.java
rename to contrib/cnd.apt/test/unit/src/org/netbeans/modules/cnd/apt/support/GuardDetectorTestCase.java
diff --git a/cnd/cnd.asm/build.xml b/contrib/cnd.asm/build.xml
similarity index 100%
rename from cnd/cnd.asm/build.xml
rename to contrib/cnd.asm/build.xml
diff --git a/cnd/cnd.asm/licenseinfo.xml b/contrib/cnd.asm/licenseinfo.xml
similarity index 100%
rename from cnd/cnd.asm/licenseinfo.xml
rename to contrib/cnd.asm/licenseinfo.xml
diff --git a/cnd/cnd.asm/manifest.mf b/contrib/cnd.asm/manifest.mf
similarity index 100%
rename from cnd/cnd.asm/manifest.mf
rename to contrib/cnd.asm/manifest.mf
diff --git a/cnd/cnd.asm/nbproject/project.properties b/contrib/cnd.asm/nbproject/project.properties
similarity index 100%
rename from cnd/cnd.asm/nbproject/project.properties
rename to contrib/cnd.asm/nbproject/project.properties
diff --git a/cnd/cnd.asm/nbproject/project.xml b/contrib/cnd.asm/nbproject/project.xml
similarity index 100%
rename from cnd/cnd.asm/nbproject/project.xml
rename to contrib/cnd.asm/nbproject/project.xml
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/AntlrTokenTypes.txt b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/AntlrTokenTypes.txt
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/AntlrTokenTypes.txt
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/AntlrTokenTypes.txt
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/BaseAsmModel.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/BaseAsmModel.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/BaseAsmModel.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/BaseAsmModel.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/BaseModelProvider.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/BaseModelProvider.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/BaseModelProvider.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/BaseModelProvider.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/SparcModelProvider.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/SparcModelProvider.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/SparcModelProvider.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/SparcModelProvider.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/X86ModelProvider.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/X86ModelProvider.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/X86ModelProvider.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/X86ModelProvider.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/amd64.xml b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/amd64.xml
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/amd64.xml
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/amd64.xml
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTIdentResolver.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTIdentResolver.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTIdentResolver.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTIdentResolver.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTParser.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTParser.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTParser.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTParser.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTScanner.g b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTScanner.g
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTScanner.g
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTScanner.g
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTSparcSyntaxProvider.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTSparcSyntaxProvider.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTSparcSyntaxProvider.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTSparcSyntaxProvider.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTx86SyntaxProvider.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTx86SyntaxProvider.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTx86SyntaxProvider.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/ATTx86SyntaxProvider.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/TokenIterator.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/TokenIterator.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/TokenIterator.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/att/TokenIterator.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisFuncNameDetector.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisFuncNameDetector.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisFuncNameDetector.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisFuncNameDetector.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisScanner.g b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisScanner.g
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisScanner.g
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisScanner.g
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisSparcSyntaxProvider.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisSparcSyntaxProvider.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisSparcSyntaxProvider.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisSparcSyntaxProvider.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisX86SyntaxProvider.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisX86SyntaxProvider.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisX86SyntaxProvider.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/dis/DisX86SyntaxProvider.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/ident/IdentScanner.g b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/ident/IdentScanner.g
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/ident/IdentScanner.g
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/ident/IdentScanner.g
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/ident/SparcX86Resolver.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/ident/SparcX86Resolver.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/ident/SparcX86Resolver.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/ident/SparcX86Resolver.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/sparc5.xml b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/sparc5.xml
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/sparc5.xml
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/sparc5.xml
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/AntlrLexer.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/AntlrLexer.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/AntlrLexer.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/AntlrLexer.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/AntlrScanner.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/AntlrScanner.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/AntlrScanner.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/AntlrScanner.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/AntlrToken.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/AntlrToken.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/AntlrToken.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/AntlrToken.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/BaseAsmSyntax.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/BaseAsmSyntax.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/BaseAsmSyntax.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/BaseAsmSyntax.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/BranchElementImpl.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/BranchElementImpl.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/BranchElementImpl.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/BranchElementImpl.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/IdentResolver.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/IdentResolver.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/IdentResolver.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/IdentResolver.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/InstructionToken.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/InstructionToken.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/InstructionToken.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/InstructionToken.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/LabelElementImpl.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/LabelElementImpl.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/LabelElementImpl.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/LabelElementImpl.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/RegisterElementImpl.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/RegisterElementImpl.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/RegisterElementImpl.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/RegisterElementImpl.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/ScannerFactory.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/ScannerFactory.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/ScannerFactory.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/ScannerFactory.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/SmartTemplateMatcher.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/SmartTemplateMatcher.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/SmartTemplateMatcher.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/SmartTemplateMatcher.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/WhitespaceToken.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/WhitespaceToken.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/WhitespaceToken.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/WhitespaceToken.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/fake/FakeInstruction.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/fake/FakeInstruction.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/fake/FakeInstruction.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/base/syntax/fake/FakeInstruction.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/Bundle.properties b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/Bundle.properties
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/Bundle.properties
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/Bundle.properties
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/CodeAnnotationSidebar.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/CodeAnnotationSidebar.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/CodeAnnotationSidebar.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/CodeAnnotationSidebar.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/CodeHighlightFactory.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/CodeHighlightFactory.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/CodeHighlightFactory.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/CodeHighlightFactory.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/FunctionNavigator.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/FunctionNavigator.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/FunctionNavigator.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/FunctionNavigator.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/GoToLabelAction.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/GoToLabelAction.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/GoToLabelAction.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/GoToLabelAction.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangeSidebarFactory.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangeSidebarFactory.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangeSidebarFactory.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangeSidebarFactory.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangesAccessor.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangesAccessor.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangesAccessor.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangesAccessor.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangesAction.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangesAction.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangesAction.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangesAction.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangesAssistance.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangesAssistance.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangesAssistance.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/LiveRangesAssistance.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterChooser.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterChooser.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterChooser.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterChooser.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterChooserListener.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterChooserListener.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterChooserListener.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterChooserListener.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterHighlightAccessor.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterHighlightAccessor.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterHighlightAccessor.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterHighlightAccessor.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterHighlightAction.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterHighlightAction.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterHighlightAction.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterHighlightAction.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterHighlightAssistance.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterHighlightAssistance.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterHighlightAssistance.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterHighlightAssistance.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageAccesor.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageAccesor.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageAccesor.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageAccesor.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageAction.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageAction.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageAction.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageAction.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageAssistance.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageAssistance.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageAssistance.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageAssistance.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmCreateFromTemplateHandler.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmCreateFromTemplateHandler.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmCreateFromTemplateHandler.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmCreateFromTemplateHandler.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataLoader.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataLoader.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataLoader.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataLoader.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataLoaderBeanInfo.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataLoaderBeanInfo.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataLoaderBeanInfo.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataLoaderBeanInfo.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataNode.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataNode.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataNode.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataNode.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataObject.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataObject.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataObject.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmDataObject.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmObjectUtilities.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmObjectUtilities.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmObjectUtilities.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/AsmObjectUtilities.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle.properties b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle.properties
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle.properties
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/dataobjects/Bundle.properties
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmEditorKit.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmEditorKit.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmEditorKit.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmEditorKit.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmEditorSupport.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmEditorSupport.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmEditorSupport.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmEditorSupport.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmLanguageHierarchy.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmLanguageHierarchy.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmLanguageHierarchy.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmLanguageHierarchy.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmLexer.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmLexer.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmLexer.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmLexer.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmModelAccessorImpl.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmModelAccessorImpl.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmModelAccessorImpl.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/AsmModelAccessorImpl.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/EditorSyntax.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/EditorSyntax.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/EditorSyntax.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/EditorSyntax.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/LexerInputReader.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/LexerInputReader.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/LexerInputReader.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/editor/LexerInputReader.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/folding/AsmCodeFoldingSideBarFactory.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/folding/AsmCodeFoldingSideBarFactory.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/folding/AsmCodeFoldingSideBarFactory.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/folding/AsmCodeFoldingSideBarFactory.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/folding/AsmFoldManager.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/folding/AsmFoldManager.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/folding/AsmFoldManager.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/folding/AsmFoldManager.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/hyperlink/AsmHyperlinkProvider.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/hyperlink/AsmHyperlinkProvider.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/hyperlink/AsmHyperlinkProvider.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/hyperlink/AsmHyperlinkProvider.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/AsmExample.s b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/AsmExample.s
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/AsmExample.s
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/AsmExample.s
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/AsmTemplate.s b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/AsmTemplate.s
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/AsmTemplate.s
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/AsmTemplate.s
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/Bundle.properties b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/Bundle.properties
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/Bundle.properties
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/Bundle.properties
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/InlineTemplate.il b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/InlineTemplate.il
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/InlineTemplate.il
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/InlineTemplate.il
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/NavigatorTopComponentSettings.xml b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/NavigatorTopComponentSettings.xml
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/NavigatorTopComponentSettings.xml
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/NavigatorTopComponentSettings.xml
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/NavigatorTopComponentWstcref.xml b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/NavigatorTopComponentWstcref.xml
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/NavigatorTopComponentWstcref.xml
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/NavigatorTopComponentWstcref.xml
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/NetBeans-Asm-fontsColors.xml b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/NetBeans-Asm-fontsColors.xml
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/NetBeans-Asm-fontsColors.xml
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/NetBeans-Asm-fontsColors.xml
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/asm-file.html b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/asm-file.html
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/asm-file.html
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/asm-file.html
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/asm_icon.png b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/asm_icon.png
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/asm_icon.png
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/asm_icon.png
diff --git a/cnd/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/resources/error-glyph.gif b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/error-glyph.gif
similarity index 100%
rename from cnd/cnd.refactoring/src/org/netbeans/modules/cnd/refactoring/resources/error-glyph.gif
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/error-glyph.gif
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/file_asm_16.png b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/file_asm_16.png
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/file_asm_16.png
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/file_asm_16.png
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/function.png b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/function.png
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/function.png
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/function.png
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/il-file.html b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/il-file.html
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/il-file.html
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/il-file.html
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/layer.xml b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/layer.xml
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/layer.xml
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/resources/layer.xml
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/menu/Bundle.properties b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/menu/Bundle.properties
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/menu/Bundle.properties
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/menu/Bundle.properties
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/menu/ModelChooser.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/menu/ModelChooser.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/menu/ModelChooser.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/menu/ModelChooser.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/Bundle.properties b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/Bundle.properties
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/Bundle.properties
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/Bundle.properties
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionInfoPanel.form b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionInfoPanel.form
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionInfoPanel.form
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionInfoPanel.form
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionInfoPanel.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionInfoPanel.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionInfoPanel.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionInfoPanel.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionListPanel.form b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionListPanel.form
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionListPanel.form
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionListPanel.form
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionListPanel.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionListPanel.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionListPanel.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/InstructionListPanel.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorAction.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorAction.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorAction.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorAction.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorTab.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorTab.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorTab.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorTab.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorTopComponent.form b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorTopComponent.form
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorTopComponent.form
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorTopComponent.form
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorTopComponent.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorTopComponent.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorTopComponent.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorTopComponent.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorUI.form b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorUI.form
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorUI.form
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorUI.form
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorUI.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorUI.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorUI.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/NavigatorUI.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/RegisterUsagesPanel.form b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/RegisterUsagesPanel.form
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/RegisterUsagesPanel.form
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/RegisterUsagesPanel.form
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/RegisterUsagesPanel.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/RegisterUsagesPanel.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/RegisterUsagesPanel.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/RegisterUsagesPanel.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/ext/TableSorter.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/ext/TableSorter.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/ext/TableSorter.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/core/ui/top/ext/TableSorter.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AbstractAsmModel.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AbstractAsmModel.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AbstractAsmModel.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AbstractAsmModel.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmModel.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmModel.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmModel.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmModel.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmModelAccessor.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmModelAccessor.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmModelAccessor.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmModelAccessor.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmModelProvider.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmModelProvider.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmModelProvider.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmModelProvider.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmState.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmState.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmState.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmState.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmSyntax.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmSyntax.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmSyntax.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmSyntax.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmSyntaxProvider.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmSyntaxProvider.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmSyntaxProvider.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmSyntaxProvider.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmTypesProvider.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmTypesProvider.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmTypesProvider.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/AsmTypesProvider.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/cpu/OpcodeFactory.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/cpu/OpcodeFactory.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/cpu/OpcodeFactory.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/cpu/OpcodeFactory.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/cpu/State.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/cpu/State.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/cpu/State.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/cpu/State.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/cpu/StateFactory.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/cpu/StateFactory.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/cpu/StateFactory.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/cpu/StateFactory.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmElement.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmElement.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmElement.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmElement.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmElementBuilder.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmElementBuilder.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmElementBuilder.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmElementBuilder.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmElementPath.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmElementPath.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmElementPath.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmElementPath.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmIconable.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmIconable.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmIconable.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmIconable.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmMeasurable.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmMeasurable.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmMeasurable.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmMeasurable.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmNameable.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmNameable.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmNameable.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmNameable.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmOffsetable.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmOffsetable.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmOffsetable.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmOffsetable.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmPropHandler.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmPropHandler.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmPropHandler.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/AsmPropHandler.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/BitWidth.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/BitWidth.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/BitWidth.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/BitWidth.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/BranchElement.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/BranchElement.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/BranchElement.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/BranchElement.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/InstructionElement.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/InstructionElement.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/InstructionElement.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/InstructionElement.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/LabelElement.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/LabelElement.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/LabelElement.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/LabelElement.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/OperandElement.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/OperandElement.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/OperandElement.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/OperandElement.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/Register.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/Register.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/Register.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/Register.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/RegisterElement.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/RegisterElement.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/RegisterElement.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/RegisterElement.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/AbstractAsmElement.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/AbstractAsmElement.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/AbstractAsmElement.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/AbstractAsmElement.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/AsmRootElement.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/AsmRootElement.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/AsmRootElement.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/AsmRootElement.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/AsmStructureElement.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/AsmStructureElement.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/AsmStructureElement.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/AsmStructureElement.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/BaseAsmElement.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/BaseAsmElement.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/BaseAsmElement.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/BaseAsmElement.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/BaseInstructionElement.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/BaseInstructionElement.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/BaseInstructionElement.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/BaseInstructionElement.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/LeafAsmElement.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/LeafAsmElement.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/LeafAsmElement.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/impl/LeafAsmElement.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/ArithmeticInstruction.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/ArithmeticInstruction.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/ArithmeticInstruction.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/ArithmeticInstruction.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/BranchInstruction.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/BranchInstruction.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/BranchInstruction.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/BranchInstruction.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/InstrVereficator.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/InstrVereficator.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/InstrVereficator.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/InstrVereficator.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/Instruction.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/Instruction.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/Instruction.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/Instruction.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/InstructionArgs.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/InstructionArgs.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/InstructionArgs.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/instruction/InstructionArgs.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/ImmediateOperand.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/ImmediateOperand.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/ImmediateOperand.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/ImmediateOperand.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/LabelOperand.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/LabelOperand.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/LabelOperand.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/LabelOperand.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/MemoryOperand.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/MemoryOperand.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/MemoryOperand.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/MemoryOperand.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/Operand.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/Operand.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/Operand.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/Operand.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/PlainOperand.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/PlainOperand.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/PlainOperand.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/PlainOperand.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/RegisterOperand.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/RegisterOperand.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/RegisterOperand.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/operand/RegisterOperand.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmBaseTokenId.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmBaseTokenId.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmBaseTokenId.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmBaseTokenId.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmHighlightLexer.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmHighlightLexer.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmHighlightLexer.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmHighlightLexer.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmModelStream.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmModelStream.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmModelStream.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmModelStream.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmParser.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmParser.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmParser.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmParser.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmToken.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmToken.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmToken.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmToken.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmTokenId.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmTokenId.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmTokenId.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/AsmTokenId.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/FunctionBoundsResolver.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/FunctionBoundsResolver.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/FunctionBoundsResolver.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/lang/syntax/FunctionBoundsResolver.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/AsmFakeable.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/AsmFakeable.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/AsmFakeable.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/AsmFakeable.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/AsmModelUtilities.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/AsmModelUtilities.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/AsmModelUtilities.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/AsmModelUtilities.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/BitMask.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/BitMask.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/BitMask.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/BitMask.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/DefaultAsmTypesEntry.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/DefaultAsmTypesEntry.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/DefaultAsmTypesEntry.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/DefaultAsmTypesEntry.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/DefaultOffsetable.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/DefaultOffsetable.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/DefaultOffsetable.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/DefaultOffsetable.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/DefaultResolverResult.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/DefaultResolverResult.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/DefaultResolverResult.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/DefaultResolverResult.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/EmptyAsmState.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/EmptyAsmState.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/EmptyAsmState.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/EmptyAsmState.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/EmptyModel.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/EmptyModel.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/EmptyModel.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/EmptyModel.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/FakeRegister.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/FakeRegister.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/FakeRegister.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/FakeRegister.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/IntervalSet.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/IntervalSet.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/IntervalSet.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/util/IntervalSet.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/DefaultXMLBaseInstruction.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/DefaultXMLBaseInstruction.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/DefaultXMLBaseInstruction.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/DefaultXMLBaseInstruction.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/DefaultXMLBaseRegister.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/DefaultXMLBaseRegister.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/DefaultXMLBaseRegister.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/DefaultXMLBaseRegister.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLAttributes.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLAttributes.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLAttributes.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLAttributes.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLReader.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLReader.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLReader.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLReader.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLReaderException.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLReaderException.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLReaderException.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLReaderException.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLRootContext.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLRootContext.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLRootContext.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/ModelXMLRootContext.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/Util.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/Util.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/Util.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/Util.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLBaseInstruction.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLBaseInstruction.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLBaseInstruction.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLBaseInstruction.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLBaseRegister.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLBaseRegister.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLBaseRegister.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLBaseRegister.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLInstructionArgs.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLInstructionArgs.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLInstructionArgs.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLInstructionArgs.java
diff --git a/cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLReaderContext.java b/contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLReaderContext.java
similarity index 100%
rename from cnd/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLReaderContext.java
rename to contrib/cnd.asm/src/org/netbeans/modules/cnd/asm/model/xml/XMLReaderContext.java
diff --git a/cnd/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/MockLabelInstance.java b/contrib/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/MockLabelInstance.java
similarity index 100%
rename from cnd/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/MockLabelInstance.java
rename to contrib/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/MockLabelInstance.java
diff --git a/cnd/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/MockRegister.java b/contrib/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/MockRegister.java
similarity index 100%
rename from cnd/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/MockRegister.java
rename to contrib/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/MockRegister.java
diff --git a/cnd/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/MockRegisterInfoAccessor.java b/contrib/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/MockRegisterInfoAccessor.java
similarity index 100%
rename from cnd/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/MockRegisterInfoAccessor.java
rename to contrib/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/MockRegisterInfoAccessor.java
diff --git a/cnd/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageActionTest.java b/contrib/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageActionTest.java
similarity index 100%
rename from cnd/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageActionTest.java
rename to contrib/cnd.asm/test/unit/src/org/netbeans/modules/cnd/asm/core/assistance/RegisterUsageActionTest.java
diff --git a/cnd/cnd.callgraph/build.xml b/contrib/cnd.callgraph/build.xml
similarity index 100%
rename from cnd/cnd.callgraph/build.xml
rename to contrib/cnd.callgraph/build.xml
diff --git a/cnd/cnd.callgraph/manifest.mf b/contrib/cnd.callgraph/manifest.mf
similarity index 100%
rename from cnd/cnd.callgraph/manifest.mf
rename to contrib/cnd.callgraph/manifest.mf
diff --git a/cnd/cnd.callgraph/nbproject/project.properties b/contrib/cnd.callgraph/nbproject/project.properties
similarity index 100%
rename from cnd/cnd.callgraph/nbproject/project.properties
rename to contrib/cnd.callgraph/nbproject/project.properties
diff --git a/cnd/cnd.callgraph/nbproject/project.xml b/contrib/cnd.callgraph/nbproject/project.xml
similarity index 100%
rename from cnd/cnd.callgraph/nbproject/project.xml
rename to contrib/cnd.callgraph/nbproject/project.xml
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/Bundle.properties b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/Bundle.properties
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/Bundle.properties
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/Bundle.properties
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/CallGraphTopComponentSettings.xml b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/CallGraphTopComponentSettings.xml
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/CallGraphTopComponentSettings.xml
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/CallGraphTopComponentSettings.xml
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/CallGraphTopComponentWstcref.xml b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/CallGraphTopComponentWstcref.xml
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/CallGraphTopComponentWstcref.xml
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/CallGraphTopComponentWstcref.xml
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/Call.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/Call.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/Call.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/Call.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/CallModel.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/CallModel.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/CallModel.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/CallModel.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/Function.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/Function.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/Function.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/Function.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphAction.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphAction.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphAction.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphAction.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphActionEDTRunnable.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphActionEDTRunnable.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphActionEDTRunnable.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphActionEDTRunnable.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphModelFactory.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphModelFactory.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphModelFactory.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphModelFactory.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphPreferences.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphPreferences.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphPreferences.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphPreferences.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphUI.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphUI.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphUI.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/CallGraphUI.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/Catalog.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/Catalog.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/Catalog.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/api/ui/Catalog.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/Bundle.properties b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/Bundle.properties
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/Bundle.properties
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/Bundle.properties
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallChildren.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallChildren.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallChildren.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallChildren.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphAction.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphAction.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphAction.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphAction.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphPanel.form b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphPanel.form
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphPanel.form
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphPanel.form
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphPanel.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphPanel.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphPanel.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphPanel.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphPopupAction.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphPopupAction.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphPopupAction.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphPopupAction.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphScene.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphScene.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphScene.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphScene.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphState.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphState.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphState.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphState.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphTopComponent.form b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphTopComponent.form
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphTopComponent.form
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphTopComponent.form
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphTopComponent.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphTopComponent.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphTopComponent.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallGraphTopComponent.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallNode.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallNode.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallNode.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/CallNode.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/DefaultCatalog.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/DefaultCatalog.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/DefaultCatalog.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/DefaultCatalog.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/FunctionRootNode.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/FunctionRootNode.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/FunctionRootNode.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/FunctionRootNode.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/GoToOccurrenceAction.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/GoToOccurrenceAction.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/GoToOccurrenceAction.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/GoToOccurrenceAction.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/GoToReferenceAction.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/GoToReferenceAction.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/GoToReferenceAction.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/GoToReferenceAction.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/LoadingNode.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/LoadingNode.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/LoadingNode.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/LoadingNode.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/RelativePathRouter.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/RelativePathRouter.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/RelativePathRouter.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/impl/RelativePathRouter.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/layer.xml b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/layer.xml
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/layer.xml
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/layer.xml
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/call_graph.png b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/call_graph.png
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/call_graph.png
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/call_graph.png
diff --git a/cnd/cnd.navigation/src/org/netbeans/modules/cnd/navigation/includeview/resources/down_20.png b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/down_20.png
similarity index 100%
rename from cnd/cnd.navigation/src/org/netbeans/modules/cnd/navigation/includeview/resources/down_20.png
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/down_20.png
diff --git a/cnd/cnd.navigation/src/org/netbeans/modules/cnd/navigation/includeview/resources/empty_20.png b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/empty_20.png
similarity index 100%
rename from cnd/cnd.navigation/src/org/netbeans/modules/cnd/navigation/includeview/resources/empty_20.png
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/empty_20.png
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/focus_on.png b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/focus_on.png
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/focus_on.png
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/focus_on.png
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/refresh.png b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/refresh.png
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/refresh.png
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/refresh.png
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/show_overriding.gif b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/show_overriding.gif
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/show_overriding.gif
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/show_overriding.gif
diff --git a/cnd/cnd.navigation/src/org/netbeans/modules/cnd/navigation/includeview/resources/up_8.png b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/up_8.png
similarity index 100%
rename from cnd/cnd.navigation/src/org/netbeans/modules/cnd/navigation/includeview/resources/up_8.png
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/up_8.png
diff --git a/cnd/cnd.qnavigator/src/org/netbeans/modules/cnd/qnavigator/resources/waitNode.gif b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/waitNode.gif
similarity index 100%
rename from cnd/cnd.qnavigator/src/org/netbeans/modules/cnd/qnavigator/resources/waitNode.gif
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/waitNode.gif
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/who_calls.png b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/who_calls.png
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/who_calls.png
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/who_calls.png
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/who_is_called.png b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/who_is_called.png
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/who_is_called.png
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/resources/who_is_called.png
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/Bundle.properties b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/Bundle.properties
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/Bundle.properties
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/Bundle.properties
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/ExportAction.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/ExportAction.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/ExportAction.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/ExportAction.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/ExportXmlAction.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/ExportXmlAction.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/ExportXmlAction.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/ExportXmlAction.java
diff --git a/cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/HorizontalHierarchicalLayout.java b/contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/HorizontalHierarchicalLayout.java
similarity index 100%
rename from cnd/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/HorizontalHierarchicalLayout.java
rename to contrib/cnd.callgraph/src/org/netbeans/modules/cnd/callgraph/support/HorizontalHierarchicalLayout.java
diff --git a/cnd/cnd.classview/build.xml b/contrib/cnd.classview/build.xml
similarity index 100%
rename from cnd/cnd.classview/build.xml
rename to contrib/cnd.classview/build.xml
diff --git a/cnd/cnd.classview/manifest.mf b/contrib/cnd.classview/manifest.mf
similarity index 100%
rename from cnd/cnd.classview/manifest.mf
rename to contrib/cnd.classview/manifest.mf
diff --git a/cnd/cnd.classview/nbproject/project.properties b/contrib/cnd.classview/nbproject/project.properties
similarity index 100%
rename from cnd/cnd.classview/nbproject/project.properties
rename to contrib/cnd.classview/nbproject/project.properties
diff --git a/cnd/cnd.classview/nbproject/project.xml b/contrib/cnd.classview/nbproject/project.xml
similarity index 100%
rename from cnd/cnd.classview/nbproject/project.xml
rename to contrib/cnd.classview/nbproject/project.xml
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ChildrenUpdater.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ChildrenUpdater.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ChildrenUpdater.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ChildrenUpdater.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassView.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassView.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassView.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassView.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewInstaller.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewInstaller.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewInstaller.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewInstaller.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewModel.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewModel.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewModel.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewModel.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewTopComponent.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewTopComponent.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewTopComponent.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewTopComponent.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewUpdater.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewUpdater.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewUpdater.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassViewUpdater.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassifierKeyArray.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassifierKeyArray.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassifierKeyArray.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ClassifierKeyArray.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/Diagnostic.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/Diagnostic.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/Diagnostic.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/Diagnostic.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/HostKeyArray.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/HostKeyArray.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/HostKeyArray.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/HostKeyArray.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/NameCache.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/NameCache.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/NameCache.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/NameCache.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/NamespaceKeyArray.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/NamespaceKeyArray.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/NamespaceKeyArray.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/NamespaceKeyArray.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/PersistentKey.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/PersistentKey.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/PersistentKey.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/PersistentKey.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ProjectsKeyArray.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ProjectsKeyArray.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/ProjectsKeyArray.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/ProjectsKeyArray.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/RootNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/RootNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/RootNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/RootNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/SmartChangeEvent.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/SmartChangeEvent.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/SmartChangeEvent.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/SmartChangeEvent.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/SortedName.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/SortedName.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/SortedName.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/SortedName.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/UpdatebleHost.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/UpdatebleHost.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/UpdatebleHost.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/UpdatebleHost.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/Bundle.properties b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/Bundle.properties
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/Bundle.properties
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/Bundle.properties
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/ContextUtils.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/ContextUtils.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/ContextUtils.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/ContextUtils.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/GoToDeclarationAction.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/GoToDeclarationAction.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/GoToDeclarationAction.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/GoToDeclarationAction.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/MoreDeclarations.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/MoreDeclarations.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/MoreDeclarations.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/MoreDeclarations.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/SelectInClassesAction.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/SelectInClassesAction.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/SelectInClassesAction.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/SelectInClassesAction.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/ShowHideClassViewAction.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/ShowHideClassViewAction.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/ShowHideClassViewAction.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/actions/ShowHideClassViewAction.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/BaseNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/BaseNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/BaseNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/BaseNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/CVUtil.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/CVUtil.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/CVUtil.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/CVUtil.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ClassNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ClassNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ClassNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ClassNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ClassifierNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ClassifierNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ClassifierNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ClassifierNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/EnumNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/EnumNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/EnumNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/EnumNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/EnumeratorNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/EnumeratorNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/EnumeratorNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/EnumeratorNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ForwardClassNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ForwardClassNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ForwardClassNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ForwardClassNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/FriendClassNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/FriendClassNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/FriendClassNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/FriendClassNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/FriendFunctionNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/FriendFunctionNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/FriendFunctionNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/FriendFunctionNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/GlobalFuncNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/GlobalFuncNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/GlobalFuncNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/GlobalFuncNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/GlobalVarNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/GlobalVarNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/GlobalVarNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/GlobalVarNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/LoadingNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/LoadingNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/LoadingNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/LoadingNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/MemberNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/MemberNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/MemberNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/MemberNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/NPNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/NPNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/NPNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/NPNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/NamespaceNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/NamespaceNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/NamespaceNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/NamespaceNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ObjectNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ObjectNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ObjectNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ObjectNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ProjectLibsNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ProjectLibsNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ProjectLibsNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ProjectLibsNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ProjectNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ProjectNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ProjectNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/ProjectNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/TypedefNode.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/TypedefNode.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/model/TypedefNode.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/model/TypedefNode.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/Bundle.properties b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/Bundle.properties
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/Bundle.properties
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/Bundle.properties
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/I18n.java b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/I18n.java
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/I18n.java
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/I18n.java
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/class_view.png b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/class_view.png
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/class_view.png
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/class_view.png
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/class_view24.png b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/class_view24.png
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/class_view24.png
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/class_view24.png
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/classview.wstcref b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/classview.wstcref
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/classview.wstcref
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/classview.wstcref
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/component.settings b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/component.settings
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/component.settings
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/component.settings
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/layer.xml b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/layer.xml
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/layer.xml
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/layer.xml
diff --git a/cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/libraries_folder.gif b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/libraries_folder.gif
similarity index 100%
rename from cnd/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/libraries_folder.gif
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/libraries_folder.gif
diff --git a/cnd/cnd.navigation/src/org/netbeans/modules/cnd/navigation/includeview/resources/waitNode.gif b/contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/waitNode.gif
similarity index 100%
rename from cnd/cnd.navigation/src/org/netbeans/modules/cnd/navigation/includeview/resources/waitNode.gif
rename to contrib/cnd.classview/src/org/netbeans/modules/cnd/classview/resources/waitNode.gif
diff --git a/cnd/cnd.classview/test/unit/data/goldenfiles/org/netbeans/modules/cnd/classview/QuoteTestCase/quote.cc.dat b/contrib/cnd.classview/test/unit/data/goldenfiles/org/netbeans/modules/cnd/classview/QuoteTestCase/quote.cc.dat
similarity index 100%
rename from cnd/cnd.classview/test/unit/data/goldenfiles/org/netbeans/modules/cnd/classview/QuoteTestCase/quote.cc.dat
rename to contrib/cnd.classview/test/unit/data/goldenfiles/org/netbeans/modules/cnd/classview/QuoteTestCase/quote.cc.dat
diff --git a/cnd/cnd.navigation/test/unit/data/goldenfiles/org/netbeans/modules/cnd/navigation/switchfiles/CppSwitchTest/welcome.cc.err b/contrib/cnd.classview/test/unit/data/goldenfiles/org/netbeans/modules/cnd/classview/QuoteTestCase/quote.cc.err
similarity index 100%
copy from cnd/cnd.navigation/test/unit/data/goldenfiles/org/netbeans/modules/cnd/navigation/switchfiles/CppSwitchTest/welcome.cc.err
copy to contrib/cnd.classview/test/unit/data/goldenfiles/org/netbeans/modules/cnd/classview/QuoteTestCase/quote.cc.err
diff --git a/cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/cpu.cc b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/cpu.cc
similarity index 100%
rename from cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/cpu.cc
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/cpu.cc
diff --git a/cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/cpu.h b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/cpu.h
similarity index 100%
rename from cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/cpu.h
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/cpu.h
diff --git a/cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/customer.cc b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/customer.cc
similarity index 100%
rename from cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/customer.cc
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/customer.cc
diff --git a/cnd/cnd.modelimpl/test/unit/data/common/quote_nosyshdr/customer.h b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/customer.h
similarity index 100%
rename from cnd/cnd.modelimpl/test/unit/data/common/quote_nosyshdr/customer.h
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/customer.h
diff --git a/cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/disk.cc b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/disk.cc
similarity index 100%
rename from cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/disk.cc
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/disk.cc
diff --git a/cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/disk.h b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/disk.h
similarity index 100%
rename from cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/disk.h
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/disk.h
diff --git a/cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/memory.cc b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/memory.cc
similarity index 100%
rename from cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/memory.cc
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/memory.cc
diff --git a/cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/memory.h b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/memory.h
similarity index 100%
rename from cnd/cnd.modelimpl/test/unit/data/common/quote_syshdr/memory.h
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/memory.h
diff --git a/cnd/cnd.modelimpl/test/unit/data/common/quote_nosyshdr/module.cc b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/module.cc
similarity index 100%
rename from cnd/cnd.modelimpl/test/unit/data/common/quote_nosyshdr/module.cc
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/module.cc
diff --git a/cnd/cnd.modelimpl/test/unit/data/common/quote_nosyshdr/module.h b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/module.h
similarity index 100%
rename from cnd/cnd.modelimpl/test/unit/data/common/quote_nosyshdr/module.h
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/module.h
diff --git a/cnd/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/quote.cc b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/quote.cc
similarity index 100%
rename from cnd/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/quote.cc
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/quote.cc
diff --git a/cnd/cnd.modelimpl/test/unit/data/common/quote_nosyshdr/system.cc b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/system.cc
similarity index 100%
rename from cnd/cnd.modelimpl/test/unit/data/common/quote_nosyshdr/system.cc
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/system.cc
diff --git a/cnd/cnd.modelimpl/test/unit/data/common/quote_nosyshdr/system.h b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/system.h
similarity index 100%
rename from cnd/cnd.modelimpl/test/unit/data/common/quote_nosyshdr/system.h
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/system.h
diff --git a/cnd/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/typedef_test.h b/contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/typedef_test.h
similarity index 100%
rename from cnd/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/typedef_test.h
rename to contrib/cnd.classview/test/unit/data/org/netbeans/modules/cnd/classview/QuoteTestCase/typedef_test.h
diff --git a/cnd/cnd.refactoring/test/unit/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageFilter b/contrib/cnd.classview/test/unit/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageFilter
similarity index 100%
rename from cnd/cnd.refactoring/test/unit/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageFilter
rename to contrib/cnd.classview/test/unit/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageFilter
diff --git a/cnd/cnd.classview/test/unit/src/org/netbeans/modules/cnd/classview/BaseTestCase.java b/contrib/cnd.classview/test/unit/src/org/netbeans/modules/cnd/classview/BaseTestCase.java
similarity index 100%
rename from cnd/cnd.classview/test/unit/src/org/netbeans/modules/cnd/classview/BaseTestCase.java
rename to contrib/cnd.classview/test/unit/src/org/netbeans/modules/cnd/classview/BaseTestCase.java
diff --git a/cnd/cnd.classview/test/unit/src/org/netbeans/modules/cnd/classview/ClassviewTest.java b/contrib/cnd.classview/test/unit/src/org/netbeans/modules/cnd/classview/ClassviewTest.java
similarity index 100%
rename from cnd/cnd.classview/test/unit/src/org/netbeans/modules/cnd/classview/ClassviewTest.java
rename to contrib/cnd.classview/test/unit/src/org/netbeans/modules/cnd/classview/ClassviewTest.java
diff --git a/cnd/cnd.classview/test/unit/src/org/netbeans/modules/cnd/classview/QuoteTestCase.java b/contrib/cnd.classview/test/unit/src/org/netbeans/modules/cnd/classview/QuoteTestCase.java
similarity index 100%
rename from cnd/cnd.classview/test/unit/src/org/netbeans/modules/cnd/classview/QuoteTestCase.java
rename to contrib/cnd.classview/test/unit/src/org/netbeans/modules/cnd/classview/QuoteTestCase.java
diff --git a/cnd/cnd.cncppunit/build.xml b/contrib/cnd.cncppunit/build.xml
similarity index 100%
rename from cnd/cnd.cncppunit/build.xml
rename to contrib/cnd.cncppunit/build.xml
diff --git a/cnd/cnd.cncppunit/manifest.mf b/contrib/cnd.cncppunit/manifest.mf
similarity index 100%
rename from cnd/cnd.cncppunit/manifest.mf
rename to contrib/cnd.cncppunit/manifest.mf
diff --git a/cnd/cnd.cncppunit/nbproject/project.properties b/contrib/cnd.cncppunit/nbproject/project.properties
similarity index 100%
rename from cnd/cnd.cncppunit/nbproject/project.properties
rename to contrib/cnd.cncppunit/nbproject/project.properties
diff --git a/cnd/cnd.cncppunit/nbproject/project.xml b/contrib/cnd.cncppunit/nbproject/project.xml
similarity index 100%
rename from cnd/cnd.cncppunit/nbproject/project.xml
rename to contrib/cnd.cncppunit/nbproject/project.xml
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/Bundle.properties b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/Bundle.properties
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/Bundle.properties
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/Bundle.properties
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/CnCppUnitTestHandlerFactory.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/CnCppUnitTestHandlerFactory.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/CnCppUnitTestHandlerFactory.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/CnCppUnitTestHandlerFactory.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/CnCppUnitTestHandlerFactoryProvider.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/CnCppUnitTestHandlerFactoryProvider.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/CnCppUnitTestHandlerFactoryProvider.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/CnCppUnitTestHandlerFactoryProvider.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/LibraryChecker.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/LibraryChecker.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/LibraryChecker.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/LibraryChecker.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/MultilineOutputHandler.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/MultilineOutputHandler.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/MultilineOutputHandler.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/MultilineOutputHandler.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/codegeneration/CUnitCodeGenerator.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/codegeneration/CUnitCodeGenerator.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/codegeneration/CUnitCodeGenerator.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/codegeneration/CUnitCodeGenerator.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/codegeneration/CppUnitCodeGenerator.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/codegeneration/CppUnitCodeGenerator.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/codegeneration/CppUnitCodeGenerator.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/codegeneration/CppUnitCodeGenerator.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/Bundle.properties b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/Bundle.properties
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/Bundle.properties
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/Bundle.properties
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCUnitPanel.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCUnitPanel.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCUnitPanel.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCUnitPanel.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCUnitPanelGUI.form b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCUnitPanelGUI.form
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCUnitPanelGUI.form
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCUnitPanelGUI.form
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCUnitPanelGUI.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCUnitPanelGUI.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCUnitPanelGUI.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCUnitPanelGUI.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCppUnitPanel.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCppUnitPanel.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCppUnitPanel.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCppUnitPanel.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCppUnitPanelGUI.form b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCppUnitPanelGUI.form
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCppUnitPanelGUI.form
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCppUnitPanelGUI.form
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCppUnitPanelGUI.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCppUnitPanelGUI.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCppUnitPanelGUI.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/NewTestCppUnitPanelGUI.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/TestCUnitIterator.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/TestCUnitIterator.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/TestCUnitIterator.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/TestCUnitIterator.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/TestCppUnitIterator.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/TestCppUnitIterator.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/TestCppUnitIterator.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/TestCppUnitIterator.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/TestLibChecker.java b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/TestLibChecker.java
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/TestLibChecker.java
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/editor/filecreation/TestLibChecker.java
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/layer.xml b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/layer.xml
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/layer.xml
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/layer.xml
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/Bundle.properties b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/Bundle.properties
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/Bundle.properties
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/Bundle.properties
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/cppunitrunner.html b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/cppunitrunner.html
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/cppunitrunner.html
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/cppunitrunner.html
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/cppunittest.html b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/cppunittest.html
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/cppunittest.html
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/cppunittest.html
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/cunittest-c.html b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/cunittest-c.html
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/cunittest-c.html
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/cunittest-c.html
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/test-cppunit.html b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/test-cppunit.html
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/test-cppunit.html
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/test-cppunit.html
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/test-cunit.html b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/test-cunit.html
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/test-cunit.html
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/test-cunit.html
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/testCUnit.png b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/testCUnit.png
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/testCUnit.png
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/testCUnit.png
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/testCppUnit.png b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/testCppUnit.png
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/testCppUnit.png
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/testCppUnit.png
diff --git a/cnd/cnd.simpleunit/src/org/netbeans/modules/cnd/simpleunit/resources/testFiles.html b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/testFiles.html
similarity index 100%
rename from cnd/cnd.simpleunit/src/org/netbeans/modules/cnd/simpleunit/resources/testFiles.html
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/resources/testFiles.html
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunitrunner-cc.template b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunitrunner-cc.template
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunitrunner-cc.template
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunitrunner-cc.template
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-cc.template b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-cc.template
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-cc.template
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-cc.template
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-h.template b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-h.template
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-h.template
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest-h.template
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest.group b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest.group
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest.group
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/cppunittest.group
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-cpp.template b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-cpp.template
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-cpp.template
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-cpp.template
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-h.template b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-h.template
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-h.template
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-class-file-h.template
diff --git a/cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-runner-file-cpp.template b/contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-runner-file-cpp.template
similarity index 100%
rename from cnd/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-runner-file-cpp.template
rename to contrib/cnd.cncppunit/src/org/netbeans/modules/cnd/cncppunit/templates/cpp/test-cppunit-runner-file-cpp.template
diff --git a/cnd/cnd.cncppunit/test/unit/src/org/netbeans/modules/cnd/cncppunit/LibraryCheckerTest.java b/contrib/cnd.cncppunit/test/unit/src/org/netbeans/modules/cnd/cncppunit/LibraryCheckerTest.java
similarity index 100%
rename from cnd/cnd.cncppunit/test/unit/src/org/netbeans/modules/cnd/cncppunit/LibraryCheckerTest.java
rename to contrib/cnd.cncppunit/test/unit/src/org/netbeans/modules/cnd/cncppunit/LibraryCheckerTest.java
diff --git a/cnd/cnd.completion/build.xml b/contrib/cnd.completion/build.xml
similarity index 100%
rename from cnd/cnd.completion/build.xml
rename to contrib/cnd.completion/build.xml
diff --git a/cnd/cnd.completion/manifest.mf b/contrib/cnd.completion/manifest.mf
similarity index 100%
rename from cnd/cnd.completion/manifest.mf
rename to contrib/cnd.completion/manifest.mf
diff --git a/cnd/cnd.completion/nbproject/project.properties b/contrib/cnd.completion/nbproject/project.properties
similarity index 100%
rename from cnd/cnd.completion/nbproject/project.properties
rename to contrib/cnd.completion/nbproject/project.properties
diff --git a/cnd/cnd.completion/nbproject/project.xml b/contrib/cnd.completion/nbproject/project.xml
similarity index 100%
rename from cnd/cnd.completion/nbproject/project.xml
rename to contrib/cnd.completion/nbproject/project.xml
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/Bundle.properties b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/Bundle.properties
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/Bundle.properties
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/Bundle.properties
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CCGoToDeclarationAction.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CCGoToDeclarationAction.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CCGoToDeclarationAction.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CCGoToDeclarationAction.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CCGoToImplementationAction.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CCGoToImplementationAction.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CCGoToImplementationAction.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CCGoToImplementationAction.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmCodeTemplateFilter.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmCodeTemplateFilter.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmCodeTemplateFilter.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmCodeTemplateFilter.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmCompletionProvider.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmCompletionProvider.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmCompletionProvider.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmCompletionProvider.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmCompletionUtils.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmCompletionUtils.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmCompletionUtils.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmCompletionUtils.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmExpressionResolverImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmExpressionResolverImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmExpressionResolverImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmExpressionResolverImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmFinderFactory.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmFinderFactory.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmFinderFactory.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmFinderFactory.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmFinderImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmFinderImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmFinderImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/CsmFinderImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/NbCsmCompletionQuery.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/NbCsmCompletionQuery.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/NbCsmCompletionQuery.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/NbCsmCompletionQuery.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/NbCsmResultItem.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/NbCsmResultItem.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/NbCsmResultItem.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/NbCsmResultItem.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/Bundle.properties b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/Bundle.properties
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/Bundle.properties
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/Bundle.properties
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CompletionSupport.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CompletionSupport.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CompletionSupport.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CompletionSupport.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletion.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletion.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletion.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletion.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletionExpression.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletionExpression.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletionExpression.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletionExpression.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletionQuery.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletionQuery.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletionQuery.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletionQuery.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletionTokenProcessor.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletionTokenProcessor.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletionTokenProcessor.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmCompletionTokenProcessor.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmExpandedTokenProcessor.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmExpandedTokenProcessor.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmExpandedTokenProcessor.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmExpandedTokenProcessor.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmFinder.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmFinder.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmFinder.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmFinder.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmResultItem.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmResultItem.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmResultItem.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/CsmResultItem.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/MacroCallback.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/MacroCallback.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/MacroCallback.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/ext/MacroCallback.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/Bundle.properties b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/Bundle.properties
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/Bundle.properties
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/Bundle.properties
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmAbstractHyperlinkProvider.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmAbstractHyperlinkProvider.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmAbstractHyperlinkProvider.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmAbstractHyperlinkProvider.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmDefineHyperlinkProvider.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmDefineHyperlinkProvider.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmDefineHyperlinkProvider.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmDefineHyperlinkProvider.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmHyperlinkProvider.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmHyperlinkProvider.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmHyperlinkProvider.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmHyperlinkProvider.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmIncludeHyperlinkProvider.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmIncludeHyperlinkProvider.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmIncludeHyperlinkProvider.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/CsmIncludeHyperlinkProvider.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/LineHyperlinkProvider.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/LineHyperlinkProvider.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/LineHyperlinkProvider.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/hyperlink/LineHyperlinkProvider.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/back.gif b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/back.gif
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/back.gif
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/back.gif
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/forward.gif b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/forward.gif
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/forward.gif
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/forward.gif
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/gotosource.gif b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/gotosource.gif
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/gotosource.gif
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/gotosource.gif
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/htmlView.gif b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/htmlView.gif
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/htmlView.gif
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/cplusplus/resources/htmlView.gif
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CompletionResolver.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CompletionResolver.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CompletionResolver.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CompletionResolver.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CompletionResolverImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CompletionResolverImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CompletionResolverImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CompletionResolverImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CompletionUtilities.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CompletionUtilities.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CompletionUtilities.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CompletionUtilities.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmContext.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmContext.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmContext.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmContext.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmContextUtilities.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmContextUtilities.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmContextUtilities.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmContextUtilities.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmDeclarationResolver.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmDeclarationResolver.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmDeclarationResolver.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmDeclarationResolver.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmOffsetResolver.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmOffsetResolver.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmOffsetResolver.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmOffsetResolver.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmOffsetUtilities.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmOffsetUtilities.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmOffsetUtilities.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmOffsetUtilities.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmProjectContentResolver.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmProjectContentResolver.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmProjectContentResolver.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmProjectContentResolver.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmStatementResolver.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmStatementResolver.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmStatementResolver.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/csm/CsmStatementResolver.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/debugger/CsmAutosProviderImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/debugger/CsmAutosProviderImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/debugger/CsmAutosProviderImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/debugger/CsmAutosProviderImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/debugger/CsmFunctionCallsProviderImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/debugger/CsmFunctionCallsProviderImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/debugger/CsmFunctionCallsProviderImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/debugger/CsmFunctionCallsProviderImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/Bundle.properties b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/Bundle.properties
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/Bundle.properties
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/Bundle.properties
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/CompletionDocumentationProviderImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/CompletionDocumentationProviderImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/CompletionDocumentationProviderImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/CompletionDocumentationProviderImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/DoxygenDocumentation.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/DoxygenDocumentation.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/DoxygenDocumentation.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/DoxygenDocumentation.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/Man2HTML.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/Man2HTML.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/Man2HTML.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/Man2HTML.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/ManDocumentation.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/ManDocumentation.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/ManDocumentation.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/doxygensupport/ManDocumentation.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/DocOffsPositionImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/DocOffsPositionImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/DocOffsPositionImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/DocOffsPositionImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/DocOffsetableImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/DocOffsetableImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/DocOffsetableImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/DocOffsetableImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/FileReferencesContext.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/FileReferencesContext.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/FileReferencesContext.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/FileReferencesContext.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/FileReferencesImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/FileReferencesImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/FileReferencesImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/FileReferencesImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferenceContextImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferenceContextImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferenceContextImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferenceContextImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferenceImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferenceImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferenceImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferenceImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferenceResolverImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferenceResolverImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferenceResolverImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferenceResolverImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferencesCache.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferencesCache.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferencesCache.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferencesCache.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferencesSupport.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferencesSupport.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferencesSupport.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ReferencesSupport.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/SymTabCache.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/SymTabCache.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/SymTabCache.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/SymTabCache.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ThisReferenceImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ThisReferenceImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ThisReferenceImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/impl/xref/ThisReferenceImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/includes/CsmIncludeCompletionItem.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/includes/CsmIncludeCompletionItem.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/includes/CsmIncludeCompletionItem.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/includes/CsmIncludeCompletionItem.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/includes/CsmIncludeCompletionProvider.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/includes/CsmIncludeCompletionProvider.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/includes/CsmIncludeCompletionProvider.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/includes/CsmIncludeCompletionProvider.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/includes/CsmIncludeCompletionQuery.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/includes/CsmIncludeCompletionQuery.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/includes/CsmIncludeCompletionQuery.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/includes/CsmIncludeCompletionQuery.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordCompletionItem.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordCompletionItem.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordCompletionItem.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordCompletionItem.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordsCompletionProvider.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordsCompletionProvider.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordsCompletionProvider.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordsCompletionProvider.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/options/Bundle.properties b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/options/Bundle.properties
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/options/Bundle.properties
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/options/Bundle.properties
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/options/CodeCompletionPanel.form b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/options/CodeCompletionPanel.form
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/options/CodeCompletionPanel.form
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/options/CodeCompletionPanel.form
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/options/CodeCompletionPanel.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/options/CodeCompletionPanel.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/options/CodeCompletionPanel.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/options/CodeCompletionPanel.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionItem.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionItem.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionItem.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionItem.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionProvider.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionProvider.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionProvider.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionProvider.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/Bundle.properties b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/Bundle.properties
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/Bundle.properties
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/Bundle.properties
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/DefaultKeyBindings.xml b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/DefaultKeyBindings.xml
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/DefaultKeyBindings.xml
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/DefaultKeyBindings.xml
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/enable-doc-completion.xml b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/enable-doc-completion.xml
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/enable-doc-completion.xml
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/enable-doc-completion.xml
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/layer.xml b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/layer.xml
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/layer.xml
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/resources/layer.xml
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/services/CsmOverloadingResolverImpl.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/services/CsmOverloadingResolverImpl.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/services/CsmOverloadingResolverImpl.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/services/CsmOverloadingResolverImpl.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/spi/dynhelp/CCHelpManager.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/spi/dynhelp/CCHelpManager.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/spi/dynhelp/CCHelpManager.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/spi/dynhelp/CCHelpManager.java
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/templates/Bundle.properties b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/templates/Bundle.properties
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/templates/Bundle.properties
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/templates/Bundle.properties
diff --git a/cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/templates/CppCodeTemplateProcessor.java b/contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/templates/CppCodeTemplateProcessor.java
similarity index 100%
rename from cnd/cnd.completion/src/org/netbeans/modules/cnd/completion/templates/CppCodeTemplateProcessor.java
rename to contrib/cnd.completion/src/org/netbeans/modules/cnd/completion/templates/CppCodeTemplateProcessor.java
diff --git a/cnd/cnd.completion/test/popular-commands.sh b/contrib/cnd.completion/test/popular-commands.sh
similarity index 100%
rename from cnd/cnd.completion/test/popular-commands.sh
rename to contrib/cnd.completion/test/popular-commands.sh
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosArrays.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosArrays.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosArrays.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosArrays.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosArrays2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosArrays2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosArrays2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosArrays2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosBody.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosBody.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosBody.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosBody.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosComment.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosComment.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosComment.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosComment.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosCompoundLine1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosCompoundLine1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosCompoundLine1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosCompoundLine1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosCompoundLine2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosCompoundLine2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosCompoundLine2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosCompoundLine2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosCompoundLine3.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosCompoundLine3.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosCompoundLine3.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosCompoundLine3.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosEmptyLine.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosEmptyLine.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosEmptyLine.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosEmptyLine.ref
diff --git a/cnd/cnd.navigation/test/unit/data/goldenfiles/org/netbeans/modules/cnd/navigation/switchfiles/CppSwitchTest/welcome.cc.dat b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosFirst.ref
similarity index 100%
copy from cnd/cnd.navigation/test/unit/data/goldenfiles/org/netbeans/modules/cnd/navigation/switchfiles/CppSwitchTest/welcome.cc.dat
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosFirst.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/MultiParseModelTest/iz164017_shared_header.h.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosIfEnd.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/MultiParseModelTest/iz164017_shared_header.h.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosIfEnd.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosInFor.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosInFor.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosInFor.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosInFor.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosInFunction.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosInFunction.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosInFunction.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosInFunction.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosInStatement.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosInStatement.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosInStatement.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosInStatement.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosMain.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosMain.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosMain.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosMain.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosMultiLine.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosMultiLine.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosMultiLine.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosMultiLine.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosNoCodeModel.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosNoCodeModel.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosNoCodeModel.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosNoCodeModel.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosScope.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosScope.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosScope.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosScope.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosStatement.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosStatement.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosStatement.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosStatement.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/MultiParseModelTest/iz164017.cpp.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosWrong.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/MultiParseModelTest/iz164017.cpp.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/AutosTestCase/testAutosWrong.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/test142903_1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/test142903_1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/test142903_1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/test142903_1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/test142903_2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/test142903_2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/test142903_2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/test142903_2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/test208053.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/test208053.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/test208053.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/test208053.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug188804.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug188804.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug188804.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug188804.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug188804_2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug188804_2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug188804_2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug188804_2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug206234.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug206234.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug206234.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug206234.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug214650.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug214650.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug214650.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug214650.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug235102_cc_1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug235102_cc_1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug235102_cc_1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug235102_cc_1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug235102_cc_2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug235102_cc_2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug235102_cc_2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testBug235102_cc_2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast3.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast3.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast3.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast3.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast4.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast4.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast4.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCast4.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionAfterSpace.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionAfterSpace.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionAfterSpace.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionAfterSpace.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionAfterSpace2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionAfterSpace2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionAfterSpace2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionAfterSpace2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions3.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions3.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions3.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions3.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions4.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions4.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions4.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionForStaticFunctions4.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInConstructor.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInConstructor.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInConstructor.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInConstructor.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInEmptyFile.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInEmptyFile.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInEmptyFile.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInEmptyFile.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/file2.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInEmptySysInclude.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/file2.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInEmptySysInclude.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/file1.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInEmptyUsrInclude.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/file1.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInEmptyUsrInclude.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug228631.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInsideChar.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug228631.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInsideChar.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug212602.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInsideInclude.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug212602.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInsideInclude.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug208927.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInsideString.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug208927.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionInsideString.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionOnEmptyInClassFunction.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionOnEmptyInClassFunction.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionOnEmptyInClassFunction.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionOnEmptyInClassFunction.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionOnEmptyInGlobFunction.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionOnEmptyInGlobFunction.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionOnEmptyInGlobFunction.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionOnEmptyInGlobFunction.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionOnEmptyInGlobal.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionOnEmptyInGlobal.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionOnEmptyInGlobal.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testCompletionOnEmptyInGlobal.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyDerefCompletion_1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyDerefCompletion_1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyDerefCompletion_1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyDerefCompletion_1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyDerefCompletion_2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyDerefCompletion_2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyDerefCompletion_2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyDerefCompletion_2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyDerefCompletion_3.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyDerefCompletion_3.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyDerefCompletion_3.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyDerefCompletion_3.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyPtrCompletion_1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyPtrCompletion_1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyPtrCompletion_1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyPtrCompletion_1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyPtrCompletion_2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyPtrCompletion_2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyPtrCompletion_2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyPtrCompletion_2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyPtrCompletion_3.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyPtrCompletion_3.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyPtrCompletion_3.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testEmptyPtrCompletion_3.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug207681.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion1.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug207681.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion1.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug205526.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion10.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug205526.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion10.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug186251.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion2.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug186251.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion2.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug185624.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion3.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug185624.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion3.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug184997.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion4.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug184997.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion4.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug183152.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion5.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug183152.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion5.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug183086.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion6.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug183086.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion6.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug183073.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion7.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug183073.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion7.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug182945.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion8.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug182945.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion8.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug182702.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion9.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug182702.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletion9.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug182520.f.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun1.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FortranFileModelTest/bug182520.f.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun1.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/variable_initializer.cc.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun2.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/variable_initializer.cc.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun2.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/variable_definition.cc.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun3.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/variable_definition.cc.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun3.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/using_extern.h.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun4.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/using_extern.h.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun4.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/unresolved_persistence.cc.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun5.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/unresolved_persistence.cc.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun5.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/typename.cc.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun6.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/typename.cc.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun6.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/typedef_pointer_to_static_member.cc.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun7.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/typedef_pointer_to_static_member.cc.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testErrorCompletionInFun7.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testExtraDeclarationOnTypeInsideFun.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testExtraDeclarationOnTypeInsideFun.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testExtraDeclarationOnTypeInsideFun.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testExtraDeclarationOnTypeInsideFun.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalCompletionInClassFunction.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalCompletionInClassFunction.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalCompletionInClassFunction.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalCompletionInClassFunction.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalCompletionInGlobFunction.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalCompletionInGlobFunction.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalCompletionInGlobFunction.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalCompletionInGlobFunction.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalCompletionInGlobal.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalCompletionInGlobal.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalCompletionInGlobal.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalCompletionInGlobal.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalMethodByScopePrefix.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalMethodByScopePrefix.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalMethodByScopePrefix.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testGlobalMethodByScopePrefix.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ109010.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ109010.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ109010.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ109010.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ119041.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ119041.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ119041.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ119041.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ131283.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ131283.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ131283.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ131283.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ131568.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ131568.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ131568.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ131568.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ159423.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ159423.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ159423.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ159423.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ159424_1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ159424_1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ159424_1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ159424_1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ159424_2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ159424_2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ159424_2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ159424_2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ166620.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ166620.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ166620.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ166620.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ173049.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ173049.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ173049.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testIZ173049.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testLocalEnumerators.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testLocalEnumerators.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testLocalEnumerators.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testLocalEnumerators.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testNoAbbrevInCompletion.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testNoAbbrevInCompletion.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testNoAbbrevInCompletion.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testNoAbbrevInCompletion.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testProtectedMethodByClassPrefix.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testProtectedMethodByClassPrefix.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testProtectedMethodByClassPrefix.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testProtectedMethodByClassPrefix.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testRecoveryBeforeFoo.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testRecoveryBeforeFoo.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testRecoveryBeforeFoo.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testRecoveryBeforeFoo.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testRestrictPointers1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testRestrictPointers1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testRestrictPointers1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testRestrictPointers1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testRestrictPointers2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testRestrictPointers2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testRestrictPointers2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testRestrictPointers2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSpecializationQualifiers_0.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSpecializationQualifiers_0.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSpecializationQualifiers_0.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSpecializationQualifiers_0.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testStringLiteral.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testStringLiteral.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testStringLiteral.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testStringLiteral.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSwitchCaseVarsAfterCompoundAndNotCompoundInDefault.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSwitchCaseVarsAfterCompoundAndNotCompoundInDefault.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSwitchCaseVarsAfterCompoundAndNotCompoundInDefault.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSwitchCaseVarsAfterCompoundAndNotCompoundInDefault.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSwitchCaseVarsInCompound.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSwitchCaseVarsInCompound.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSwitchCaseVarsInCompound.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSwitchCaseVarsInCompound.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSwitchCaseVarsNotIncCompound.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSwitchCaseVarsNotIncCompound.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSwitchCaseVarsNotIncCompound.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CCBasicCompletionTestCase/testSwitchCaseVarsNotIncCompound.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testAllCapital.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testAllCapital.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testAllCapital.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testAllCapital.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testFirstCapitalCamelCase.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testFirstCapitalCamelCase.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testFirstCapitalCamelCase.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testFirstCapitalCamelCase.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testFirstLowCamelCase.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testFirstLowCamelCase.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testFirstLowCamelCase.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testFirstLowCamelCase.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testUnderscore.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testUnderscore.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testUnderscore.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testUnderscore.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testUnderscoreCompound.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testUnderscoreCompound.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testUnderscoreCompound.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/CamelCaseCompletionTestCase/testUnderscoreCompound.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionAfterNew.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionAfterNew.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionAfterNew.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionAfterNew.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionAfterNewWithClassPrefix.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionAfterNewWithClassPrefix.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionAfterNewWithClassPrefix.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionAfterNewWithClassPrefix.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionOnUnfinishedConstructor1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionOnUnfinishedConstructor1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionOnUnfinishedConstructor1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionOnUnfinishedConstructor1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionOnUnfinishedConstructor2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionOnUnfinishedConstructor2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionOnUnfinishedConstructor2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testCompletionOnUnfinishedConstructor2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testConstructorDefinition.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testConstructorDefinition.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testConstructorDefinition.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testConstructorDefinition.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testConstructorDereference.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testConstructorDereference.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testConstructorDereference.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testConstructorDereference.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDefaultConstructorWithNew.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDefaultConstructorWithNew.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDefaultConstructorWithNew.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDefaultConstructorWithNew.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDefaultConstructorWithoutNew.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDefaultConstructorWithoutNew.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDefaultConstructorWithoutNew.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDefaultConstructorWithoutNew.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructor.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructor.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructor.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructor.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructorByClassPrefix.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructorByClassPrefix.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructorByClassPrefix.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructorByClassPrefix.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructorByClassPrefixAndTilda.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructorByClassPrefixAndTilda.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructorByClassPrefixAndTilda.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructorByClassPrefixAndTilda.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructorTilda.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructorTilda.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructorTilda.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testDestructorTilda.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testNewDConstructor.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testNewDConstructor.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testNewDConstructor.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testNewDConstructor.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testStaticUnnamedUnions.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testStaticUnnamedUnions.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testStaticUnnamedUnions.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testStaticUnnamedUnions.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testUnnamedDefinitions.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testUnnamedDefinitions.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testUnnamedDefinitions.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testUnnamedDefinitions.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testUnnamedEnums.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testUnnamedEnums.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testUnnamedEnums.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/ClassContentTestCase/testUnnamedEnums.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_3.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_3.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_3.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_3.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_4.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_4.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_4.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_4.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_5.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_5.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_5.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_5.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_6.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_6.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_6.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_6.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_7.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_7.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_7.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_7.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_8.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_8.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_8.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/DotArrowSubstitutionTestCase/testDotToArrowAutoFix_8.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestC_Case/testBug216764.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestC_Case/testBug216764.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestC_Case/testBug216764.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestC_Case/testBug216764.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testBug228519.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testBug228519.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testBug228519.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testBug228519.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testClassAEnumFun.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testClassAEnumFun.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testClassAEnumFun.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testClassAEnumFun.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testClassAEnumeratorsInFun.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testClassAEnumeratorsInFun.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testClassAEnumeratorsInFun.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testClassAEnumeratorsInFun.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testClassAaPubFun.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testClassAaPubFun.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testClassAaPubFun.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testClassAaPubFun.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testEnumInFun.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testEnumInFun.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testEnumInFun.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testEnumInFun.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testVarAaPubFun.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testVarAaPubFun.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testVarAaPubFun.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/EnumTestCase/testVarAaPubFun.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarA.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarA.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarA.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarA.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarASt.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarASt.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarASt.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarASt.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarB.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarB.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarB.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarB.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarBSt.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarBSt.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarBSt.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarBSt.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarE.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarE.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarE.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarE.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarESt.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarESt.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarESt.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendCClassVarESt.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarA.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarA.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarA.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarA.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarASt.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarASt.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarASt.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarASt.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarB.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarB.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarB.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarB.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarBSt.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarBSt.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarBSt.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarBSt.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarD.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarD.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarD.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarD.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarDSt.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarDSt.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarDSt.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FriendTestCase/testInFriendFuncVarDSt.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsArguments.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsArguments.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsArguments.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsArguments.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsMultiple.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsMultiple.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsMultiple.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsMultiple.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/typedef_inside_func.cc.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsNoStd.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/typedef_inside_func.cc.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsNoStd.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/typedef_enum_in_class_scope.cc.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsNone.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/typedef_enum_in_class_scope.cc.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsNone.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/throw_const.cc.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsWrong.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/throw_const.cc.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/FunctionCallsTestCase/testFunctionCallsWrong.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/GlobalCompletionTestCase/testBug251256.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/GlobalCompletionTestCase/testBug251256.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/GlobalCompletionTestCase/testBug251256.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/GlobalCompletionTestCase/testBug251256.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunClassA.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunClassA.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunClassA.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunClassA.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarA.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarA.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarA.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarA.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarB.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarB.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarB.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarB.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarC.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarC.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarC.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarC.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarD.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarD.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarD.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarD.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarE.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarE.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarE.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassAaPubFunVarE.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunClassA.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunClassA.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunClassA.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunClassA.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunClassB.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunClassB.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunClassB.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunClassB.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarA.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarA.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarA.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarA.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarB.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarB.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarB.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarB.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarC.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarC.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarC.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarC.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarD.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarD.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarD.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarD.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarE.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarE.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarE.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassBbProtFunVarE.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunClassC.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunClassC.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunClassC.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunClassC.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarA.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarA.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarA.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarA.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarB.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarB.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarB.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarB.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarC.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarC.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarC.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarC.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarD.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarD.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarD.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarD.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarE.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarE.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarE.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassCcPrivFunVarE.ref
diff --git a/cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/test_include_correcteness.cc.err b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassA.ref
similarity index 100%
copy from cnd/cnd.modelimpl/test/unit/data/goldenfiles/org/netbeans/modules/cnd/modelimpl/trace/FileModelTest/test_include_correcteness.cc.err
copy to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassA.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassB.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassB.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassB.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassB.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassC.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassC.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassC.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassC.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassD.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassD.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassD.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunClassD.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarA.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarA.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarA.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarA.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarB.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarB.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarB.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarB.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarC.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarC.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarC.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarC.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarD.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarD.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarD.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarD.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarE.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarE.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarE.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassDdPubFunVarE.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunClassC.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunClassC.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunClassC.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunClassC.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunClassE.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunClassE.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunClassE.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunClassE.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarA.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarA.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarA.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarA.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarB.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarB.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarB.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarB.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarC.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarC.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarC.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarC.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarD.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarD.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarD.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarD.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarE.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarE.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarE.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/InheritanceTestCase/testClassEePubFunVarE.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS3.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS3.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS3.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS3.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS4.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS4.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS4.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS4.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS5.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS5.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS5.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS5.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS51.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS51.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS51.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/test202486_NS51.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testBug254671_1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testBug254671_1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testBug254671_1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testBug254671_1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testBug254671_2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testBug254671_2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testBug254671_2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testBug254671_2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testBug254671_3.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testBug254671_3.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testBug254671_3.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testBug254671_3.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testGlobalFunsWithPrefix_1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testGlobalFunsWithPrefix_1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testGlobalFunsWithPrefix_1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testGlobalFunsWithPrefix_1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testGlobalFunsWithPrefix_2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testGlobalFunsWithPrefix_2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testGlobalFunsWithPrefix_2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testGlobalFunsWithPrefix_2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testLibraryClassStaticFunctions_1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testLibraryClassStaticFunctions_1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testLibraryClassStaticFunctions_1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testLibraryClassStaticFunctions_1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testLibraryClassStaticFunctions_2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testLibraryClassStaticFunctions_2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testLibraryClassStaticFunctions_2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testLibraryClassStaticFunctions_2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testMergeOfLibrariesNamespaces.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testMergeOfLibrariesNamespaces.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testMergeOfLibrariesNamespaces.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testMergeOfLibrariesNamespaces.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testStdSizeT.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testStdSizeT.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testStdSizeT.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/LibrariesContentTestCase/testStdSizeT.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceFunctionsTestCase/testInClassMethod.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceFunctionsTestCase/testInClassMethod.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceFunctionsTestCase/testInClassMethod.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceFunctionsTestCase/testInClassMethod.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceFunctionsTestCase/testInNamespaceMethod.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceFunctionsTestCase/testInNamespaceMethod.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceFunctionsTestCase/testInNamespaceMethod.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceFunctionsTestCase/testInNamespaceMethod.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceFunctionsTestCase/testInNamespaceMethod2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceFunctionsTestCase/testInNamespaceMethod2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceFunctionsTestCase/testInNamespaceMethod2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceFunctionsTestCase/testInNamespaceMethod2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceUsingTestCase/testInFunc.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceUsingTestCase/testInFunc.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceUsingTestCase/testInFunc.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceUsingTestCase/testInFunc.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceUsingTestCase/testInUsing.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceUsingTestCase/testInUsing.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceUsingTestCase/testInUsing.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespaceUsingTestCase/testInUsing.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/test231548.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/test231548.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/test231548.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/test231548.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testIZ146962.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testIZ146962.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testIZ146962.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testIZ146962.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunction.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunction.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunction.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunction.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionAliasesS1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionAliasesS1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionAliasesS1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionAliasesS1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionAliasesS2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionAliasesS2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionAliasesS2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionAliasesS2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionNsS1AsPrefix.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionNsS1AsPrefix.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionNsS1AsPrefix.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionNsS1AsPrefix.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionNsS1S2AsPrefix.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionNsS1S2AsPrefix.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionNsS1S2AsPrefix.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInFunctionNsS1S2AsPrefix.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSElems1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSElems1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSElems1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSElems1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSElems2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSElems2.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSElems2.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSElems2.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSFunc1.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSFunc1.ref
similarity index 100%
rename from cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSFunc1.ref
rename to contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSFunc1.ref
diff --git a/cnd/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSFunc2.ref b/contrib/cnd.completion/test/unit/data/goldenfiles/org/netbeans/modules/cnd/completion/NamespacesTestCase/testInnerNSFunc2.ref
similarity index 100%
... 18412 lines suppressed ...

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists