diff --git a/.github/actions/gradle-run/action.yml b/.github/actions/gradle-run/action.yml
index f24feca..7f2c03b 100644
--- a/.github/actions/gradle-run/action.yml
+++ b/.github/actions/gradle-run/action.yml
@@ -33,7 +33,7 @@ runs:
       if: ${{ contains(inputs.steps, 'build') }}
       shell: bash
       run: |
-        ./gradlew runPluginVerifier buildPlugin
+        ./gradlew buildPlugin
         ls -la build/distributions
 
     - name: Test
diff --git a/build.gradle b/build.gradle
index c8ac5f7..f758ee2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -79,10 +79,6 @@ tasks {
         dependsOn 'copyLsp'
     }
 
-    verifyPlugin {
-        dependsOn 'copyLsp'
-    }
-
     test {
         dependsOn 'copyLspToInstrumented'
     }
diff --git a/src/main/java/com/sap/cap/cds/Plugin.java b/src/main/java/com/sap/cap/cds/Plugin.java
deleted file mode 100644
index 5fe9fe0..0000000
--- a/src/main/java/com/sap/cap/cds/Plugin.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.sap.cap.cds;
-
-public class Plugin {
-
-    /* Overview of all relevant IDs, names, and labels for the plugin itself */
-
-    public static final String ID = "com.sap.cap.cds"; // Should not be changed. See plugin.xml
-
-    public static final String PACKAGE = "com.sap.cap.cds";
-
-    public static final String LABEL = "intellij-cds"; // Used for build subfolder and zip file
-
-}
diff --git a/src/main/java/com/sap/cap/cds/FileType.java b/src/main/java/com/sap/cap/cds/intellij/FileType.java
similarity index 96%
rename from src/main/java/com/sap/cap/cds/FileType.java
rename to src/main/java/com/sap/cap/cds/intellij/FileType.java
index c61a717..0984683 100644
--- a/src/main/java/com/sap/cap/cds/FileType.java
+++ b/src/main/java/com/sap/cap/cds/intellij/FileType.java
@@ -1,4 +1,4 @@
-package com.sap.cap.cds;
+package com.sap.cap.cds.intellij;
 
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.util.NlsContexts;
diff --git a/src/main/java/com/sap/cap/cds/Icons.java b/src/main/java/com/sap/cap/cds/intellij/Icons.java
similarity index 87%
rename from src/main/java/com/sap/cap/cds/Icons.java
rename to src/main/java/com/sap/cap/cds/intellij/Icons.java
index c6f158b..1969771 100644
--- a/src/main/java/com/sap/cap/cds/Icons.java
+++ b/src/main/java/com/sap/cap/cds/intellij/Icons.java
@@ -1,4 +1,4 @@
-package com.sap.cap.cds;
+package com.sap.cap.cds.intellij;
 
 import com.intellij.openapi.util.IconLoader;
 
