diff --git a/lsp/org.eclipse.cdt.lsp.core.tests/META-INF/MANIFEST.MF b/lsp/org.eclipse.cdt.lsp.core.tests/META-INF/MANIFEST.MF
index ba121a4bd3a..e4f98bea2dd 100644
--- a/lsp/org.eclipse.cdt.lsp.core.tests/META-INF/MANIFEST.MF
+++ b/lsp/org.eclipse.cdt.lsp.core.tests/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.google.gson;bundle-version="2.8.2",
+ org.eclipse.cdt.lsp.cquery;bundle-version="0.1.0",
  org.junit,
  org.eclipse.lsp4j,
  org.eclipse.lsp4j.jsonrpc,
diff --git a/lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/core/tests/cquery/CqueryJsonParseTest.java b/lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/cquery/tests/CqueryJsonParseTest.java
similarity index 89%
rename from lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/core/tests/cquery/CqueryJsonParseTest.java
rename to lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/cquery/tests/CqueryJsonParseTest.java
index 419dc47c937..93eb1a1d99b 100644
--- a/lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/core/tests/cquery/CqueryJsonParseTest.java
+++ b/lsp/org.eclipse.cdt.lsp.core.tests/src/org/eclipse/cdt/lsp/cquery/tests/CqueryJsonParseTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Manish Khurana , Nathan Ridge and others.
+ * Copyright (c) 2018, 2020 Manish Khurana , Nathan Ridge and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -9,21 +9,21 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.lsp.core.tests.cquery;
+package org.eclipse.cdt.lsp.cquery.tests;
 
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.eclipse.cdt.cquery.CqueryInactiveRegions;
-import org.eclipse.cdt.cquery.CquerySemanticHighlights;
-import org.eclipse.cdt.cquery.ExtendedSymbolKindType;
-import org.eclipse.cdt.cquery.HighlightSymbol;
-import org.eclipse.cdt.cquery.IndexingProgressStats;
-import org.eclipse.cdt.cquery.StorageClass;
-import org.eclipse.cdt.cquery.SymbolRole;
-import org.eclipse.cdt.internal.cquery.ui.CqueryProtocolExtension;
+import org.eclipse.cdt.lsp.internal.cquery.CqueryInactiveRegions;
+import org.eclipse.cdt.lsp.internal.cquery.CquerySemanticHighlights;
+import org.eclipse.cdt.lsp.internal.cquery.ExtendedSymbolKindType;
+import org.eclipse.cdt.lsp.internal.cquery.HighlightSymbol;
+import org.eclipse.cdt.lsp.internal.cquery.IndexingProgressStats;
+import org.eclipse.cdt.lsp.internal.cquery.StorageClass;
+import org.eclipse.cdt.lsp.internal.cquery.SymbolRole;
+import org.eclipse.cdt.lsp.internal.cquery.ui.CqueryProtocolExtension;
 import org.eclipse.lsp4j.Position;
 import org.eclipse.lsp4j.Range;
 import org.eclipse.lsp4j.jsonrpc.json.JsonRpcMethod;
diff --git a/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF b/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF
index 5b6dc3c613f..809f273543f 100644
--- a/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF
+++ b/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF
@@ -23,16 +23,11 @@ Require-Bundle: com.google.gson;bundle-version="2.8.2",
  org.eclipse.cdt.ui
 Import-Package: org.eclipse.ui.editors.text,
  org.eclipse.ui.texteditor
