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/core/tests/cquery/CqueryJsonParseTest.java
index e891b9c8acf..d2b6f84172f 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/core/tests/cquery/CqueryJsonParseTest.java
@@ -16,14 +16,14 @@ 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.lsp.core.Server2ClientProtocolExtension;
-import org.eclipse.cdt.lsp.core.cquery.CqueryInactiveRegions;
-import org.eclipse.cdt.lsp.core.cquery.CquerySemanticHighlights;
-import org.eclipse.cdt.lsp.core.cquery.ExtendedSymbolKindType;
-import org.eclipse.cdt.lsp.core.cquery.HighlightSymbol;
-import org.eclipse.cdt.lsp.core.cquery.IndexingProgressStats;
-import org.eclipse.cdt.lsp.core.cquery.StorageClass;
-import org.eclipse.cdt.lsp.core.cquery.SymbolRole;
 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 d3a60881ece..7306dd26bc2 100644
--- a/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF
+++ b/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF
@@ -22,8 +22,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.lsp.core;x-friends:="org.eclipse.cdt.lsp.ui",
- org.eclipse.cdt.lsp.core.cquery;x-friends:="org.eclipse.cdt.lsp.ui",
+Export-Package: org.eclipse.cdt.cquery;x-friends:="org.eclipse.cdt.lsp.ui",
+ org.eclipse.cdt.internal.cquery;x-internal:=true,
+ org.eclipse.cdt.internal.cquery.core;x-internal:=true,
+ org.eclipse.cdt.internal.cquery.ui;x-internal:=true,
+ org.eclipse.cdt.lsp.core;x-friends:="org.eclipse.cdt.lsp.ui",
  org.eclipse.cdt.lsp.internal.core;x-internal:=true
 Bundle-Activator: org.eclipse.cdt.lsp.core.Activator
 Bundle-ActivationPolicy: lazy
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CqueryInactiveRegions.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/CqueryInactiveRegions.java
similarity index 95%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CqueryInactiveRegions.java
rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/CqueryInactiveRegions.java
index 5f83be536a6..dd6d4a65897 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CqueryInactiveRegions.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/CqueryInactiveRegions.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.lsp.core.cquery;
+package org.eclipse.cdt.cquery;
 
 import java.net.URI;
 import java.util.List;
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CquerySemanticHighlights.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/CquerySemanticHighlights.java
similarity index 95%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CquerySemanticHighlights.java
rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/CquerySemanticHighlights.java
index a9c4f6f9eac..50ae9218d9f 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CquerySemanticHighlights.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/CquerySemanticHighlights.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.lsp.core.cquery;
+package org.eclipse.cdt.cquery;
 
 import java.net.URI;
 import java.util.List;
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/ExtendedSymbolKindType.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/ExtendedSymbolKindType.java
similarity index 96%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/ExtendedSymbolKindType.java
rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/ExtendedSymbolKindType.java
index 729842bd72b..603fc027b24 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/ExtendedSymbolKindType.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/ExtendedSymbolKindType.java
@@ -13,10 +13,11 @@
  *     Alexander Fedorov <alexander.fedorov@arsysop.ru> - Bug 558516
  *******************************************************************************/
 
