diff --git a/cmake/README.txt b/cmake/README.txt
index 833281a1921..144d93c5a96 100644
--- a/cmake/README.txt
+++ b/cmake/README.txt
@@ -1,3 +1 @@
 Files in this directory tree provide CMake support for the CDT core build.
-
-Bundles with a name starting with 'org.eclipse.cdt.cmake.is' provide support for the CDT indexer. 'is' in this case stands for Indexer Support.
diff --git a/cmake/aggregator/pom.xml b/cmake/aggregator/pom.xml
index 9b3f6f919e9..70178d2b175 100644
--- a/cmake/aggregator/pom.xml
+++ b/cmake/aggregator/pom.xml
@@ -28,6 +28,7 @@
 
 	<modules>
 		<module>../../releng/org.eclipse.cdt.target</module>
+        <module>../../jsoncdb</module>
         <module>..</module>
 	</modules>
 </project>
diff --git a/cmake/pom.xml b/cmake/pom.xml
index 012a40eb341..9ffe003e461 100644
--- a/cmake/pom.xml
+++ b/cmake/pom.xml
@@ -30,18 +30,5 @@
         <module>org.eclipse.cdt.cmake.core.tests</module>
 		<module>org.eclipse.cdt.cmake.ui</module>
 		<module>org.eclipse.cdt.cmake-feature</module>
-		<module>org.eclipse.cdt.jsoncdb.core.doc</module>
-		<module>org.eclipse.cdt.jsoncdb.core</module>
-		<module>org.eclipse.cdt.jsoncdb.core.tests</module>
-        <module>org.eclipse.cdt.jsoncdb.core.ui</module>
-		<module>org.eclipse.cdt.jsoncdb.arm</module>
-		<module>org.eclipse.cdt.jsoncdb.arm.tests</module>
-		<module>org.eclipse.cdt.jsoncdb.hpenonstop</module>
-		<module>org.eclipse.cdt.jsoncdb.hpenonstop.tests</module>
-		<module>org.eclipse.cdt.jsoncdb.intel</module>
-		<module>org.eclipse.cdt.jsoncdb.nvidia</module>
-		<module>org.eclipse.cdt.jsoncdb.nvidia.tests</module>
-		<module>org.eclipse.cdt.jsoncdb.microsoft</module>
-		<module>org.eclipse.cdt.jsoncdb.microsoft.tests</module>
 	</modules>
 </project>
