diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 50313c4a3..2fab3e3ce 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -28,6 +28,7 @@
 
 	<modules>
 		<module>../eclipse-extensions/org.springframework.boot.ide.main.feature</module>
+		<module>../eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol</module>
 		
 		<module>org.springframework.boot.ide.branding</module>
 		<module>org.springframework.boot.ide.branding.feature</module>
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/.classpath b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.classpath
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/.classpath
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.classpath
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/.project b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.project
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/.project
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.project
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.jdt.core.prefs b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.jdt.core.prefs
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/.settings/org.eclipse.jdt.core.prefs
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/META-INF/MANIFEST.MF
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/build.properties b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/build.properties
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/build.properties
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/build.properties
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample.png b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample.png
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample.png
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample.png
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample@2x.png b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample@2x.png
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample@2x.png
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/icons/sample@2x.png
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/plugin.xml b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/plugin.xml
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/plugin.xml
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/plugin.xml
diff --git a/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml
new file mode 100644
index 000000000..9d3c3ba05
--- /dev/null
+++ b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.boot.ide</groupId>
+		<artifactId>org.springframework.boot.ide</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+		<relativePath>../../eclipse-distribution/pom.xml</relativePath>
+	</parent>
+	
+	<artifactId>org.springframework.tooling.ls.eclipse.gotosymbol</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<version>0.0.10-SNAPSHOT</version>
+	  
+</project>
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/GotoSymbolPlugin.java
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialog.java
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialogModel.java b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialogModel.java
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialogModel.java
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/GotoSymbolDialogModel.java
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InFileSymbolsProvider.java b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InFileSymbolsProvider.java
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InFileSymbolsProvider.java
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InFileSymbolsProvider.java
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InWorkspaceSymbolsProvider.java b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InWorkspaceSymbolsProvider.java
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InWorkspaceSymbolsProvider.java
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/InWorkspaceSymbolsProvider.java
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SymbolsProvider.java b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SymbolsProvider.java
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SymbolsProvider.java
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/dialogs/SymbolsProvider.java
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/handlers/GotoSymbolHandler.java b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/handlers/GotoSymbolHandler.java
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/handlers/GotoSymbolHandler.java
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/handlers/GotoSymbolHandler.java
diff --git a/eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/util/SwtConnect.java b/eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/util/SwtConnect.java
similarity index 100%
rename from eclipse-plugins/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/util/SwtConnect.java
rename to eclipse-extensions/org.springframework.tooling.ls.eclipse.gotosymbol/src/org/springframework/tooling/ls/eclipse/gotosymbol/util/SwtConnect.java