diff --git a/serverlessworkflow-annotations/pom.xml b/annotations/pom.xml
similarity index 100%
rename from serverlessworkflow-annotations/pom.xml
rename to annotations/pom.xml
diff --git a/serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/AdditionalProperties.java b/annotations/src/main/java/io/serverlessworkflow/annotations/AdditionalProperties.java
similarity index 100%
rename from serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/AdditionalProperties.java
rename to annotations/src/main/java/io/serverlessworkflow/annotations/AdditionalProperties.java
diff --git a/serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/Item.java b/annotations/src/main/java/io/serverlessworkflow/annotations/Item.java
similarity index 100%
rename from serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/Item.java
rename to annotations/src/main/java/io/serverlessworkflow/annotations/Item.java
diff --git a/serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/ItemKey.java b/annotations/src/main/java/io/serverlessworkflow/annotations/ItemKey.java
similarity index 100%
rename from serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/ItemKey.java
rename to annotations/src/main/java/io/serverlessworkflow/annotations/ItemKey.java
diff --git a/serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/ItemValue.java b/annotations/src/main/java/io/serverlessworkflow/annotations/ItemValue.java
similarity index 100%
rename from serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/ItemValue.java
rename to annotations/src/main/java/io/serverlessworkflow/annotations/ItemValue.java
diff --git a/serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/OneOfSetter.java b/annotations/src/main/java/io/serverlessworkflow/annotations/OneOfSetter.java
similarity index 100%
rename from serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/OneOfSetter.java
rename to annotations/src/main/java/io/serverlessworkflow/annotations/OneOfSetter.java
diff --git a/serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/OneOfValueProvider.java b/annotations/src/main/java/io/serverlessworkflow/annotations/OneOfValueProvider.java
similarity index 100%
rename from serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/OneOfValueProvider.java
rename to annotations/src/main/java/io/serverlessworkflow/annotations/OneOfValueProvider.java
diff --git a/serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/Union.java b/annotations/src/main/java/io/serverlessworkflow/annotations/Union.java
similarity index 100%
rename from serverlessworkflow-annotations/src/main/java/io/serverlessworkflow/annotations/Union.java
rename to annotations/src/main/java/io/serverlessworkflow/annotations/Union.java
diff --git a/api/pom.xml b/api/pom.xml
index 19414b85..f69dfd99 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -83,7 +83,7 @@
     
         <plugin>
             <groupId>io.serverlessworkflow</groupId>
-            <artifactId>jackson-generator</artifactId>
+            <artifactId>serverless-workflow-jackson-generator</artifactId>
             <version>${project.version}</version>
             <dependencies/>
             <configuration>
diff --git a/jackson-generator/pom.xml b/generators/jackson/pom.xml
similarity index 93%
rename from jackson-generator/pom.xml
rename to generators/jackson/pom.xml
index 55d2e03c..81d4c254 100644
--- a/jackson-generator/pom.xml
+++ b/generators/jackson/pom.xml
@@ -3,10 +3,11 @@
   <packaging>maven-plugin</packaging>
   <parent>
     <groupId>io.serverlessworkflow</groupId>
-    <artifactId>serverlessworkflow-parent</artifactId>
+    <artifactId>serverlessworkflow-generators</artifactId>
     <version>8.0.0-SNAPSHOT</version>
   </parent>
-  <artifactId>jackson-generator</artifactId>
+  <artifactId>serverless-workflow-jackson-generator</artifactId>
+  <name>Serverless Workflow :: Generator:: Jackson</name>
   <properties>
     <maven-plugin-tools.version>3.15.1</maven-plugin-tools.version>
   </properties>