diff --git a/src/main/java/com/sap/cap/cds/Language.java b/src/main/java/com/sap/cap/cds/intellij/Language.java
similarity index 86%
rename from src/main/java/com/sap/cap/cds/Language.java
rename to src/main/java/com/sap/cap/cds/intellij/Language.java
index bc78573..61f2a31 100644
--- a/src/main/java/com/sap/cap/cds/Language.java
+++ b/src/main/java/com/sap/cap/cds/intellij/Language.java
@@ -1,4 +1,4 @@
-package com.sap.cap.cds;
+package com.sap.cap.cds.intellij;
 
 public class Language extends com.intellij.lang.Language {
 
diff --git a/src/main/java/com/sap/cap/cds/intellij/Plugin.java b/src/main/java/com/sap/cap/cds/intellij/Plugin.java
new file mode 100644
index 0000000..09f3591
--- /dev/null
+++ b/src/main/java/com/sap/cap/cds/intellij/Plugin.java
@@ -0,0 +1,13 @@
+package com.sap.cap.cds.intellij;
+
+public class Plugin {
+
+    /* Overview of all relevant IDs, names, and labels for the plugin itself */
+
+    public static final String ID = "com.sap.cap.cds.intellij"; // Should not be changed. See plugin.xml
+
+    public static final String PACKAGE = "com.sap.cap.cds.intellij";
+
+    public static final String LABEL = "intellij-cds"; // Used for build subfolder and zip file
+
+}
diff --git a/src/main/java/com/sap/cap/cds/lsp/ServerDescriptor.java b/src/main/java/com/sap/cap/cds/intellij/lsp/ServerDescriptor.java
similarity index 97%
rename from src/main/java/com/sap/cap/cds/lsp/ServerDescriptor.java
rename to src/main/java/com/sap/cap/cds/intellij/lsp/ServerDescriptor.java
index 95206f9..90e7403 100644
--- a/src/main/java/com/sap/cap/cds/lsp/ServerDescriptor.java
+++ b/src/main/java/com/sap/cap/cds/intellij/lsp/ServerDescriptor.java
@@ -1,4 +1,4 @@
-package com.sap.cap.cds.lsp;
+package com.sap.cap.cds.intellij.lsp;
 
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
@@ -6,7 +6,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.platform.lsp.api.ProjectWideLspServerDescriptor;
 import com.intellij.platform.lsp.api.customization.LspFormattingSupport;
-import com.sap.cap.cds.FileType;
+import com.sap.cap.cds.intellij.FileType;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
diff --git a/src/main/java/com/sap/cap/cds/lsp/ServerSupportProvider.java b/src/main/java/com/sap/cap/cds/intellij/lsp/ServerSupportProvider.java
similarity index 84%
rename from src/main/java/com/sap/cap/cds/lsp/ServerSupportProvider.java
rename to src/main/java/com/sap/cap/cds/intellij/lsp/ServerSupportProvider.java
index a35caae..b0ddea7 100644
--- a/src/main/java/com/sap/cap/cds/lsp/ServerSupportProvider.java
+++ b/src/main/java/com/sap/cap/cds/intellij/lsp/ServerSupportProvider.java
@@ -1,13 +1,13 @@
-package com.sap.cap.cds.lsp;
+package com.sap.cap.cds.intellij.lsp;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.platform.lsp.api.LspServer;
 import com.intellij.platform.lsp.api.lsWidget.LspServerWidgetItem;
-import com.sap.cap.cds.FileType;
-import com.sap.cap.cds.Icons;
-import com.sap.cap.cds.Language;
-import com.sap.cap.cds.textmate.BundleManager;
+import com.sap.cap.cds.intellij.FileType;
+import com.sap.cap.cds.intellij.Icons;
+import com.sap.cap.cds.intellij.Language;
+import com.sap.cap.cds.intellij.textmate.BundleManager;
 import kotlin.jvm.internal.Intrinsics;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/src/main/java/com/sap/cap/cds/textmate/Bundle.java b/src/main/java/com/sap/cap/cds/intellij/textmate/Bundle.java
similarity index 80%
rename from src/main/java/com/sap/cap/cds/textmate/Bundle.java
rename to src/main/java/com/sap/cap/cds/intellij/textmate/Bundle.java
index 6d00fbf..d61adda 100644
--- a/src/main/java/com/sap/cap/cds/textmate/Bundle.java
+++ b/src/main/java/com/sap/cap/cds/intellij/textmate/Bundle.java
@@ -1,4 +1,4 @@
-package com.sap.cap.cds.textmate;
+package com.sap.cap.cds.intellij.textmate;
 
 public class Bundle {
 
diff --git a/src/main/java/com/sap/cap/cds/textmate/BundleManager.java b/src/main/java/com/sap/cap/cds/intellij/textmate/BundleManager.java
similarity index 92%
rename from src/main/java/com/sap/cap/cds/textmate/BundleManager.java
rename to src/main/java/com/sap/cap/cds/intellij/textmate/BundleManager.java
index 4986c50..3ec896c 100644
--- a/src/main/java/com/sap/cap/cds/textmate/BundleManager.java
+++ b/src/main/java/com/sap/cap/cds/intellij/textmate/BundleManager.java
@@ -1,4 +1,4 @@
-package com.sap.cap.cds.textmate;
+package com.sap.cap.cds.intellij.textmate;
 
 
 import com.intellij.ide.AppLifecycleListener;
@@ -8,9 +8,9 @@
 import com.intellij.openapi.startup.ProjectActivity;
 import com.intellij.openapi.startup.StartupActivity;
 import com.intellij.util.PathUtil;
-import com.sap.cap.cds.Language;
-import com.sap.cap.cds.util.Logger;
-import com.sap.cap.cds.Plugin;
+import com.sap.cap.cds.intellij.Language;
+import com.sap.cap.cds.intellij.util.Logger;
+import com.sap.cap.cds.intellij.Plugin;
 import kotlin.Unit;
 import kotlin.coroutines.Continuation;
 import org.jetbrains.annotations.NotNull;
@@ -22,8 +22,8 @@
 import java.nio.file.Paths;
 import java.util.List;
 
-import static com.sap.cap.cds.util.StackUtil.getCaller;
-import static com.sap.cap.cds.util.StackUtil.getMethod;
+import static com.sap.cap.cds.intellij.util.StackUtil.getCaller;
+import static com.sap.cap.cds.intellij.util.StackUtil.getMethod;
 
 public class BundleManager implements AppLifecycleListener, /*obsolete*/ StartupActivity, /* replacement*/ ProjectActivity, DynamicPluginListener {
 
diff --git a/src/main/java/com/sap/cap/cds/util/Logger.java b/src/main/java/com/sap/cap/cds/intellij/util/Logger.java
similarity index 73%
rename from src/main/java/com/sap/cap/cds/util/Logger.java
rename to src/main/java/com/sap/cap/cds/intellij/util/Logger.java
index 3577888..8100ba2 100644
--- a/src/main/java/com/sap/cap/cds/util/Logger.java
+++ b/src/main/java/com/sap/cap/cds/intellij/util/Logger.java
@@ -1,7 +1,7 @@
-package com.sap.cap.cds.util;
+package com.sap.cap.cds.intellij.util;
 
-import com.sap.cap.cds.Plugin;
-import com.sap.cap.cds.textmate.Bundle;
+import com.sap.cap.cds.intellij.Plugin;
+import com.sap.cap.cds.intellij.textmate.Bundle;
 
 import static com.intellij.openapi.diagnostic.Logger.*;
 
diff --git a/src/main/java/com/sap/cap/cds/util/StackUtil.java b/src/main/java/com/sap/cap/cds/intellij/util/StackUtil.java
similarity index 92%
rename from src/main/java/com/sap/cap/cds/util/StackUtil.java
rename to src/main/java/com/sap/cap/cds/intellij/util/StackUtil.java
index f187868..ab924d1 100644
--- a/src/main/java/com/sap/cap/cds/util/StackUtil.java
+++ b/src/main/java/com/sap/cap/cds/intellij/util/StackUtil.java
@@ -1,4 +1,4 @@
-package com.sap.cap.cds.util;
+package com.sap.cap.cds.intellij.util;
 
 public class StackUtil {
     public static StackTraceElement getCaller(int depth) {
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index cb665a2..a9dab27 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -1,5 +1,5 @@
 <idea-plugin>
-    <id>com.sap.cap.cds</id>
+    <id>com.sap.cap.cds.intellij</id>
     <name>CAP CDS Language Support</name>
     <category>Custom Language</category>
     <vendor url="https://sap.com">SAP SE</vendor>
@@ -27,34 +27,34 @@ The set of features will grow with future releases of the plugin, according to t
     <extensions defaultExtensionNs="com.intellij">
         <fileType
                 name="cds"
-                implementationClass="com.sap.cap.cds.FileType"
+                implementationClass="com.sap.cap.cds.intellij.FileType"
                 fieldName="INSTANCE"
                 language="cds"
                 extensions="cds"/>
-        <platform.lsp.serverSupportProvider implementation="com.sap.cap.cds.lsp.ServerSupportProvider"/>
+        <platform.lsp.serverSupportProvider implementation="com.sap.cap.cds.intellij.lsp.ServerSupportProvider"/>
     </extensions>
 
     <applicationListeners>
         <listener
                 topic="com.intellij.ide.AppLifecycleListener"
-                class="com.sap.cap.cds.textmate.BundleManager"
+                class="com.sap.cap.cds.intellij.textmate.BundleManager"
                 activeInHeadlessMode="true" activeInTestMode="true"
         />
         <listener
                 topic="com.intellij.openapi.startup.StartupActivity"
-                class="com.sap.cap.cds.textmate.BundleManager"
+                class="com.sap.cap.cds.intellij.textmate.BundleManager"
                 activeInHeadlessMode="true" activeInTestMode="true"
         />
         <listener
                 topic="com.intellij.ide.plugins.DynamicPluginListener"
-                class="com.sap.cap.cds.textmate.BundleManager"
+                class="com.sap.cap.cds.intellij.textmate.BundleManager"
                 activeInHeadlessMode="true" activeInTestMode="true"
         />
     </applicationListeners>
     <projectListeners>
         <listener
                 topic="com.intellij.openapi.startup.ProjectActivity"
-                class="com.sap.cap.cds.textmate.BundleManager"
+                class="com.sap.cap.cds.intellij.textmate.BundleManager"
                 activeInHeadlessMode="true" activeInTestMode="true"
         />
     </projectListeners>
diff --git a/src/test/java/com/sap/cap/cds/intellij/ServerDescriptorTest.java b/src/test/java/com/sap/cap/cds/intellij/ServerDescriptorTest.java
index 55fb139..5f92c9a 100644
--- a/src/test/java/com/sap/cap/cds/intellij/ServerDescriptorTest.java
+++ b/src/test/java/com/sap/cap/cds/intellij/ServerDescriptorTest.java
@@ -1,10 +1,10 @@
-package com.sap.cap.cds;
+package com.sap.cap.cds.intellij;
 
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.configurations.GeneralCommandLine;
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import com.intellij.testFramework.fixtures.TempDirTestFixture;
-import com.sap.cap.cds.lsp.ServerDescriptor;
+import com.sap.cap.cds.intellij.lsp.ServerDescriptor;
 
 import java.io.*;
 import java.util.regex.Pattern;