diff --git a/.gitignore b/.gitignore
index d47b9e8e..4cf94cc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,4 +35,4 @@ drivers/
 error-screenshots/
 webpack.generated.js
 integration-tests/smoke-tests/build/
-deployment-commons/src/main/frontend/
+commons/deployment/src/main/frontend/
diff --git a/deployment-commons/pom.xml b/commons/deployment/pom.xml
similarity index 99%
rename from deployment-commons/pom.xml
rename to commons/deployment/pom.xml
index bfcd6d4b..8c69e753 100644
--- a/deployment-commons/pom.xml
+++ b/commons/deployment/pom.xml
@@ -7,6 +7,7 @@
         <groupId>com.github.mcollovati</groupId>
         <artifactId>quarkus-hilla-parent</artifactId>
         <version>${revision}</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-hilla-commons-deployment</artifactId>
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/AtmospherePatches.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/AtmospherePatches.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/AtmospherePatches.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/AtmospherePatches.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/AuthFormBuildItem.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/AuthFormBuildItem.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/AuthFormBuildItem.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/AuthFormBuildItem.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/FilterableRepositoryImplementor.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/FilterableRepositoryImplementor.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/FilterableRepositoryImplementor.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/FilterableRepositoryImplementor.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/FilterableRepositoryImplementorBuildItem.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/FilterableRepositoryImplementorBuildItem.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/FilterableRepositoryImplementorBuildItem.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/FilterableRepositoryImplementorBuildItem.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/InjectableObjectFactoryFieldUsageRemovalMethodVisitor.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/InjectableObjectFactoryFieldUsageRemovalMethodVisitor.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/InjectableObjectFactoryFieldUsageRemovalMethodVisitor.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/InjectableObjectFactoryFieldUsageRemovalMethodVisitor.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaEnvironmentBuildItem.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaEnvironmentBuildItem.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaEnvironmentBuildItem.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaEnvironmentBuildItem.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaExtensionProcessor.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaExtensionProcessor.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaExtensionProcessor.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaExtensionProcessor.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaNativeProcessor.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaNativeProcessor.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaNativeProcessor.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/QuarkusHillaNativeProcessor.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/AsmUtils.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/AsmUtils.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/AsmUtils.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/AsmUtils.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/MethodRedirectNode.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/MethodRedirectNode.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/MethodRedirectNode.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/MethodRedirectNode.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/MethodReplacementClassVisitor.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/MethodReplacementClassVisitor.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/MethodReplacementClassVisitor.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/MethodReplacementClassVisitor.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/MethodSignature.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/MethodSignature.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/MethodSignature.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/MethodSignature.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/NonnullPluginConfigProcessorClassVisitor.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/NonnullPluginConfigProcessorClassVisitor.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/NonnullPluginConfigProcessorClassVisitor.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/NonnullPluginConfigProcessorClassVisitor.java
diff --git a/deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/OffendingMethodCallsReplacer.java b/commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/OffendingMethodCallsReplacer.java
similarity index 100%
rename from deployment-commons/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/OffendingMethodCallsReplacer.java
rename to commons/deployment/src/main/java/com/github/mcollovati/quarkus/hilla/deployment/asm/OffendingMethodCallsReplacer.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/AbstractEndpointControllerTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/AbstractEndpointControllerTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/AbstractEndpointControllerTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/AbstractEndpointControllerTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/AbstractReactiveEndpointTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/AbstractReactiveEndpointTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/AbstractReactiveEndpointTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/AbstractReactiveEndpointTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/BrowserCallableControllerTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/BrowserCallableControllerTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/BrowserCallableControllerTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/BrowserCallableControllerTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/EndpointControllerTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/EndpointControllerTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/EndpointControllerTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/EndpointControllerTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/EndpointSecurityTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/EndpointSecurityTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/EndpointSecurityTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/EndpointSecurityTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/HillaPushClient.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/HillaPushClient.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/HillaPushClient.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/HillaPushClient.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/ReactiveEndpointTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/ReactiveEndpointTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/ReactiveEndpointTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/ReactiveEndpointTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/ReactiveSecureEndpointTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/ReactiveSecureEndpointTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/ReactiveSecureEndpointTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/ReactiveSecureEndpointTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SignalsSecurityTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SignalsSecurityTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SignalsSecurityTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SignalsSecurityTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SignalsTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SignalsTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SignalsTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SignalsTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringDataExtensionsSupportTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringDataExtensionsSupportTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringDataExtensionsSupportTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringDataExtensionsSupportTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringDiExtensionSupportReactiveEndpointTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringDiExtensionSupportReactiveEndpointTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringDiExtensionSupportReactiveEndpointTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringDiExtensionSupportReactiveEndpointTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringDiExtensionsSupportTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringDiExtensionsSupportTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringDiExtensionsSupportTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringDiExtensionsSupportTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringReplacementsTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringReplacementsTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringReplacementsTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/SpringReplacementsTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/TestUtils.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/TestUtils.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/TestUtils.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/TestUtils.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/CrudRepositoryServiceTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/CrudRepositoryServiceTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/CrudRepositoryServiceTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/CrudRepositoryServiceTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/EntityIds.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/EntityIds.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/EntityIds.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/EntityIds.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/GeneratedIsNewTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/GeneratedIsNewTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/GeneratedIsNewTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/GeneratedIsNewTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/GetterEntityRepository.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/GetterEntityRepository.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/GetterEntityRepository.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/GetterEntityRepository.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/ListRepositoryServiceTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/ListRepositoryServiceTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/ListRepositoryServiceTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/ListRepositoryServiceTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/PrimitiveIdEntityRepository.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/PrimitiveIdEntityRepository.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/PrimitiveIdEntityRepository.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/PrimitiveIdEntityRepository.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/SelfImplementedRepository.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/SelfImplementedRepository.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/SelfImplementedRepository.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/SelfImplementedRepository.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/SelfImplementedRepositoryTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/SelfImplementedRepositoryTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/SelfImplementedRepositoryTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/SelfImplementedRepositoryTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/StringIdEntityRepository.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/StringIdEntityRepository.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/StringIdEntityRepository.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/StringIdEntityRepository.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestCrudRepositoryService.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestCrudRepositoryService.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestCrudRepositoryService.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestCrudRepositoryService.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestEntity.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestEntity.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestEntity.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestEntity.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestListRepositoryService.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestListRepositoryService.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestListRepositoryService.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestListRepositoryService.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestRepository.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestRepository.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestRepository.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/TestRepository.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/CrudRepositoryServiceTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/CrudRepositoryServiceTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/CrudRepositoryServiceTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/CrudRepositoryServiceTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/ListRepositoryServiceTest.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/ListRepositoryServiceTest.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/ListRepositoryServiceTest.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/ListRepositoryServiceTest.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestCrudRepositoryService.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestCrudRepositoryService.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestCrudRepositoryService.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestCrudRepositoryService.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestEntity.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestEntity.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestEntity.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestEntity.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestListRepositoryService.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestListRepositoryService.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestListRepositoryService.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestListRepositoryService.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestRepository.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestRepository.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestRepository.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/TestRepository.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/Pojo.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/Pojo.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/Pojo.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/Pojo.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/ReactiveEndpoint.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/ReactiveEndpoint.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/ReactiveEndpoint.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/ReactiveEndpoint.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/ReactiveSecureEndpoint.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/ReactiveSecureEndpoint.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/ReactiveSecureEndpoint.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/ReactiveSecureEndpoint.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/SecureEndpoint.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/SecureEndpoint.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/SecureEndpoint.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/SecureEndpoint.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/TestBrowserCallable.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/TestBrowserCallable.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/TestBrowserCallable.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/TestBrowserCallable.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/TestCustomCrudService.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/TestCustomCrudService.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/TestCustomCrudService.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/TestCustomCrudService.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/TestEndpoint.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/TestEndpoint.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/TestEndpoint.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/endpoints/TestEndpoint.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/signals/NumberSignalService.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/signals/NumberSignalService.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/signals/NumberSignalService.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/signals/NumberSignalService.java
diff --git a/deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/signals/SecureNumberSignalService.java b/commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/signals/SecureNumberSignalService.java
similarity index 100%
rename from deployment-commons/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/signals/SecureNumberSignalService.java
rename to commons/deployment/src/test/java/com/github/mcollovati/quarkus/hilla/deployment/signals/SecureNumberSignalService.java
diff --git a/deployment-commons/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/application.properties b/commons/deployment/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/application.properties
similarity index 100%
rename from deployment-commons/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/application.properties
rename to commons/deployment/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/application.properties
diff --git a/deployment-commons/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/import.sql b/commons/deployment/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/import.sql
similarity index 100%
rename from deployment-commons/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/import.sql
rename to commons/deployment/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/panache/import.sql
diff --git a/deployment-commons/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/application.properties b/commons/deployment/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/application.properties
similarity index 100%
rename from deployment-commons/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/application.properties
rename to commons/deployment/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/application.properties
diff --git a/deployment-commons/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/import.sql b/commons/deployment/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/import.sql
similarity index 100%
rename from deployment-commons/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/import.sql
rename to commons/deployment/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/crud/spring/import.sql
diff --git a/deployment-commons/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/test-application.properties b/commons/deployment/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/test-application.properties
similarity index 100%
rename from deployment-commons/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/test-application.properties
rename to commons/deployment/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/test-application.properties
diff --git a/deployment-commons/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/test-spring-di-application.properties b/commons/deployment/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/test-spring-di-application.properties
similarity index 100%
rename from deployment-commons/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/test-spring-di-application.properties
rename to commons/deployment/src/test/resources/com/github/mcollovati/quarkus/hilla/deployment/test-spring-di-application.properties
diff --git a/hilla-shaded-deps/pom.xml b/commons/hilla-shaded-deps/pom.xml
similarity index 99%
rename from hilla-shaded-deps/pom.xml
rename to commons/hilla-shaded-deps/pom.xml
index 7a2e1e41..fb44e998 100644
--- a/hilla-shaded-deps/pom.xml
+++ b/commons/hilla-shaded-deps/pom.xml
@@ -7,6 +7,7 @@
         <groupId>com.github.mcollovati</groupId>
         <artifactId>quarkus-hilla-parent</artifactId>
         <version>${revision}</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>hilla-shaded-deps</artifactId>