-Export-Package: org.eclipse.cdt.cquery;x-friends:="org.eclipse.cdt.lsp.ui",
- org.eclipse.cdt.internal.cquery;x-friends:="org.eclipse.cdt.lsp.ui",
- org.eclipse.cdt.internal.cquery.ui;x-internal:=true,
- org.eclipse.cdt.lsp;x-friends:="org.eclipse.cdt.lsp.ui,org.eclipse.cdt.lsp.clangd",
+Export-Package: org.eclipse.cdt.lsp;x-friends:="org.eclipse.cdt.lsp.ui,org.eclipse.cdt.lsp.clangd",
  org.eclipse.cdt.lsp.core;x-friends:="org.eclipse.cdt.lsp.ui",
  org.eclipse.cdt.lsp.internal.core;x-internal:=true,
  org.eclipse.cdt.lsp.internal.text;x-friends:="org.eclipse.cdt.lsp.ui"
 Bundle-Activator: org.eclipse.cdt.lsp.core.Activator
 Bundle-ActivationPolicy: lazy
 Service-Component: OSGI-INF/org.eclipse.cdt.lsp.internal.core.ContributedLanguageServers.xml,
- OSGI-INF/org.eclipse.cdt.internal.cquery.CqueryLanguageServer.xml,
- OSGI-INF/org.eclipse.cdt.lsp.internal.core.ContributedProtocolExtensions.xml,
- OSGI-INF/org.eclipse.cdt.internal.cquery.ui.CqueryProtocolExtension.xml
+ OSGI-INF/org.eclipse.cdt.lsp.internal.core.ContributedProtocolExtensions.xml
diff --git a/lsp/org.eclipse.cdt.lsp.cquery/.project b/lsp/org.eclipse.cdt.lsp.cquery/.project
index 940eb472c4e..c758d33fb1f 100644
--- a/lsp/org.eclipse.cdt.lsp.cquery/.project
+++ b/lsp/org.eclipse.cdt.lsp.cquery/.project
@@ -20,6 +20,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ds.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.pde.PluginNature</nature>
diff --git a/lsp/org.eclipse.cdt.lsp.cquery/META-INF/MANIFEST.MF b/lsp/org.eclipse.cdt.lsp.cquery/META-INF/MANIFEST.MF
index 2250e3c492a..fdcb812c787 100644
--- a/lsp/org.eclipse.cdt.lsp.cquery/META-INF/MANIFEST.MF
+++ b/lsp/org.eclipse.cdt.lsp.cquery/META-INF/MANIFEST.MF
@@ -6,3 +6,18 @@ Bundle-Version: 0.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: com.google.gson;bundle-version="2.8.2",
+ org.eclipse.cdt.lsp.core;bundle-version="1.1.100",
+ org.eclipse.cdt.lsp.ui;bundle-version="0.1.100",
+ org.eclipse.cdt.ui;bundle-version="7.0.0",
+ org.eclipse.core.runtime;bundle-version="3.19.0",
+ org.eclipse.jface.text;bundle-version="3.16.400",
+ org.eclipse.lsp4j.jsonrpc;bundle-version="0.9.0",
+ org.eclipse.lsp4j;bundle-version="0.9.0",
+ org.eclipse.osgi.services;bundle-version="3.9.0";resolution:=optional,
+ org.eclipse.ui;bundle-version="3.118.0"
+Bundle-ActivationPolicy: lazy
+Service-Component: OSGI-INF/org.eclipse.cdt.lsp.internal.cquery.ui.CqueryLanguageServer.xml,
+ OSGI-INF/org.eclipse.cdt.lsp.internal.cquery.ui.CqueryProtocolExtension.xml
+Export-Package: org.eclipse.cdt.lsp.internal.cquery;x-internal:=true,
+ org.eclipse.cdt.lsp.internal.cquery.ui;x-internal:=true
diff --git a/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/org.eclipse.cdt.internal.cquery.CqueryLanguageServer.xml b/lsp/org.eclipse.cdt.lsp.cquery/OSGI-INF/org.eclipse.cdt.lsp.internal.cquery.ui.CqueryLanguageServer.xml
similarity index 58%
rename from lsp/org.eclipse.cdt.lsp.core/OSGI-INF/org.eclipse.cdt.internal.cquery.CqueryLanguageServer.xml
rename to lsp/org.eclipse.cdt.lsp.cquery/OSGI-INF/org.eclipse.cdt.lsp.internal.cquery.ui.CqueryLanguageServer.xml
index 811c204defc..d84b2617965 100644
--- a/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/org.eclipse.cdt.internal.cquery.CqueryLanguageServer.xml
+++ b/lsp/org.eclipse.cdt.lsp.cquery/OSGI-INF/org.eclipse.cdt.lsp.internal.cquery.ui.CqueryLanguageServer.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.internal.cquery.CqueryLanguageServer">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.lsp.internal.cquery.ui.CqueryLanguageServer">
    <service>
       <provide interface="org.eclipse.cdt.lsp.LanguageServerConfiguration"/>
    </service>