diff --git a/jsoncdb/aggregator/.project b/jsoncdb/aggregator/.project
new file mode 100644
index 00000000000..87378bbbb30
--- /dev/null
+++ b/jsoncdb/aggregator/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.cdt.jsoncdb-aggregator</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+	</natures>
+</projectDescription>
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.core.resources.prefs b/jsoncdb/aggregator/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/aggregator/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/aggregator/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.m2e.core.prefs
rename to jsoncdb/aggregator/.settings/org.eclipse.m2e.core.prefs
diff --git a/jsoncdb/aggregator/pom.xml b/jsoncdb/aggregator/pom.xml
new file mode 100644
index 00000000000..1034bb66d03
--- /dev/null
+++ b/jsoncdb/aggregator/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
+
+   This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License 2.0
+   which accompanies this distribution, and is available at
+   https://www.eclipse.org/legal/epl-2.0/
+
+   SPDX-License-Identifier: EPL-2.0
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.cdt</groupId>
+		<artifactId>jsoncdb-parent</artifactId>
+		<version>10.4.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>jsoncdb-aggregator</artifactId>
+	<packaging>pom</packaging>
+    <!-- aggregates just the jsoncdb modules
+        Convenient if you focus on working on the jsoncdb modules only.
+     -->
+
+	<modules>
+		<module>../../releng/org.eclipse.cdt.target</module>
+        <module>..</module>
+	</modules>
+</project>
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.classpath b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/.classpath
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.classpath
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.gitignore b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/.gitignore
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.gitignore
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.project
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.launching.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.launching.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.ui.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.ui.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.m2e.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/OSGI-INF/l10n/bundle.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/OSGI-INF/l10n/bundle.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/OSGI-INF/l10n/bundle.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm.tests/src/org/eclipse/cdt/jsoncdb/arm/ToolDetectionParticipantTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/src/org/eclipse/cdt/jsoncdb/arm/ToolDetectionParticipantTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm.tests/src/org/eclipse/cdt/jsoncdb/arm/ToolDetectionParticipantTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm.tests/src/org/eclipse/cdt/jsoncdb/arm/ToolDetectionParticipantTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/.classpath b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/.classpath
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/.classpath
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/.gitignore b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/.gitignore
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/.gitignore
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/.project
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.launching.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.launching.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.ui.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.ui.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.m2e.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/doc/compiler.xhtml b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/doc/compiler.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/doc/compiler.xhtml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/doc/compiler.xhtml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/help_content_extension.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/help_content_extension.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/help_content_extension.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/help_content_extension.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/plugin.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/plugin.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/plugin.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/plugin.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/plugin.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/plugin.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/plugin.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmClangToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmClangToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmClangToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmClangToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccBuiltinDetectionBehavior.java b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccBuiltinDetectionBehavior.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccBuiltinDetectionBehavior.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccBuiltinDetectionBehavior.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.arm/src/org/eclipse/cdt/jsoncdb/arm/ArmccToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/.project
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/html/builtins-detection.xhtml b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/doc/html/builtins-detection.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/html/builtins-detection.xhtml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/doc/html/builtins-detection.xhtml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/html/notices.html b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/doc/html/notices.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/html/notices.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/doc/html/notices.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/html/supported-compilers.xhtml b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/doc/html/supported-compilers.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/html/supported-compilers.xhtml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/doc/html/supported-compilers.xhtml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/toc.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/doc/toc.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/toc.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/doc/toc.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/topics_Tasks.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/doc/topics_Tasks.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/doc/topics_Tasks.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/doc/topics_Tasks.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/plugin.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/plugin.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/plugin.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/plugin.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/plugin.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/plugin.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/plugin.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.doc/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.doc/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.doc/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/.classpath b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/.classpath
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.classpath
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/.gitignore b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/.gitignore
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.gitignore
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.project
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.launching.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.launching.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.ui.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.ui.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.m2e.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/OSGI-INF/l10n/bundle.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/OSGI-INF/l10n/bundle.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/OSGI-INF/l10n/bundle.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectLangStd_GCC_Test.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectLangStd_GCC_Test.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectLangStd_GCC_Test.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectLangStd_GCC_Test.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectSysroot_GCC_Test.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectSysroot_GCC_Test.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectSysroot_GCC_Test.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/BuiltinsDetectSysroot_GCC_Test.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludeFile_GCCTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludeFile_GCCTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludeFile_GCCTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludeFile_GCCTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludePath_C_POSIXTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludePath_C_POSIXTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludePath_C_POSIXTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/IncludePath_C_POSIXTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroDefine_C_POSIXTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroDefine_C_POSIXTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroDefine_C_POSIXTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroDefine_C_POSIXTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroUndefine_C_POSIXTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroUndefine_C_POSIXTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroUndefine_C_POSIXTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacroUndefine_C_POSIXTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacrosFile_GCCTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacrosFile_GCCTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacrosFile_GCCTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/MacrosFile_GCCTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetectionTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetectionTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetectionTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetectionTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserLookupResultTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserLookupResultTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserLookupResultTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ParserLookupResultTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_C_Test.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_C_Test.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_C_Test.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_C_Test.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_armcc_Test.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_armcc_Test.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_armcc_Test.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/SystemIncludePath_armcc_Test.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ToolCommandlineParserTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ToolCommandlineParserTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ToolCommandlineParserTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/ToolCommandlineParserTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccOutputProcessorTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccOutputProcessorTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccOutputProcessorTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccOutputProcessorTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/cbd-gcc.output.txt b/jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/cbd-gcc.output.txt
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/cbd-gcc.output.txt
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.tests/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/cbd-gcc.output.txt
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/.classpath b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/.classpath
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.classpath
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.project
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.launching.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.launching.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.ui.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.ui.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.m2e.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/OSGI-INF/l10n/bundle.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/OSGI-INF/l10n/bundle.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/OSGI-INF/l10n/bundle.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/plugin.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/plugin.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/plugin.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/plugin.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/JsonCdbPreferencePage.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/JsonCdbPreferencePage.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/JsonCdbPreferencePage.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/JsonCdbPreferencePage.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/Messages.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/Messages.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/Messages.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/Messages.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/messages.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/messages.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/messages.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core.ui/src/org/eclipse/cdt/jsoncdb/core/ui/internal/messages.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.classpath b/jsoncdb/org.eclipse.cdt.jsoncdb.core/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/.classpath
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/.classpath
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.gitignore b/jsoncdb/org.eclipse.cdt.jsoncdb.core/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/.gitignore
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/.gitignore
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.options b/jsoncdb/org.eclipse.cdt.jsoncdb.core/.options
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/.options
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/.options
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.core/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/.project
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.launching.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.launching.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.ui.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.ui.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.m2e.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.ds.annotations.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.ds.annotations.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.ds.annotations.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.ds.annotations.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/OSGI-INF/org.eclipse.cdt.jsoncdb.core.internal.ParserPreferencesAccess.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.core/OSGI-INF/org.eclipse.cdt.jsoncdb.core.internal.ParserPreferencesAccess.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/OSGI-INF/org.eclipse.cdt.jsoncdb.core.internal.ParserPreferencesAccess.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/OSGI-INF/org.eclipse.cdt.jsoncdb.core.internal.ParserPreferencesAccess.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.core/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.core/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/plugin.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.core/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/plugin.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/plugin.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/plugin.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.core/plugin.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/plugin.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/plugin.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.core/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/schema/participant.exsd b/jsoncdb/org.eclipse.cdt.jsoncdb.core/schema/participant.exsd
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/schema/participant.exsd
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/schema/participant.exsd
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CommandEntry.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CommandEntry.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CommandEntry.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CommandEntry.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/CompileCommandsJsonParser.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferences.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferences.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferences.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferences.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesAccess.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesAccess.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesAccess.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesAccess.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesMetadata.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesMetadata.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesMetadata.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/IParserPreferencesMetadata.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/ISourceFileInfoConsumer.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/ISourceFileInfoConsumer.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/ISourceFileInfoConsumer.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/ISourceFileInfoConsumer.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/Messages.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/Messages.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/Messages.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/Messages.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/ParseRequest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/ParseRequest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/ParseRequest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/ParseRequest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Messages.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Messages.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Messages.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Messages.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParseContext.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParseContext.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParseContext.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParseContext.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetection.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetection.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetection.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserDetection.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferences.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferences.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferences.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferences.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesAccess.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesAccess.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesAccess.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesAccess.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesMetadata.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesMetadata.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesMetadata.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/ParserPreferencesMetadata.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Plugin.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Plugin.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Plugin.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/Plugin.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/AbstractConsole.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/AbstractConsole.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/AbstractConsole.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/AbstractConsole.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/CompilerBuiltinsDetector.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/CompilerBuiltinsDetector.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/CompilerBuiltinsDetector.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/CompilerBuiltinsDetector.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/DetectorConsole.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/DetectorConsole.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/DetectorConsole.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/DetectorConsole.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccBuiltinDetectionBehavior.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccBuiltinDetectionBehavior.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccBuiltinDetectionBehavior.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/GccBuiltinDetectionBehavior.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/MaybeGccBuiltinDetectionBehavior.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/Messages.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/Messages.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/Messages.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/Messages.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/RawSourceFileInfo.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/RawSourceFileInfo.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/RawSourceFileInfo.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/RawSourceFileInfo.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/messages.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/messages.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/messages.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/builtins/messages.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/messages.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/messages.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/messages.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/internal/messages.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/messages.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/messages.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/messages.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/messages.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/package-info.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/package-info.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/package-info.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/package-info.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/Arglets.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/Arglets.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/Arglets.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/Arglets.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolCommandlineParser.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolCommandlineParser.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolCommandlineParser.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolCommandlineParser.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/DefaultToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IArglet.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IArglet.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IArglet.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IArglet.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IParserHandler.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IParserHandler.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IParserHandler.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IParserHandler.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawSourceFileInfo.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawSourceFileInfo.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawSourceFileInfo.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawSourceFileInfo.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawSourceFileInfoCollector.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawSourceFileInfoCollector.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawSourceFileInfoCollector.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IRawSourceFileInfoCollector.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IResponseFileArglet.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IResponseFileArglet.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IResponseFileArglet.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IResponseFileArglet.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolCommandlineParser.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolCommandlineParser.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolCommandlineParser.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolCommandlineParser.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/IToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ParticipantTestUtil.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ParticipantTestUtil.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ParticipantTestUtil.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ParticipantTestUtil.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ResponseFileArglets.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ResponseFileArglets.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ResponseFileArglets.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/ResponseFileArglets.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/GccOutputProcessor.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/GccOutputProcessor.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/GccOutputProcessor.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/GccOutputProcessor.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsDetectionBehavior.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsDetectionBehavior.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsDetectionBehavior.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsDetectionBehavior.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsOutputProcessor.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsOutputProcessor.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsOutputProcessor.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/IBuiltinsOutputProcessor.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/OutputSniffer.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/OutputSniffer.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/OutputSniffer.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/builtins/OutputSniffer.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/package-info.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/package-info.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/package-info.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/package-info.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.classpath b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.classpath
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.classpath
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.gitignore b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.gitignore
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.gitignore
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.project
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.launching.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.launching.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.ui.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.ui.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.m2e.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/OSGI-INF/l10n/bundle.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/OSGI-INF/l10n/bundle.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/OSGI-INF/l10n/bundle.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/src/org/eclipse/cdt/jsoncdb/hpenonstop/ToolDetectionParticipantTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/src/org/eclipse/cdt/jsoncdb/hpenonstop/ToolDetectionParticipantTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop.tests/src/org/eclipse/cdt/jsoncdb/hpenonstop/ToolDetectionParticipantTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop.tests/src/org/eclipse/cdt/jsoncdb/hpenonstop/ToolDetectionParticipantTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.classpath b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.classpath
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.classpath
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.gitignore b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.gitignore
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.gitignore
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.project
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.launching.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.launching.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.ui.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.ui.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.m2e.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/doc/compiler.xhtml b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/doc/compiler.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/doc/compiler.xhtml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/doc/compiler.xhtml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/help_content_extension.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/help_content_extension.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/help_content_extension.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/help_content_extension.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/plugin.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC11ToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC11ToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC11ToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC11ToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC89ToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC89ToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC89ToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC89ToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC99ToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC99ToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC99ToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.hpenonstop/src/org/eclipse/cdt/jsoncdb/hpenonstop/HpeC99ToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/.classpath b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/.classpath
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/.classpath
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/.gitignore b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/.gitignore
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/.gitignore
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/.project
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.launching.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.launching.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.ui.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.ui.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.m2e.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/doc/compiler.xhtml b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/doc/compiler.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/doc/compiler.xhtml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/doc/compiler.xhtml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/help_content_extension.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/help_content_extension.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/help_content_extension.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/help_content_extension.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/plugin.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/plugin.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/plugin.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/plugin.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/plugin.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/plugin.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/plugin.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IccToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IccToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IccToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IccToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclCandCppToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclCandCppToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclCandCppToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclCandCppToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IclToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcClangToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcClangToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcClangToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcClangToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IcpcToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCToolCommandlineParser.java b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCToolCommandlineParser.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCToolCommandlineParser.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCToolCommandlineParser.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCppToolCommandlineParser.java b/jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCppToolCommandlineParser.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCppToolCommandlineParser.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.intel/src/org/eclipse/cdt/jsoncdb/intel/IntelCppToolCommandlineParser.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.classpath b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.classpath
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.classpath
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.gitignore b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.gitignore
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.gitignore
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.project
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.launching.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.launching.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.ui.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.ui.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.m2e.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/OSGI-INF/l10n/bundle.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/OSGI-INF/l10n/bundle.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/OSGI-INF/l10n/bundle.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/src/org/eclipse/cdt/jsoncdb/microsoft/ToolDetectionParticipantTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/src/org/eclipse/cdt/jsoncdb/microsoft/ToolDetectionParticipantTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft.tests/src/org/eclipse/cdt/jsoncdb/microsoft/ToolDetectionParticipantTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft.tests/src/org/eclipse/cdt/jsoncdb/microsoft/ToolDetectionParticipantTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/.classpath b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/.classpath
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.classpath
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/.gitignore b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/.gitignore
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.gitignore
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.project
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.launching.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.launching.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.ui.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.ui.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.m2e.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/doc/compiler.xhtml b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/doc/compiler.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/doc/compiler.xhtml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/doc/compiler.xhtml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/help_content_extension.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/help_content_extension.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/help_content_extension.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/help_content_extension.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/plugin.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/plugin.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/plugin.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/plugin.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/plugin.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/plugin.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/plugin.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolCommandlineParser.java b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolCommandlineParser.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolCommandlineParser.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolCommandlineParser.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.microsoft/src/org/eclipse/cdt/jsoncdb/microsoft/MsclToolDetectionParticipant.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.classpath b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.classpath
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.classpath
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.gitignore b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.gitignore
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.gitignore
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.project
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.core.resources.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.core.resources.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.launching.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.launching.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.ui.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.ui.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.m2e.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.m2e.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.m2e.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/OSGI-INF/l10n/bundle.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/OSGI-INF/l10n/bundle.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/OSGI-INF/l10n/bundle.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/ToolDetectionParticipantTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/ToolDetectionParticipantTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/ToolDetectionParticipantTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/ToolDetectionParticipantTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccBuiltins_DetectLangStdTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccOutputProcessorTest.java b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccOutputProcessorTest.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccOutputProcessorTest.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/NvccOutputProcessorTest.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/cbd-nvcc.output.txt b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/cbd-nvcc.output.txt
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/cbd-nvcc.output.txt
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia.tests/src/org/eclipse/cdt/jsoncdb/nvidia/builtins/cbd-nvcc.output.txt
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/.classpath b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.classpath
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/.classpath
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.classpath
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/.gitignore b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.gitignore
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/.gitignore
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.gitignore
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/.project b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.project
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/.project
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.project
diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.core.resources.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..99f26c0203a
--- /dev/null
+++ b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.core.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.core.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.launching.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.launching.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.launching.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.launching.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.ui.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.ui.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.jdt.ui.prefs
diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.m2e.core.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 00000000000..f897a7f1cb2
--- /dev/null
+++ b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.pde.api.tools.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.pde.api.tools.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.pde.api.tools.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.pde.api.tools.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.pde.prefs b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.pde.prefs
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.pde.prefs
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/.settings/org.eclipse.pde.prefs
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/META-INF/MANIFEST.MF
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/META-INF/MANIFEST.MF
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/META-INF/MANIFEST.MF
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/about.html b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/about.html
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/about.html
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/about.html
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/build.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/build.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/build.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/build.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/doc/compiler.xhtml b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/doc/compiler.xhtml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/doc/compiler.xhtml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/doc/compiler.xhtml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/help_content_extension.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/help_content_extension.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/help_content_extension.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/help_content_extension.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/plugin.properties b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/plugin.properties
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/plugin.properties
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/plugin.properties
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/plugin.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/plugin.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/plugin.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/plugin.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/pom.xml b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/pom.xml
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/pom.xml
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/pom.xml
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccBuiltinDetectionBehavior.java b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccBuiltinDetectionBehavior.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccBuiltinDetectionBehavior.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccBuiltinDetectionBehavior.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccLangStdArglet.java b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccLangStdArglet.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccLangStdArglet.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccLangStdArglet.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathArglet.java b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathArglet.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathArglet.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccSystemIncludePathArglet.java
diff --git a/cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccToolDetectionParticipant.java b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccToolDetectionParticipant.java
similarity index 100%
rename from cmake/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccToolDetectionParticipant.java
rename to jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccToolDetectionParticipant.java
diff --git a/jsoncdb/pom.xml b/jsoncdb/pom.xml
new file mode 100644
index 00000000000..ab3b21ddaa3
--- /dev/null
+++ b/jsoncdb/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Copyright (c) 2020, 2021 Contributors to the Eclipse Foundation
+
+   This program and the accompanying materials
+   are made available under the terms of the Eclipse Public License 2.0
+   which accompanies this distribution, and is available at
+   https://www.eclipse.org/legal/epl-2.0/
+
+   SPDX-License-Identifier: EPL-2.0
+-->
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.eclipse.cdt</groupId>
+		<artifactId>cdt-parent</artifactId>
+		<version>10.4.0-SNAPSHOT</version>
+	</parent>
+
+	<groupId>org.eclipse.cdt</groupId>
+	<artifactId>jsoncdb-parent</artifactId>
+	<version>10.4.0-SNAPSHOT</version>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>org.eclipse.cdt.jsoncdb.core.doc</module>
+		<module>org.eclipse.cdt.jsoncdb.core</module>
+		<module>org.eclipse.cdt.jsoncdb.core.tests</module>
+        <module>org.eclipse.cdt.jsoncdb.core.ui</module>
+		<module>org.eclipse.cdt.jsoncdb.arm</module>
+		<module>org.eclipse.cdt.jsoncdb.arm.tests</module>
+		<module>org.eclipse.cdt.jsoncdb.hpenonstop</module>
+		<module>org.eclipse.cdt.jsoncdb.hpenonstop.tests</module>
+		<module>org.eclipse.cdt.jsoncdb.intel</module>
+		<module>org.eclipse.cdt.jsoncdb.nvidia</module>
+		<module>org.eclipse.cdt.jsoncdb.nvidia.tests</module>
+		<module>org.eclipse.cdt.jsoncdb.microsoft</module>
+		<module>org.eclipse.cdt.jsoncdb.microsoft.tests</module>
+	</modules>
+</project>
diff --git a/pom.xml b/pom.xml
index cbc3119c4e7..a2afc056496 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,6 +259,7 @@
 
 		<module>terminal</module>
 
+		<module>jsoncdb</module>
 		<module>cmake</module>
 
 		<module>releng/org.eclipse.cdt.native-feature</module>