diff --git a/cmake/org.eclipse.cdt.cmake.is.core.ui/src/org/eclipse/cdt/cmake/is/core/ui/internal/IndexerSupportPreferencePage.java b/cmake/org.eclipse.cdt.cmake.is.core.ui/src/org/eclipse/cdt/cmake/is/core/ui/internal/IndexerSupportPreferencePage.java
index d2368a5180b..a9e750dd784 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core.ui/src/org/eclipse/cdt/cmake/is/core/ui/internal/IndexerSupportPreferencePage.java
+++ b/cmake/org.eclipse.cdt.cmake.is.core.ui/src/org/eclipse/cdt/cmake/is/core/ui/internal/IndexerSupportPreferencePage.java
@@ -13,9 +13,9 @@ package org.eclipse.cdt.cmake.is.core.ui.internal;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import org.eclipse.cdt.cmake.is.core.language.settings.providers.IParserPreferences;
-import org.eclipse.cdt.cmake.is.core.language.settings.providers.IParserPreferencesAccess;
-import org.eclipse.cdt.cmake.is.core.language.settings.providers.IParserPreferencesMetadata;
+import org.eclipse.cdt.cmake.is.core.IParserPreferences;
+import org.eclipse.cdt.cmake.is.core.IParserPreferencesAccess;
+import org.eclipse.cdt.cmake.is.core.IParserPreferencesMetadata;
 import org.eclipse.cdt.core.options.OptionMetadata;
 import org.eclipse.e4.core.contexts.EclipseContextFactory;
 import org.eclipse.jface.layout.GridDataFactory;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.is.core/META-INF/MANIFEST.MF
index 107cd16185f..199df1f13b2 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/META-INF/MANIFEST.MF
+++ b/cmake/org.eclipse.cdt.cmake.is.core/META-INF/MANIFEST.MF
@@ -11,9 +11,8 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.cdt.cmake.is.core.internal.Plugin
 Export-Package: org.eclipse.cdt.cmake.is.core;x-internal:=true;uses:="org.eclipse.core.runtime,org.eclipse.cdt.core.settings.model,org.eclipse.cdt.cmake.is.core.builtins",
- org.eclipse.cdt.cmake.is.core.language.settings.providers;x-internal:=true,
- org.eclipse.cdt.cmake.is.core.participant;uses:="org.eclipse.core.runtime,org.eclipse.cdt.cmake.is.core.participant.builtins,org.eclipse.cdt.cmake.is.core",
- org.eclipse.cdt.cmake.is.core.participant.builtins;uses:="org.eclipse.cdt.cmake.is.core"
+ org.eclipse.cdt.cmake.is.core.participant;uses:="org.eclipse.core.runtime,org.eclipse.cdt.cmake.is.core.participant.builtins",
+ org.eclipse.cdt.cmake.is.core.participant.builtins;uses:="org.eclipse.cdt.cmake.is.core.participant"
 Require-Bundle: org.eclipse.ui.workbench;bundle-version="3.8.0",
  org.eclipse.cdt.ui,
  org.eclipse.core.resources;bundle-version="3.13.700",
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/OSGI-INF/org.eclipse.cdt.cmake.is.core.internal.ParserPreferencesAccess.xml b/cmake/org.eclipse.cdt.cmake.is.core/OSGI-INF/org.eclipse.cdt.cmake.is.core.internal.ParserPreferencesAccess.xml
index aa9cc6c7138..2e38abe76e9 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/OSGI-INF/org.eclipse.cdt.cmake.is.core.internal.ParserPreferencesAccess.xml
+++ b/cmake/org.eclipse.cdt.cmake.is.core/OSGI-INF/org.eclipse.cdt.cmake.is.core.internal.ParserPreferencesAccess.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.cmake.is.core.internal.ParserPreferencesAccess">
    <service>
-      <provide interface="org.eclipse.cdt.cmake.is.core.language.settings.providers.IParserPreferencesAccess"/>
+      <provide interface="org.eclipse.cdt.cmake.is.core.IParserPreferencesAccess"/>
    </service>
    <implementation class="org.eclipse.cdt.cmake.is.core.internal.ParserPreferencesAccess"/>
 </scr:component>
