diff --git a/components/pom.xml b/components/pom.xml
index 8661065..23fee4b 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -17,12 +17,6 @@
 
     <modules>
         <module>fluent-builtin</module>
-        <module>fluent-mindmap</module>
-        <module>fluentqa-md</module>
-
-        <module>fluent-excel</module>
-        <module>fluent-quickdao</module>
-        <module>fluent-httpclients</module>
         <module>fluent-testlibs</module>
         <module>fluent-loader</module>
     </modules>
diff --git a/components/fluent-excel/README.md b/fluent-wrappers/fluent-excel/README.md
similarity index 100%
rename from components/fluent-excel/README.md
rename to fluent-wrappers/fluent-excel/README.md
diff --git a/components/fluent-excel/pom.xml b/fluent-wrappers/fluent-excel/pom.xml
similarity index 99%
rename from components/fluent-excel/pom.xml
rename to fluent-wrappers/fluent-excel/pom.xml
index 2c0a30a..0eeb45f 100644
--- a/components/fluent-excel/pom.xml
+++ b/fluent-wrappers/fluent-excel/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.fluent</groupId>
-        <artifactId>components</artifactId>
+        <artifactId>fluent-wrappers</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/components/fluent-excel/src/main/java/io/fluentqa/excel/ExcelReadWriter.java b/fluent-wrappers/fluent-excel/src/main/java/io/fluentqa/excel/ExcelReadWriter.java
similarity index 100%
rename from components/fluent-excel/src/main/java/io/fluentqa/excel/ExcelReadWriter.java
rename to fluent-wrappers/fluent-excel/src/main/java/io/fluentqa/excel/ExcelReadWriter.java
diff --git a/components/fluent-excel/src/main/java/io/fluentqa/excel/package-info.java b/fluent-wrappers/fluent-excel/src/main/java/io/fluentqa/excel/package-info.java
similarity index 100%
rename from components/fluent-excel/src/main/java/io/fluentqa/excel/package-info.java
rename to fluent-wrappers/fluent-excel/src/main/java/io/fluentqa/excel/package-info.java
diff --git a/components/fluent-excel/src/test/java/io/fluentqa/excel/DemoExcelModel.java b/fluent-wrappers/fluent-excel/src/test/java/io/fluentqa/excel/DemoExcelModel.java
similarity index 100%
rename from components/fluent-excel/src/test/java/io/fluentqa/excel/DemoExcelModel.java
rename to fluent-wrappers/fluent-excel/src/test/java/io/fluentqa/excel/DemoExcelModel.java
diff --git a/components/fluent-excel/src/test/java/io/fluentqa/excel/ExcelUtilsTest.java b/fluent-wrappers/fluent-excel/src/test/java/io/fluentqa/excel/ExcelUtilsTest.java
similarity index 100%
rename from components/fluent-excel/src/test/java/io/fluentqa/excel/ExcelUtilsTest.java
rename to fluent-wrappers/fluent-excel/src/test/java/io/fluentqa/excel/ExcelUtilsTest.java
diff --git a/components/fluent-excel/src/test/resources/test.xlsx b/fluent-wrappers/fluent-excel/src/test/resources/test.xlsx
similarity index 100%
rename from components/fluent-excel/src/test/resources/test.xlsx
rename to fluent-wrappers/fluent-excel/src/test/resources/test.xlsx
diff --git a/components/fluent-httpclients/.gitignore b/fluent-wrappers/fluent-httpclients/.gitignore
similarity index 100%
rename from components/fluent-httpclients/.gitignore
rename to fluent-wrappers/fluent-httpclients/.gitignore
diff --git a/components/fluent-httpclients/README.md b/fluent-wrappers/fluent-httpclients/README.md
similarity index 100%
rename from components/fluent-httpclients/README.md
rename to fluent-wrappers/fluent-httpclients/README.md
diff --git a/components/fluent-httpclients/pom.xml b/fluent-wrappers/fluent-httpclients/pom.xml
similarity index 98%
rename from components/fluent-httpclients/pom.xml
rename to fluent-wrappers/fluent-httpclients/pom.xml
index 9ecc274..7d91a50 100644
--- a/components/fluent-httpclients/pom.xml
+++ b/fluent-wrappers/fluent-httpclients/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.fluent</groupId>
-    <artifactId>components</artifactId>
+    <artifactId>fluent-wrappers</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpClientOption.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpClientOption.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpClientOption.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpClientOption.java
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpException.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpException.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpException.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpException.java
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpRequestModel.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpRequestModel.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpRequestModel.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpRequestModel.java
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpResponseModel.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpResponseModel.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpResponseModel.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/base/HttpResponseModel.java
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/base/MediaTypeEnum.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/base/MediaTypeEnum.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/base/MediaTypeEnum.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/base/MediaTypeEnum.java
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/base/MethodEnum.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/base/MethodEnum.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/base/MethodEnum.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/base/MethodEnum.java
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/factory/HttpClientFactory.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/factory/HttpClientFactory.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/factory/HttpClientFactory.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/factory/HttpClientFactory.java
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/factory/HttpClientProcessor.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/factory/HttpClientProcessor.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/factory/HttpClientProcessor.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/factory/HttpClientProcessor.java
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/CustomCallback.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/CustomCallback.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/CustomCallback.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/CustomCallback.java
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/HttpRequestHeaderInterceptor.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/HttpRequestHeaderInterceptor.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/HttpRequestHeaderInterceptor.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/HttpRequestHeaderInterceptor.java
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/retry/RetryCallback.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/retry/RetryCallback.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/retry/RetryCallback.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/retry/RetryCallback.java
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/retry/RetryHelper.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/retry/RetryHelper.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/retry/RetryHelper.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/interceptors/retry/RetryHelper.java
diff --git a/components/fluent-httpclients/src/main/java/io/fluent/clients/rest/RestAssuredClient.java b/fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/rest/RestAssuredClient.java
similarity index 100%
rename from components/fluent-httpclients/src/main/java/io/fluent/clients/rest/RestAssuredClient.java
rename to fluent-wrappers/fluent-httpclients/src/main/java/io/fluent/clients/rest/RestAssuredClient.java
diff --git a/components/fluent-httpclients/src/test/java/io/fluent/clients/base/HttpRequestModelTest.java b/fluent-wrappers/fluent-httpclients/src/test/java/io/fluent/clients/base/HttpRequestModelTest.java
similarity index 100%
rename from components/fluent-httpclients/src/test/java/io/fluent/clients/base/HttpRequestModelTest.java
rename to fluent-wrappers/fluent-httpclients/src/test/java/io/fluent/clients/base/HttpRequestModelTest.java
diff --git a/components/fluent-httpclients/src/test/java/io/fluent/clients/factory/HttpClientFactoryTest.java b/fluent-wrappers/fluent-httpclients/src/test/java/io/fluent/clients/factory/HttpClientFactoryTest.java
similarity index 100%
rename from components/fluent-httpclients/src/test/java/io/fluent/clients/factory/HttpClientFactoryTest.java
rename to fluent-wrappers/fluent-httpclients/src/test/java/io/fluent/clients/factory/HttpClientFactoryTest.java
diff --git a/components/fluent-mindmap/README.md b/fluent-wrappers/fluent-mindmap/README.md
similarity index 100%
rename from components/fluent-mindmap/README.md
rename to fluent-wrappers/fluent-mindmap/README.md
diff --git a/components/fluent-mindmap/pom.xml b/fluent-wrappers/fluent-mindmap/pom.xml
similarity index 97%
rename from components/fluent-mindmap/pom.xml
rename to fluent-wrappers/fluent-mindmap/pom.xml
index 312fd1d..0952c28 100644
--- a/components/fluent-mindmap/pom.xml
+++ b/fluent-wrappers/fluent-mindmap/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.fluent</groupId>
-        <artifactId>components</artifactId>
+        <artifactId>fluent-wrappers</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapAccessor.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapAccessor.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapAccessor.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapAccessor.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapConvertConfig.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapConvertConfig.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapConvertConfig.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapConvertConfig.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapPath.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapPath.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapPath.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapPath.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapPathRecord.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapPathRecord.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapPathRecord.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapPathRecord.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapTransformer.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapTransformer.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapTransformer.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindMapTransformer.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindmapTypeEnum.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindmapTypeEnum.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindmapTypeEnum.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/MindmapTypeEnum.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/NodeLevel.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/NodeLevel.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/NodeLevel.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/api/NodeLevel.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/exception/MindMapException.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/exception/MindMapException.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/exception/MindMapException.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/exception/MindMapException.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/FreeMindNode.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/FreeMindNode.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/FreeMindNode.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/FreeMindNode.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/FreeMindTransformer.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/FreeMindTransformer.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/FreeMindTransformer.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/FreeMindTransformer.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Arrowlink.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Arrowlink.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Arrowlink.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Arrowlink.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Attribute.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Attribute.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Attribute.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Attribute.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/AttributeLayout.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/AttributeLayout.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/AttributeLayout.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/AttributeLayout.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Cloud.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Cloud.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Cloud.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Cloud.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Edge.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Edge.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Edge.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Edge.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Font.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Font.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Font.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Font.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Hook.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Hook.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Hook.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Hook.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Html.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Html.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Html.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Html.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Icon.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Icon.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Icon.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Icon.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Linktarget.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Linktarget.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Linktarget.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Linktarget.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Map.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Map.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Map.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Map.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Node.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Node.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Node.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Node.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/ObjectFactory.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/ObjectFactory.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/ObjectFactory.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/ObjectFactory.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Parameters.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Parameters.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Parameters.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Parameters.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Richcontent.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Richcontent.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Richcontent.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Richcontent.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Text.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Text.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Text.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/freemind/model/Text.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/package-info.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/package-info.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/package-info.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/package-info.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/XMindNode.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/XMindNode.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/XMindNode.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/XMindNode.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/XMindUtil.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/XMindUtil.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/XMindUtil.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/XMindUtil.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/XmindTransformer.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/XmindTransformer.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/XmindTransformer.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/XmindTransformer.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Attached.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Attached.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Attached.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Attached.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Children.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Children.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Children.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Children.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Comments.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Comments.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Comments.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Comments.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/JsonRootBean.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/JsonRootBean.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/JsonRootBean.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/JsonRootBean.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Notes.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Notes.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Notes.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/Notes.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/RootTopic.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/RootTopic.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/RootTopic.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/RootTopic.java
diff --git a/components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/XmindRawData.java b/fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/XmindRawData.java
similarity index 100%
rename from components/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/XmindRawData.java
rename to fluent-wrappers/fluent-mindmap/src/main/java/io/fluentqa/mindmap/xmind/model/XmindRawData.java
diff --git a/components/fluent-mindmap/src/main/resources/t2.mm b/fluent-wrappers/fluent-mindmap/src/main/resources/t2.mm
similarity index 100%
rename from components/fluent-mindmap/src/main/resources/t2.mm
rename to fluent-wrappers/fluent-mindmap/src/main/resources/t2.mm
diff --git a/components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/DemoBean.java b/fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/DemoBean.java
similarity index 100%
rename from components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/DemoBean.java
rename to fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/DemoBean.java
diff --git a/components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/DemoBeanConfig.java b/fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/DemoBeanConfig.java
similarity index 100%
rename from components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/DemoBeanConfig.java
rename to fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/DemoBeanConfig.java
diff --git a/components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/DemoBeanWOLevel.java b/fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/DemoBeanWOLevel.java
similarity index 100%
rename from components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/DemoBeanWOLevel.java
rename to fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/DemoBeanWOLevel.java
diff --git a/components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/MindMapAccessorTest.java b/fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/MindMapAccessorTest.java
similarity index 100%
rename from components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/MindMapAccessorTest.java
rename to fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/api/MindMapAccessorTest.java
diff --git a/components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/freemind/FreeMindConverterTest.java b/fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/freemind/FreeMindConverterTest.java
similarity index 100%
rename from components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/freemind/FreeMindConverterTest.java
rename to fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/freemind/FreeMindConverterTest.java
diff --git a/components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/xmind/XMindUtilTest.java b/fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/xmind/XMindUtilTest.java
similarity index 100%
rename from components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/xmind/XMindUtilTest.java
rename to fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/xmind/XMindUtilTest.java
diff --git a/components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/xmind/XmindTransformerTest.java b/fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/xmind/XmindTransformerTest.java
similarity index 100%
rename from components/fluent-mindmap/src/test/java/io/fluentqa/mindmap/xmind/XmindTransformerTest.java
rename to fluent-wrappers/fluent-mindmap/src/test/java/io/fluentqa/mindmap/xmind/XmindTransformerTest.java
diff --git a/components/fluent-mindmap/src/test/resources/Xmind10+.xmind b/fluent-wrappers/fluent-mindmap/src/test/resources/Xmind10+.xmind
similarity index 100%
rename from components/fluent-mindmap/src/test/resources/Xmind10+.xmind
rename to fluent-wrappers/fluent-mindmap/src/test/resources/Xmind10+.xmind
diff --git a/components/fluent-mindmap/src/test/resources/Xmind8.xmind b/fluent-wrappers/fluent-mindmap/src/test/resources/Xmind8.xmind
similarity index 100%
rename from components/fluent-mindmap/src/test/resources/Xmind8.xmind
rename to fluent-wrappers/fluent-mindmap/src/test/resources/Xmind8.xmind
diff --git a/components/fluent-mindmap/src/test/resources/XmindZen.xmind b/fluent-wrappers/fluent-mindmap/src/test/resources/XmindZen.xmind
similarity index 100%
rename from components/fluent-mindmap/src/test/resources/XmindZen.xmind
rename to fluent-wrappers/fluent-mindmap/src/test/resources/XmindZen.xmind
diff --git a/components/fluent-mindmap/src/test/resources/case-template.xmind b/fluent-wrappers/fluent-mindmap/src/test/resources/case-template.xmind
similarity index 100%
rename from components/fluent-mindmap/src/test/resources/case-template.xmind
rename to fluent-wrappers/fluent-mindmap/src/test/resources/case-template.xmind
diff --git a/components/fluent-mindmap/src/test/resources/t2.mm b/fluent-wrappers/fluent-mindmap/src/test/resources/t2.mm
similarity index 100%
rename from components/fluent-mindmap/src/test/resources/t2.mm
rename to fluent-wrappers/fluent-mindmap/src/test/resources/t2.mm
diff --git "a/components/fluent-mindmap/src/test/resources/\345\205\203\344\273\266\347\256\241\347\220\206\347\224\250\344\276\213.mm" "b/fluent-wrappers/fluent-mindmap/src/test/resources/\345\205\203\344\273\266\347\256\241\347\220\206\347\224\250\344\276\213.mm"
similarity index 100%
rename from "components/fluent-mindmap/src/test/resources/\345\205\203\344\273\266\347\256\241\347\220\206\347\224\250\344\276\213.mm"
rename to "fluent-wrappers/fluent-mindmap/src/test/resources/\345\205\203\344\273\266\347\256\241\347\220\206\347\224\250\344\276\213.mm"
diff --git "a/components/fluent-mindmap/src/test/resources/\351\200\232\347\224\250\347\273\204\344\273\266\347\224\250\344\276\213.mm" "b/fluent-wrappers/fluent-mindmap/src/test/resources/\351\200\232\347\224\250\347\273\204\344\273\266\347\224\250\344\276\213.mm"
similarity index 100%
rename from "components/fluent-mindmap/src/test/resources/\351\200\232\347\224\250\347\273\204\344\273\266\347\224\250\344\276\213.mm"
rename to "fluent-wrappers/fluent-mindmap/src/test/resources/\351\200\232\347\224\250\347\273\204\344\273\266\347\224\250\344\276\213.mm"
diff --git a/components/fluent-quickdao/.gitignore b/fluent-wrappers/fluent-quickdao/.gitignore
similarity index 100%
rename from components/fluent-quickdao/.gitignore
rename to fluent-wrappers/fluent-quickdao/.gitignore
diff --git a/components/fluent-quickdao/README.md b/fluent-wrappers/fluent-quickdao/README.md
similarity index 100%
rename from components/fluent-quickdao/README.md
rename to fluent-wrappers/fluent-quickdao/README.md
diff --git a/components/fluent-quickdao/pom.xml b/fluent-wrappers/fluent-quickdao/pom.xml
similarity index 96%
rename from components/fluent-quickdao/pom.xml
rename to fluent-wrappers/fluent-quickdao/pom.xml
index d928ee6..a5d6b59 100644
--- a/components/fluent-quickdao/pom.xml
+++ b/fluent-wrappers/fluent-quickdao/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>io.fluent</groupId>
-    <artifactId>components</artifactId>
+    <artifactId>fluent-wrappers</artifactId>
     <version>1.0-SNAPSHOT</version>
   </parent>
 
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/QuickDao.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/QuickDao.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/QuickDao.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/QuickDao.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/annotations/QuickDaoColumn.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/annotations/QuickDaoColumn.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/annotations/QuickDaoColumn.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/annotations/QuickDaoColumn.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/constants/DefaultConstants.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/constants/DefaultConstants.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/constants/DefaultConstants.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/constants/DefaultConstants.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/DataSourceCreator.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/DataSourceCreator.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/DataSourceCreator.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/DataSourceCreator.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/DialectAndDrivers.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/DialectAndDrivers.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/DialectAndDrivers.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/DialectAndDrivers.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/DataSourceSetting.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/DataSourceSetting.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/DataSourceSetting.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/DataSourceSetting.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/TableColumn.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/TableColumn.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/TableColumn.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/TableColumn.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/TableInfoQuery.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/TableInfoQuery.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/TableInfoQuery.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/TableInfoQuery.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/TableInfoQueryFinder.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/TableInfoQueryFinder.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/TableInfoQueryFinder.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/datasource/model/TableInfoQueryFinder.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/entity/EntityUtil.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/entity/EntityUtil.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/entity/EntityUtil.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/entity/EntityUtil.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/exceptions/DbExecutionFoundException.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/exceptions/DbExecutionFoundException.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/exceptions/DbExecutionFoundException.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/exceptions/DbExecutionFoundException.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/exceptions/NoDbDriverFoundException.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/exceptions/NoDbDriverFoundException.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/exceptions/NoDbDriverFoundException.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/exceptions/NoDbDriverFoundException.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlExecuteResponse.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlExecuteResponse.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlExecuteResponse.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlExecuteResponse.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlQueryResponse.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlQueryResponse.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlQueryResponse.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlQueryResponse.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlRequest.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlRequest.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlRequest.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlRequest.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlService.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlService.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlService.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/service/SqlService.java
diff --git a/components/fluent-quickdao/src/main/java/io/fluent/quickdao/service/package-info.java b/fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/service/package-info.java
similarity index 100%
rename from components/fluent-quickdao/src/main/java/io/fluent/quickdao/service/package-info.java
rename to fluent-wrappers/fluent-quickdao/src/main/java/io/fluent/quickdao/service/package-info.java
diff --git a/components/fluent-quickdao/src/test/java/io/fluent/quickdao/HeroDemoEntity.java b/fluent-wrappers/fluent-quickdao/src/test/java/io/fluent/quickdao/HeroDemoEntity.java
similarity index 100%
rename from components/fluent-quickdao/src/test/java/io/fluent/quickdao/HeroDemoEntity.java
rename to fluent-wrappers/fluent-quickdao/src/test/java/io/fluent/quickdao/HeroDemoEntity.java
diff --git a/components/fluent-quickdao/src/test/java/io/fluent/quickdao/QuickDaoTest.java b/fluent-wrappers/fluent-quickdao/src/test/java/io/fluent/quickdao/QuickDaoTest.java
similarity index 100%
rename from components/fluent-quickdao/src/test/java/io/fluent/quickdao/QuickDaoTest.java
rename to fluent-wrappers/fluent-quickdao/src/test/java/io/fluent/quickdao/QuickDaoTest.java
diff --git a/components/fluent-quickdao/src/test/java/io/fluent/quickdao/entity/EntityUtilTest.java b/fluent-wrappers/fluent-quickdao/src/test/java/io/fluent/quickdao/entity/EntityUtilTest.java
similarity index 100%
rename from components/fluent-quickdao/src/test/java/io/fluent/quickdao/entity/EntityUtilTest.java
rename to fluent-wrappers/fluent-quickdao/src/test/java/io/fluent/quickdao/entity/EntityUtilTest.java
diff --git a/components/fluent-quickdao/src/test/java/io/fluent/quickdao/entity/GithubStarredRepo.java b/fluent-wrappers/fluent-quickdao/src/test/java/io/fluent/quickdao/entity/GithubStarredRepo.java
similarity index 100%
rename from components/fluent-quickdao/src/test/java/io/fluent/quickdao/entity/GithubStarredRepo.java
rename to fluent-wrappers/fluent-quickdao/src/test/java/io/fluent/quickdao/entity/GithubStarredRepo.java
diff --git a/components/fluent-quickdao/src/test/resources/config/db.setting b/fluent-wrappers/fluent-quickdao/src/test/resources/config/db.setting
similarity index 100%
rename from components/fluent-quickdao/src/test/resources/config/db.setting
rename to fluent-wrappers/fluent-quickdao/src/test/resources/config/db.setting
diff --git a/components/fluentqa-md/low-code-2.json b/fluent-wrappers/fluentqa-md/low-code-2.json
similarity index 100%
rename from components/fluentqa-md/low-code-2.json
rename to fluent-wrappers/fluentqa-md/low-code-2.json
diff --git a/components/fluentqa-md/low-code-3.json b/fluent-wrappers/fluentqa-md/low-code-3.json
similarity index 100%
rename from components/fluentqa-md/low-code-3.json
rename to fluent-wrappers/fluentqa-md/low-code-3.json
diff --git a/components/fluentqa-md/low-code.html b/fluent-wrappers/fluentqa-md/low-code.html
similarity index 100%
rename from components/fluentqa-md/low-code.html
rename to fluent-wrappers/fluentqa-md/low-code.html
diff --git a/components/fluentqa-md/low-code.json b/fluent-wrappers/fluentqa-md/low-code.json
similarity index 100%
rename from components/fluentqa-md/low-code.json
rename to fluent-wrappers/fluentqa-md/low-code.json
diff --git a/components/fluentqa-md/pom.xml b/fluent-wrappers/fluentqa-md/pom.xml
similarity index 95%
rename from components/fluentqa-md/pom.xml
rename to fluent-wrappers/fluentqa-md/pom.xml
index b8c07e4..066902d 100644
--- a/components/fluentqa-md/pom.xml
+++ b/fluent-wrappers/fluentqa-md/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>io.fluent</groupId>
-        <artifactId>components</artifactId>
+        <artifactId>fluent-wrappers</artifactId>
         <version>1.0-SNAPSHOT</version>
     </parent>
 
