diff --git a/test/debug/modules.sh b/debug/modules.sh
similarity index 100%
rename from test/debug/modules.sh
rename to debug/modules.sh
diff --git a/test/debug/pom.xml b/debug/pom.xml
similarity index 51%
rename from test/debug/pom.xml
rename to debug/pom.xml
index 4bab4fbdeb..9c7ca20eb2 100644
--- a/test/debug/pom.xml
+++ b/debug/pom.xml
@@ -4,20 +4,20 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.test</groupId>
+        <groupId>cloud.piranha</groupId>
         <artifactId>project</artifactId>
         <version>25.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>piranha-test-debug</artifactId>
+    <artifactId>piranha-debug</artifactId>
 
-    <name>Piranha - Test - Debug</name>
+    <name>Piranha - Debug</name>
     <description>
         This project can be used as entry project in remote debugging, giving
         one most dependencies of Piranha to step through the source.
         
         In the IDE, for instance, Eclipse, go to 
-          run - debug configurations - remote java application - project
+        run - debug configurations - remote java application - project
         And add this project there. 
     </description>
 
@@ -33,367 +33,654 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
+        <!-- Piranha dependencies -->
+        <dependency>
+            <groupId>cloud.piranha.arquillian</groupId>
+            <artifactId>piranha-arquillian-managed</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>cloud.piranha.arquillian</groupId>
             <artifactId>piranha-arquillian-server</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.core</groupId>
             <artifactId>piranha-core-api</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.core</groupId>
             <artifactId>piranha-core-impl</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha</groupId>
+            <artifactId>piranha-embedded</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-annotationscan</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-fileupload</artifactId>
+            <artifactId>piranha-extension-annotationscan-classfile</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-angus</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-bytesstreamhandler</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-compat-glassfish7x</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-compat-tomcat10x</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-concurro</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-coreprofile</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-default-datasource</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-eclipselink</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-epicyro</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-exousia</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-expressly</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-mojarra</artifactId>
+            <artifactId>piranha-extension-fileupload</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-soteria</artifactId>
+            <artifactId>piranha-extension-handlestypes</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-yasson</artifactId>
+            <artifactId>piranha-extension-hazelcast</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-wasp</artifactId>
+            <artifactId>piranha-extension-herring</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-hazelcast</artifactId>
+            <artifactId>piranha-extension-hibernate-validator</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
-            <artifactId>piranha-extension-herring</artifactId>
+            <artifactId>piranha-extension-jaxb</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-jersey</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-jstl</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-micro</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-microprofile</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-naming-cdi</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-omnifaces-config</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-omnifaces-microprofile-jwt-auth</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-omnifaces-omniservices</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-omnifaces-omniutils</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-omnifish-omnibeans</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-omnifish-transact</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-parsson</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-platform</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-policy</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-scinitializer</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-security-jakarta</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-security-servlet</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-servlet</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-servletannotations</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-soteria</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-tempdir</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-webprofile</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-webxml</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-welcomefile</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.extension</groupId>
             <artifactId>piranha-extension-weld</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-yasson</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.extension</groupId>
+            <artifactId>piranha-extension-wasp</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.feature</groupId>
+            <artifactId>piranha-feature-api</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.feature</groupId>
+            <artifactId>piranha-feature-crac</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.feature</groupId>
+            <artifactId>piranha-feature-exitonstop</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.feature</groupId>
+            <artifactId>piranha-feature-http</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.feature</groupId>
+            <artifactId>piranha-feature-https</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.feature</groupId>
+            <artifactId>piranha-feature-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.feature</groupId>
+            <artifactId>piranha-feature-isolatedwebapp</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.feature</groupId>
+            <artifactId>piranha-feature-logging</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.feature</groupId>
+            <artifactId>piranha-feature-pid</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.feature</groupId>
+            <artifactId>piranha-feature-webapp</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.feature</groupId>
+            <artifactId>piranha-feature-webapps</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.http</groupId>
             <artifactId>piranha-http-api</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.http</groupId>
+            <artifactId>piranha-http-crac</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.http</groupId>
             <artifactId>piranha-http-grizzly</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.http</groupId>
             <artifactId>piranha-http-impl</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.http</groupId>
             <artifactId>piranha-http-jdk</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.http</groupId>
             <artifactId>piranha-http-netty</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.http</groupId>
             <artifactId>piranha-http-tests</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.http</groupId>
             <artifactId>piranha-http-undertow</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.http</groupId>
+            <artifactId>piranha-http-virtual</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.http</groupId>
             <artifactId>piranha-http-webapp</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.maven</groupId>
+            <artifactId>piranha-maven-plugin</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
-            <groupId>cloud.piranha.dist</groupId>
-            <artifactId>piranha-dist-micro</artifactId>
+            <groupId>cloud.piranha</groupId>
+            <artifactId>piranha-multi</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.micro</groupId>
             <artifactId>piranha-micro-builder</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.micro</groupId>
             <artifactId>piranha-micro-core</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.micro</groupId>
             <artifactId>piranha-micro-loader</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.resource</groupId>
             <artifactId>piranha-resource-api</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.resource</groupId>
             <artifactId>piranha-resource-impl</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha.resource</groupId>
             <artifactId>piranha-resource-shrinkwrap</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>cloud.piranha</groupId>
