diff --git a/distribution/sensinact-distribution-generator/packaging/distribution.xml b/distribution/generator/packaging/distribution.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/packaging/distribution.xml
rename to distribution/generator/packaging/distribution.xml
diff --git a/distribution/sensinact-distribution-generator/packaging/pom.xml b/distribution/generator/packaging/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/packaging/pom.xml
rename to distribution/generator/packaging/pom.xml
diff --git a/distribution/sensinact-distribution-generator/pom.xml b/distribution/generator/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/pom.xml
rename to distribution/generator/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/ZprofileSkeleton/about.html b/distribution/generator/profile/ZprofileSkeleton/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/ZprofileSkeleton/about.html
rename to distribution/generator/profile/ZprofileSkeleton/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/ZprofileSkeleton/pom.xml b/distribution/generator/profile/ZprofileSkeleton/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/ZprofileSkeleton/pom.xml
rename to distribution/generator/profile/ZprofileSkeleton/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/android-imu-profile/about.html b/distribution/generator/profile/android-imu-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/android-imu-profile/about.html
rename to distribution/generator/profile/android-imu-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/android-imu-profile/pom.xml b/distribution/generator/profile/android-imu-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/android-imu-profile/pom.xml
rename to distribution/generator/profile/android-imu-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/application-profile/about.html b/distribution/generator/profile/application-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/application-profile/about.html
rename to distribution/generator/profile/application-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/application-profile/pom.xml b/distribution/generator/profile/application-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/application-profile/pom.xml
rename to distribution/generator/profile/application-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/free-sms/pom.xml b/distribution/generator/profile/free-sms/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/free-sms/pom.xml
rename to distribution/generator/profile/free-sms/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/http-profile/about.html b/distribution/generator/profile/http-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/http-profile/about.html
rename to distribution/generator/profile/http-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/http-profile/pom.xml b/distribution/generator/profile/http-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/http-profile/pom.xml
rename to distribution/generator/profile/http-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/inovallee/about.html b/distribution/generator/profile/inovallee/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/inovallee/about.html
rename to distribution/generator/profile/inovallee/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/inovallee/pom.xml b/distribution/generator/profile/inovallee/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/inovallee/pom.xml
rename to distribution/generator/profile/inovallee/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/jsonpath-profile/about.html b/distribution/generator/profile/jsonpath-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/jsonpath-profile/about.html
rename to distribution/generator/profile/jsonpath-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/jsonpath-profile/pom.xml b/distribution/generator/profile/jsonpath-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/jsonpath-profile/pom.xml
rename to distribution/generator/profile/jsonpath-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/kodi-profile/about.html b/distribution/generator/profile/kodi-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/kodi-profile/about.html
rename to distribution/generator/profile/kodi-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/kodi-profile/pom.xml b/distribution/generator/profile/kodi-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/kodi-profile/pom.xml
rename to distribution/generator/profile/kodi-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/ldapfilter/about.html b/distribution/generator/profile/ldapfilter/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/ldapfilter/about.html
rename to distribution/generator/profile/ldapfilter/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/ldapfilter/pom.xml b/distribution/generator/profile/ldapfilter/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/ldapfilter/pom.xml
rename to distribution/generator/profile/ldapfilter/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/mqtt-nb-profile/about.html b/distribution/generator/profile/mqtt-nb-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/mqtt-nb-profile/about.html
rename to distribution/generator/profile/mqtt-nb-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/mqtt-nb-profile/pom.xml b/distribution/generator/profile/mqtt-nb-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/mqtt-nb-profile/pom.xml
rename to distribution/generator/profile/mqtt-nb-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/mqtt-sb-profile/about.html b/distribution/generator/profile/mqtt-sb-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/mqtt-sb-profile/about.html
rename to distribution/generator/profile/mqtt-sb-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/mqtt-sb-profile/pom.xml b/distribution/generator/profile/mqtt-sb-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/mqtt-sb-profile/pom.xml
rename to distribution/generator/profile/mqtt-sb-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/mqtt-server/about.html b/distribution/generator/profile/mqtt-server/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/mqtt-server/about.html
rename to distribution/generator/profile/mqtt-server/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/mqtt-server/pom.xml b/distribution/generator/profile/mqtt-server/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/mqtt-server/pom.xml
rename to distribution/generator/profile/mqtt-server/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/onem2m-mqttbinding/about.html b/distribution/generator/profile/onem2m-mqttbinding/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/onem2m-mqttbinding/about.html
rename to distribution/generator/profile/onem2m-mqttbinding/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/onem2m-mqttbinding/pom.xml b/distribution/generator/profile/onem2m-mqttbinding/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/onem2m-mqttbinding/pom.xml
rename to distribution/generator/profile/onem2m-mqttbinding/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/onem2m/about.html b/distribution/generator/profile/onem2m/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/onem2m/about.html
rename to distribution/generator/profile/onem2m/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/onem2m/pom.xml b/distribution/generator/profile/onem2m/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/onem2m/pom.xml
rename to distribution/generator/profile/onem2m/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/openhab-profile/about.html b/distribution/generator/profile/openhab-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/openhab-profile/about.html
rename to distribution/generator/profile/openhab-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/openhab-profile/pom.xml b/distribution/generator/profile/openhab-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/openhab-profile/pom.xml
rename to distribution/generator/profile/openhab-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/openweather-profile/about.html b/distribution/generator/profile/openweather-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/openweather-profile/about.html
rename to distribution/generator/profile/openweather-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/openweather-profile/pom.xml b/distribution/generator/profile/openweather-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/openweather-profile/pom.xml
rename to distribution/generator/profile/openweather-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/pom.xml b/distribution/generator/profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/pom.xml
rename to distribution/generator/profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/rest-profile/about.html b/distribution/generator/profile/rest-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/rest-profile/about.html
rename to distribution/generator/profile/rest-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/rest-profile/pom.xml b/distribution/generator/profile/rest-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/rest-profile/pom.xml
rename to distribution/generator/profile/rest-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/sensinact-datastore/about.html b/distribution/generator/profile/sensinact-datastore/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/sensinact-datastore/about.html
rename to distribution/generator/profile/sensinact-datastore/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/sensinact-datastore/pom.xml b/distribution/generator/profile/sensinact-datastore/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/sensinact-datastore/pom.xml
rename to distribution/generator/profile/sensinact-datastore/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/sensinact-remote/about.html b/distribution/generator/profile/sensinact-remote/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/sensinact-remote/about.html
rename to distribution/generator/profile/sensinact-remote/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/sensinact-remote/pom.xml b/distribution/generator/profile/sensinact-remote/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/sensinact-remote/pom.xml
rename to distribution/generator/profile/sensinact-remote/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/simulation-profile/about.html b/distribution/generator/profile/simulation-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/simulation-profile/about.html
rename to distribution/generator/profile/simulation-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/simulation-profile/pom.xml b/distribution/generator/profile/simulation-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/simulation-profile/pom.xml
rename to distribution/generator/profile/simulation-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/storage-agent-profile/pom.xml b/distribution/generator/profile/storage-agent-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/storage-agent-profile/pom.xml
rename to distribution/generator/profile/storage-agent-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/studio-web-profile/about.html b/distribution/generator/profile/studio-web-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/studio-web-profile/about.html
rename to distribution/generator/profile/studio-web-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/studio-web-profile/pom.xml b/distribution/generator/profile/studio-web-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/studio-web-profile/pom.xml
rename to distribution/generator/profile/studio-web-profile/pom.xml
diff --git a/distribution/sensinact-distribution-generator/profile/swagger-profile/about.html b/distribution/generator/profile/swagger-profile/about.html
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/swagger-profile/about.html
rename to distribution/generator/profile/swagger-profile/about.html
diff --git a/distribution/sensinact-distribution-generator/profile/swagger-profile/pom.xml b/distribution/generator/profile/swagger-profile/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-generator/profile/swagger-profile/pom.xml
rename to distribution/generator/profile/swagger-profile/pom.xml
diff --git a/distribution/pom.xml b/distribution/pom.xml
index d14db03..58918cd 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -28,8 +28,8 @@
     <name>sensiNact IoT Gateway - Distribution</name>
 
     <modules>