diff --git a/jackson-generator/src/main/java/io/serverlessworkflow/generator/jackson/GeneratorUtils.java b/generators/jackson/src/main/java/io/serverlessworkflow/generator/jackson/GeneratorUtils.java
similarity index 100%
rename from jackson-generator/src/main/java/io/serverlessworkflow/generator/jackson/GeneratorUtils.java
rename to generators/jackson/src/main/java/io/serverlessworkflow/generator/jackson/GeneratorUtils.java
diff --git a/jackson-generator/src/main/java/io/serverlessworkflow/generator/jackson/JacksonMixInPojo.java b/generators/jackson/src/main/java/io/serverlessworkflow/generator/jackson/JacksonMixInPojo.java
similarity index 100%
rename from jackson-generator/src/main/java/io/serverlessworkflow/generator/jackson/JacksonMixInPojo.java
rename to generators/jackson/src/main/java/io/serverlessworkflow/generator/jackson/JacksonMixInPojo.java
diff --git a/generators/pom.xml b/generators/pom.xml
new file mode 100644
index 00000000..9ad258c4
--- /dev/null
+++ b/generators/pom.xml
@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.serverlessworkflow</groupId>
+        <artifactId>serverlessworkflow-parent</artifactId>
+        <version>8.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>serverlessworkflow-generators</artifactId>
+    <name>Serverless Workflow :: Generators</name>
+    <packaging>pom</packaging>
+       <modules>
+        <module>jackson</module>
+        <module>types</module>
+    </modules>
+</project>
\ No newline at end of file
diff --git a/custom-generator/pom.xml b/generators/types/pom.xml
similarity index 90%
rename from custom-generator/pom.xml
rename to generators/types/pom.xml
index 55b2215b..232009ea 100644
--- a/custom-generator/pom.xml
+++ b/generators/types/pom.xml
@@ -2,11 +2,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.serverlessworkflow</groupId>
-        <artifactId>serverlessworkflow-parent</artifactId>
+        <artifactId>serverlessworkflow-generators</artifactId>
         <version>8.0.0-SNAPSHOT</version>
     </parent>
-    <artifactId>serverless-workflow-custom-generator</artifactId>
-    <name>Serverless Workflow :: Custom Generator</name>
+    <artifactId>serverless-workflow-types-generator</artifactId>
+    <name>Serverless Workflow :: Generator:: Types</name>
     <dependencies>
         <dependency>
             <groupId>org.jsonschema2pojo</groupId>
diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/AllAnyOneOfSchemaRule.java b/generators/types/src/main/java/io/serverlessworkflow/generator/AllAnyOneOfSchemaRule.java
similarity index 100%
rename from custom-generator/src/main/java/io/serverlessworkflow/generator/AllAnyOneOfSchemaRule.java
rename to generators/types/src/main/java/io/serverlessworkflow/generator/AllAnyOneOfSchemaRule.java
diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/CustomAnnotator.java b/generators/types/src/main/java/io/serverlessworkflow/generator/CustomAnnotator.java
similarity index 100%
rename from custom-generator/src/main/java/io/serverlessworkflow/generator/CustomAnnotator.java
rename to generators/types/src/main/java/io/serverlessworkflow/generator/CustomAnnotator.java
diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/EmptyObjectTypeRule.java b/generators/types/src/main/java/io/serverlessworkflow/generator/EmptyObjectTypeRule.java
similarity index 100%
rename from custom-generator/src/main/java/io/serverlessworkflow/generator/EmptyObjectTypeRule.java
rename to generators/types/src/main/java/io/serverlessworkflow/generator/EmptyObjectTypeRule.java
diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/GeneratorUtils.java b/generators/types/src/main/java/io/serverlessworkflow/generator/GeneratorUtils.java
similarity index 100%
rename from custom-generator/src/main/java/io/serverlessworkflow/generator/GeneratorUtils.java
rename to generators/types/src/main/java/io/serverlessworkflow/generator/GeneratorUtils.java
diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/RefNameHelper.java b/generators/types/src/main/java/io/serverlessworkflow/generator/RefNameHelper.java
similarity index 100%
rename from custom-generator/src/main/java/io/serverlessworkflow/generator/RefNameHelper.java
rename to generators/types/src/main/java/io/serverlessworkflow/generator/RefNameHelper.java
diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/UnevaluatedPropertiesRule.java b/generators/types/src/main/java/io/serverlessworkflow/generator/UnevaluatedPropertiesRule.java
similarity index 100%
rename from custom-generator/src/main/java/io/serverlessworkflow/generator/UnevaluatedPropertiesRule.java
rename to generators/types/src/main/java/io/serverlessworkflow/generator/UnevaluatedPropertiesRule.java
diff --git a/custom-generator/src/main/java/io/serverlessworkflow/generator/UnreferencedFactory.java b/generators/types/src/main/java/io/serverlessworkflow/generator/UnreferencedFactory.java
similarity index 100%
rename from custom-generator/src/main/java/io/serverlessworkflow/generator/UnreferencedFactory.java
rename to generators/types/src/main/java/io/serverlessworkflow/generator/UnreferencedFactory.java
diff --git a/pom.xml b/pom.xml
index a187fbfe..0f420cee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,12 +38,11 @@
 
   <modules>
     <module>api</module>