-            <artifactId>piranha-embedded</artifactId>
+            <artifactId>piranha-single</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>cloud.piranha.spring</groupId>
+            <artifactId>piranha-embedded-spring-boot-starter</artifactId>
             <version>${project.version}</version>
+            <scope>compile</scope>
         </dependency>
 
-        <!-- Jakarta Annotation -->
+        <!-- BOM dependencies -->
+        <dependency>
+            <groupId>jakarta.activation</groupId>
+            <artifactId>jakarta.activation-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta Authentication -->
         <dependency>
             <groupId>jakarta.authentication</groupId>
             <artifactId>jakarta.authentication-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta Authorization -->
         <dependency>
             <groupId>jakarta.authorization</groupId>
             <artifactId>jakarta.authorization-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise.concurrent</groupId>
+            <artifactId>jakarta.enterprise.concurrent-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-el-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-core-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-web-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.ejb</groupId>
+            <artifactId>jakarta.ejb-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta Expression Language -->
         <dependency>
             <groupId>jakarta.el</groupId>
             <artifactId>jakarta.el-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta Faces -->
         <dependency>
             <groupId>jakarta.faces</groupId>
             <artifactId>jakarta.faces-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta JSON Processing -->
         <dependency>
-            <groupId>jakarta.json</groupId>
-            <artifactId>jakarta.json-api</artifactId>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.interceptor</groupId>
+            <artifactId>jakarta.interceptor-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta JSON Binding -->
         <dependency>
             <groupId>jakarta.json.bind</groupId>
             <artifactId>jakarta.json.bind-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.json</groupId>
+            <artifactId>jakarta.json-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet.jsp</groupId>
+            <artifactId>jakarta.servlet.jsp-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta Persistence -->
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta EE WebProfile -->
         <dependency>
-            <groupId>jakarta.platform</groupId>
-            <artifactId>jakarta.jakartaee-web-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta Security -->
         <dependency>
             <groupId>jakarta.security.enterprise</groupId>
             <artifactId>jakarta.security.enterprise-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta Servlet -->
         <dependency>
             <groupId>jakarta.servlet</groupId>
             <artifactId>jakarta.servlet-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta Server Pages -->
-        <dependency>
-            <groupId>jakarta.servlet.jsp</groupId>
-            <artifactId>jakarta.servlet.jsp-api</artifactId>
-        </dependency>
-
-        <!-- Jakarta Standard Tag Library -->
         <dependency>
             <groupId>jakarta.servlet.jsp.jstl</groupId>
             <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta Transactions -->
         <dependency>
             <groupId>jakarta.transaction</groupId>
             <artifactId>jakarta.transaction-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta Bean Validation -->
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta WebSocket -->
         <dependency>
             <groupId>jakarta.websocket</groupId>
             <artifactId>jakarta.websocket-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta REST -->
         <dependency>
-            <groupId>jakarta.ws.rs</groupId>
-            <artifactId>jakarta.ws.rs-api</artifactId>
+            <groupId>jakarta.websocket</groupId>
+            <artifactId>jakarta.websocket-client-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- Jakarta XML Binding -->
         <dependency>
             <groupId>jakarta.xml.bind</groupId>
             <artifactId>jakarta.xml.bind-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- MicroProfile Config -->
         <dependency>
             <groupId>org.eclipse.microprofile.config</groupId>
             <artifactId>microprofile-config-api</artifactId>
+            <scope>compile</scope>
         </dependency>
-
-        <!-- MicroProfile JWT -->
         <dependency>
             <groupId>org.eclipse.microprofile.jwt</groupId>
             <artifactId>microprofile-jwt-auth-api</artifactId>
+            <scope>compile</scope>
         </dependency>
 
+        <!-- Implementation or test dependencies -->
+
         <!-- Apache Maven -->
         <dependency>
             <groupId>org.apache.maven</groupId>
diff --git a/test/debug/src/main/java/cloud/piranha/debug/Debug.java b/debug/src/main/java/cloud/piranha/debug/Debug.java
similarity index 100%
rename from test/debug/src/main/java/cloud/piranha/debug/Debug.java
rename to debug/src/main/java/cloud/piranha/debug/Debug.java
diff --git a/test/debug/src/main/java/module-info.java b/debug/src/main/java/module-info.java
similarity index 100%
rename from test/debug/src/main/java/module-info.java
rename to debug/src/main/java/module-info.java
diff --git a/pom.xml b/pom.xml
index d99a812eb4..9e4c72a402 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,6 +45,7 @@
         <module>arquillian</module>
         <module>bom</module>
         <module>core</module>
+        <module>debug</module>
         <module>dist</module>
         <module>embedded</module>
         <module>extension</module>
diff --git a/test/pom.xml b/test/pom.xml
index 32dbaeb244..364a197709 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -18,7 +18,6 @@
         <module>embedded</module>
         <module>common</module>
         <module>coreprofile</module>
-        <module>debug</module>
         <module>jpms</module>
         <module>micro</module>
         <module>server</module>