-   <implementation class="org.eclipse.cdt.internal.cquery.CqueryLanguageServer"/>
+   <implementation class="org.eclipse.cdt.lsp.internal.cquery.ui.CqueryLanguageServer"/>
 </scr:component>
\ No newline at end of file
diff --git a/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/org.eclipse.cdt.internal.cquery.ui.CqueryProtocolExtension.xml b/lsp/org.eclipse.cdt.lsp.cquery/OSGI-INF/org.eclipse.cdt.lsp.internal.cquery.ui.CqueryProtocolExtension.xml
similarity index 57%
rename from lsp/org.eclipse.cdt.lsp.core/OSGI-INF/org.eclipse.cdt.internal.cquery.ui.CqueryProtocolExtension.xml
rename to lsp/org.eclipse.cdt.lsp.cquery/OSGI-INF/org.eclipse.cdt.lsp.internal.cquery.ui.CqueryProtocolExtension.xml
index 516262d86ad..a0e1d226a8b 100644
--- a/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/org.eclipse.cdt.internal.cquery.ui.CqueryProtocolExtension.xml
+++ b/lsp/org.eclipse.cdt.lsp.cquery/OSGI-INF/org.eclipse.cdt.lsp.internal.cquery.ui.CqueryProtocolExtension.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.internal.cquery.ui.CqueryProtocolExtension">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.lsp.internal.cquery.ui.CqueryProtocolExtension">
    <service>
       <provide interface="org.eclipse.cdt.lsp.LanguageProtocolExtension"/>
    </service>
-   <implementation class="org.eclipse.cdt.internal.cquery.ui.CqueryProtocolExtension"/>
+   <implementation class="org.eclipse.cdt.lsp.internal.cquery.ui.CqueryProtocolExtension"/>
 </scr:component>