diff --git a/runtime-commons/pom.xml b/commons/runtime/pom.xml
similarity index 98%
rename from runtime-commons/pom.xml
rename to commons/runtime/pom.xml
index d29c57c0..529e8f0d 100644
--- a/runtime-commons/pom.xml
+++ b/commons/runtime/pom.xml
@@ -7,6 +7,7 @@
         <groupId>com.github.mcollovati</groupId>
         <artifactId>quarkus-hilla-parent</artifactId>
         <version>${revision}</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-hilla-commons</artifactId>
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/AnyLiteral.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/AnyLiteral.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/AnyLiteral.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/AnyLiteral.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/BodyHandlerRecorder.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/BodyHandlerRecorder.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/BodyHandlerRecorder.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/BodyHandlerRecorder.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/HillaAtmosphereObjectFactory.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/HillaAtmosphereObjectFactory.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/HillaAtmosphereObjectFactory.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/HillaAtmosphereObjectFactory.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/HillaConfiguration.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/HillaConfiguration.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/HillaConfiguration.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/HillaConfiguration.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/HillaFormAuthenticationMechanism.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/HillaFormAuthenticationMechanism.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/HillaFormAuthenticationMechanism.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/HillaFormAuthenticationMechanism.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/HillaSecurityPolicy.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/HillaSecurityPolicy.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/HillaSecurityPolicy.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/HillaSecurityPolicy.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/HillaSecurityRecorder.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/HillaSecurityRecorder.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/HillaSecurityRecorder.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/HillaSecurityRecorder.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/NonNullApi.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/NonNullApi.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/NonNullApi.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/NonNullApi.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusApplicationContext.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusApplicationContext.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusApplicationContext.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusApplicationContext.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusAtmosphereServlet.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusAtmosphereServlet.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusAtmosphereServlet.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusAtmosphereServlet.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointConfiguration.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointConfiguration.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointConfiguration.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointConfiguration.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointController.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointController.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointController.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointController.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointControllerConfiguration.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointControllerConfiguration.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointControllerConfiguration.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointControllerConfiguration.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointProperties.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointProperties.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointProperties.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusEndpointProperties.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusHandlerHelper.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusHandlerHelper.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusHandlerHelper.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusHandlerHelper.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusHillaExtension.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusHillaExtension.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusHillaExtension.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusHillaExtension.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusNavigationAccessControl.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusNavigationAccessControl.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusNavigationAccessControl.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusNavigationAccessControl.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusVaadinServiceListenerPropagator.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusVaadinServiceListenerPropagator.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusVaadinServiceListenerPropagator.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/QuarkusVaadinServiceListenerPropagator.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/SpringReplacements.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/SpringReplacements.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/SpringReplacements.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/SpringReplacements.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/FilterableRepositorySupport.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/FilterableRepositorySupport.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/FilterableRepositorySupport.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/FilterableRepositorySupport.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/PropertyStringFilterSpecification.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/PropertyStringFilterSpecification.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/PropertyStringFilterSpecification.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/PropertyStringFilterSpecification.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/CrudRepositoryService.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/CrudRepositoryService.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/CrudRepositoryService.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/CrudRepositoryService.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/FilterableRepository.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/FilterableRepository.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/FilterableRepository.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/FilterableRepository.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/ListRepositoryService.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/ListRepositoryService.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/ListRepositoryService.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/ListRepositoryService.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/package-info.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/package-info.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/package-info.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/panache/package-info.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/CrudRepositoryService.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/CrudRepositoryService.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/CrudRepositoryService.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/CrudRepositoryService.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/FilterableRepository.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/FilterableRepository.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/FilterableRepository.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/FilterableRepository.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/ListRepositoryService.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/ListRepositoryService.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/ListRepositoryService.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/ListRepositoryService.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/package-info.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/package-info.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/package-info.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/crud/spring/package-info.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/graal/AtmosphereDeferredInitializer.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/graal/AtmosphereDeferredInitializer.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/graal/AtmosphereDeferredInitializer.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/graal/AtmosphereDeferredInitializer.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/graal/AtmosphereDeferredInitializerRecorder.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/graal/AtmosphereDeferredInitializerRecorder.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/graal/AtmosphereDeferredInitializerRecorder.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/graal/AtmosphereDeferredInitializerRecorder.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/graal/AtmosphereServletConfig.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/graal/AtmosphereServletConfig.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/graal/AtmosphereServletConfig.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/graal/AtmosphereServletConfig.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/graal/DelayedInitBroadcaster.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/graal/DelayedInitBroadcaster.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/graal/DelayedInitBroadcaster.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/graal/DelayedInitBroadcaster.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/graal/DelayedSchedulerExecutorsFactory.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/graal/DelayedSchedulerExecutorsFactory.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/graal/DelayedSchedulerExecutorsFactory.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/graal/DelayedSchedulerExecutorsFactory.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/reload/AbstractEndpointsWatcher.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/reload/AbstractEndpointsWatcher.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/reload/AbstractEndpointsWatcher.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/reload/AbstractEndpointsWatcher.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/reload/EndpointClassesWatcher.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/reload/EndpointClassesWatcher.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/reload/EndpointClassesWatcher.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/reload/EndpointClassesWatcher.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/reload/EndpointSourcesWatcher.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/reload/EndpointSourcesWatcher.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/reload/EndpointSourcesWatcher.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/reload/EndpointSourcesWatcher.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/reload/HillaHotReplacementSetup.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/reload/HillaHotReplacementSetup.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/reload/HillaHotReplacementSetup.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/reload/HillaHotReplacementSetup.java
diff --git a/runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/reload/HillaLiveReloadRecorder.java b/commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/reload/HillaLiveReloadRecorder.java
similarity index 100%
rename from runtime-commons/src/main/java/com/github/mcollovati/quarkus/hilla/reload/HillaLiveReloadRecorder.java
rename to commons/runtime/src/main/java/com/github/mcollovati/quarkus/hilla/reload/HillaLiveReloadRecorder.java
diff --git a/runtime-commons/src/main/resources/META-INF/microprofile-config.properties b/commons/runtime/src/main/resources/META-INF/microprofile-config.properties
similarity index 100%
rename from runtime-commons/src/main/resources/META-INF/microprofile-config.properties
rename to commons/runtime/src/main/resources/META-INF/microprofile-config.properties
diff --git a/runtime-commons/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup b/commons/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup
similarity index 100%
rename from runtime-commons/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup
rename to commons/runtime/src/main/resources/META-INF/services/io.quarkus.dev.spi.HotReplacementSetup
diff --git a/runtime-commons/src/test/java/com/github/mcollovati/quarkus/hilla/reload/AbstractEndpointsWatcherTest.java b/commons/runtime/src/test/java/com/github/mcollovati/quarkus/hilla/reload/AbstractEndpointsWatcherTest.java
similarity index 100%
rename from runtime-commons/src/test/java/com/github/mcollovati/quarkus/hilla/reload/AbstractEndpointsWatcherTest.java
rename to commons/runtime/src/test/java/com/github/mcollovati/quarkus/hilla/reload/AbstractEndpointsWatcherTest.java
diff --git a/deployment/pom.xml b/lit/deployment/pom.xml
similarity index 98%
rename from deployment/pom.xml
rename to lit/deployment/pom.xml
index 68bc77d3..9c98f83b 100644
--- a/deployment/pom.xml
+++ b/lit/deployment/pom.xml
@@ -7,6 +7,7 @@
         <groupId>com.github.mcollovati</groupId>
         <artifactId>quarkus-hilla-parent</artifactId>
         <version>${revision}</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-hilla-deployment</artifactId>
