diff --git a/.travis.yml b/.travis.yml
index c7490e24df..c17bc8eeb4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: java
 sudo: false
 dist: trusty
-script: mvn clean install -DRAPIDOID_CI=true && bin/build-examples.sh
+script: mvn clean install -DRAPIDOID_CI=true
 
 jdk:
   - oraclejdk8
diff --git a/bin/full_verify.sh b/bin/full_verify.sh
index 56c16a2e16..a62c19f7e4 100755
--- a/bin/full_verify.sh
+++ b/bin/full_verify.sh
@@ -12,6 +12,3 @@ mvn clean install
 
 cd docker-tests
 ./retest.sh
-
-cd ../examples
-mvn clean install
diff --git a/commons/pom.xml b/commons/pom.xml
new file mode 100644
index 0000000000..57d72f6586
--- /dev/null
+++ b/commons/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.rapidoid</groupId>
+		<artifactId>rapidoid</artifactId>
+		<version>5.4.6-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>commons</artifactId>
+	<packaging>pom</packaging>
+
+	<modules>
+		<module>rapidoid-essentials</module>
+		<module>rapidoid-commons</module>
+		<module>rapidoid-test-commons</module>
+	</modules>
+
+</project>
\ No newline at end of file
diff --git a/rapidoid-commons/pom.xml b/commons/rapidoid-commons/pom.xml
similarity index 100%
rename from rapidoid-commons/pom.xml
rename to commons/rapidoid-commons/pom.xml
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/AbstractRapidoidModule.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/AbstractRapidoidModule.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/AbstractRapidoidModule.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/AbstractRapidoidModule.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/RapidoidModule.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/RapidoidModule.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/RapidoidModule.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/RapidoidModule.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/RapidoidModules.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/RapidoidModules.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/RapidoidModules.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/RapidoidModules.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/activity/AbstractLoopThread.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/activity/AbstractLoopThread.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/activity/AbstractLoopThread.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/activity/AbstractLoopThread.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/activity/AbstractThreadActivity.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/activity/AbstractThreadActivity.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/activity/AbstractThreadActivity.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/activity/AbstractThreadActivity.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/activity/Activity.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/activity/Activity.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/activity/Activity.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/activity/Activity.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/activity/LifecycleActivity.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/activity/LifecycleActivity.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/activity/LifecycleActivity.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/activity/LifecycleActivity.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/activity/NamedActivity.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/activity/NamedActivity.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/activity/NamedActivity.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/activity/NamedActivity.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/activity/RapidoidThread.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/activity/RapidoidThread.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/activity/RapidoidThread.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/activity/RapidoidThread.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/activity/RapidoidThreadFactory.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/activity/RapidoidThreadFactory.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/activity/RapidoidThreadFactory.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/activity/RapidoidThreadFactory.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/activity/RapidoidThreadLocals.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/activity/RapidoidThreadLocals.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/activity/RapidoidThreadLocals.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/activity/RapidoidThreadLocals.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Authors.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Authors.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Authors.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Authors.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Composite.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Composite.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Composite.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Composite.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Contributors.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Contributors.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Contributors.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Contributors.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Controller.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Controller.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Controller.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Controller.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Cookie.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Cookie.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Cookie.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Cookie.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/DELETE.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/DELETE.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/DELETE.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/DELETE.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Desc.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Desc.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Desc.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Desc.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/DontReload.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/DontReload.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/DontReload.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/DontReload.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/GET.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/GET.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/GET.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/GET.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/HEAD.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/HEAD.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/HEAD.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/HEAD.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Header.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Header.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Header.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Header.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/IntegrationTest.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/IntegrationTest.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/IntegrationTest.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/IntegrationTest.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/OPTIONS.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/OPTIONS.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/OPTIONS.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/OPTIONS.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/OfType.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/OfType.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/OfType.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/OfType.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Order.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Order.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Order.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Order.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/PATCH.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/PATCH.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/PATCH.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/PATCH.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/POST.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/POST.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/POST.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/POST.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/PUT.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/PUT.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/PUT.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/PUT.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Page.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Page.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Page.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Page.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Param.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Param.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Param.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Param.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Profiles.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Profiles.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Profiles.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Profiles.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Programmatic.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Programmatic.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Programmatic.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Programmatic.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/RapidoidModuleDesc.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/RapidoidModuleDesc.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/RapidoidModuleDesc.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/RapidoidModuleDesc.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Required.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Required.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Required.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Required.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Run.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Run.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Run.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Run.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Scaffold.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Scaffold.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Scaffold.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Scaffold.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/ScanPackages.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/ScanPackages.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/ScanPackages.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/ScanPackages.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Service.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Service.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Service.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Service.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Since.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Since.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Since.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Since.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Special.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Special.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Special.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Special.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/TRACE.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/TRACE.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/TRACE.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/TRACE.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/ToString.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/ToString.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/ToString.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/ToString.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Transaction.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Transaction.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Transaction.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Transaction.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/TransactionMode.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/TransactionMode.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/TransactionMode.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/TransactionMode.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Transient.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Transient.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Transient.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Transient.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/annotation/Valid.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Valid.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/annotation/Valid.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/annotation/Valid.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/ActionsProp.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/ActionsProp.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/ActionsProp.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/ActionsProp.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/AnnotatedPropertyFilter.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/AnnotatedPropertyFilter.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/AnnotatedPropertyFilter.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/AnnotatedPropertyFilter.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/BeanProp.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/BeanProp.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/BeanProp.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/BeanProp.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/BeanProperties.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/BeanProperties.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/BeanProperties.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/BeanProperties.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/Beany.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/Beany.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/Beany.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/Beany.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/CustomReadOnlyProp.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/CustomReadOnlyProp.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/CustomReadOnlyProp.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/CustomReadOnlyProp.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/JSProp.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/JSProp.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/JSProp.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/JSProp.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/MapProp.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/MapProp.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/MapProp.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/MapProp.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/Metadata.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/Metadata.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/Metadata.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/Metadata.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/Prop.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/Prop.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/Prop.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/Prop.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/PropKind.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/PropKind.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/PropKind.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/PropKind.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/PropertyFilter.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/PropertyFilter.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/PropertyFilter.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/PropertyFilter.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/PropertySelector.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/PropertySelector.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/PropertySelector.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/PropertySelector.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/PropertySelectorByName.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/PropertySelectorByName.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/PropertySelectorByName.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/PropertySelectorByName.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/beany/SerializableBean.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/beany/SerializableBean.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/beany/SerializableBean.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/beany/SerializableBean.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/Cache.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/Cache.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/Cache.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/Cache.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/CacheAtom.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/CacheAtom.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/CacheAtom.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/CacheAtom.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/CacheDSL.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/CacheDSL.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/CacheDSL.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/CacheDSL.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/Cached.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/Cached.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/Cached.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/Cached.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/Caching.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/Caching.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/Caching.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/Caching.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheBucket.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheBucket.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheBucket.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheBucket.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheFactory.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheFactory.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheFactory.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheFactory.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheStats.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheStats.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheStats.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CacheStats.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CachedValue.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CachedValue.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CachedValue.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/CachedValue.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ConcurrentCache.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ConcurrentCache.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ConcurrentCache.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ConcurrentCache.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ConcurrentCacheAtom.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ConcurrentCacheAtom.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ConcurrentCacheAtom.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ConcurrentCacheAtom.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ConcurrentCacheAtomWithStats.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ConcurrentCacheAtomWithStats.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ConcurrentCacheAtomWithStats.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ConcurrentCacheAtomWithStats.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/L1CacheSegment.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/L1CacheSegment.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/impl/L1CacheSegment.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/L1CacheSegment.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ManageableCache.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ManageableCache.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ManageableCache.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/ManageableCache.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/SimpleCacheTable.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/SimpleCacheTable.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cache/impl/SimpleCacheTable.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cache/impl/SimpleCacheTable.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cls/AbstractTypeSpecificFactory.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cls/AbstractTypeSpecificFactory.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cls/AbstractTypeSpecificFactory.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cls/AbstractTypeSpecificFactory.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cls/AbstractTypeSpecificVisitor.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cls/AbstractTypeSpecificVisitor.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cls/AbstractTypeSpecificVisitor.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cls/AbstractTypeSpecificVisitor.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cls/Cls.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cls/Cls.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cls/Cls.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cls/Cls.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cls/InterceptorProxy.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cls/InterceptorProxy.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cls/InterceptorProxy.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cls/InterceptorProxy.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cls/Proxies.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cls/Proxies.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cls/Proxies.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cls/Proxies.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cls/TypeKind.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cls/TypeKind.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cls/TypeKind.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cls/TypeKind.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cls/TypeSpecificFactory.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cls/TypeSpecificFactory.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cls/TypeSpecificFactory.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cls/TypeSpecificFactory.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cls/TypeSpecificVisitor.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/cls/TypeSpecificVisitor.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/cls/TypeSpecificVisitor.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/cls/TypeSpecificVisitor.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractCollectionDecorator.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractCollectionDecorator.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractCollectionDecorator.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractCollectionDecorator.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractDecorator.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractDecorator.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractDecorator.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractDecorator.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractIteratorDecorator.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractIteratorDecorator.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractIteratorDecorator.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractIteratorDecorator.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractListDecorator.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractListDecorator.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractListDecorator.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractListDecorator.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractMapDecorator.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractMapDecorator.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractMapDecorator.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractMapDecorator.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractSetDecorator.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractSetDecorator.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractSetDecorator.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AbstractSetDecorator.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/collection/AutoExpandingMap.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AutoExpandingMap.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/collection/AutoExpandingMap.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/collection/AutoExpandingMap.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingCollection.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingCollection.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingCollection.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingCollection.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingIterator.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingIterator.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingIterator.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingIterator.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingMap.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingMap.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingMap.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingMap.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingSet.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingSet.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingSet.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/collection/ChangeTrackingSet.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/collection/Coll.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/collection/Coll.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/collection/Coll.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/collection/Coll.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/AnyObj.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/AnyObj.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/AnyObj.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/AnyObj.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/Arr.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Arr.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/Arr.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Arr.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/CommonsModule.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/CommonsModule.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/CommonsModule.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/CommonsModule.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/Dates.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Dates.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/Dates.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Dates.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/Deep.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Deep.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/Deep.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Deep.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/English.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/English.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/English.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/English.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/Err.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Err.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/Err.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Err.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/JS.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/JS.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/JS.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/JS.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/RapidoidInfo.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/RapidoidInfo.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/RapidoidInfo.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/RapidoidInfo.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/Rnd.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Rnd.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/Rnd.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Rnd.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/Stats.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Stats.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/Stats.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Stats.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/Str.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Str.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/Str.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/Str.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/commons/StringRewriter.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/commons/StringRewriter.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/commons/StringRewriter.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/commons/StringRewriter.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Callback.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Callback.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/concurrent/Callback.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Callback.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Callbacks.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Callbacks.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/concurrent/Callbacks.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Callbacks.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Future.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Future.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/concurrent/Future.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Future.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Futures.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Futures.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/concurrent/Futures.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Futures.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Promise.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Promise.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/concurrent/Promise.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Promise.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Promises.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Promises.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/concurrent/Promises.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/Promises.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/concurrent/impl/FutureImpl.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/impl/FutureImpl.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/concurrent/impl/FutureImpl.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/impl/FutureImpl.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/concurrent/impl/PromiseImpl.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/impl/PromiseImpl.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/concurrent/impl/PromiseImpl.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/concurrent/impl/PromiseImpl.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/BasicConfig.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/BasicConfig.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/BasicConfig.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/BasicConfig.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/Conf.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/Conf.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/Conf.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/Conf.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/Config.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/Config.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/Config.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/Config.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigAlternatives.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigAlternatives.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/ConfigAlternatives.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigAlternatives.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigBase.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigBase.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/ConfigBase.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigBase.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigChangeListener.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigChangeListener.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/ConfigChangeListener.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigChangeListener.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigChanges.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigChanges.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/ConfigChanges.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigChanges.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigHelp.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigHelp.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/ConfigHelp.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigHelp.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigImpl.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigImpl.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/ConfigImpl.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigImpl.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigLoaderUtil.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigLoaderUtil.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/ConfigLoaderUtil.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigLoaderUtil.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigOption.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigOption.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/ConfigOption.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigOption.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigOptions.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigOptions.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/ConfigOptions.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigOptions.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigParser.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigParser.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/ConfigParser.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigParser.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigUtil.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigUtil.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/ConfigUtil.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigUtil.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigValueStore.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigValueStore.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/ConfigValueStore.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/ConfigValueStore.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/config/RapidoidInitializer.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/config/RapidoidInitializer.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/config/RapidoidInitializer.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/config/RapidoidInitializer.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/crypto/AESCypherTool.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/crypto/AESCypherTool.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/crypto/AESCypherTool.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/crypto/AESCypherTool.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/crypto/Crypto.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/crypto/Crypto.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/crypto/Crypto.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/crypto/Crypto.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/crypto/CryptoKey.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/crypto/CryptoKey.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/crypto/CryptoKey.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/crypto/CryptoKey.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/ctx/Classes.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/Classes.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/ctx/Classes.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/Classes.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/ctx/Contextual.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/Contextual.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/ctx/Contextual.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/Contextual.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/ctx/Ctx.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/Ctx.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/ctx/Ctx.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/Ctx.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/ctx/CtxMetadata.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/CtxMetadata.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/ctx/CtxMetadata.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/CtxMetadata.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/ctx/Ctxs.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/Ctxs.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/ctx/Ctxs.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/Ctxs.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/ctx/PersisterProvider.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/PersisterProvider.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/ctx/PersisterProvider.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/PersisterProvider.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/ctx/UserInfo.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/UserInfo.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/ctx/UserInfo.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/UserInfo.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/ctx/With.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/With.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/ctx/With.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/With.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/ctx/WithContext.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/WithContext.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/ctx/WithContext.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/ctx/WithContext.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/data/JSON.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/data/JSON.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/data/JSON.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/data/JSON.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/data/Parse.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/data/Parse.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/data/Parse.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/data/Parse.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/data/TUUIDDeserializer.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/data/TUUIDDeserializer.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/data/TUUIDDeserializer.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/data/TUUIDDeserializer.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/data/TUUIDSerializer.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/data/TUUIDSerializer.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/data/TUUIDSerializer.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/data/TUUIDSerializer.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/data/XML.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/data/XML.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/data/XML.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/data/XML.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/data/YAML.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/data/YAML.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/data/YAML.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/data/YAML.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/datamodel/IRange.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/datamodel/IRange.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/datamodel/IRange.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/datamodel/IRange.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/datamodel/PageableData.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/datamodel/PageableData.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/datamodel/PageableData.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/datamodel/PageableData.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/datamodel/Range.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/datamodel/Range.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/datamodel/Range.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/datamodel/Range.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/datamodel/Results.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/datamodel/Results.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/datamodel/Results.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/datamodel/Results.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/datamodel/impl/PagingIterator.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/datamodel/impl/PagingIterator.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/datamodel/impl/PagingIterator.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/datamodel/impl/PagingIterator.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/datamodel/impl/ResultsImpl.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/datamodel/impl/ResultsImpl.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/datamodel/impl/ResultsImpl.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/datamodel/impl/ResultsImpl.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/env/Env.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/env/Env.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/env/Env.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/env/Env.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/env/EnvMode.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/env/EnvMode.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/env/EnvMode.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/env/EnvMode.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/env/EnvProperties.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/env/EnvProperties.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/env/EnvProperties.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/env/EnvProperties.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/env/Environment.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/env/Environment.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/env/Environment.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/env/Environment.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/env/RapidoidEnv.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/env/RapidoidEnv.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/env/RapidoidEnv.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/env/RapidoidEnv.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/expire/ExpirationCrawlerThread.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/expire/ExpirationCrawlerThread.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/expire/ExpirationCrawlerThread.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/expire/ExpirationCrawlerThread.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/expire/Expire.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/expire/Expire.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/expire/Expire.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/expire/Expire.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/expire/Expiring.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/expire/Expiring.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/expire/Expiring.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/expire/Expiring.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/group/AbstractManageable.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/group/AbstractManageable.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/group/AbstractManageable.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/group/AbstractManageable.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/group/Action.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/group/Action.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/group/Action.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/group/Action.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/group/AutoManageable.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/group/AutoManageable.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/group/AutoManageable.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/group/AutoManageable.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/group/GroupOf.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/group/GroupOf.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/group/GroupOf.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/group/GroupOf.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/group/GroupStats.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/group/GroupStats.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/group/GroupStats.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/group/GroupStats.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/group/Groups.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/group/Groups.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/group/Groups.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/group/Groups.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/group/Manageable.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/group/Manageable.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/group/Manageable.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/group/Manageable.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/group/ManageableBean.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/group/ManageableBean.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/group/ManageableBean.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/group/ManageableBean.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/group/Manageables.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/group/Manageables.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/group/Manageables.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/group/Manageables.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/http/HttpVerb.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/http/HttpVerb.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/http/HttpVerb.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/http/HttpVerb.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/http/MediaType.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/http/MediaType.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/http/MediaType.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/http/MediaType.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/insight/AbstractInsightful.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/insight/AbstractInsightful.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/insight/AbstractInsightful.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/insight/AbstractInsightful.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/insight/CounterMeasure.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/insight/CounterMeasure.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/insight/CounterMeasure.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/insight/CounterMeasure.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/insight/Insightful.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/insight/Insightful.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/insight/Insightful.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/insight/Insightful.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/insight/Insights.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/insight/Insights.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/insight/Insights.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/insight/Insights.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/insight/InsightsThread.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/insight/InsightsThread.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/insight/InsightsThread.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/insight/InsightsThread.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/insight/JMXMetrics.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/insight/JMXMetrics.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/insight/JMXMetrics.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/insight/JMXMetrics.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/insight/Measure.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/insight/Measure.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/insight/Measure.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/insight/Measure.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/insight/Metrics.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/insight/Metrics.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/insight/Metrics.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/insight/Metrics.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/insight/PercentMeasure.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/insight/PercentMeasure.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/insight/PercentMeasure.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/insight/PercentMeasure.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/insight/StatsMeasure.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/insight/StatsMeasure.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/insight/StatsMeasure.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/insight/StatsMeasure.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/io/FileSearch.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/io/FileSearch.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/io/FileSearch.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/io/FileSearch.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/io/FileSearchResult.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/io/FileSearchResult.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/io/FileSearchResult.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/io/FileSearchResult.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/io/IO.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/io/IO.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/io/IO.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/io/IO.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/io/Res.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/io/Res.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/io/Res.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/io/Res.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/io/ResKey.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/io/ResKey.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/io/ResKey.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/io/ResKey.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/io/Upload.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/io/Upload.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/io/Upload.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/io/Upload.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/job/CallbackExecutorJob.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/job/CallbackExecutorJob.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/job/CallbackExecutorJob.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/job/CallbackExecutorJob.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/job/ContextPreservingJobWrapper.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/job/ContextPreservingJobWrapper.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/job/ContextPreservingJobWrapper.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/job/ContextPreservingJobWrapper.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/job/Jobs.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/job/Jobs.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/job/Jobs.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/job/Jobs.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/job/JobsDSL.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/job/JobsDSL.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/job/JobsDSL.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/job/JobsDSL.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/job/JobsDelayDSL.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/job/JobsDelayDSL.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/job/JobsDelayDSL.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/job/JobsDelayDSL.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/job/ManageableExecutor.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/job/ManageableExecutor.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/job/ManageableExecutor.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/job/ManageableExecutor.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/job/PredefinedContextJobWrapper.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/job/PredefinedContextJobWrapper.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/job/PredefinedContextJobWrapper.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/job/PredefinedContextJobWrapper.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/Calc.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Calc.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/Calc.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Calc.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/Customizer.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Customizer.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/Customizer.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Customizer.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/Dynamic.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Dynamic.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/Dynamic.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Dynamic.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/Executable.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Executable.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/Executable.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Executable.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/F2.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/F2.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/F2.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/F2.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/F3.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/F3.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/F3.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/F3.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/FiveParamLambda.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/FiveParamLambda.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/FiveParamLambda.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/FiveParamLambda.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/FourParamLambda.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/FourParamLambda.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/FourParamLambda.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/FourParamLambda.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/Lmbd.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Lmbd.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/Lmbd.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Lmbd.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/Mapper.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Mapper.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/Mapper.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Mapper.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/NParamLambda.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/NParamLambda.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/NParamLambda.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/NParamLambda.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/OneParamLambda.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/OneParamLambda.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/OneParamLambda.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/OneParamLambda.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/Operation.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Operation.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/Operation.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Operation.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/Predicate.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Predicate.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/Predicate.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/Predicate.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/ResultCounterCallback.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/ResultCounterCallback.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/ResultCounterCallback.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/ResultCounterCallback.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/SevenParamLambda.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/SevenParamLambda.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/SevenParamLambda.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/SevenParamLambda.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/SixParamLambda.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/SixParamLambda.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/SixParamLambda.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/SixParamLambda.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/ThreeParamLambda.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/ThreeParamLambda.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/ThreeParamLambda.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/ThreeParamLambda.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/ToMap.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/ToMap.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/ToMap.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/ToMap.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/lambda/TwoParamLambda.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/TwoParamLambda.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/lambda/TwoParamLambda.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/lambda/TwoParamLambda.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/log/LogHP.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/log/LogHP.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/log/LogHP.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/log/LogHP.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/log/LogbackUtil.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/log/LogbackUtil.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/log/LogbackUtil.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/log/LogbackUtil.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/log/commons/RapidoidLog.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/log/commons/RapidoidLog.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/log/commons/RapidoidLog.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/log/commons/RapidoidLog.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/log/commons/RapidoidLogFactory.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/log/commons/RapidoidLogFactory.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/log/commons/RapidoidLogFactory.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/log/commons/RapidoidLogFactory.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/pool/ArrayPool.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/pool/ArrayPool.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/pool/ArrayPool.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/pool/ArrayPool.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/pool/Pool.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/pool/Pool.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/pool/Pool.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/pool/Pool.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/pool/Pools.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/pool/Pools.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/pool/Pools.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/pool/Pools.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/pool/SynchronizedArrayPool.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/pool/SynchronizedArrayPool.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/pool/SynchronizedArrayPool.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/pool/SynchronizedArrayPool.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/pool/SynchronizedPool.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/pool/SynchronizedPool.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/pool/SynchronizedPool.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/pool/SynchronizedPool.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/pool/ThreadSafeArrayPool.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/pool/ThreadSafeArrayPool.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/pool/ThreadSafeArrayPool.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/pool/ThreadSafeArrayPool.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/process/Proc.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/process/Proc.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/process/Proc.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/process/Proc.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/process/ProcessCrawlerThread.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/process/ProcessCrawlerThread.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/process/ProcessCrawlerThread.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/process/ProcessCrawlerThread.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/process/ProcessHandle.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/process/ProcessHandle.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/process/ProcessHandle.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/process/ProcessHandle.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/process/ProcessIOThread.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/process/ProcessIOThread.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/process/ProcessIOThread.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/process/ProcessIOThread.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/process/ProcessParams.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/process/ProcessParams.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/process/ProcessParams.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/process/ProcessParams.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/process/Processes.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/process/Processes.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/process/Processes.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/process/Processes.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/scan/ClasspathScanner.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/scan/ClasspathScanner.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/scan/ClasspathScanner.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/scan/ClasspathScanner.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/scan/ClasspathUtil.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/scan/ClasspathUtil.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/scan/ClasspathUtil.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/scan/ClasspathUtil.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/scan/Scan.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/scan/Scan.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/scan/Scan.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/scan/Scan.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/scan/ScanParams.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/scan/ScanParams.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/scan/ScanParams.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/scan/ScanParams.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/Auth.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/Auth.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/Auth.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/Auth.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/AuthResponse.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/AuthResponse.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/AuthResponse.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/AuthResponse.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/DataPermissions.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/DataPermissions.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/DataPermissions.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/DataPermissions.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/Role.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/Role.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/Role.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/Role.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/Secure.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/Secure.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/Secure.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/Secure.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Administrator.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Administrator.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Administrator.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Administrator.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanChange.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanChange.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanChange.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanChange.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanDelete.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanDelete.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanDelete.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanDelete.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanInsert.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanInsert.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanInsert.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanInsert.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanManage.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanManage.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanManage.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanManage.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanRead.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanRead.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanRead.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/CanRead.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/LoggedIn.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/LoggedIn.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/annotation/LoggedIn.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/LoggedIn.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Manager.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Manager.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Manager.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Manager.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Moderator.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Moderator.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Moderator.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Moderator.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Roles.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Roles.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Roles.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/security/annotation/Roles.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/serialize/Ser.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/serialize/Ser.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/serialize/Ser.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/serialize/Ser.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/serialize/Serialize.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/serialize/Serialize.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/serialize/Serialize.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/serialize/Serialize.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/serialize/TypeSpecificDeserializer.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/serialize/TypeSpecificDeserializer.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/serialize/TypeSpecificDeserializer.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/serialize/TypeSpecificDeserializer.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/serialize/TypeSpecificSerializer.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/serialize/TypeSpecificSerializer.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/serialize/TypeSpecificSerializer.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/serialize/TypeSpecificSerializer.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/test/RapidoidIntegrationTest.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/test/RapidoidIntegrationTest.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/test/RapidoidIntegrationTest.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/test/RapidoidIntegrationTest.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/test/RapidoidTest.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/test/RapidoidTest.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/test/RapidoidTest.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/test/RapidoidTest.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/timeseries/TSValue.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/timeseries/TSValue.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/timeseries/TSValue.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/timeseries/TSValue.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/timeseries/TimeSeries.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/timeseries/TimeSeries.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/timeseries/TimeSeries.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/timeseries/TimeSeries.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/AbstractMapImpl.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/AbstractMapImpl.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/AbstractMapImpl.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/AbstractMapImpl.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/AnsiColor.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/AnsiColor.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/AnsiColor.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/AnsiColor.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/AppInfo.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/AppInfo.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/AppInfo.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/AppInfo.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/BenchmarkOperation.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/BenchmarkOperation.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/BenchmarkOperation.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/BenchmarkOperation.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Bufs.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/Bufs.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/Bufs.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/Bufs.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/ByType.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/ByType.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/ByType.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/ByType.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Constants.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/Constants.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/Constants.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/Constants.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/D.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/D.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/D.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/D.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Deleted.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/Deleted.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/Deleted.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/Deleted.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Dict.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/Dict.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/Dict.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/Dict.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/ErrCodeAndMsg.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/ErrCodeAndMsg.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/ErrCodeAndMsg.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/ErrCodeAndMsg.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Expectation.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/Expectation.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/Expectation.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/Expectation.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/LazyInit.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/LazyInit.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/LazyInit.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/LazyInit.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Lorem.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/Lorem.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/Lorem.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/Lorem.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/MapEntry.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/MapEntry.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/MapEntry.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/MapEntry.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Msc.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/Msc.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/Msc.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/Msc.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/MscOpts.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/MscOpts.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/MscOpts.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/MscOpts.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/None.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/None.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/None.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/None.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/NullOutputStream.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/NullOutputStream.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/NullOutputStream.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/NullOutputStream.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Once.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/Once.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/Once.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/Once.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Resetable.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/Resetable.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/Resetable.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/Resetable.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/RuntimeInfo.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/RuntimeInfo.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/RuntimeInfo.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/RuntimeInfo.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/SimpleBucket.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/SimpleBucket.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/SimpleBucket.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/SimpleBucket.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/SimpleHashTable.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/SimpleHashTable.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/SimpleHashTable.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/SimpleHashTable.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/SimpleList.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/SimpleList.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/SimpleList.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/SimpleList.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/SimpleMap.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/SimpleMap.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/SimpleMap.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/SimpleMap.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/SimplePersisterProvider.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/SimplePersisterProvider.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/SimplePersisterProvider.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/SimplePersisterProvider.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/SlidingWindowList.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/SlidingWindowList.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/SlidingWindowList.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/SlidingWindowList.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/TUUID.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/TUUID.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/TUUID.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/TUUID.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/TokenAuthData.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/TokenAuthData.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/TokenAuthData.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/TokenAuthData.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Tokens.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/Tokens.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/Tokens.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/Tokens.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Usage.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/Usage.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/Usage.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/Usage.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/Wait.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/Wait.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/Wait.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/Wait.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/util/WebData.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/util/WebData.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/util/WebData.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/util/WebData.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/validation/InvalidData.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/validation/InvalidData.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/validation/InvalidData.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/validation/InvalidData.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/validation/Validators.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/validation/Validators.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/validation/Validators.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/validation/Validators.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/value/AbstractDecoratorValue.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/value/AbstractDecoratorValue.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/value/AbstractDecoratorValue.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/value/AbstractDecoratorValue.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/value/AbstractValue.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/value/AbstractValue.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/value/AbstractValue.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/value/AbstractValue.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/value/OrValue.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/value/OrValue.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/value/OrValue.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/value/OrValue.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/value/SimpleValueStore.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/value/SimpleValueStore.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/value/SimpleValueStore.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/value/SimpleValueStore.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/value/StoredValue.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/value/StoredValue.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/value/StoredValue.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/value/StoredValue.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/value/ToValue.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/value/ToValue.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/value/ToValue.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/value/ToValue.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/value/Value.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/value/Value.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/value/Value.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/value/Value.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/value/ValueStore.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/value/ValueStore.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/value/ValueStore.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/value/ValueStore.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/value/Values.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/value/Values.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/value/Values.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/value/Values.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/var/Var.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/var/Var.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/var/Var.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/var/Var.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/var/Vars.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/var/Vars.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/var/Vars.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/var/Vars.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/var/impl/AbstractVar.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/var/impl/AbstractVar.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/var/impl/AbstractVar.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/var/impl/AbstractVar.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/var/impl/DecoratorVar.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/var/impl/DecoratorVar.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/var/impl/DecoratorVar.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/var/impl/DecoratorVar.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/var/impl/MandatoryVar.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/var/impl/MandatoryVar.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/var/impl/MandatoryVar.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/var/impl/MandatoryVar.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/var/impl/SimpleVar.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/var/impl/SimpleVar.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/var/impl/SimpleVar.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/var/impl/SimpleVar.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/var/impl/ValidatingVar.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/var/impl/ValidatingVar.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/var/impl/ValidatingVar.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/var/impl/ValidatingVar.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/web/Screen.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/web/Screen.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/web/Screen.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/web/Screen.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/web/ScreenBean.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/web/ScreenBean.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/web/ScreenBean.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/web/ScreenBean.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/wrap/BoolWrap.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/BoolWrap.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/wrap/BoolWrap.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/BoolWrap.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/wrap/CharWrap.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/CharWrap.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/wrap/CharWrap.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/CharWrap.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/wrap/DoubleWrap.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/DoubleWrap.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/wrap/DoubleWrap.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/DoubleWrap.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/wrap/FloatWrap.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/FloatWrap.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/wrap/FloatWrap.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/FloatWrap.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/wrap/IntWrap.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/IntWrap.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/wrap/IntWrap.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/IntWrap.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/wrap/LongWrap.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/LongWrap.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/wrap/LongWrap.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/LongWrap.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/wrap/ShortWrap.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/ShortWrap.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/wrap/ShortWrap.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/wrap/ShortWrap.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/writable/ReusableWritable.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/writable/ReusableWritable.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/writable/ReusableWritable.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/writable/ReusableWritable.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/writable/Writable.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/writable/Writable.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/writable/Writable.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/writable/Writable.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/writable/WritableOutputStream.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/writable/WritableOutputStream.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/writable/WritableOutputStream.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/writable/WritableOutputStream.java
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/writable/WritableUtils.java b/commons/rapidoid-commons/src/main/java/org/rapidoid/writable/WritableUtils.java
similarity index 100%
rename from rapidoid-commons/src/main/java/org/rapidoid/writable/WritableUtils.java
rename to commons/rapidoid-commons/src/main/java/org/rapidoid/writable/WritableUtils.java
diff --git a/rapidoid-commons/src/main/resources/built-in-config-default.yml b/commons/rapidoid-commons/src/main/resources/built-in-config-default.yml
similarity index 100%
rename from rapidoid-commons/src/main/resources/built-in-config-default.yml
rename to commons/rapidoid-commons/src/main/resources/built-in-config-default.yml
diff --git a/rapidoid-commons/src/main/resources/built-in-config-dev.yml b/commons/rapidoid-commons/src/main/resources/built-in-config-dev.yml
similarity index 100%
rename from rapidoid-commons/src/main/resources/built-in-config-dev.yml
rename to commons/rapidoid-commons/src/main/resources/built-in-config-dev.yml
diff --git a/rapidoid-commons/src/main/resources/built-in-config-mysql.yml b/commons/rapidoid-commons/src/main/resources/built-in-config-mysql.yml
similarity index 100%
rename from rapidoid-commons/src/main/resources/built-in-config-mysql.yml
rename to commons/rapidoid-commons/src/main/resources/built-in-config-mysql.yml
diff --git a/rapidoid-commons/src/main/resources/built-in-config-platform.yml b/commons/rapidoid-commons/src/main/resources/built-in-config-platform.yml
similarity index 100%
rename from rapidoid-commons/src/main/resources/built-in-config-platform.yml
rename to commons/rapidoid-commons/src/main/resources/built-in-config-platform.yml
diff --git a/rapidoid-commons/src/main/resources/built-in-config-postgres.yml b/commons/rapidoid-commons/src/main/resources/built-in-config-postgres.yml
similarity index 100%
rename from rapidoid-commons/src/main/resources/built-in-config-postgres.yml
rename to commons/rapidoid-commons/src/main/resources/built-in-config-postgres.yml
diff --git a/rapidoid-commons/src/main/resources/built-in-config-test.yml b/commons/rapidoid-commons/src/main/resources/built-in-config-test.yml
similarity index 100%
rename from rapidoid-commons/src/main/resources/built-in-config-test.yml
rename to commons/rapidoid-commons/src/main/resources/built-in-config-test.yml
diff --git a/rapidoid-commons/src/main/resources/built-in-config.yml b/commons/rapidoid-commons/src/main/resources/built-in-config.yml
similarity index 100%
rename from rapidoid-commons/src/main/resources/built-in-config.yml
rename to commons/rapidoid-commons/src/main/resources/built-in-config.yml
diff --git a/rapidoid-commons/src/main/resources/commons-logging.properties b/commons/rapidoid-commons/src/main/resources/commons-logging.properties
similarity index 100%
rename from rapidoid-commons/src/main/resources/commons-logging.properties
rename to commons/rapidoid-commons/src/main/resources/commons-logging.properties
diff --git a/rapidoid-commons/src/main/resources/irregular-plural.txt b/commons/rapidoid-commons/src/main/resources/irregular-plural.txt
similarity index 100%
rename from rapidoid-commons/src/main/resources/irregular-plural.txt
rename to commons/rapidoid-commons/src/main/resources/irregular-plural.txt
diff --git a/rapidoid-commons/src/main/resources/lorem-ipsum.txt b/commons/rapidoid-commons/src/main/resources/lorem-ipsum.txt
similarity index 100%
rename from rapidoid-commons/src/main/resources/lorem-ipsum.txt
rename to commons/rapidoid-commons/src/main/resources/lorem-ipsum.txt
diff --git a/rapidoid-commons/src/main/resources/rapidoid-classes.txt b/commons/rapidoid-commons/src/main/resources/rapidoid-classes.txt
similarity index 100%
rename from rapidoid-commons/src/main/resources/rapidoid-classes.txt
rename to commons/rapidoid-commons/src/main/resources/rapidoid-classes.txt
diff --git a/rapidoid-commons/src/main/resources/rapidoid.properties b/commons/rapidoid-commons/src/main/resources/rapidoid.properties
similarity index 100%
rename from rapidoid-commons/src/main/resources/rapidoid.properties
rename to commons/rapidoid-commons/src/main/resources/rapidoid.properties
diff --git a/rapidoid-commons/src/main/resources/rapidoid.txt b/commons/rapidoid-commons/src/main/resources/rapidoid.txt
similarity index 100%
rename from rapidoid-commons/src/main/resources/rapidoid.txt
rename to commons/rapidoid-commons/src/main/resources/rapidoid.txt
diff --git a/rapidoid-commons/src/test/java/Bbb.java b/commons/rapidoid-commons/src/test/java/Bbb.java
similarity index 100%
rename from rapidoid-commons/src/test/java/Bbb.java
rename to commons/rapidoid-commons/src/test/java/Bbb.java
diff --git a/rapidoid-commons/src/test/java/cccccc/Ccccc.java b/commons/rapidoid-commons/src/test/java/cccccc/Ccccc.java
similarity index 100%
rename from rapidoid-commons/src/test/java/cccccc/Ccccc.java
rename to commons/rapidoid-commons/src/test/java/cccccc/Ccccc.java
diff --git a/rapidoid-commons/src/test/java/com/moja/Aaa.java b/commons/rapidoid-commons/src/test/java/com/moja/Aaa.java
similarity index 100%
rename from rapidoid-commons/src/test/java/com/moja/Aaa.java
rename to commons/rapidoid-commons/src/test/java/com/moja/Aaa.java
diff --git a/rapidoid-commons/src/test/java/custom/rapidoid/scan/Bar.java b/commons/rapidoid-commons/src/test/java/custom/rapidoid/scan/Bar.java
similarity index 100%
rename from rapidoid-commons/src/test/java/custom/rapidoid/scan/Bar.java
rename to commons/rapidoid-commons/src/test/java/custom/rapidoid/scan/Bar.java
diff --git a/rapidoid-commons/src/test/java/custom/rapidoid/scan/ClasspathScanTest.java b/commons/rapidoid-commons/src/test/java/custom/rapidoid/scan/ClasspathScanTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/custom/rapidoid/scan/ClasspathScanTest.java
rename to commons/rapidoid-commons/src/test/java/custom/rapidoid/scan/ClasspathScanTest.java
diff --git a/rapidoid-commons/src/test/java/custom/rapidoid/scan/MyAnnot.java b/commons/rapidoid-commons/src/test/java/custom/rapidoid/scan/MyAnnot.java
similarity index 100%
rename from rapidoid-commons/src/test/java/custom/rapidoid/scan/MyAnnot.java
rename to commons/rapidoid-commons/src/test/java/custom/rapidoid/scan/MyAnnot.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/anyobj/AnyObjTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/anyobj/AnyObjTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/anyobj/AnyObjTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/anyobj/AnyObjTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/aop/A.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/aop/A.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/aop/A.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/aop/A.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/aop/AOPTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/aop/AOPTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/aop/AOPTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/aop/AOPTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/aop/B.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/aop/B.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/aop/B.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/aop/B.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/aop/C.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/aop/C.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/aop/C.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/aop/C.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/aop/MyService.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/aop/MyService.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/aop/MyService.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/aop/MyService.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/arr/ArrTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/arr/ArrTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/arr/ArrTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/arr/ArrTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/beany/BeanyPropertiesTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/beany/BeanyPropertiesTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/beany/BeanyPropertiesTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/beany/BeanyPropertiesTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/beany/BeanySerializationTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/beany/BeanySerializationTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/beany/BeanySerializationTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/beany/BeanySerializationTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/beany/BeanyTestCommons.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/beany/BeanyTestCommons.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/beany/BeanyTestCommons.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/beany/BeanyTestCommons.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/cache/SimpleCachingTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/cache/SimpleCachingTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/cache/SimpleCachingTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/cache/SimpleCachingTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/cls/ClsTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/cls/ClsTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/cls/ClsTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/cls/ClsTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/commons/AutoExpandingMapTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/commons/AutoExpandingMapTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/commons/AutoExpandingMapTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/commons/AutoExpandingMapTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/commons/JSTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/commons/JSTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/commons/JSTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/commons/JSTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/commons/RapidoidInfoTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/commons/RapidoidInfoTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/commons/RapidoidInfoTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/commons/RapidoidInfoTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/commons/StrTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/commons/StrTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/commons/StrTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/commons/StrTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/commons/StringRewriterTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/commons/StringRewriterTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/commons/StringRewriterTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/commons/StringRewriterTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/config/ConfigLoadingTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/config/ConfigLoadingTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/config/ConfigLoadingTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/config/ConfigLoadingTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/config/ConfigOptionsTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/config/ConfigOptionsTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/config/ConfigOptionsTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/config/ConfigOptionsTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/config/ConfigurationBeanTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/config/ConfigurationBeanTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/config/ConfigurationBeanTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/config/ConfigurationBeanTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/config/EnvTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/config/EnvTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/config/EnvTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/config/EnvTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/config/Platform.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/config/Platform.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/config/Platform.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/config/Platform.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/config/RootCustomizationTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/config/RootCustomizationTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/config/RootCustomizationTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/config/RootCustomizationTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/crypto/CryptoTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/crypto/CryptoTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/crypto/CryptoTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/crypto/CryptoTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/ctx/AppCtxTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/ctx/AppCtxTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/ctx/AppCtxTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/ctx/AppCtxTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/ctx/CtxTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/ctx/CtxTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/ctx/CtxTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/ctx/CtxTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/ctx/JobChainingTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/ctx/JobChainingTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/ctx/JobChainingTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/ctx/JobChainingTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/ctx/JobsTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/ctx/JobsTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/ctx/JobsTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/ctx/JobsTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/data/JSONTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/data/JSONTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/data/JSONTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/data/JSONTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/data/ParseTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/data/ParseTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/data/ParseTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/data/ParseTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/data/Person.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/data/Person.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/data/Person.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/data/Person.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/data/User.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/data/User.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/data/User.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/data/User.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/data/XMLTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/data/XMLTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/data/XMLTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/data/XMLTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/data/YAMLTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/data/YAMLTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/data/YAMLTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/data/YAMLTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/dates/DatesTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/dates/DatesTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/dates/DatesTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/dates/DatesTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/english/EnglishTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/english/EnglishTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/english/EnglishTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/english/EnglishTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/io/ResTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/io/ResTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/io/ResTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/io/ResTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/log/LogHPTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/log/LogHPTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/log/LogHPTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/log/LogHPTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/process/ProcTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/process/ProcTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/process/ProcTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/process/ProcTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/security/DataPermissionsTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/security/DataPermissionsTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/security/DataPermissionsTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/security/DataPermissionsTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/security/MethodSecurityTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/security/MethodSecurityTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/security/MethodSecurityTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/security/MethodSecurityTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/security/RoleBasedSecurityTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/security/RoleBasedSecurityTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/security/RoleBasedSecurityTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/security/RoleBasedSecurityTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/security/RolesTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/security/RolesTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/security/RolesTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/security/RolesTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/security/SecurityTestCommons.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/security/SecurityTestCommons.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/security/SecurityTestCommons.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/security/SecurityTestCommons.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/security/User.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/security/User.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/security/User.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/security/User.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/serialize/SerializationTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/serialize/SerializationTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/serialize/SerializationTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/serialize/SerializationTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/test/AbstractCommonsTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/test/AbstractCommonsTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/test/AbstractCommonsTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/test/AbstractCommonsTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/util/DynamicTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/util/DynamicTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/util/DynamicTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/util/DynamicTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/util/EgInterface.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/util/EgInterface.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/util/EgInterface.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/util/EgInterface.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/util/MscTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/util/MscTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/util/MscTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/util/MscTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/util/SimpleHashTableTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/util/SimpleHashTableTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/util/SimpleHashTableTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/util/SimpleHashTableTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/util/SlidingWindowListTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/util/SlidingWindowListTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/util/SlidingWindowListTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/util/SlidingWindowListTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/util/TUUIDTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/util/TUUIDTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/util/TUUIDTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/util/TUUIDTest.java
diff --git a/rapidoid-commons/src/test/java/org/rapidoid/writable/WritableUtilsTest.java b/commons/rapidoid-commons/src/test/java/org/rapidoid/writable/WritableUtilsTest.java
similarity index 100%
rename from rapidoid-commons/src/test/java/org/rapidoid/writable/WritableUtilsTest.java
rename to commons/rapidoid-commons/src/test/java/org/rapidoid/writable/WritableUtilsTest.java
diff --git a/rapidoid-commons/src/test/resources/ConfigurationBeanTest/beans.yml b/commons/rapidoid-commons/src/test/resources/ConfigurationBeanTest/beans.yml
similarity index 100%
rename from rapidoid-commons/src/test/resources/ConfigurationBeanTest/beans.yml
rename to commons/rapidoid-commons/src/test/resources/ConfigurationBeanTest/beans.yml
diff --git a/rapidoid-commons/src/test/resources/DataPermissionsTest/config.yml b/commons/rapidoid-commons/src/test/resources/DataPermissionsTest/config.yml
similarity index 100%
rename from rapidoid-commons/src/test/resources/DataPermissionsTest/config.yml
rename to commons/rapidoid-commons/src/test/resources/DataPermissionsTest/config.yml
diff --git a/rapidoid-commons/src/test/resources/MethodSecurityTest/config.yaml b/commons/rapidoid-commons/src/test/resources/MethodSecurityTest/config.yaml
similarity index 100%
rename from rapidoid-commons/src/test/resources/MethodSecurityTest/config.yaml
rename to commons/rapidoid-commons/src/test/resources/MethodSecurityTest/config.yaml
diff --git a/rapidoid-commons/src/test/resources/RoleBasedSecurityTest/config.yaml b/commons/rapidoid-commons/src/test/resources/RoleBasedSecurityTest/config.yaml
similarity index 100%
rename from rapidoid-commons/src/test/resources/RoleBasedSecurityTest/config.yaml
rename to commons/rapidoid-commons/src/test/resources/RoleBasedSecurityTest/config.yaml
diff --git a/rapidoid-commons/src/test/resources/RolesTest/config.yaml b/commons/rapidoid-commons/src/test/resources/RolesTest/config.yaml
similarity index 100%
rename from rapidoid-commons/src/test/resources/RolesTest/config.yaml
rename to commons/rapidoid-commons/src/test/resources/RolesTest/config.yaml
diff --git a/rapidoid-commons/src/test/resources/abc.doc b/commons/rapidoid-commons/src/test/resources/abc.doc
similarity index 100%
rename from rapidoid-commons/src/test/resources/abc.doc
rename to commons/rapidoid-commons/src/test/resources/abc.doc
diff --git a/rapidoid-commons/src/test/resources/abc.txt b/commons/rapidoid-commons/src/test/resources/abc.txt
similarity index 100%
rename from rapidoid-commons/src/test/resources/abc.txt
rename to commons/rapidoid-commons/src/test/resources/abc.txt
diff --git a/rapidoid-commons/src/test/resources/cached-file.txt b/commons/rapidoid-commons/src/test/resources/cached-file.txt
similarity index 100%
rename from rapidoid-commons/src/test/resources/cached-file.txt
rename to commons/rapidoid-commons/src/test/resources/cached-file.txt
diff --git a/rapidoid-commons/src/test/resources/counter.jar b/commons/rapidoid-commons/src/test/resources/counter.jar
similarity index 100%
rename from rapidoid-commons/src/test/resources/counter.jar
rename to commons/rapidoid-commons/src/test/resources/counter.jar
diff --git a/rapidoid-commons/src/test/resources/my-cfg/cfg-prof1.json b/commons/rapidoid-commons/src/test/resources/my-cfg/cfg-prof1.json
similarity index 100%
rename from rapidoid-commons/src/test/resources/my-cfg/cfg-prof1.json
rename to commons/rapidoid-commons/src/test/resources/my-cfg/cfg-prof1.json
diff --git a/rapidoid-commons/src/test/resources/my-cfg/cfg.json b/commons/rapidoid-commons/src/test/resources/my-cfg/cfg.json
similarity index 100%
rename from rapidoid-commons/src/test/resources/my-cfg/cfg.json
rename to commons/rapidoid-commons/src/test/resources/my-cfg/cfg.json
diff --git a/rapidoid-commons/src/test/resources/my-cfg/mycfg-prof1.yml b/commons/rapidoid-commons/src/test/resources/my-cfg/mycfg-prof1.yml
similarity index 100%
rename from rapidoid-commons/src/test/resources/my-cfg/mycfg-prof1.yml
rename to commons/rapidoid-commons/src/test/resources/my-cfg/mycfg-prof1.yml
diff --git a/rapidoid-commons/src/test/resources/my-cfg/mycfg.yml b/commons/rapidoid-commons/src/test/resources/my-cfg/mycfg.yml
similarity index 100%
rename from rapidoid-commons/src/test/resources/my-cfg/mycfg.yml
rename to commons/rapidoid-commons/src/test/resources/my-cfg/mycfg.yml
diff --git a/rapidoid-commons/src/test/resources/persons.yaml b/commons/rapidoid-commons/src/test/resources/persons.yaml
similarity index 100%
rename from rapidoid-commons/src/test/resources/persons.yaml
rename to commons/rapidoid-commons/src/test/resources/persons.yaml
diff --git a/rapidoid-commons/src/test/resources/res1/abc.txt b/commons/rapidoid-commons/src/test/resources/res1/abc.txt
similarity index 100%
rename from rapidoid-commons/src/test/resources/res1/abc.txt
rename to commons/rapidoid-commons/src/test/resources/res1/abc.txt
diff --git a/rapidoid-commons/src/test/resources/res2/abc.txt b/commons/rapidoid-commons/src/test/resources/res2/abc.txt
similarity index 100%
rename from rapidoid-commons/src/test/resources/res2/abc.txt
rename to commons/rapidoid-commons/src/test/resources/res2/abc.txt
diff --git a/rapidoid-commons/src/test/resources/test-results/ConfigurationBeanTest/testBasicConfig/result b/commons/rapidoid-commons/src/test/resources/test-results/ConfigurationBeanTest/testBasicConfig/result
similarity index 100%
rename from rapidoid-commons/src/test/resources/test-results/ConfigurationBeanTest/testBasicConfig/result
rename to commons/rapidoid-commons/src/test/resources/test-results/ConfigurationBeanTest/testBasicConfig/result
diff --git a/rapidoid-commons/src/test/resources/test.yaml b/commons/rapidoid-commons/src/test/resources/test.yaml
similarity index 100%
rename from rapidoid-commons/src/test/resources/test.yaml
rename to commons/rapidoid-commons/src/test/resources/test.yaml
diff --git a/rapidoid-essentials/.gitignore b/commons/rapidoid-essentials/.gitignore
similarity index 100%
rename from rapidoid-essentials/.gitignore
rename to commons/rapidoid-essentials/.gitignore
diff --git a/rapidoid-essentials/pom.xml b/commons/rapidoid-essentials/pom.xml
similarity index 100%
rename from rapidoid-essentials/pom.xml
rename to commons/rapidoid-essentials/pom.xml
diff --git a/rapidoid-essentials/src/main/java/org/rapidoid/RapidoidThing.java b/commons/rapidoid-essentials/src/main/java/org/rapidoid/RapidoidThing.java
similarity index 100%
rename from rapidoid-essentials/src/main/java/org/rapidoid/RapidoidThing.java
rename to commons/rapidoid-essentials/src/main/java/org/rapidoid/RapidoidThing.java
diff --git a/rapidoid-essentials/src/main/java/org/rapidoid/event/Event.java b/commons/rapidoid-essentials/src/main/java/org/rapidoid/event/Event.java
similarity index 100%
rename from rapidoid-essentials/src/main/java/org/rapidoid/event/Event.java
rename to commons/rapidoid-essentials/src/main/java/org/rapidoid/event/Event.java
diff --git a/rapidoid-essentials/src/main/java/org/rapidoid/event/EventListener.java b/commons/rapidoid-essentials/src/main/java/org/rapidoid/event/EventListener.java
similarity index 100%
rename from rapidoid-essentials/src/main/java/org/rapidoid/event/EventListener.java
rename to commons/rapidoid-essentials/src/main/java/org/rapidoid/event/EventListener.java
diff --git a/rapidoid-essentials/src/main/java/org/rapidoid/event/Events.java b/commons/rapidoid-essentials/src/main/java/org/rapidoid/event/Events.java
similarity index 100%
rename from rapidoid-essentials/src/main/java/org/rapidoid/event/Events.java
rename to commons/rapidoid-essentials/src/main/java/org/rapidoid/event/Events.java
diff --git a/rapidoid-essentials/src/main/java/org/rapidoid/event/Fire.java b/commons/rapidoid-essentials/src/main/java/org/rapidoid/event/Fire.java
similarity index 100%
rename from rapidoid-essentials/src/main/java/org/rapidoid/event/Fire.java
rename to commons/rapidoid-essentials/src/main/java/org/rapidoid/event/Fire.java
diff --git a/rapidoid-essentials/src/main/java/org/rapidoid/log/GlobalCfg.java b/commons/rapidoid-essentials/src/main/java/org/rapidoid/log/GlobalCfg.java
similarity index 100%
rename from rapidoid-essentials/src/main/java/org/rapidoid/log/GlobalCfg.java
rename to commons/rapidoid-essentials/src/main/java/org/rapidoid/log/GlobalCfg.java
diff --git a/rapidoid-essentials/src/main/java/org/rapidoid/log/Log.java b/commons/rapidoid-essentials/src/main/java/org/rapidoid/log/Log.java
similarity index 100%
rename from rapidoid-essentials/src/main/java/org/rapidoid/log/Log.java
rename to commons/rapidoid-essentials/src/main/java/org/rapidoid/log/Log.java
diff --git a/rapidoid-essentials/src/main/java/org/rapidoid/log/LogLevel.java b/commons/rapidoid-essentials/src/main/java/org/rapidoid/log/LogLevel.java
similarity index 100%
rename from rapidoid-essentials/src/main/java/org/rapidoid/log/LogLevel.java
rename to commons/rapidoid-essentials/src/main/java/org/rapidoid/log/LogLevel.java
diff --git a/rapidoid-essentials/src/main/java/org/rapidoid/log/LogOptions.java b/commons/rapidoid-essentials/src/main/java/org/rapidoid/log/LogOptions.java
similarity index 100%
rename from rapidoid-essentials/src/main/java/org/rapidoid/log/LogOptions.java
rename to commons/rapidoid-essentials/src/main/java/org/rapidoid/log/LogOptions.java
diff --git a/rapidoid-essentials/src/main/java/org/rapidoid/log/LogStats.java b/commons/rapidoid-essentials/src/main/java/org/rapidoid/log/LogStats.java
similarity index 100%
rename from rapidoid-essentials/src/main/java/org/rapidoid/log/LogStats.java
rename to commons/rapidoid-essentials/src/main/java/org/rapidoid/log/LogStats.java
diff --git a/rapidoid-essentials/src/main/java/org/rapidoid/u/U.java b/commons/rapidoid-essentials/src/main/java/org/rapidoid/u/U.java
similarity index 100%
rename from rapidoid-essentials/src/main/java/org/rapidoid/u/U.java
rename to commons/rapidoid-essentials/src/main/java/org/rapidoid/u/U.java
diff --git a/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/coll/EssentialsCollTest.java b/commons/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/coll/EssentialsCollTest.java
similarity index 100%
rename from rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/coll/EssentialsCollTest.java
rename to commons/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/coll/EssentialsCollTest.java
diff --git a/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/collutils/EssentialsUtilsTest.java b/commons/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/collutils/EssentialsUtilsTest.java
similarity index 100%
rename from rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/collutils/EssentialsUtilsTest.java
rename to commons/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/collutils/EssentialsUtilsTest.java
diff --git a/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/dynamic/Dog.java b/commons/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/dynamic/Dog.java
similarity index 100%
rename from rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/dynamic/Dog.java
rename to commons/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/dynamic/Dog.java
diff --git a/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/dynamic/EssentialsDynamicTest.java b/commons/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/dynamic/EssentialsDynamicTest.java
similarity index 100%
rename from rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/dynamic/EssentialsDynamicTest.java
rename to commons/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/dynamic/EssentialsDynamicTest.java
diff --git a/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/strutils/EssentialsStrUtilsTest.java b/commons/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/strutils/EssentialsStrUtilsTest.java
similarity index 100%
rename from rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/strutils/EssentialsStrUtilsTest.java
rename to commons/rapidoid-essentials/src/test/java/org/rapidoid/docs/essentials/strutils/EssentialsStrUtilsTest.java
diff --git a/rapidoid-essentials/src/test/java/org/rapidoid/event/EventsTest.java b/commons/rapidoid-essentials/src/test/java/org/rapidoid/event/EventsTest.java
similarity index 100%
rename from rapidoid-essentials/src/test/java/org/rapidoid/event/EventsTest.java
rename to commons/rapidoid-essentials/src/test/java/org/rapidoid/event/EventsTest.java
diff --git a/rapidoid-essentials/src/test/java/org/rapidoid/log/LogTest.java b/commons/rapidoid-essentials/src/test/java/org/rapidoid/log/LogTest.java
similarity index 100%
rename from rapidoid-essentials/src/test/java/org/rapidoid/log/LogTest.java
rename to commons/rapidoid-essentials/src/test/java/org/rapidoid/log/LogTest.java
diff --git a/rapidoid-essentials/src/test/java/org/rapidoid/u/UTest.java b/commons/rapidoid-essentials/src/test/java/org/rapidoid/u/UTest.java
similarity index 100%
rename from rapidoid-essentials/src/test/java/org/rapidoid/u/UTest.java
rename to commons/rapidoid-essentials/src/test/java/org/rapidoid/u/UTest.java
diff --git a/rapidoid-test-commons/pom.xml b/commons/rapidoid-test-commons/pom.xml
similarity index 100%
rename from rapidoid-test-commons/pom.xml
rename to commons/rapidoid-test-commons/pom.xml
diff --git a/rapidoid-test-commons/src/main/java/org/rapidoid/test/Doc.java b/commons/rapidoid-test-commons/src/main/java/org/rapidoid/test/Doc.java
similarity index 100%
rename from rapidoid-test-commons/src/main/java/org/rapidoid/test/Doc.java
rename to commons/rapidoid-test-commons/src/main/java/org/rapidoid/test/Doc.java
diff --git a/rapidoid-test-commons/src/main/java/org/rapidoid/test/ExpectErrors.java b/commons/rapidoid-test-commons/src/main/java/org/rapidoid/test/ExpectErrors.java
similarity index 100%
rename from rapidoid-test-commons/src/main/java/org/rapidoid/test/ExpectErrors.java
rename to commons/rapidoid-test-commons/src/main/java/org/rapidoid/test/ExpectErrors.java
diff --git a/rapidoid-test-commons/src/main/java/org/rapidoid/test/TestCommons.java b/commons/rapidoid-test-commons/src/main/java/org/rapidoid/test/TestCommons.java
similarity index 100%
rename from rapidoid-test-commons/src/main/java/org/rapidoid/test/TestCommons.java
rename to commons/rapidoid-test-commons/src/main/java/org/rapidoid/test/TestCommons.java
diff --git a/examples/pom.xml b/examples/pom.xml
index ce2d51beab..f7c4c550d3 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -2,9 +2,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.rapidoid</groupId>
+	<parent>
+		<groupId>org.rapidoid</groupId>
+		<artifactId>rapidoid</artifactId>
+		<version>5.4.6-SNAPSHOT</version>
+	</parent>
+
 	<artifactId>examples</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/pom.xml b/pom.xml
index 5f1d8df4d9..97663c09f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -87,9 +87,7 @@
 	</properties>
 
 	<modules>
-		<module>rapidoid-essentials</module>
-		<module>rapidoid-commons</module>
-		<module>rapidoid-test-commons</module>
+		<module>commons</module>
 		<module>rapidoid-sql</module>
 		<module>rapidoid-buffer</module>
 		<module>rapidoid-jpa</module>
@@ -110,6 +108,7 @@
 		<module>rapidoid-benchmark</module>
 		<module>rapidoid-integration-tests</module>
 		<module>rapidoid-platform</module>
+		<module>examples</module>
 		<module>app-maven-plugin</module>
 	</modules>