\ No newline at end of file
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/CommandEntry.java b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CommandEntry.java
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/CommandEntry.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CommandEntry.java
index 93e46370e25..2d585aaa1ce 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/CommandEntry.java
+++ b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CommandEntry.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.cmake.is.core.language.settings.providers;
+package org.eclipse.cdt.cmake.is.core;
 
 /**
  * Represents a parsed command entry of a compile_commands.json file.
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/CompileCommandsJsonParser.java b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java
similarity index 99%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/CompileCommandsJsonParser.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java
index 31f6def4dcd..5cd47a16b9b 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/CompileCommandsJsonParser.java
+++ b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/CompileCommandsJsonParser.java
@@ -6,7 +6,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.cdt.cmake.is.core.language.settings.providers;
+package org.eclipse.cdt.cmake.is.core;
 
 import java.io.File;
 import java.io.FileReader;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/IIndexerInfoConsumer.java b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IIndexerInfoConsumer.java
similarity index 95%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/IIndexerInfoConsumer.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IIndexerInfoConsumer.java
index 76761668327..2d3e7c27175 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/IIndexerInfoConsumer.java
+++ b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IIndexerInfoConsumer.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.cmake.is.core.language.settings.providers;
+package org.eclipse.cdt.cmake.is.core;
 
 import java.util.List;
 import java.util.Map;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/IParserPreferences.java b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferences.java
similarity index 95%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/IParserPreferences.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferences.java
index 90ebd06e13b..0dfaa93cf41 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/IParserPreferences.java
+++ b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferences.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.cmake.is.core.language.settings.providers;
+package org.eclipse.cdt.cmake.is.core;
 
 /**
  * Preferences to configure the {@code compile_commands.json} parser.
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/IParserPreferencesAccess.java b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferencesAccess.java
similarity index 93%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/IParserPreferencesAccess.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferencesAccess.java
index 07307799123..a13a30fa7dc 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/IParserPreferencesAccess.java
+++ b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferencesAccess.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.cmake.is.core.language.settings.providers;
+package org.eclipse.cdt.cmake.is.core;
 
 /**
  * Provides access to the {@code compile_commands.json} parser preferences and its preference metadata.<br>
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/IParserPreferencesMetadata.java b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferencesMetadata.java
similarity index 95%
rename from cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/IParserPreferencesMetadata.java
rename to cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferencesMetadata.java
index 81f5b0eb215..9072340efd8 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/language/settings/providers/IParserPreferencesMetadata.java
+++ b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/IParserPreferencesMetadata.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.cmake.is.core.language.settings.providers;
+package org.eclipse.cdt.cmake.is.core;
 
 import org.eclipse.cdt.core.options.OptionMetadata;
 
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferences.java b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferences.java
index fc204e04210..e2e305b6e47 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferences.java
+++ b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferences.java
@@ -13,8 +13,8 @@ package org.eclipse.cdt.cmake.is.core.internal;
 
 import java.util.Objects;
 
-import org.eclipse.cdt.cmake.is.core.language.settings.providers.IParserPreferences;
-import org.eclipse.cdt.cmake.is.core.language.settings.providers.IParserPreferencesMetadata;
+import org.eclipse.cdt.cmake.is.core.IParserPreferences;
+import org.eclipse.cdt.cmake.is.core.IParserPreferencesMetadata;
 import org.eclipse.cdt.core.options.OptionStorage;
 
 /**
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesAccess.java b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesAccess.java
index fb3bbedec19..60773d727bd 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesAccess.java
+++ b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesAccess.java
@@ -11,9 +11,9 @@
 
 package org.eclipse.cdt.cmake.is.core.internal;
 
-import org.eclipse.cdt.cmake.is.core.language.settings.providers.IParserPreferences;
-import org.eclipse.cdt.cmake.is.core.language.settings.providers.IParserPreferencesAccess;
-import org.eclipse.cdt.cmake.is.core.language.settings.providers.IParserPreferencesMetadata;
+import org.eclipse.cdt.cmake.is.core.IParserPreferences;
+import org.eclipse.cdt.cmake.is.core.IParserPreferencesAccess;
+import org.eclipse.cdt.cmake.is.core.IParserPreferencesMetadata;
 import org.eclipse.cdt.core.options.OptionStorage;
 import org.eclipse.cdt.core.options.OsgiPreferenceStorage;
 import org.eclipse.core.runtime.preferences.IScopeContext;
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesMetadata.java b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesMetadata.java
index fecd4854ae7..912da1fc289 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesMetadata.java
+++ b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/ParserPreferencesMetadata.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.cdt.cmake.is.core.internal;
 
-import org.eclipse.cdt.cmake.is.core.language.settings.providers.IParserPreferencesMetadata;
+import org.eclipse.cdt.cmake.is.core.IParserPreferencesMetadata;
 import org.eclipse.cdt.core.options.BaseOption;
 import org.eclipse.cdt.core.options.OptionMetadata;
 
diff --git a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/CompilerBuiltinsDetector.java b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/CompilerBuiltinsDetector.java
index 1651d539074..eb1a35bebf8 100644
--- a/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/CompilerBuiltinsDetector.java
+++ b/cmake/org.eclipse.cdt.cmake.is.core/src/main/java/org/eclipse/cdt/cmake/is/core/internal/builtins/CompilerBuiltinsDetector.java
@@ -19,9 +19,9 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
+import org.eclipse.cdt.cmake.is.core.IParserPreferences;
+import org.eclipse.cdt.cmake.is.core.IParserPreferencesAccess;
 import org.eclipse.cdt.cmake.is.core.internal.Plugin;
-import org.eclipse.cdt.cmake.is.core.language.settings.providers.IParserPreferences;
-import org.eclipse.cdt.cmake.is.core.language.settings.providers.IParserPreferencesAccess;
 import org.eclipse.cdt.cmake.is.core.participant.IRawIndexerInfo;
 import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsDetectionBehavior;
 import org.eclipse.cdt.cmake.is.core.participant.builtins.IBuiltinsOutputProcessor;