diff --git a/hilla-jandex/pom.xml b/lit/hilla-jandex/pom.xml
similarity index 99%
rename from hilla-jandex/pom.xml
rename to lit/hilla-jandex/pom.xml
index 3fdb4a6f..b992221a 100644
--- a/hilla-jandex/pom.xml
+++ b/lit/hilla-jandex/pom.xml
@@ -7,6 +7,7 @@
         <groupId>com.github.mcollovati</groupId>
         <artifactId>quarkus-hilla-parent</artifactId>
         <version>${revision}</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>hilla-jandex</artifactId>
diff --git a/runtime/pom.xml b/lit/runtime/pom.xml
similarity index 99%
rename from runtime/pom.xml
rename to lit/runtime/pom.xml
index 709f8028..ad10ce98 100644
--- a/runtime/pom.xml
+++ b/lit/runtime/pom.xml
@@ -7,6 +7,7 @@
         <groupId>com.github.mcollovati</groupId>
         <artifactId>quarkus-hilla-parent</artifactId>
         <version>${revision}</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-hilla</artifactId>
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/README.tpl.qute.md b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/README.tpl.qute.md
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/README.tpl.qute.md
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/README.tpl.qute.md
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/index.ts b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/index.ts
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/index.ts
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/index.ts
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/routes.ts b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/routes.ts
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/routes.ts
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/routes.ts
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/views/main-view.ts b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/views/main-view.ts
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/views/main-view.ts
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/views/main-view.ts
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package-lock.json b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package-lock.json
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package-lock.json
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package-lock.json
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package.json b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package.json
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package.json
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package.json
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/pom.xml.tpl.qute b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/pom.xml.tpl.qute
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/pom.xml.tpl.qute
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/pom.xml.tpl.qute
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/src/main/hilla-scaffold-package-name-holder.txt b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/src/main/hilla-scaffold-package-name-holder.txt
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/src/main/hilla-scaffold-package-name-holder.txt
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/src/main/hilla-scaffold-package-name-holder.txt
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/types.d.ts b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/types.d.ts
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/types.d.ts
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/types.d.ts
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/vite.config.ts b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/vite.config.ts
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/vite.config.ts
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/vite.config.ts
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/codestart.yml b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/codestart.yml
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/codestart.yml
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/codestart.yml
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/HelloEndpoint.java b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/HelloEndpoint.java
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/HelloEndpoint.java
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/HelloEndpoint.java
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/package-info.java b/lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/package-info.java
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/package-info.java
rename to lit/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/package-info.java
diff --git a/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/lit/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from runtime/src/main/resources/META-INF/quarkus-extension.yaml
rename to lit/runtime/src/main/resources/META-INF/quarkus-extension.yaml
diff --git a/pom.xml b/pom.xml
index 899e51af..7cf22ec5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,15 +462,15 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>hilla-shaded-deps</module>
-                <module>hilla-jandex</module>
-                <module>hilla-react-jandex</module>
-                <module>runtime-commons</module>
-                <module>runtime</module>
-                <module>runtime-react</module>
-                <module>deployment-commons</module>
-                <module>deployment</module>
-                <module>deployment-react</module>
+                <module>commons/hilla-shaded-deps</module>
+                <module>lit/hilla-jandex</module>
+                <module>react/hilla-react-jandex</module>
+                <module>commons/runtime</module>
+                <module>lit/runtime</module>
+                <module>react/runtime</module>
+                <module>commons/deployment</module>
+                <module>lit/deployment</module>
+                <module>react/deployment</module>
             </modules>
         </profile>
         <profile>
