diff --git a/lsp/org.eclipse.cdt.lsp.clangd/.project b/lsp/org.eclipse.cdt.lsp.clangd/.project
index e7db37a25a3..3e1df7ce1ce 100644
--- a/lsp/org.eclipse.cdt.lsp.clangd/.project
+++ b/lsp/org.eclipse.cdt.lsp.clangd/.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.clangd/META-INF/MANIFEST.MF b/lsp/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
index a1e8b83865f..71a123a3563 100644
--- a/lsp/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
+++ b/lsp/org.eclipse.cdt.lsp.clangd/META-INF/MANIFEST.MF
@@ -6,3 +6,8 @@ Bundle-Version: 0.1.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Service-Component: OSGI-INF/org.eclipse.cdt.lsp.internal.clangd.ClangdLanguageServer.xml
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.cdt.lsp.core;bundle-version="1.1.100",
+ org.eclipse.osgi.services;bundle-version="3.9.0";resolution:=optional,
+ org.eclipse.osgi;bundle-version="3.16.0"
diff --git a/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/org.eclipse.cdt.internal.clangd.ClangdLanguageServer.xml b/lsp/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.internal.clangd.ClangdLanguageServer.xml
similarity index 59%
rename from lsp/org.eclipse.cdt.lsp.core/OSGI-INF/org.eclipse.cdt.internal.clangd.ClangdLanguageServer.xml
rename to lsp/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.internal.clangd.ClangdLanguageServer.xml
index d139d35d2e1..8a3304ae03e 100644
--- a/lsp/org.eclipse.cdt.lsp.core/OSGI-INF/org.eclipse.cdt.internal.clangd.ClangdLanguageServer.xml
+++ b/lsp/org.eclipse.cdt.lsp.clangd/OSGI-INF/org.eclipse.cdt.lsp.internal.clangd.ClangdLanguageServer.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.clangd.ClangdLanguageServer">
+<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.cdt.lsp.internal.clangd.ClangdLanguageServer">
    <service>
       <provide interface="org.eclipse.cdt.lsp.LanguageServerConfiguration"/>
    </service>
-   <implementation class="org.eclipse.cdt.internal.clangd.ClangdLanguageServer"/>
+   <implementation class="org.eclipse.cdt.lsp.internal.clangd.ClangdLanguageServer"/>
 </scr:component>
\ No newline at end of file
diff --git a/lsp/org.eclipse.cdt.lsp.clangd/src/.gitkeep b/lsp/org.eclipse.cdt.lsp.clangd/src/.gitkeep
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/clangd/ClangdLanguageServer.java b/lsp/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdLanguageServer.java
similarity index 95%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/clangd/ClangdLanguageServer.java
rename to lsp/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdLanguageServer.java
index 43f97ec74f1..d41c9cb7f34 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/clangd/ClangdLanguageServer.java
+++ b/lsp/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdLanguageServer.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.cdt.internal.clangd;
+package org.eclipse.cdt.lsp.internal.clangd;
 
 import java.net.URI;
 
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/clangd/ClangdMessages.java b/lsp/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdMessages.java
similarity index 83%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/clangd/ClangdMessages.java
rename to lsp/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdMessages.java
index ef31ff2245e..d029fc11c0b 100644
--- a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/clangd/ClangdMessages.java
+++ b/lsp/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdMessages.java
@@ -11,18 +11,21 @@
  * Contributors:
  *     Alexander Fedorov (ArSysOp) - initial API and implementation
  *******************************************************************************/
-package org.eclipse.cdt.internal.clangd;
+package org.eclipse.cdt.lsp.internal.clangd;
 
 import org.eclipse.osgi.util.NLS;
 
 public class ClangdMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.clangd.ClangdMessages"; //$NON-NLS-1$
-	public static String ClangdLanguageServer_label;
+
+	private static final String BUNDLE_NAME = "org.eclipse.cdt.lsp.internal.clangd.ClangdMessages"; //$NON-NLS-1$
+
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, ClangdMessages.class);
 	}
 
+	public static String ClangdLanguageServer_label;
+
 	private ClangdMessages() {
 	}
 }
diff --git a/lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/clangd/ClangdMessages.properties b/lsp/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdMessages.properties
similarity index 100%
rename from lsp/org.eclipse.cdt.lsp.core/src/org/eclipse/cdt/internal/clangd/ClangdMessages.properties
rename to lsp/org.eclipse.cdt.lsp.clangd/src/org/eclipse/cdt/lsp/internal/clangd/ClangdMessages.properties
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 fef4fd1b8d5..5b6dc3c613f 100644
--- a/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF
+++ b/lsp/org.eclipse.cdt.lsp.core/META-INF/MANIFEST.MF
@@ -24,17 +24,15 @@ Require-Bundle: com.google.gson;bundle-version="2.8.2",
 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.clangd;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;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.clangd.ClangdLanguageServer.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