-        <module>sensinact-distribution-generator</module>
-        <module>sensinact-distribution-template</module>
+        <module>generator</module>
+        <module>template</module>
     </modules>
 </project>
 
diff --git a/distribution/sensinact-distribution-template/.profile-enabled/README b/distribution/template/.profile-enabled/README
similarity index 100%
rename from distribution/sensinact-distribution-template/.profile-enabled/README
rename to distribution/template/.profile-enabled/README
diff --git a/distribution/sensinact-distribution-template/README b/distribution/template/README
similarity index 100%
rename from distribution/sensinact-distribution-template/README
rename to distribution/template/README
diff --git a/distribution/sensinact-distribution-template/about.html b/distribution/template/about.html
similarity index 100%
rename from distribution/sensinact-distribution-template/about.html
rename to distribution/template/about.html
diff --git a/distribution/sensinact-distribution-template/application/README b/distribution/template/application/README
similarity index 100%
rename from distribution/sensinact-distribution-template/application/README
rename to distribution/template/application/README
diff --git a/distribution/sensinact-distribution-template/cfgs/README b/distribution/template/cfgs/README
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/README
rename to distribution/template/cfgs/README
diff --git a/distribution/sensinact-distribution-template/cfgs/application-manager.config b/distribution/template/cfgs/application-manager.config
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/application-manager.config
rename to distribution/template/cfgs/application-manager.config
diff --git a/distribution/sensinact-distribution-template/cfgs/http-onem2m-agent.config b/distribution/template/cfgs/http-onem2m-agent.config
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/http-onem2m-agent.config
rename to distribution/template/cfgs/http-onem2m-agent.config
diff --git a/distribution/sensinact-distribution-template/cfgs/mqtt-agent.config b/distribution/template/cfgs/mqtt-agent.config
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/mqtt-agent.config
rename to distribution/template/cfgs/mqtt-agent.config
diff --git a/distribution/sensinact-distribution-template/cfgs/mqtt-generic-agent.config b/distribution/template/cfgs/mqtt-generic-agent.config
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/mqtt-generic-agent.config
rename to distribution/template/cfgs/mqtt-generic-agent.config
diff --git a/distribution/sensinact-distribution-template/cfgs/mqtt-onem2m-agent.config b/distribution/template/cfgs/mqtt-onem2m-agent.config
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/mqtt-onem2m-agent.config
rename to distribution/template/cfgs/mqtt-onem2m-agent.config
diff --git a/distribution/sensinact-distribution-template/cfgs/mqtt-server.config b/distribution/template/cfgs/mqtt-server.config
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/mqtt-server.config
rename to distribution/template/cfgs/mqtt-server.config
diff --git a/distribution/sensinact-distribution-template/cfgs/onem2m-device.config b/distribution/template/cfgs/onem2m-device.config
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/onem2m-device.config
rename to distribution/template/cfgs/onem2m-device.config
diff --git a/distribution/sensinact-distribution-template/cfgs/org.apache.aries.rsa.discovery.zookeeper.config b/distribution/template/cfgs/org.apache.aries.rsa.discovery.zookeeper.config
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/org.apache.aries.rsa.discovery.zookeeper.config
rename to distribution/template/cfgs/org.apache.aries.rsa.discovery.zookeeper.config
diff --git a/distribution/sensinact-distribution-template/cfgs/org.apache.aries.rsa.provider.fastbin.config b/distribution/template/cfgs/org.apache.aries.rsa.provider.fastbin.config
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/org.apache.aries.rsa.provider.fastbin.config
rename to distribution/template/cfgs/org.apache.aries.rsa.provider.fastbin.config
diff --git a/distribution/sensinact-distribution-template/cfgs/sensinact.config b/distribution/template/cfgs/sensinact.config
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/sensinact.config
rename to distribution/template/cfgs/sensinact.config
diff --git a/distribution/sensinact-distribution-template/cfgs/storage-agent.config b/distribution/template/cfgs/storage-agent.config
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/storage-agent.config
rename to distribution/template/cfgs/storage-agent.config
diff --git a/distribution/sensinact-distribution-template/cfgs/temperatures-generator.config b/distribution/template/cfgs/temperatures-generator.config
similarity index 100%
rename from distribution/sensinact-distribution-template/cfgs/temperatures-generator.config
rename to distribution/template/cfgs/temperatures-generator.config
diff --git a/distribution/sensinact-distribution-template/conf/all.policy b/distribution/template/conf/all.policy
similarity index 100%
rename from distribution/sensinact-distribution-template/conf/all.policy
rename to distribution/template/conf/all.policy
diff --git a/distribution/sensinact-distribution-template/conf/config.properties b/distribution/template/conf/config.properties
similarity index 100%
rename from distribution/sensinact-distribution-template/conf/config.properties
rename to distribution/template/conf/config.properties
diff --git a/distribution/sensinact-distribution-template/conf/logback.xml b/distribution/template/conf/logback.xml
similarity index 100%
rename from distribution/sensinact-distribution-template/conf/logback.xml
rename to distribution/template/conf/logback.xml
diff --git a/distribution/sensinact-distribution-template/conf/system.properties b/distribution/template/conf/system.properties
similarity index 100%
rename from distribution/sensinact-distribution-template/conf/system.properties
rename to distribution/template/conf/system.properties
diff --git a/distribution/sensinact-distribution-template/datastore/keystore/keystore.jks b/distribution/template/datastore/keystore/keystore.jks
similarity index 100%
rename from distribution/sensinact-distribution-template/datastore/keystore/keystore.jks
rename to distribution/template/datastore/keystore/keystore.jks
Binary files differ
diff --git a/distribution/sensinact-distribution-template/distribution.xml b/distribution/template/distribution.xml
similarity index 100%
rename from distribution/sensinact-distribution-template/distribution.xml
rename to distribution/template/distribution.xml
diff --git a/distribution/sensinact-distribution-template/epl-v10.html b/distribution/template/epl-v10.html
similarity index 100%
rename from distribution/sensinact-distribution-template/epl-v10.html
rename to distribution/template/epl-v10.html
diff --git a/distribution/sensinact-distribution-template/info.txt b/distribution/template/info.txt
similarity index 100%
rename from distribution/sensinact-distribution-template/info.txt
rename to distribution/template/info.txt
diff --git a/distribution/sensinact-distribution-template/load/README b/distribution/template/load/README
similarity index 100%
rename from distribution/sensinact-distribution-template/load/README
rename to distribution/template/load/README
diff --git a/distribution/sensinact-distribution-template/log/README b/distribution/template/log/README
similarity index 100%
rename from distribution/sensinact-distribution-template/log/README
rename to distribution/template/log/README
diff --git a/distribution/sensinact-distribution-template/notice.html b/distribution/template/notice.html
similarity index 100%
rename from distribution/sensinact-distribution-template/notice.html
rename to distribution/template/notice.html
diff --git a/distribution/sensinact-distribution-template/pom.xml b/distribution/template/pom.xml
similarity index 100%
rename from distribution/sensinact-distribution-template/pom.xml
rename to distribution/template/pom.xml
diff --git a/distribution/sensinact-distribution-template/sensinact b/distribution/template/sensinact
similarity index 100%
rename from distribution/sensinact-distribution-template/sensinact
rename to distribution/template/sensinact
diff --git a/distribution/sensinact-distribution-template/sensinact.bat b/distribution/template/sensinact.bat
similarity index 100%
rename from distribution/sensinact-distribution-template/sensinact.bat
rename to distribution/template/sensinact.bat
diff --git a/distribution/sensinact-distribution-template/thethingsnetwork-device.properties b/distribution/template/thethingsnetwork-device.properties
similarity index 100%
rename from distribution/sensinact-distribution-template/thethingsnetwork-device.properties
rename to distribution/template/thethingsnetwork-device.properties