@@ -583,15 +583,15 @@
         <profile>
             <id>all-modules</id>
             <modules>
-                <module>hilla-shaded-deps</module>
-                <module>hilla-jandex</module>
-                <module>hilla-react-jandex</module>
-                <module>runtime-commons</module>
-                <module>runtime</module>
-                <module>runtime-react</module>
-                <module>deployment-commons</module>
-                <module>deployment</module>
-                <module>deployment-react</module>
+                <module>commons/hilla-shaded-deps</module>
+                <module>lit/hilla-jandex</module>
+                <module>react/hilla-react-jandex</module>
+                <module>commons/runtime</module>
+                <module>lit/runtime</module>
+                <module>react/runtime</module>
+                <module>commons/deployment</module>
+                <module>lit/deployment</module>
+                <module>react/deployment</module>
                 <module>integration-tests</module>
             </modules>
         </profile>
diff --git a/deployment-react/pom.xml b/react/deployment/pom.xml
similarity index 98%
rename from deployment-react/pom.xml
rename to react/deployment/pom.xml
index 72509e3d..d5ccd347 100644
--- a/deployment-react/pom.xml
+++ b/react/deployment/pom.xml
@@ -7,6 +7,7 @@
         <groupId>com.github.mcollovati</groupId>
         <artifactId>quarkus-hilla-parent</artifactId>
         <version>${revision}</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-hilla-react-deployment</artifactId>
