diff --git a/components/pom.xml b/components/pom.xml
index c09c7c5..8661065 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -19,13 +19,11 @@
         <module>fluent-builtin</module>
         <module>fluent-mindmap</module>
         <module>fluentqa-md</module>
-        <module>fluent-openapi</module>
+
         <module>fluent-excel</module>
         <module>fluent-quickdao</module>
         <module>fluent-httpclients</module>
-        <module>fluent-datafactory</module>
         <module>fluent-testlibs</module>
-        <module>fluent-spring</module>
         <module>fluent-loader</module>
     </modules>
 
diff --git a/components/fluent-datafactory/pom.xml b/modules/fluent-datafactory/pom.xml
similarity index 99%
rename from components/fluent-datafactory/pom.xml
rename to modules/fluent-datafactory/pom.xml
index 05c6f09..7a95ca1 100644
--- a/components/fluent-datafactory/pom.xml
+++ b/modules/fluent-datafactory/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.fluent</groupId>
-        <artifactId>components</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/annotation/DataDesc.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/annotation/DataDesc.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/annotation/DataDesc.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/annotation/DataDesc.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/annotation/DataFactory.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/annotation/DataFactory.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/annotation/DataFactory.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/annotation/DataFactory.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/annotation/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/annotation/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/annotation/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/annotation/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IAnnotationData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IAnnotationData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IAnnotationData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IAnnotationData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IDataFactoryContext.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IDataFactoryContext.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IDataFactoryContext.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IDataFactoryContext.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IRegexGen.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IRegexGen.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IRegexGen.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/core/IRegexGen.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/api/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/api/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/DataFactoryData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/DataFactoryData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/DataFactoryData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/DataFactoryData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/context/DefaultDataContext.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/context/DefaultDataContext.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/context/DefaultDataContext.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/context/DefaultDataContext.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/ArrayData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/ArrayData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/ArrayData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/ArrayData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/BeanData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/BeanData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/BeanData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/BeanData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/EnumData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/EnumData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/EnumData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/EnumData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/IterableData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/IterableData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/IterableData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/IterableData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/MapData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/MapData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/MapData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/MapData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/NullData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/NullData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/NullData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/NullData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/aggregate/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/annotation/AbstractAnnotationData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/annotation/AbstractAnnotationData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/annotation/AbstractAnnotationData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/annotation/AbstractAnnotationData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/annotation/AbstractNumberData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/annotation/AbstractNumberData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/annotation/AbstractNumberData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/annotation/AbstractNumberData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/annotation/DefaultDataFactoryAnnotationData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/annotation/DefaultDataFactoryAnnotationData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/annotation/DefaultDataFactoryAnnotationData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/annotation/DefaultDataFactoryAnnotationData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/lang/StringData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/lang/StringData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/lang/StringData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/lang/StringData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/lang/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/lang/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/lang/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/lang/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/math/BigDecimalData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/math/BigDecimalData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/math/BigDecimalData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/math/BigDecimalData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/math/BigIntegerData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/math/BigIntegerData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/math/BigIntegerData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/math/BigIntegerData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/math/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/math/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/math/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/math/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/BoolArrayData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/BoolArrayData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/BoolArrayData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/BoolArrayData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/BoolData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/BoolData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/BoolData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/BoolData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ByteArrayData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ByteArrayData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ByteArrayData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ByteArrayData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ByteData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ByteData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ByteData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ByteData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/CharArrayData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/CharArrayData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/CharArrayData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/CharArrayData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/CharData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/CharData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/CharData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/CharData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/DoubleArrayData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/DoubleArrayData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/DoubleArrayData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/DoubleArrayData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/DoubleData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/DoubleData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/DoubleData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/DoubleData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/FloatArrayData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/FloatArrayData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/FloatArrayData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/FloatArrayData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/FloatData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/FloatData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/FloatData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/FloatData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/IntegerArrayData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/IntegerArrayData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/IntegerArrayData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/IntegerArrayData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/IntegerData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/IntegerData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/IntegerData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/IntegerData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/LongArrayData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/LongArrayData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/LongArrayData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/LongArrayData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/LongData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/LongData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/LongData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/LongData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ShortArrayData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ShortArrayData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ShortArrayData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ShortArrayData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ShortData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ShortData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ShortData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/ShortData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/VoidData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/VoidData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/VoidData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/VoidData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/primitive/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/LocalDateData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/LocalDateData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/LocalDateData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/LocalDateData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/LocalDateTimeData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/LocalDateTimeData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/LocalDateTimeData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/LocalDateTimeData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/LocalTimeData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/LocalTimeData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/LocalTimeData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/LocalTimeData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/YearData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/YearData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/YearData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/YearData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/time/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/util/CurrencyData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/util/CurrencyData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/util/CurrencyData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/util/CurrencyData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/util/DateData.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/util/DateData.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/util/DateData.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/util/DateData.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/util/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/util/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/util/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/data/util/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/regex/DefaultRegexGen.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/regex/DefaultRegexGen.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/regex/DefaultRegexGen.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/api/regex/DefaultRegexGen.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/exception/DataFactoryRuntimeException.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/exception/DataFactoryRuntimeException.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/exception/DataFactoryRuntimeException.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/exception/DataFactoryRuntimeException.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/support/factory/DataFactoryMapping.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/support/factory/DataFactoryMapping.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/support/factory/DataFactoryMapping.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/support/factory/DataFactoryMapping.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/support/factory/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/support/factory/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/support/factory/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/support/factory/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/support/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/support/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/support/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/support/package-info.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/DataClassUtil.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/DataClassUtil.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/DataClassUtil.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/DataClassUtil.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/DataFactoryDataUtil.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/DataFactoryDataUtil.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/DataFactoryDataUtil.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/DataFactoryDataUtil.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/DataPrimitiveUtil.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/DataPrimitiveUtil.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/DataPrimitiveUtil.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/DataPrimitiveUtil.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/InnerDataUtil.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/InnerDataUtil.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/InnerDataUtil.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/core/util/InnerDataUtil.java
diff --git a/components/fluent-datafactory/src/main/java/io/fluent/datafactory/package-info.java b/modules/fluent-datafactory/src/main/java/io/fluent/datafactory/package-info.java
similarity index 100%
rename from components/fluent-datafactory/src/main/java/io/fluent/datafactory/package-info.java
rename to modules/fluent-datafactory/src/main/java/io/fluent/datafactory/package-info.java
diff --git a/components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/DataFactoryDataTest.java b/modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/DataFactoryDataTest.java
similarity index 100%
rename from components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/DataFactoryDataTest.java
rename to modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/DataFactoryDataTest.java
diff --git a/components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/DataSourceBuilder.java b/modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/DataSourceBuilder.java
similarity index 100%
rename from components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/DataSourceBuilder.java
rename to modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/DataSourceBuilder.java
diff --git a/components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/PostgreSqlTest.java b/modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/PostgreSqlTest.java
similarity index 100%
rename from components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/PostgreSqlTest.java
rename to modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/PostgreSqlTest.java
diff --git a/components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/SqlExecutor.java b/modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/SqlExecutor.java
similarity index 100%
rename from components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/SqlExecutor.java
rename to modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/SqlExecutor.java
diff --git a/components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/TestTable.java b/modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/TestTable.java
similarity index 100%
rename from components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/TestTable.java
rename to modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/TestTable.java
diff --git a/components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/User.java b/modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/User.java
similarity index 100%
rename from components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/User.java
rename to modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/User.java
diff --git a/components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/UserAnnotationNumber.java b/modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/UserAnnotationNumber.java
similarity index 100%
rename from components/fluent-datafactory/src/test/java/io/fluent/datafactory/core/UserAnnotationNumber.java
rename to modules/fluent-datafactory/src/test/java/io/fluent/datafactory/core/UserAnnotationNumber.java
diff --git a/components/fluent-mocker/pom.xml b/modules/fluent-mocker/pom.xml
similarity index 100%
rename from components/fluent-mocker/pom.xml
rename to modules/fluent-mocker/pom.xml
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/Mock.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/Mock.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/Mock.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/Mock.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/MockConfiguration.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/MockConfiguration.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/MockConfiguration.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/MockConfiguration.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/exception/MockException.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/exception/MockException.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/exception/MockException.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/exception/MockException.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/exception/MockParserException.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/exception/MockParserException.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/exception/MockParserException.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/exception/MockParserException.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/exception/ParameterSizeException.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/exception/ParameterSizeException.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/exception/ParameterSizeException.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/exception/ParameterSizeException.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockBeanFactory.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockBeanFactory.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockBeanFactory.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockBeanFactory.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockMapperFactory.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockMapperFactory.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockMapperFactory.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockMapperFactory.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockObjectFactory.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockObjectFactory.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockObjectFactory.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockObjectFactory.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockProxyHandlerFactory.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockProxyHandlerFactory.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockProxyHandlerFactory.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockProxyHandlerFactory.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockProxyHandlerFactoryImpl.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockProxyHandlerFactoryImpl.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockProxyHandlerFactoryImpl.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/factory/MockProxyHandlerFactoryImpl.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/factory/SimpleBean.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/factory/SimpleBean.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/factory/SimpleBean.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/factory/SimpleBean.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/ArrayFieldValueGetter.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/ArrayFieldValueGetter.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/ArrayFieldValueGetter.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/ArrayFieldValueGetter.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/DoubleFieldValueGetter.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/DoubleFieldValueGetter.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/DoubleFieldValueGetter.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/DoubleFieldValueGetter.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/EnumFieldValueGetter.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/EnumFieldValueGetter.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/EnumFieldValueGetter.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/EnumFieldValueGetter.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/FieldValueGetter.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/FieldValueGetter.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/FieldValueGetter.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/FieldValueGetter.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/IntegerFieldValueGetter.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/IntegerFieldValueGetter.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/IntegerFieldValueGetter.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/IntegerFieldValueGetter.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/ListFieldValueGetter.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/ListFieldValueGetter.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/ListFieldValueGetter.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/ListFieldValueGetter.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/ObjectFieldValueGetter.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/ObjectFieldValueGetter.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/ObjectFieldValueGetter.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/ObjectFieldValueGetter.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/StringFieldValueGetter.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/StringFieldValueGetter.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/StringFieldValueGetter.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/fieldvaluegetter/StringFieldValueGetter.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/function/ExFunction.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/function/ExFunction.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/function/ExFunction.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/function/ExFunction.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/function/ExProxyHandler.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/function/ExProxyHandler.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/function/ExProxyHandler.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/function/ExProxyHandler.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/function/TypeParse.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/function/TypeParse.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/function/TypeParse.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/function/TypeParse.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/invoker/ArrayElementInvoker.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/invoker/ArrayElementInvoker.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/invoker/ArrayElementInvoker.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/invoker/ArrayElementInvoker.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/invoker/ElementInvoker.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/invoker/ElementInvoker.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/invoker/ElementInvoker.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/invoker/ElementInvoker.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/invoker/Invoker.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/invoker/Invoker.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/invoker/Invoker.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/invoker/Invoker.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/invoker/ListElementInvoker.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/invoker/ListElementInvoker.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/invoker/ListElementInvoker.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/invoker/ListElementInvoker.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/invoker/MethodInvoker.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/invoker/MethodInvoker.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/invoker/MethodInvoker.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/invoker/MethodInvoker.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/loader/BranchResult.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/BranchResult.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/loader/BranchResult.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/BranchResult.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/loader/DefaultMockMethodLoader.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/DefaultMockMethodLoader.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/loader/DefaultMockMethodLoader.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/DefaultMockMethodLoader.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/loader/LoadResults.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/LoadResults.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/loader/LoadResults.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/LoadResults.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/loader/MethodLoader.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/MethodLoader.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/loader/MethodLoader.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/MethodLoader.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/loader/MockMethodLoadReport.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/MockMethodLoadReport.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/loader/MockMethodLoadReport.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/MockMethodLoadReport.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/loader/MockMethodLoadResult.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/MockMethodLoadResult.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/loader/MockMethodLoadResult.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/MockMethodLoadResult.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/loader/Result.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/Result.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/loader/Result.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/loader/Result.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/ArrayMapper.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/ArrayMapper.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/ArrayMapper.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/ArrayMapper.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/ArrayMapperType.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/ArrayMapperType.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/ArrayMapperType.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/ArrayMapperType.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockArray.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockArray.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockArray.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockArray.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockBean.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockBean.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockBean.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockBean.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockProxy.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockProxy.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockProxy.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockProxy.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockProxyType.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockProxyType.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockProxyType.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockProxyType.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockValue.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockValue.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockValue.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mapper/MockValue.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/ConstMockField.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/ConstMockField.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/ConstMockField.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/ConstMockField.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockBean.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockBean.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockBean.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockBean.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockField.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockField.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockField.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockField.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockMapBean.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockMapBean.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockMapBean.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockMapBean.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockMapObject.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockMapObject.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockMapObject.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockMapObject.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockNormalObject.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockNormalObject.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockNormalObject.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockNormalObject.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockObject.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockObject.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockObject.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/MockObject.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/ParallelMockBean.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/ParallelMockBean.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/ParallelMockBean.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/ParallelMockBean.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/ParallelMockMapBean.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/ParallelMockMapBean.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/ParallelMockMapBean.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/mockbean/ParallelMockMapBean.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/package-info.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/package-info.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/package-info.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/package-info.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/parser/ArraysParser.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/ArraysParser.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/parser/ArraysParser.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/ArraysParser.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/parser/BaseFieldParser.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/BaseFieldParser.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/parser/BaseFieldParser.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/BaseFieldParser.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/parser/DoubleParser.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/DoubleParser.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/parser/DoubleParser.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/DoubleParser.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/parser/FieldParser.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/FieldParser.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/parser/FieldParser.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/FieldParser.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/parser/InstructionParser.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/InstructionParser.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/parser/InstructionParser.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/InstructionParser.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/parser/IntegerParser.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/IntegerParser.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/parser/IntegerParser.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/IntegerParser.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/parser/ListParser.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/ListParser.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/parser/ListParser.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/ListParser.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/parser/MockObjectParser.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/MockObjectParser.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/parser/MockObjectParser.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/MockObjectParser.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/parser/ObjectParser.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/ObjectParser.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/parser/ObjectParser.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/ObjectParser.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/parser/ParameterParser.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/ParameterParser.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/parser/ParameterParser.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/parser/ParameterParser.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/utils/ChineseUtil.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/ChineseUtil.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/utils/ChineseUtil.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/ChineseUtil.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/utils/ClassScanner.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/ClassScanner.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/utils/ClassScanner.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/ClassScanner.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/utils/CollectorUtil.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/CollectorUtil.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/utils/CollectorUtil.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/CollectorUtil.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/utils/FieldUtils.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/FieldUtils.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/utils/FieldUtils.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/FieldUtils.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/utils/MethodUtil.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/MethodUtil.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/utils/MethodUtil.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/MethodUtil.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/utils/MockUtil.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/MockUtil.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/utils/MockUtil.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/MockUtil.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/utils/ProxyUtils.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/ProxyUtils.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/utils/ProxyUtils.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/ProxyUtils.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/utils/RandomUtil.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/RandomUtil.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/utils/RandomUtil.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/RandomUtil.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/utils/RegexUtil.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/RegexUtil.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/utils/RegexUtil.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/RegexUtil.java
diff --git a/components/fluent-mocker/src/main/java/io/fluent/mocker/utils/SingleFactory.java b/modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/SingleFactory.java
similarity index 100%
rename from components/fluent-mocker/src/main/java/io/fluent/mocker/utils/SingleFactory.java
rename to modules/fluent-mocker/src/main/java/io/fluent/mocker/utils/SingleFactory.java
diff --git a/components/fluent-openapi/pom.xml b/modules/fluent-openapi/pom.xml
similarity index 97%
rename from components/fluent-openapi/pom.xml
rename to modules/fluent-openapi/pom.xml
index 7589806..1cddb21 100644
--- a/components/fluent-openapi/pom.xml
+++ b/modules/fluent-openapi/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.fluent</groupId>
-        <artifactId>components</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/components/fluent-openapi/src/main/java/io/fluent/differ/OpenApiDiffer.java b/modules/fluent-openapi/src/main/java/io/fluent/differ/OpenApiDiffer.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/differ/OpenApiDiffer.java
rename to modules/fluent-openapi/src/main/java/io/fluent/differ/OpenApiDiffer.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/PostmanParser.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/PostmanParser.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/PostmanParser.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/PostmanParser.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/ValueUtils.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/ValueUtils.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/ValueUtils.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/ValueUtils.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanBody.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanBody.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanBody.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanBody.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanCollection.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanCollection.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanCollection.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanCollection.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanCollectionInfo.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanCollectionInfo.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanCollectionInfo.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanCollectionInfo.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanEvent.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanEvent.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanEvent.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanEvent.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanFileBody.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanFileBody.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanFileBody.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanFileBody.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanFormDataBody.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanFormDataBody.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanFormDataBody.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanFormDataBody.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanItem.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanItem.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanItem.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanItem.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanKeyValue.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanKeyValue.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanKeyValue.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanKeyValue.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanQuery.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanQuery.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanQuery.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanQuery.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanRawBody.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanRawBody.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanRawBody.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanRawBody.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanRequest.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanRequest.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanRequest.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanRequest.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanResponse.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanResponse.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanResponse.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanResponse.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanScript.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanScript.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanScript.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanScript.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanUrl.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanUrl.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanUrl.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanUrl.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanUrlEncodedBody.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanUrlEncodedBody.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanUrlEncodedBody.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/PostmanUrlEncodedBody.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/model/ResponseBodyMode.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/model/ResponseBodyMode.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/model/ResponseBodyMode.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/model/ResponseBodyMode.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/postman/package-info.java b/modules/fluent-openapi/src/main/java/io/fluent/postman/package-info.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/postman/package-info.java
rename to modules/fluent-openapi/src/main/java/io/fluent/postman/package-info.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/swagger/SwaggerParser.java b/modules/fluent-openapi/src/main/java/io/fluent/swagger/SwaggerParser.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/swagger/SwaggerParser.java
rename to modules/fluent-openapi/src/main/java/io/fluent/swagger/SwaggerParser.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerApi.java b/modules/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerApi.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerApi.java
rename to modules/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerApi.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerInfo.java b/modules/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerInfo.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerInfo.java
rename to modules/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerInfo.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerParameter.java b/modules/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerParameter.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerParameter.java
rename to modules/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerParameter.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerRequest.java b/modules/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerRequest.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerRequest.java
rename to modules/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerRequest.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerTag.java b/modules/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerTag.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerTag.java
rename to modules/fluent-openapi/src/main/java/io/fluent/swagger/model/SwaggerTag.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/swagger/package-info.java b/modules/fluent-openapi/src/main/java/io/fluent/swagger/package-info.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/swagger/package-info.java
rename to modules/fluent-openapi/src/main/java/io/fluent/swagger/package-info.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/utils/TypeUtils.java b/modules/fluent-openapi/src/main/java/io/fluent/utils/TypeUtils.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/utils/TypeUtils.java
rename to modules/fluent-openapi/src/main/java/io/fluent/utils/TypeUtils.java
diff --git a/components/fluent-openapi/src/main/java/io/fluent/utils/UrlUtils.java b/modules/fluent-openapi/src/main/java/io/fluent/utils/UrlUtils.java
similarity index 100%
rename from components/fluent-openapi/src/main/java/io/fluent/utils/UrlUtils.java
rename to modules/fluent-openapi/src/main/java/io/fluent/utils/UrlUtils.java
diff --git a/components/fluent-openapi/src/test/java/io/fluent/postman/PostmanParserTest.java b/modules/fluent-openapi/src/test/java/io/fluent/postman/PostmanParserTest.java
similarity index 100%
rename from components/fluent-openapi/src/test/java/io/fluent/postman/PostmanParserTest.java
rename to modules/fluent-openapi/src/test/java/io/fluent/postman/PostmanParserTest.java
diff --git a/components/fluent-openapi/src/test/java/io/fluent/swagger/SwaggerParserTest.java b/modules/fluent-openapi/src/test/java/io/fluent/swagger/SwaggerParserTest.java
similarity index 100%
rename from components/fluent-openapi/src/test/java/io/fluent/swagger/SwaggerParserTest.java
rename to modules/fluent-openapi/src/test/java/io/fluent/swagger/SwaggerParserTest.java
diff --git a/components/fluent-openapi/src/test/resources/openproject-postman.json b/modules/fluent-openapi/src/test/resources/openproject-postman.json
similarity index 100%
rename from components/fluent-openapi/src/test/resources/openproject-postman.json
rename to modules/fluent-openapi/src/test/resources/openproject-postman.json
diff --git a/components/fluent-spring/pom.xml b/modules/fluent-spring/pom.xml
similarity index 97%
rename from components/fluent-spring/pom.xml
rename to modules/fluent-spring/pom.xml
index c0702bd..b7c1679 100644
--- a/components/fluent-spring/pom.xml
+++ b/modules/fluent-spring/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.fluent</groupId>
-        <artifactId>components</artifactId>
+        <artifactId>modules</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/components/fluent-spring/src/main/java/io/fluent/spring/config/SpringConfig.java b/modules/fluent-spring/src/main/java/io/fluent/spring/config/SpringConfig.java
similarity index 100%
rename from components/fluent-spring/src/main/java/io/fluent/spring/config/SpringConfig.java
rename to modules/fluent-spring/src/main/java/io/fluent/spring/config/SpringConfig.java
diff --git a/components/fluent-spring/src/main/java/io/fluent/spring/util/IpUtils.java b/modules/fluent-spring/src/main/java/io/fluent/spring/util/IpUtils.java
similarity index 100%
rename from components/fluent-spring/src/main/java/io/fluent/spring/util/IpUtils.java
rename to modules/fluent-spring/src/main/java/io/fluent/spring/util/IpUtils.java
diff --git a/components/fluent-spring/src/main/java/io/fluent/spring/util/SpringRegisterUtil.java b/modules/fluent-spring/src/main/java/io/fluent/spring/util/SpringRegisterUtil.java
similarity index 100%
rename from components/fluent-spring/src/main/java/io/fluent/spring/util/SpringRegisterUtil.java
rename to modules/fluent-spring/src/main/java/io/fluent/spring/util/SpringRegisterUtil.java
diff --git a/components/fluent-spring/src/main/java/io/fluent/spring/util/SpringUtils.java b/modules/fluent-spring/src/main/java/io/fluent/spring/util/SpringUtils.java
similarity index 100%
rename from components/fluent-spring/src/main/java/io/fluent/spring/util/SpringUtils.java
rename to modules/fluent-spring/src/main/java/io/fluent/spring/util/SpringUtils.java
diff --git a/components/fluent-spring/src/main/resources/META-INF/spring.factories b/modules/fluent-spring/src/main/resources/META-INF/spring.factories
similarity index 100%
rename from components/fluent-spring/src/main/resources/META-INF/spring.factories
rename to modules/fluent-spring/src/main/resources/META-INF/spring.factories
diff --git a/modules/pom.xml b/modules/pom.xml
index dcb9ba9..647b1d9 100644
--- a/modules/pom.xml
+++ b/modules/pom.xml
@@ -13,8 +13,11 @@
     <artifactId>modules</artifactId>
     <packaging>pom</packaging>
     <modules>
+        <module>fluent-datafactory</module>
         <module>fluent-base-ext</module>
         <module>fluent-payment</module>
+        <module>fluent-openapi</module>
+        <module>fluent-spring</module>
     </modules>
 
     <properties>