diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.classpath b/cmake/org.eclipse.cdt.cmake.is.arm.tests/.classpath
index ef6fc421521..336abe9f465 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.arm.tests/.classpath
@@ -2,7 +2,7 @@
-
+
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/build.properties b/cmake/org.eclipse.cdt.cmake.is.arm.tests/build.properties
index e64808bdfda..30c35d74ee2 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm.tests/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.arm.tests/build.properties
@@ -1,5 +1,5 @@
-source.. = src/main/java/
-output.. = target/classes/
+source.. = src/
+output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm.tests/src/main/java/org/eclipse/cdt/cmake/is/arm/ToolDetectionParticipantTest.java b/cmake/org.eclipse.cdt.cmake.is.arm.tests/src/org/eclipse/cdt/cmake/is/arm/ToolDetectionParticipantTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm.tests/src/main/java/org/eclipse/cdt/cmake/is/arm/ToolDetectionParticipantTest.java
rename to cmake/org.eclipse.cdt.cmake.is.arm.tests/src/org/eclipse/cdt/cmake/is/arm/ToolDetectionParticipantTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/.classpath b/cmake/org.eclipse.cdt.cmake.is.arm/.classpath
index 418090144b4..fd968d06ff7 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.arm/.classpath
@@ -6,6 +6,6 @@
-
-
+
+
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/build.properties b/cmake/org.eclipse.cdt.cmake.is.arm/build.properties
index bbe01dd7e18..2367d3898da 100644
--- a/cmake/org.eclipse.cdt.cmake.is.arm/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.arm/build.properties
@@ -1,5 +1,5 @@
-source.. = src/main/java/
-output.. = target/classes/
+source.. = src/
+output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmClangToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmClangToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmClangToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmClangToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmccBuiltinDetectionBehavior.java b/cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmccBuiltinDetectionBehavior.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmccBuiltinDetectionBehavior.java
rename to cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmccBuiltinDetectionBehavior.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmccToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmccToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.arm/src/main/java/org/eclipse/cdt/cmake/is/arm/ArmccToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.arm/src/org/eclipse/cdt/cmake/is/arm/ArmccToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.doc/build.properties b/cmake/org.eclipse.cdt.cmake.is.core.doc/build.properties
index a08b68c8daa..92fb195f129 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.doc/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.core.doc/build.properties
@@ -1,5 +1,5 @@
-source.. = src/main/java/
-output.. = target/classes/
+source.. = src/
+output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/.classpath b/cmake/org.eclipse.cdt.cmake.is.core.tests/.classpath
index 5961d4fef12..b5519095830 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.core.tests/.classpath
@@ -1,13 +1,12 @@
-
-
-
+
-
+
-
+
+
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/build.properties b/cmake/org.eclipse.cdt.cmake.is.core.tests/build.properties
index 30b6859c59a..3a552b3eca8 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.tests/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.core.tests/build.properties
@@ -1,6 +1,6 @@
-source.. = src/main/java/,\
+source.. = src/,\
src/main/resources/
-output.. = target/classes/
+output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/l10n/bundle.properties,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectLangStd_GCC_Test.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectLangStd_GCC_Test.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectLangStd_GCC_Test.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectLangStd_GCC_Test.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectSysroot_GCC_Test.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectSysroot_GCC_Test.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectSysroot_GCC_Test.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/BuiltinsDetectSysroot_GCC_Test.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/IncludeFile_GCCTest.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/IncludeFile_GCCTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/IncludeFile_GCCTest.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/IncludeFile_GCCTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/IncludePath_C_POSIXTest.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/IncludePath_C_POSIXTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/IncludePath_C_POSIXTest.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/IncludePath_C_POSIXTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/MacroDefine_C_POSIXTest.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacroDefine_C_POSIXTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/MacroDefine_C_POSIXTest.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacroDefine_C_POSIXTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/MacroUndefine_C_POSIXTest.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacroUndefine_C_POSIXTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/MacroUndefine_C_POSIXTest.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacroUndefine_C_POSIXTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/MacrosFile_GCCTest.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacrosFile_GCCTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/MacrosFile_GCCTest.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/MacrosFile_GCCTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserDetectionTest.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ParserDetectionTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserDetectionTest.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ParserDetectionTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserLookupResultTest.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ParserLookupResultTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserLookupResultTest.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ParserLookupResultTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_C_Test.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_C_Test.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_C_Test.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_C_Test.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_armcc_Test.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_armcc_Test.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_armcc_Test.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/SystemIncludePath_armcc_Test.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ToolCommandlineParserTest.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ToolCommandlineParserTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ToolCommandlineParserTest.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/ToolCommandlineParserTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/GccOutputProcessorTest.java b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/builtins/GccOutputProcessorTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/GccOutputProcessorTest.java
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/builtins/GccOutputProcessorTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/resources/org/eclipse/cdt/cmake/is/core/internal/builtins/cbd-gcc.output.txt b/cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/builtins/cbd-gcc.output.txt
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core.tests/src/main/resources/org/eclipse/cdt/cmake/is/core/internal/builtins/cbd-gcc.output.txt
rename to cmake/org.eclipse.cdt.cmake.is.core.tests/src/org/eclipse/cdt/cmake/is/core/internal/builtins/cbd-gcc.output.txt
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/.classpath b/cmake/org.eclipse.cdt.cmake.is.core.ui/.classpath
index 1db08c6b4ce..e801ebfb468 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.ui/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.core.ui/.classpath
@@ -3,5 +3,5 @@
-
+
diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/build.properties b/cmake/org.eclipse.cdt.cmake.is.core.ui/build.properties
index 06eacd5d169..80fd8dbc9ba 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.ui/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.core.ui/build.properties
@@ -1,5 +1,5 @@
source.. = src/
-output.. = target/classes/
+output.. = bin/
bin.includes = plugin.xml,\
META-INF/,\
.,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/.classpath b/cmake/org.eclipse.cdt.cmake.is.core/.classpath
index 418090144b4..79a7cca69b1 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.core/.classpath
@@ -6,6 +6,6 @@
-
-
+
+
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/build.properties b/cmake/org.eclipse.cdt.cmake.is.core/build.properties
index efbfd933060..cc2d2ec430c 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.core/build.properties
@@ -1,5 +1,5 @@
-source.. = src/main/java/
-output.. = target/classes/
+source.. = src/
+output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CommandEntry.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/CommandEntry.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CommandEntry.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/CommandEntry.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IIndexerInfoConsumer.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IIndexerInfoConsumer.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IIndexerInfoConsumer.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IIndexerInfoConsumer.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferences.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferences.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferences.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferences.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferencesAccess.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferencesAccess.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferencesAccess.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferencesAccess.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferencesMetadata.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferencesMetadata.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferencesMetadata.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/IParserPreferencesMetadata.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/Messages.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/Messages.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/Messages.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/Messages.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/ParseRequest.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/ParseRequest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/ParseRequest.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/ParseRequest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/Messages.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/Messages.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/Messages.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/Messages.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParseContext.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParseContext.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParseContext.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParseContext.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserDetection.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserDetection.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserDetection.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserDetection.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferences.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferences.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferences.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferences.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesAccess.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesAccess.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesAccess.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesAccess.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesMetadata.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesMetadata.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesMetadata.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesMetadata.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/Plugin.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/Plugin.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/Plugin.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/Plugin.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/StringUtil.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/StringUtil.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/StringUtil.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/StringUtil.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/AbstractConsole.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/AbstractConsole.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/AbstractConsole.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/AbstractConsole.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/CompilerBuiltinsDetector.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/CompilerBuiltinsDetector.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/CompilerBuiltinsDetector.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/CompilerBuiltinsDetector.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/DetectorConsole.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/DetectorConsole.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/DetectorConsole.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/DetectorConsole.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/GccBuiltinDetectionBehavior.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/GccBuiltinDetectionBehavior.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/GccBuiltinDetectionBehavior.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/GccBuiltinDetectionBehavior.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/Messages.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/Messages.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/Messages.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/Messages.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/RawIndexerInfo.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/RawIndexerInfo.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/RawIndexerInfo.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/RawIndexerInfo.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/messages.properties b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/messages.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/messages.properties
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/builtins/messages.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/messages.properties b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/messages.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/messages.properties
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/internal/messages.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/messages.properties b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/messages.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/messages.properties
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/messages.properties
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/package-info.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/package-info.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/package-info.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/package-info.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/Arglets.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/Arglets.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/Arglets.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/Arglets.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/DefaultToolCommandlineParser.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/DefaultToolCommandlineParser.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/DefaultToolCommandlineParser.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/DefaultToolCommandlineParser.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/DefaultToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/DefaultToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/DefaultToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/DefaultToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IArglet.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IArglet.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IArglet.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IArglet.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IParserHandler.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IParserHandler.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IParserHandler.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IParserHandler.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfo.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfo.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfo.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfo.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfoCollector.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfoCollector.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfoCollector.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IRawIndexerInfoCollector.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IResponseFileArglet.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IResponseFileArglet.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IResponseFileArglet.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IResponseFileArglet.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IToolCommandlineParser.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IToolCommandlineParser.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IToolCommandlineParser.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IToolCommandlineParser.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/IToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/IToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/ParticipantTestUtil.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/ParticipantTestUtil.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/ParticipantTestUtil.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/ParticipantTestUtil.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/ResponseFileArglets.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/ResponseFileArglets.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/ResponseFileArglets.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/ResponseFileArglets.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/builtins/GccOutputProcessor.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/GccOutputProcessor.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/builtins/GccOutputProcessor.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/GccOutputProcessor.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsDetectionBehavior.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsDetectionBehavior.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsDetectionBehavior.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsDetectionBehavior.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsOutputProcessor.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsOutputProcessor.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsOutputProcessor.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/IBuiltinsOutputProcessor.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/builtins/OutputSniffer.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/OutputSniffer.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/builtins/OutputSniffer.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/builtins/OutputSniffer.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/package-info.java b/cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/package-info.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/participant/package-info.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/org/eclipse/cdt/cmake/is/core/participant/package-info.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.classpath b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.classpath
index ef6fc421521..247e5e43320 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/.classpath
@@ -2,10 +2,10 @@
-
+
-
+
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/build.properties b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/build.properties
index 2c107fa893b..0a753e1d198 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/build.properties
@@ -1,5 +1,5 @@
-source.. = src/main/java/
-output.. = target/classes/
+source.. = src/
+output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/l10n/bundle.properties,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/ToolDetectionParticipantTest.java b/cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/src/org/eclipse/cdt/cmake/is/hpenonstop/ToolDetectionParticipantTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/ToolDetectionParticipantTest.java
rename to cmake/org.eclipse.cdt.cmake.is.hpenonstop.tests/src/org/eclipse/cdt/cmake/is/hpenonstop/ToolDetectionParticipantTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.classpath b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.classpath
index 418090144b4..79a7cca69b1 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/.classpath
@@ -6,6 +6,6 @@
-
-
+
+
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/build.properties b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/build.properties
index bbe01dd7e18..2367d3898da 100644
--- a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/build.properties
@@ -1,5 +1,5 @@
-source.. = src/main/java/
-output.. = target/classes/
+source.. = src/
+output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC11ToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC11ToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC11ToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC11ToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC89ToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC89ToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC89ToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC89ToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC99ToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC99ToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/main/java/org/eclipse/cdt/cmake/is/hpenonstop/HpeC99ToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.hpenonstop/src/org/eclipse/cdt/cmake/is/hpenonstop/HpeC99ToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/.classpath b/cmake/org.eclipse.cdt.cmake.is.intel/.classpath
index 418090144b4..79a7cca69b1 100644
--- a/cmake/org.eclipse.cdt.cmake.is.intel/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.intel/.classpath
@@ -6,6 +6,6 @@
-
-
+
+
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/build.properties b/cmake/org.eclipse.cdt.cmake.is.intel/build.properties
index 0aa9db925c1..04dc5ce1555 100644
--- a/cmake/org.eclipse.cdt.cmake.is.intel/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.intel/build.properties
@@ -1,5 +1,5 @@
-source.. = src/main/java/
-output.. = target/classes/
+source.. = src/
+output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IccToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IccToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IccToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IccToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IclCandCppToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IclCandCppToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IclCandCppToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IclCandCppToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IclToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IclToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IclToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IclToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IcpcClangToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IcpcClangToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IcpcClangToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IcpcClangToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IcpcToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IcpcToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IcpcToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IcpcToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IntelCToolCommandlineParser.java b/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IntelCToolCommandlineParser.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IntelCToolCommandlineParser.java
rename to cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IntelCToolCommandlineParser.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IntelCppToolCommandlineParser.java b/cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IntelCppToolCommandlineParser.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.intel/src/main/java/org/eclipse/cdt/cmake/is/intel/IntelCppToolCommandlineParser.java
rename to cmake/org.eclipse.cdt.cmake.is.intel/src/org/eclipse/cdt/cmake/is/intel/IntelCppToolCommandlineParser.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.classpath b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.classpath
index ef6fc421521..247e5e43320 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/.classpath
@@ -2,10 +2,10 @@
-
+
-
+
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/build.properties b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/build.properties
index 2c107fa893b..0a753e1d198 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/build.properties
@@ -1,5 +1,5 @@
-source.. = src/main/java/
-output.. = target/classes/
+source.. = src/
+output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/l10n/bundle.properties,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/src/main/java/org/eclipse/cdt/cmake/is/microsoft/ToolDetectionParticipantTest.java b/cmake/org.eclipse.cdt.cmake.is.microsoft.tests/src/org/eclipse/cdt/cmake/is/microsoft/ToolDetectionParticipantTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft.tests/src/main/java/org/eclipse/cdt/cmake/is/microsoft/ToolDetectionParticipantTest.java
rename to cmake/org.eclipse.cdt.cmake.is.microsoft.tests/src/org/eclipse/cdt/cmake/is/microsoft/ToolDetectionParticipantTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/.classpath b/cmake/org.eclipse.cdt.cmake.is.microsoft/.classpath
index 418090144b4..79a7cca69b1 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.microsoft/.classpath
@@ -6,6 +6,6 @@
-
-
+
+
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/build.properties b/cmake/org.eclipse.cdt.cmake.is.microsoft/build.properties
index bbe01dd7e18..2367d3898da 100644
--- a/cmake/org.eclipse.cdt.cmake.is.microsoft/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.microsoft/build.properties
@@ -1,5 +1,5 @@
-source.. = src/main/java/
-output.. = target/classes/
+source.. = src/
+output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/src/main/java/org/eclipse/cdt/cmake/is/microsoft/MsclToolCommandlineParser.java b/cmake/org.eclipse.cdt.cmake.is.microsoft/src/org/eclipse/cdt/cmake/is/microsoft/MsclToolCommandlineParser.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/src/main/java/org/eclipse/cdt/cmake/is/microsoft/MsclToolCommandlineParser.java
rename to cmake/org.eclipse.cdt.cmake.is.microsoft/src/org/eclipse/cdt/cmake/is/microsoft/MsclToolCommandlineParser.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.microsoft/src/main/java/org/eclipse/cdt/cmake/is/microsoft/MsclToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.microsoft/src/org/eclipse/cdt/cmake/is/microsoft/MsclToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.microsoft/src/main/java/org/eclipse/cdt/cmake/is/microsoft/MsclToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.microsoft/src/org/eclipse/cdt/cmake/is/microsoft/MsclToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.classpath b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.classpath
index 5961d4fef12..b5519095830 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/.classpath
@@ -1,13 +1,12 @@
-
-
-
+
-
+
-
+
+
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/build.properties b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/build.properties
index 30b6859c59a..3a552b3eca8 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/build.properties
@@ -1,6 +1,6 @@
-source.. = src/main/java/,\
+source.. = src/,\
src/main/resources/
-output.. = target/classes/
+output.. = bin/
bin.includes = META-INF/,\
.,\
OSGI-INF/l10n/bundle.properties,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathTest.java b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathTest.java
rename to cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/ToolDetectionParticipantTest.java b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/ToolDetectionParticipantTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/ToolDetectionParticipantTest.java
rename to cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/ToolDetectionParticipantTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java
rename to cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/java/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java
rename to cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/NvccOutputProcessorTest.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/resources/org/eclipse/cdt/cmake/is/nvidia/builtins/cbd-nvcc.output.txt b/cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/cbd-nvcc.output.txt
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/main/resources/org/eclipse/cdt/cmake/is/nvidia/builtins/cbd-nvcc.output.txt
rename to cmake/org.eclipse.cdt.cmake.is.nvidia.tests/src/org/eclipse/cdt/cmake/is/nvidia/builtins/cbd-nvcc.output.txt
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/.classpath b/cmake/org.eclipse.cdt.cmake.is.nvidia/.classpath
index 418090144b4..79a7cca69b1 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/.classpath
+++ b/cmake/org.eclipse.cdt.cmake.is.nvidia/.classpath
@@ -6,6 +6,6 @@
-
-
+
+
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/build.properties b/cmake/org.eclipse.cdt.cmake.is.nvidia/build.properties
index bbe01dd7e18..2367d3898da 100644
--- a/cmake/org.eclipse.cdt.cmake.is.nvidia/build.properties
+++ b/cmake/org.eclipse.cdt.cmake.is.nvidia/build.properties
@@ -1,5 +1,5 @@
-source.. = src/main/java/
-output.. = target/classes/
+source.. = src/
+output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.xml,\
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccBuiltinDetectionBehavior.java b/cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccBuiltinDetectionBehavior.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccBuiltinDetectionBehavior.java
rename to cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccBuiltinDetectionBehavior.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccLangStdArglet.java b/cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccLangStdArglet.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccLangStdArglet.java
rename to cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccLangStdArglet.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathArglet.java b/cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathArglet.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathArglet.java
rename to cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccSystemIncludePathArglet.java
diff --git a/cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccToolDetectionParticipant.java b/cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.cmake.is.nvidia/src/main/java/org/eclipse/cdt/cmake/is/nvidia/NvccToolDetectionParticipant.java
rename to cmake/org.eclipse.cdt.cmake.is.nvidia/src/org/eclipse/cdt/cmake/is/nvidia/NvccToolDetectionParticipant.java