diff --git a/hilla-react-jandex/pom.xml b/react/hilla-react-jandex/pom.xml
similarity index 99%
rename from hilla-react-jandex/pom.xml
rename to react/hilla-react-jandex/pom.xml
index ed3252a7..3cb1de87 100644
--- a/hilla-react-jandex/pom.xml
+++ b/react/hilla-react-jandex/pom.xml
@@ -7,6 +7,7 @@
         <groupId>com.github.mcollovati</groupId>
         <artifactId>quarkus-hilla-parent</artifactId>
         <version>${revision}</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>hilla-react-jandex</artifactId>
diff --git a/runtime-react/pom.xml b/react/runtime/pom.xml
similarity index 99%
rename from runtime-react/pom.xml
rename to react/runtime/pom.xml
index 85bc7964..0264b21b 100644
--- a/runtime-react/pom.xml
+++ b/react/runtime/pom.xml
@@ -7,6 +7,7 @@
         <groupId>com.github.mcollovati</groupId>
         <artifactId>quarkus-hilla-parent</artifactId>
         <version>${revision}</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>quarkus-hilla-react</artifactId>
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/README.tpl.qute.md b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/README.tpl.qute.md
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/README.tpl.qute.md
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/README.tpl.qute.md
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/App.tsx b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/App.tsx
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/App.tsx
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/App.tsx
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/index.ts b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/index.ts
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/index.ts
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/index.ts
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/routes.tsx b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/routes.tsx
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/routes.tsx
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/routes.tsx
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/views/MainView.tsx b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/views/MainView.tsx
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/views/MainView.tsx
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/frontend/views/MainView.tsx
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package-lock.json b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package-lock.json
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package-lock.json
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package-lock.json
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package.json b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package.json
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package.json
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/package.json
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/pom.xml.tpl.qute b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/pom.xml.tpl.qute
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/pom.xml.tpl.qute
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/pom.xml.tpl.qute
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/src/main/hilla-scaffold-package-name-holder.txt b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/src/main/hilla-scaffold-package-name-holder.txt
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/src/main/hilla-scaffold-package-name-holder.txt
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/src/main/hilla-scaffold-package-name-holder.txt
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/types.d.ts b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/types.d.ts
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/types.d.ts
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/types.d.ts
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/vite.config.ts b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/vite.config.ts
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/vite.config.ts
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/base/vite.config.ts
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/codestart.yml b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/codestart.yml
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/codestart.yml
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/codestart.yml
diff --git a/runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/HelloEndpoint.java b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/HelloEndpoint.java
similarity index 100%
rename from runtime-react/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/HelloEndpoint.java
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/HelloEndpoint.java
diff --git a/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/package-info.java b/react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/package-info.java
similarity index 100%
rename from runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/package-info.java
rename to react/runtime/src/main/codestarts/quarkus/quakus-hilla-maven-codestart/java/src/main/java/org/acme/endpoints/package-info.java
diff --git a/runtime-react/src/main/resources/META-INF/quarkus-extension.yaml b/react/runtime/src/main/resources/META-INF/quarkus-extension.yaml
similarity index 100%
rename from runtime-react/src/main/resources/META-INF/quarkus-extension.yaml
rename to react/runtime/src/main/resources/META-INF/quarkus-extension.yaml