-package org.eclipse.cdt.lsp.core.cquery;
+package org.eclipse.cdt.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.core/src/org/eclipse/cdt/cquery/HighlightSymbol.java
new file mode 100644
index 00000000000..617b99b6663
--- /dev/null
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/HighlightSymbol.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2018 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 accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************/
+
+package org.eclipse.cdt.cquery;
+
+import java.util.List;
+
+import org.eclipse.lsp4j.Range;
+
+public class HighlightSymbol {
+	private int stableId;
+	private ExtendedSymbolKindType parentKind;
+	private ExtendedSymbolKindType kind;
+	private StorageClass storage;
+	private List<Range> ranges;
+	private Integer role;
+
+	public HighlightSymbol(int stableId, ExtendedSymbolKindType parentKind, ExtendedSymbolKindType kind,
+			StorageClass storage, Integer role, List<Range> ranges) {
+		this.stableId = stableId;
+		this.parentKind = parentKind;
+		this.kind = kind;
+		this.storage = storage;
+		this.role = role;
+		this.ranges = ranges;
+	}
+
+	public int getStableId() {
+		return stableId;
+	}
+
+	public ExtendedSymbolKindType getParentKind() {
+		return parentKind;
+	}
+
+	public ExtendedSymbolKindType getKind() {
+		return kind;
+	}
+
+	public StorageClass getStorage() {
+		return storage;
+	}
+
+	public Integer getRole() {
+		return role;
+	}
+
+	public List<Range> getRanges() {
+		return ranges;
+	}
+}
\ No newline at end of file
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/IndexingProgressStats.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/IndexingProgressStats.java
similarity index 97%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/IndexingProgressStats.java
rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/IndexingProgressStats.java
index 3d7787ba998..56553003396 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/IndexingProgressStats.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/IndexingProgressStats.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.lsp.core.cquery;
+package org.eclipse.cdt.cquery;
 
 public class IndexingProgressStats {
 	private int indexRequestCount;
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/StorageClass.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/StorageClass.java
similarity index 85%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/StorageClass.java
rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/StorageClass.java
index 44480c30ed0..700021b3000 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/StorageClass.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/StorageClass.java
@@ -13,9 +13,9 @@
  *     Alexander Fedorov <alexander.fedorov@arsysop.ru> - Bug 558516
  *******************************************************************************/
 
-package org.eclipse.cdt.lsp.core.cquery;
+package org.eclipse.cdt.cquery;
 
-import org.eclipse.cdt.lsp.internal.core.LspCoreMessages;
+import org.eclipse.cdt.internal.cquery.CqueryMessages;
 import org.eclipse.osgi.util.NLS;
 
 public enum StorageClass {
@@ -34,7 +34,7 @@ public enum StorageClass {
 	public static StorageClass forValue(int value) {
 		StorageClass[] allValues = StorageClass.values();
 		if (value < 1 || value > allValues.length) {
-			throw new IllegalArgumentException(NLS.bind(LspCoreMessages.StorageClass_e_illegal_value, value));
+			throw new IllegalArgumentException(NLS.bind(CqueryMessages.StorageClass_e_illegal_value, value));
 		}
 		return allValues[value - 1];
 	}
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/SymbolRole.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/SymbolRole.java
similarity index 96%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/SymbolRole.java
rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/SymbolRole.java
index a163d711b90..14421b45072 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/SymbolRole.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/cquery/SymbolRole.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html
  *******************************************************************************/
 
-package org.eclipse.cdt.lsp.core.cquery;
+package org.eclipse.cdt.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/CqueryMessages.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CqueryMessages.java
new file mode 100644
index 00000000000..ec310694880
--- /dev/null
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CqueryMessages.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2019 Eclipse Foundation 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:
+ *     Alexander Fedorov <alexander.fedorov@arsysop.ru> - initial API and implementatin
+ *******************************************************************************/
+package org.eclipse.cdt.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$
+
+	static {
+		// initialize resource bundle
+		NLS.initializeMessages(BUNDLE_NAME, CqueryMessages.class);
+	}
+
+	public static String CquerySymbolKind_e_illegal_value;
+	public static String Server2ClientProtocolExtension_cquery_busy;
+	public static String Server2ClientProtocolExtension_cquery_idle;
+	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.core/src/org/eclipse/cdt/internal/cquery/CqueryMessages.properties
new file mode 100644
index 00000000000..26bf2ea054f
--- /dev/null
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CqueryMessages.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2019 Eclipse Foundation 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:
+#     Eclipse Foundation - initial API and implementation
+#     Alexander Fedorov <alexander.fedorov@arsysop.ru> - Bug 558484
+###############################################################################
+
+CquerySymbolKind_e_illegal_value=Illegal value  {0} for cquery symbol kind
+Server2ClientProtocolExtension_cquery_busy=CQuery : Busy | {0} Jobs
+Server2ClientProtocolExtension_cquery_idle=CQuery : Idle
+StorageClass_e_illegal_value=Illegal enum value: {0}
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CquerySymbolKind.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CquerySymbolKind.java
similarity index 84%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CquerySymbolKind.java
rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CquerySymbolKind.java
index 721383b57cf..13f44bc75c5 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/CquerySymbolKind.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/CquerySymbolKind.java
@@ -13,12 +13,11 @@
  *     Alexander Fedorov <alexander.fedorov@arsysop.ru> - Bug 558516
  *******************************************************************************/
 
-package org.eclipse.cdt.lsp.core.cquery;
+package org.eclipse.cdt.internal.cquery;
 
-import org.eclipse.cdt.lsp.internal.core.LspCoreMessages;
 import org.eclipse.osgi.util.NLS;
 
-enum CquerySymbolKind {
+public enum CquerySymbolKind {
 	Unknown(0), TypeAlias(252), Parameter(253), StaticMethod(254), Macro(255);
 
 	private int value;
@@ -44,7 +43,7 @@ enum CquerySymbolKind {
 		case 255:
 			return CquerySymbolKind.Macro;
 		default:
-			throw new IllegalArgumentException(NLS.bind(LspCoreMessages.CquerySymbolKind_e_illegal_value, value));
+			throw new IllegalArgumentException(NLS.bind(CqueryMessages.CquerySymbolKind_e_illegal_value, value));
 		}
 	}
 }
\ No newline at end of file
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CqueryLanguageServer.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/core/CqueryLanguageServer.java
similarity index 94%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CqueryLanguageServer.java
rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/core/CqueryLanguageServer.java
index 953a8f745a2..6181594b57f 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CqueryLanguageServer.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/core/CqueryLanguageServer.java
@@ -9,11 +9,12 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.lsp.core;
+package org.eclipse.cdt.internal.cquery.core;
 
 import java.net.URI;
 
 import org.eclipse.cdt.internal.ui.editor.CEditor;
+import org.eclipse.cdt.lsp.core.ICPPLanguageServer;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/HighlightSymbol.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/ui/HighlightingNames.java
similarity index 69%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/HighlightSymbol.java
rename to lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/ui/HighlightingNames.java
index b5b4820a33e..e15274c0f9f 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/cquery/HighlightSymbol.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/cquery/ui/HighlightingNames.java
@@ -1,32 +1,28 @@
 /*******************************************************************************
- * Copyright (c) 2018 Manish Khurana , Nathan Ridge and others.
+ * Copyright (c) 2018-2019 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 accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/
+ * 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.lsp.core.cquery;
+package org.eclipse.cdt.internal.cquery.ui;
 
 import java.util.HashMap;
-import java.util.List;
 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.lsp4j.Range;
 import org.eclipse.lsp4j.SymbolKind;
 
-public class HighlightSymbol {
-	private int stableId;
-	private ExtendedSymbolKindType parentKind;
-	private ExtendedSymbolKindType kind;
-	private StorageClass storage;
-	private List<Range> ranges;
-	private Integer role;
-	public static Map<Integer, String> semanticHighlightSymbolsMap = new HashMap<>();
+//FIXME: AF: rework this compilation unit from a container of static functions to a normal type
+public class HighlightingNames {
+
+	private static Map<Integer, String> semanticHighlightSymbolsMap = new HashMap<>();
 
 	static {
 		semanticHighlightSymbolsMap.put(SymbolKind.Namespace.getValue(), SemanticHighlightings.NAMESPACE);
@@ -43,10 +39,6 @@ public class HighlightSymbol {
 		semanticHighlightSymbolsMap.put(CquerySymbolKind.Macro.getValue(), SemanticHighlightings.MACRO_DEFINITION);
 	}
 
-	public static boolean isDeclaration(int role) {
-		return (role & SymbolRole.Declaration) != 0 || (role & SymbolRole.Definition) != 0;
-	}
-
 	public static String getHighlightingName(ExtendedSymbolKindType kind, ExtendedSymbolKindType parentKind,
 			StorageClass storage, int role) {
 		// semanticHighlightSymbolsMap contains mappings where the color is determined entirely
@@ -82,37 +74,8 @@ public class HighlightSymbol {
 		return highlightingName;
 	}
 
-	public HighlightSymbol(int stableId, ExtendedSymbolKindType parentKind, ExtendedSymbolKindType kind,
-			StorageClass storage, Integer role, List<Range> ranges) {
-		this.stableId = stableId;
-		this.parentKind = parentKind;
-		this.kind = kind;
-		this.storage = storage;
-		this.role = role;
-		this.ranges = ranges;
+	private static boolean isDeclaration(int role) {
+		return (role & SymbolRole.Declaration) != 0 || (role & SymbolRole.Definition) != 0;
 	}
 
-	public int getStableId() {
-		return stableId;
-	}
-
-	public ExtendedSymbolKindType getParentKind() {
-		return parentKind;
-	}
-
-	public ExtendedSymbolKindType getKind() {
-		return kind;
-	}
-
-	public StorageClass getStorage() {
-		return storage;
-	}
-
-	public Integer getRole() {
-		return role;
-	}
-
-	public List<Range> getRanges() {
-		return ranges;
-	}
-}
\ No newline at end of file
+}
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPStreamConnectionProvider.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPStreamConnectionProvider.java
index b30ba08a87a..94f16733231 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPStreamConnectionProvider.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/CPPStreamConnectionProvider.java
@@ -22,6 +22,7 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.cdt.internal.cquery.core.CqueryLanguageServer;
 import org.eclipse.cdt.lsp.internal.core.LspCoreMessages;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IProject;
@@ -45,6 +46,7 @@ public class CPPStreamConnectionProvider extends ProcessStreamConnectionProvider
 
 	public static final String CQUERY_ID = "cquery"; //$NON-NLS-1$
 
+	//FIXME: AF: the list of available servers should be extracted from some service
 	public CPPStreamConnectionProvider() throws UnsupportedOperationException {
 		List<String> commands = new ArrayList<>();
 		if (store.getString(PreferenceConstants.P_SERVER_CHOICE).equals(CQUERY_ID)) {
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Server2ClientProtocolExtension.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Server2ClientProtocolExtension.java
index 55de673f8bb..0b965236cc4 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Server2ClientProtocolExtension.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/core/Server2ClientProtocolExtension.java
@@ -19,13 +19,14 @@ import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.eclipse.cdt.cquery.CqueryInactiveRegions;
+import org.eclipse.cdt.cquery.CquerySemanticHighlights;
+import org.eclipse.cdt.cquery.HighlightSymbol;
+import org.eclipse.cdt.cquery.IndexingProgressStats;
+import org.eclipse.cdt.internal.cquery.CqueryMessages;
+import org.eclipse.cdt.internal.cquery.ui.HighlightingNames;
 import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightedPosition;
 import org.eclipse.cdt.internal.ui.editor.SemanticHighlightingManager.HighlightingStyle;
-import org.eclipse.cdt.lsp.core.cquery.CqueryInactiveRegions;
-import org.eclipse.cdt.lsp.core.cquery.CquerySemanticHighlights;
-import org.eclipse.cdt.lsp.core.cquery.HighlightSymbol;
-import org.eclipse.cdt.lsp.core.cquery.IndexingProgressStats;
-import org.eclipse.cdt.lsp.internal.core.LspCoreMessages;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.PreferenceConstants;
 import org.eclipse.core.resources.IFile;
@@ -52,6 +53,7 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.internal.WorkbenchWindow;
 
+//FIXME: AF: currently this extension is cquery-specific and it should be contributed from cquery-specific part
 @SuppressWarnings("restriction")
 public class Server2ClientProtocolExtension extends LanguageClientImpl {
 
@@ -71,8 +73,8 @@ public class Server2ClientProtocolExtension extends LanguageClientImpl {
 					statusLine.add(cqueryStatusField);
 				}
 				String msg = stats.getTotalJobs() > 0
-						? NLS.bind(LspCoreMessages.Server2ClientProtocolExtension_cquery_busy, stats.getTotalJobs())
-						: LspCoreMessages.Server2ClientProtocolExtension_cquery_idle;
+						? NLS.bind(CqueryMessages.Server2ClientProtocolExtension_cquery_busy, stats.getTotalJobs())
+						: CqueryMessages.Server2ClientProtocolExtension_cquery_idle;
 				cqueryStatusField.setText(msg);
 			}
 		});
@@ -170,7 +172,7 @@ public class Server2ClientProtocolExtension extends LanguageClientImpl {
 
 		for (HighlightSymbol highlight : highlights.getSymbols()) {
 
-			String highlightingName = HighlightSymbol.getHighlightingName(highlight.getKind(),
+			String highlightingName = HighlightingNames.getHighlightingName(highlight.getKind(),
 					highlight.getParentKind(), highlight.getStorage(), highlight.getRole());
 			String colorKey = PreferenceConstants.EDITOR_SEMANTIC_HIGHLIGHTING_PREFIX + highlightingName
 					+ PreferenceConstants.EDITOR_SEMANTIC_HIGHLIGHTING_COLOR_SUFFIX;
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/core/LspCoreMessages.java b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/core/LspCoreMessages.java
index 1f5eb975fbe..eb7649656b1 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/core/LspCoreMessages.java
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/core/LspCoreMessages.java
@@ -24,10 +24,6 @@ public class LspCoreMessages extends NLS {
 	}
 
 	public static String CPPStreamConnectionProvider_e_unsupported;
-	public static String CquerySymbolKind_e_illegal_value;
-	public static String Server2ClientProtocolExtension_cquery_busy;
-	public static String Server2ClientProtocolExtension_cquery_idle;
-	public static String StorageClass_e_illegal_value;
 
 	private LspCoreMessages() {
 	}
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/core/LspCoreMessages.properties b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/core/LspCoreMessages.properties
index a94d55dcd0b..bb6ba35d9df 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/core/LspCoreMessages.properties
+++ b/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/lsp/internal/core/LspCoreMessages.properties
@@ -13,7 +13,3 @@
 ###############################################################################
 
 CPPStreamConnectionProvider_e_unsupported=Unsupported Language Server
-CquerySymbolKind_e_illegal_value=Illegal value  {0} for cquery symbol kind
-Server2ClientProtocolExtension_cquery_busy=CQuery : Busy | {0} Jobs
-Server2ClientProtocolExtension_cquery_idle=CQuery : Idle
-StorageClass_e_illegal_value=Illegal enum value: {0}