diff --git a/components/fluentqa-md/src/main/java/io/fluentqa/md/MarkdownAccessor.java b/fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/MarkdownAccessor.java
similarity index 100%
rename from components/fluentqa-md/src/main/java/io/fluentqa/md/MarkdownAccessor.java
rename to fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/MarkdownAccessor.java
diff --git a/components/fluentqa-md/src/main/java/io/fluentqa/md/package-info.java b/fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/package-info.java
similarity index 100%
rename from components/fluentqa-md/src/main/java/io/fluentqa/md/package-info.java
rename to fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/package-info.java
diff --git a/components/fluentqa-md/src/main/java/io/fluentqa/md/parser/FieldParseConfig.java b/fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/parser/FieldParseConfig.java
similarity index 100%
rename from components/fluentqa-md/src/main/java/io/fluentqa/md/parser/FieldParseConfig.java
rename to fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/parser/FieldParseConfig.java
diff --git a/components/fluentqa-md/src/main/java/io/fluentqa/md/parser/ParseConfig.java b/fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/parser/ParseConfig.java
similarity index 100%
rename from components/fluentqa-md/src/main/java/io/fluentqa/md/parser/ParseConfig.java
rename to fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/parser/ParseConfig.java
diff --git a/components/fluentqa-md/src/main/java/io/fluentqa/md/parser/awesome/AwesomeListParserConfig.java b/fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/parser/awesome/AwesomeListParserConfig.java
similarity index 100%
rename from components/fluentqa-md/src/main/java/io/fluentqa/md/parser/awesome/AwesomeListParserConfig.java
rename to fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/parser/awesome/AwesomeListParserConfig.java
diff --git a/components/fluentqa-md/src/main/java/io/fluentqa/md/parser/awesome/AwesomeModel.java b/fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/parser/awesome/AwesomeModel.java
similarity index 100%
rename from components/fluentqa-md/src/main/java/io/fluentqa/md/parser/awesome/AwesomeModel.java
rename to fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/parser/awesome/AwesomeModel.java
diff --git a/components/fluentqa-md/src/main/java/io/fluentqa/md/parser/awesome/MarkdownAwesomeListParser.java b/fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/parser/awesome/MarkdownAwesomeListParser.java
similarity index 100%
rename from components/fluentqa-md/src/main/java/io/fluentqa/md/parser/awesome/MarkdownAwesomeListParser.java
rename to fluent-wrappers/fluentqa-md/src/main/java/io/fluentqa/md/parser/awesome/MarkdownAwesomeListParser.java
diff --git a/components/fluentqa-md/src/test/java/io/fluentqa/md/parsers/MarkdownAwesomeListParserTest.java b/fluent-wrappers/fluentqa-md/src/test/java/io/fluentqa/md/parsers/MarkdownAwesomeListParserTest.java
similarity index 100%
rename from components/fluentqa-md/src/test/java/io/fluentqa/md/parsers/MarkdownAwesomeListParserTest.java
rename to fluent-wrappers/fluentqa-md/src/test/java/io/fluentqa/md/parsers/MarkdownAwesomeListParserTest.java
diff --git a/components/fluentqa-md/src/test/resources/low-code-1.md b/fluent-wrappers/fluentqa-md/src/test/resources/low-code-1.md
similarity index 100%
rename from components/fluentqa-md/src/test/resources/low-code-1.md
rename to fluent-wrappers/fluentqa-md/src/test/resources/low-code-1.md
diff --git a/components/fluentqa-md/src/test/resources/low-code-2.md b/fluent-wrappers/fluentqa-md/src/test/resources/low-code-2.md
similarity index 100%
rename from components/fluentqa-md/src/test/resources/low-code-2.md
rename to fluent-wrappers/fluentqa-md/src/test/resources/low-code-2.md
diff --git a/components/fluentqa-md/src/test/resources/low-code-3.md b/fluent-wrappers/fluentqa-md/src/test/resources/low-code-3.md
similarity index 100%
rename from components/fluentqa-md/src/test/resources/low-code-3.md
rename to fluent-wrappers/fluentqa-md/src/test/resources/low-code-3.md
diff --git a/components/fluentqa-md/src/test/resources/low-code-4.md b/fluent-wrappers/fluentqa-md/src/test/resources/low-code-4.md
similarity index 100%
rename from components/fluentqa-md/src/test/resources/low-code-4.md
rename to fluent-wrappers/fluentqa-md/src/test/resources/low-code-4.md
diff --git a/components/fluentqa-md/src/test/resources/low-code-5.md b/fluent-wrappers/fluentqa-md/src/test/resources/low-code-5.md
similarity index 100%
rename from components/fluentqa-md/src/test/resources/low-code-5.md
rename to fluent-wrappers/fluentqa-md/src/test/resources/low-code-5.md
diff --git a/components/fluentqa-md/src/test/resources/low-code-6.md b/fluent-wrappers/fluentqa-md/src/test/resources/low-code-6.md
similarity index 100%
rename from components/fluentqa-md/src/test/resources/low-code-6.md
rename to fluent-wrappers/fluentqa-md/src/test/resources/low-code-6.md
diff --git a/components/fluentqa-md/src/test/resources/test-resources.md b/fluent-wrappers/fluentqa-md/src/test/resources/test-resources.md
similarity index 100%
rename from components/fluentqa-md/src/test/resources/test-resources.md
rename to fluent-wrappers/fluentqa-md/src/test/resources/test-resources.md
diff --git a/components/fluentqa-md/test-resources.html b/fluent-wrappers/fluentqa-md/test-resources.html
similarity index 100%
rename from components/fluentqa-md/test-resources.html
rename to fluent-wrappers/fluentqa-md/test-resources.html
diff --git a/fluent-wrappers/pom.xml b/fluent-wrappers/pom.xml
index 219c2de..4ed38cb 100644
--- a/fluent-wrappers/pom.xml
+++ b/fluent-wrappers/pom.xml
@@ -19,5 +19,10 @@
         <module>fluent-allure</module>
         <module>fluent-jira</module>
         <module>fluent-supabase</module>
+        <module>fluent-quickdao</module>
+        <module>fluent-mindmap</module>
+        <module>fluentqa-md</module>
+        <module>fluent-excel</module>
+        <module>fluent-httpclients</module>
     </modules>
 </project>
\ No newline at end of file