-    <module>custom-generator</module>
     <module>impl</module>
-    <module>serverlessworkflow-types</module>
-    <module>serverlessworkflow-annotations</module>
-    <module>jackson-generator</module>
-    <module>serverlessworkflow-serialization</module>
+    <module>types</module>
+    <module>annotations</module>
+    <module>generators</module>
+    <module>serialization</module>
   </modules>
 
     <properties>
diff --git a/serverlessworkflow-serialization/pom.xml b/serialization/pom.xml
similarity index 94%
rename from serverlessworkflow-serialization/pom.xml
rename to serialization/pom.xml
index 55787c00..6e8411f0 100644
--- a/serverlessworkflow-serialization/pom.xml
+++ b/serialization/pom.xml
@@ -6,6 +6,7 @@
     <version>8.0.0-SNAPSHOT</version>
   </parent>
   <artifactId>serverlessworkflow-serialization</artifactId>
+  <name>Serverless Workflow :: Serialization</name>
    <dependencies>
      <dependency>
         <groupId>io.serverlessworkflow</groupId>
diff --git a/serverlessworkflow-serialization/src/main/java/io/serverlessworkflow/serialization/DeserializeHelper.java b/serialization/src/main/java/io/serverlessworkflow/serialization/DeserializeHelper.java
similarity index 100%
rename from serverlessworkflow-serialization/src/main/java/io/serverlessworkflow/serialization/DeserializeHelper.java
rename to serialization/src/main/java/io/serverlessworkflow/serialization/DeserializeHelper.java
diff --git a/serverlessworkflow-serialization/src/main/java/io/serverlessworkflow/serialization/SerializeHelper.java b/serialization/src/main/java/io/serverlessworkflow/serialization/SerializeHelper.java
similarity index 100%
rename from serverlessworkflow-serialization/src/main/java/io/serverlessworkflow/serialization/SerializeHelper.java
rename to serialization/src/main/java/io/serverlessworkflow/serialization/SerializeHelper.java
diff --git a/serverlessworkflow-types/pom.xml b/types/pom.xml
similarity index 97%
rename from serverlessworkflow-types/pom.xml
rename to types/pom.xml
index 90aa8996..20b4d552 100644
--- a/serverlessworkflow-types/pom.xml
+++ b/types/pom.xml
@@ -52,7 +52,7 @@
             <dependencies>
                 <dependency>
                     <groupId>io.serverlessworkflow</groupId>
-                    <artifactId>serverless-workflow-custom-generator</artifactId>
+                    <artifactId>serverless-workflow-types-generator</artifactId>
                     <version>${project.version}</version>
                 </dependency>
             </dependencies>
diff --git a/serverlessworkflow-types/src/main/resources/schema/workflow.yaml b/types/src/main/resources/schema/workflow.yaml
similarity index 100%
rename from serverlessworkflow-types/src/main/resources/schema/workflow.yaml
rename to types/src/main/resources/schema/workflow.yaml