\ No newline at end of file
diff --git a/lsp/org.eclipse.cdt.lsp.cquery/src/.gitkeep b/lsp/org.eclipse.cdt.lsp.cquery/src/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/CqueryInactiveRegions.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CqueryInactiveRegions.java
similarity index 88%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/CqueryInactiveRegions.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CqueryInactiveRegions.java
index dd6d4a65897..0596e047d0f 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/CqueryInactiveRegions.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CqueryInactiveRegions.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Manish Khurana , Nathan Ridge and others.
+ * Copyright (c) 2018, 2020 Manish Khurana , Nathan Ridge and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.cquery;
+package org.eclipse.cdt.lsp.internal.cquery;
 
 import java.net.URI;
 import java.util.List;
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CqueryMessages.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CqueryMessages.java
similarity index 79%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CqueryMessages.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CqueryMessages.java
index 76351e8158b..aefff62e285 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CqueryMessages.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CqueryMessages.java
@@ -7,13 +7,13 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.cdt.internal.cquery;
+package org.eclipse.cdt.lsp.internal.cquery;
 
 import org.eclipse.osgi.util.NLS;
 
 public class CqueryMessages extends NLS {
 
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.cquery.CqueryMessages"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.cdt.lsp.internal.cquery.CqueryMessages"; //$NON-NLS-1$
 
 	static {
 		// initialize resource bundle
@@ -22,7 +22,6 @@ public class CqueryMessages extends NLS {
 
 	public static String CqueryLanguageServer_label;
 	public static String CquerySymbolKind_e_illegal_value;
-	public static String Server2ClientProtocolExtension_cquery_name;
 	public static String StorageClass_e_illegal_value;
 
 	private CqueryMessages() {
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CqueryMessages.properties b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CqueryMessages.properties
similarity index 100%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CqueryMessages.properties
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CqueryMessages.properties
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/CquerySemanticHighlights.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CquerySemanticHighlights.java
similarity index 87%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/CquerySemanticHighlights.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CquerySemanticHighlights.java
index 50ae9218d9f..e7c2dc058a4 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/CquerySemanticHighlights.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CquerySemanticHighlights.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Manish Khurana , Nathan Ridge and others.
+ * Copyright (c) 2018, 2020 Manish Khurana , Nathan Ridge and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.cquery;
+package org.eclipse.cdt.lsp.internal.cquery;
 
 import java.net.URI;
 import java.util.List;
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CquerySymbolKind.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CquerySymbolKind.java
similarity index 75%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CquerySymbolKind.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CquerySymbolKind.java
index 13f44bc75c5..688eaa2a2ca 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CquerySymbolKind.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/CquerySymbolKind.java
@@ -1,19 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2018-2019 Manish Khurana, Nathan Ridge and others.
+ * Copyright (c) 2018, 2020 Manish Khurana, Nathan Ridge and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * https://www.eclipse.org/legal/epl-2.0/.
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Manish Khurana <mkmanishkhurana98@gmail.com> - initial API and implementation
- *     Nathan Ridge <zeratul976@hotmail.com> - initial API and implementation
- *     Alexander Fedorov <alexander.fedorov@arsysop.ru> - Bug 558516
  *******************************************************************************/
 
-package org.eclipse.cdt.internal.cquery;
+package org.eclipse.cdt.lsp.internal.cquery;
 
 import org.eclipse.osgi.util.NLS;
 
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/ExtendedSymbolKindType.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ExtendedSymbolKindType.java
similarity index 82%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/ExtendedSymbolKindType.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ExtendedSymbolKindType.java
index 603fc027b24..21032819e3c 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/ExtendedSymbolKindType.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ExtendedSymbolKindType.java
@@ -1,23 +1,17 @@
 /*******************************************************************************
- * Copyright (c) 2018-2019 Manish Khurana, Nathan Ridge and others.
+ * Copyright (c) 2018, 2020 Manish Khurana, Nathan Ridge and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * https://www.eclipse.org/legal/epl-2.0/.
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Manish Khurana <mkmanishkhurana98@gmail.com> - initial API and implementation
- *     Nathan Ridge <zeratul976@hotmail.com> - initial API and implementation
- *     Alexander Fedorov <alexander.fedorov@arsysop.ru> - Bug 558516
  *******************************************************************************/
 
-package org.eclipse.cdt.cquery;
+package org.eclipse.cdt.lsp.internal.cquery;
 
 import java.lang.reflect.Type;
 
-import org.eclipse.cdt.internal.cquery.CquerySymbolKind;
 import org.eclipse.lsp4j.SymbolKind;
 
 import com.google.gson.JsonDeserializationContext;
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/HighlightSymbol.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/HighlightSymbol.java
similarity index 92%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/HighlightSymbol.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/HighlightSymbol.java
index 617b99b6663..81eed08b856 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/HighlightSymbol.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/HighlightSymbol.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Manish Khurana , Nathan Ridge and others.
+ * Copyright (c) 2018, 2020 Manish Khurana , Nathan Ridge and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.cquery;
+package org.eclipse.cdt.lsp.internal.cquery;
 
 import java.util.List;
 
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/IndexingProgressStats.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/IndexingProgressStats.java
similarity index 93%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/IndexingProgressStats.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/IndexingProgressStats.java
index 56553003396..72247a68283 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/IndexingProgressStats.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/IndexingProgressStats.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 Manish Khurana , Nathan Ridge and others.
+ * Copyright (c) 2018, 2020 Manish Khurana , Nathan Ridge and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.cquery;
+package org.eclipse.cdt.lsp.internal.cquery;
 
 public class IndexingProgressStats {
 	private int indexRequestCount;
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/StorageClass.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/StorageClass.java
similarity index 69%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/StorageClass.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/StorageClass.java
index 700021b3000..11ee78e2110 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/StorageClass.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/StorageClass.java
@@ -1,21 +1,15 @@
 /*******************************************************************************
- * Copyright (c) 2018-2019 Manish Khurana, Nathan Ridge and others.
+ * Copyright (c) 2018, 2020 Manish Khurana, Nathan Ridge and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
  * https://www.eclipse.org/legal/epl-2.0/.
  *
  * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     Manish Khurana <mkmanishkhurana98@gmail.com> - initial API and implementation
- *     Nathan Ridge <zeratul976@hotmail.com> - initial API and implementation
- *     Alexander Fedorov <alexander.fedorov@arsysop.ru> - Bug 558516
  *******************************************************************************/
 
-package org.eclipse.cdt.cquery;
+package org.eclipse.cdt.lsp.internal.cquery;
 
-import org.eclipse.cdt.internal.cquery.CqueryMessages;
 import org.eclipse.osgi.util.NLS;
 
 public enum StorageClass {
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/SymbolRole.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/SymbolRole.java
similarity index 70%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/SymbolRole.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/SymbolRole.java
index 14421b45072..1ee31e6ce27 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/SymbolRole.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/SymbolRole.java
@@ -1,12 +1,14 @@
 /*******************************************************************************
- * Copyright (c) 2018 Nathan Ridge and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * Copyright (c) 2018, 2020 Nathan Ridge and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0/.
+ *
+ * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.cquery;
+package org.eclipse.cdt.lsp.internal.cquery;
 
 /**
  * A class to contain constants that represent different roles
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CqueryLanguageServer.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/CqueryLanguageServer.java
similarity index 93%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CqueryLanguageServer.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/CqueryLanguageServer.java
index 83502c72df4..71e9cf2e1dd 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CqueryLanguageServer.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/CqueryLanguageServer.java
@@ -9,12 +9,13 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.internal.cquery;
+package org.eclipse.cdt.lsp.internal.cquery.ui;
 
 import java.net.URI;
 
 import org.eclipse.cdt.internal.ui.editor.CEditor;
 import org.eclipse.cdt.lsp.LanguageServerConfiguration;
+import org.eclipse.cdt.lsp.internal.cquery.CqueryMessages;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
@@ -22,6 +23,7 @@ import org.osgi.service.component.annotations.Component;
 
 import com.google.gson.JsonObject;
 
+@SuppressWarnings("restriction")
 @Component
 public class CqueryLanguageServer implements LanguageServerConfiguration {
 
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/ui/CqueryProtocolExtension.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/CqueryProtocolExtension.java
similarity index 84%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/ui/CqueryProtocolExtension.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/CqueryProtocolExtension.java
index 29743814f83..19d69e40934 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/ui/CqueryProtocolExtension.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/CqueryProtocolExtension.java
@@ -8,19 +8,20 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.internal.cquery.ui;
+package org.eclipse.cdt.lsp.internal.cquery.ui;
 
-import org.eclipse.cdt.cquery.CqueryInactiveRegions;
-import org.eclipse.cdt.cquery.CquerySemanticHighlights;
-import org.eclipse.cdt.cquery.IndexingProgressStats;
-import org.eclipse.cdt.internal.cquery.CqueryMessages;
 import org.eclipse.cdt.lsp.LanguageProtocolExtension;
 import org.eclipse.cdt.lsp.internal.core.ShowStatus;
+import org.eclipse.cdt.lsp.internal.cquery.CqueryInactiveRegions;
+import org.eclipse.cdt.lsp.internal.cquery.CqueryMessages;
+import org.eclipse.cdt.lsp.internal.cquery.CquerySemanticHighlights;
+import org.eclipse.cdt.lsp.internal.cquery.IndexingProgressStats;
 import org.eclipse.cdt.lsp.internal.text.SetInactiveRegions;
 import org.eclipse.cdt.lsp.internal.ui.StatusLineMessage;
 import org.eclipse.lsp4j.jsonrpc.services.JsonNotification;
 import org.osgi.service.component.annotations.Component;
 
+@SuppressWarnings("restriction")
 @Component
 public class CqueryProtocolExtension implements LanguageProtocolExtension {
 
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/ui/HighlightingNames.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/HighlightingNames.java
similarity index 90%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/ui/HighlightingNames.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/HighlightingNames.java
index e15274c0f9f..b91e9f993fd 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/ui/HighlightingNames.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/HighlightingNames.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018-2019 Manish Khurana, Nathan Ridge and others.
+ * Copyright (c) 2018, 2020 Manish Khurana, Nathan Ridge and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -7,19 +7,20 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.cdt.internal.cquery.ui;
+package org.eclipse.cdt.lsp.internal.cquery.ui;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.eclipse.cdt.cquery.ExtendedSymbolKindType;
-import org.eclipse.cdt.cquery.StorageClass;
-import org.eclipse.cdt.cquery.SymbolRole;
-import org.eclipse.cdt.internal.cquery.CquerySymbolKind;
 import org.eclipse.cdt.internal.ui.editor.SemanticHighlightings;
+import org.eclipse.cdt.lsp.internal.cquery.CquerySymbolKind;
+import org.eclipse.cdt.lsp.internal.cquery.ExtendedSymbolKindType;
+import org.eclipse.cdt.lsp.internal.cquery.StorageClass;
+import org.eclipse.cdt.lsp.internal.cquery.SymbolRole;
 import org.eclipse.lsp4j.SymbolKind;
 
 //FIXME: AF: rework this compilation unit from a container of static functions to a normal type
+@SuppressWarnings("restriction")
 public class HighlightingNames {
 
 	private static Map<Integer, String> semanticHighlightSymbolsMap = new HashMap<>();
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/ui/PublishSemanticHighlighting.java b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/PublishSemanticHighlighting.java
similarity index 96%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/ui/PublishSemanticHighlighting.java
rename to lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/PublishSemanticHighlighting.java
index f5f217d181d..e0fa9e1ec89 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/ui/PublishSemanticHighlighting.java
+++ b/lsp/org.eclipse.cdt.lsp.cquery/src/org/eclipse/cdt/lsp/internal/cquery/ui/PublishSemanticHighlighting.java
@@ -7,7 +7,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
-package org.eclipse.cdt.internal.cquery.ui;
+package org.eclipse.cdt.lsp.internal.cquery.ui;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -15,12 +15,12 @@ import java.util.List;
 import java.util.Optional;
 import java.util.function.Consumer;
 
-import org.eclipse.cdt.cquery.CquerySemanticHighlights;
-import org.eclipse.cdt.cquery.HighlightSymbol;
 import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightedPosition;
 import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightingStyle;
 import org.eclipse.cdt.lsp.core.Activator;
 import org.eclipse.cdt.lsp.core.PresentationReconcilerCPP;
+import org.eclipse.cdt.lsp.internal.cquery.CquerySemanticHighlights;
+import org.eclipse.cdt.lsp.internal.cquery.HighlightSymbol;
 import org.eclipse.cdt.lsp.internal.text.ResolveDocumentUri;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.PreferenceConstants;
@@ -38,6 +38,7 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Display;
 
 //FIXME: needs more work
+@SuppressWarnings("restriction")
 public class PublishSemanticHighlighting implements Consumer<CquerySemanticHighlights> {
 
 	private final ResolveDocumentUri uri;
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/ui/StatusLineMessage.java b/lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/StatusLineMessage.java
similarity index 100%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/ui/StatusLineMessage.java
rename to lsp/org.eclipse.cdt.lsp.ui/src/org/eclipse/cdt/lsp/internal/ui/StatusLineMessage.java