diff --git a/modules/analytics/Samples/GadgetLocationData/artifact.xml b/modules-old/analytics/Samples/GadgetLocationData/artifact.xml
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/artifact.xml
rename to modules-old/analytics/Samples/GadgetLocationData/artifact.xml
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/assets/html_templates/view_fence_popup.html b/modules-old/analytics/Samples/GadgetLocationData/locationData/assets/html_templates/view_fence_popup.html
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/assets/html_templates/view_fence_popup.html
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/assets/html_templates/view_fence_popup.html
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Proximity_alert.siddhiql b/modules-old/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Proximity_alert.siddhiql
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Proximity_alert.siddhiql
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Proximity_alert.siddhiql
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Speed_alert.siddhiql b/modules-old/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Speed_alert.siddhiql
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Speed_alert.siddhiql
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Speed_alert.siddhiql
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Stationery_alert.siddhiql b/modules-old/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Stationery_alert.siddhiql
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Stationery_alert.siddhiql
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Stationery_alert.siddhiql
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Traffic_alert.siddhiql b/modules-old/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Traffic_alert.siddhiql
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Traffic_alert.siddhiql
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Traffic_alert.siddhiql
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Within_alert.siddhiql b/modules-old/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Within_alert.siddhiql
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Within_alert.siddhiql
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/conf/alerts/Geo-ExecutionPlan-Within_alert.siddhiql
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/css/style.css b/modules-old/analytics/Samples/GadgetLocationData/locationData/css/style.css
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/css/style.css
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/css/style.css
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/gadget.json b/modules-old/analytics/Samples/GadgetLocationData/locationData/gadget.json
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/gadget.json
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/gadget.json
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/img/floor.jpg b/modules-old/analytics/Samples/GadgetLocationData/locationData/img/floor.jpg
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/img/floor.jpg
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/img/floor.jpg
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/include/commons.jag b/modules-old/analytics/Samples/GadgetLocationData/locationData/include/commons.jag
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/include/commons.jag
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/include/commons.jag
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/include/store_alerts.jag b/modules-old/analytics/Samples/GadgetLocationData/locationData/include/store_alerts.jag
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/include/store_alerts.jag
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/include/store_alerts.jag
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/index.xml b/modules-old/analytics/Samples/GadgetLocationData/locationData/index.xml
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/index.xml
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/index.xml
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/js/RestCaller.js b/modules-old/analytics/Samples/GadgetLocationData/locationData/js/RestCaller.js
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/js/RestCaller.js
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/js/RestCaller.js
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/js/graph.js b/modules-old/analytics/Samples/GadgetLocationData/locationData/js/graph.js
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/js/graph.js
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/js/graph.js
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/js/traffic.js b/modules-old/analytics/Samples/GadgetLocationData/locationData/js/traffic.js
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/js/traffic.js
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/js/traffic.js
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/lib/css/bootstrap.css b/modules-old/analytics/Samples/GadgetLocationData/locationData/lib/css/bootstrap.css
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/lib/css/bootstrap.css
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/lib/css/bootstrap.css
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/lib/js/bootstrap.js b/modules-old/analytics/Samples/GadgetLocationData/locationData/lib/js/bootstrap.js
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/lib/js/bootstrap.js
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/lib/js/bootstrap.js
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/lib/js/d3.js b/modules-old/analytics/Samples/GadgetLocationData/locationData/lib/js/d3.js
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/lib/js/d3.js
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/lib/js/d3.js
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/lib/js/d3tip.js b/modules-old/analytics/Samples/GadgetLocationData/locationData/lib/js/d3tip.js
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/lib/js/d3tip.js
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/lib/js/d3tip.js
diff --git a/modules/analytics/Samples/GadgetLocationData/locationData/lib/js/jquery.js b/modules-old/analytics/Samples/GadgetLocationData/locationData/lib/js/jquery.js
similarity index 100%
rename from modules/analytics/Samples/GadgetLocationData/locationData/lib/js/jquery.js
rename to modules-old/analytics/Samples/GadgetLocationData/locationData/lib/js/jquery.js
diff --git a/modules/analytics/distribution/datasource_config_change.xml b/modules-old/analytics/distribution/datasource_config_change.xml
similarity index 100%
rename from modules/analytics/distribution/datasource_config_change.xml
rename to modules-old/analytics/distribution/datasource_config_change.xml
diff --git a/modules/analytics/distribution/ds_config.xml b/modules-old/analytics/distribution/ds_config.xml
similarity index 100%
rename from modules/analytics/distribution/ds_config.xml
rename to modules-old/analytics/distribution/ds_config.xml
diff --git a/modules/analytics/distribution/input-adapter-change.xml b/modules-old/analytics/distribution/input-adapter-change.xml
similarity index 100%
rename from modules/analytics/distribution/input-adapter-change.xml
rename to modules-old/analytics/distribution/input-adapter-change.xml
diff --git a/modules/analytics/distribution/output-adapter-change.xml b/modules-old/analytics/distribution/output-adapter-change.xml
similarity index 100%
rename from modules/analytics/distribution/output-adapter-change.xml
rename to modules-old/analytics/distribution/output-adapter-change.xml
diff --git a/modules/analytics/distribution/pom.xml b/modules-old/analytics/distribution/pom.xml
similarity index 100%
rename from modules/analytics/distribution/pom.xml
rename to modules-old/analytics/distribution/pom.xml
diff --git a/modules/analytics/distribution/src/assembly/bin.xml b/modules-old/analytics/distribution/src/assembly/bin.xml
similarity index 100%
rename from modules/analytics/distribution/src/assembly/bin.xml
rename to modules-old/analytics/distribution/src/assembly/bin.xml
diff --git a/modules/analytics/distribution/src/assembly/dist.xml b/modules-old/analytics/distribution/src/assembly/dist.xml
similarity index 100%
rename from modules/analytics/distribution/src/assembly/dist.xml
rename to modules-old/analytics/distribution/src/assembly/dist.xml
diff --git a/modules/analytics/distribution/src/assembly/filter.properties b/modules-old/analytics/distribution/src/assembly/filter.properties
similarity index 100%
rename from modules/analytics/distribution/src/assembly/filter.properties
rename to modules-old/analytics/distribution/src/assembly/filter.properties
diff --git a/modules/analytics/distribution/src/bin/load-spark-env-vars.bat b/modules-old/analytics/distribution/src/bin/load-spark-env-vars.bat
similarity index 100%
rename from modules/analytics/distribution/src/bin/load-spark-env-vars.bat
rename to modules-old/analytics/distribution/src/bin/load-spark-env-vars.bat
diff --git a/modules/analytics/distribution/src/bin/load-spark-env-vars.sh b/modules-old/analytics/distribution/src/bin/load-spark-env-vars.sh
similarity index 100%
rename from modules/analytics/distribution/src/bin/load-spark-env-vars.sh
rename to modules-old/analytics/distribution/src/bin/load-spark-env-vars.sh
diff --git a/modules/analytics/distribution/src/bin/wso2server.bat b/modules-old/analytics/distribution/src/bin/wso2server.bat
similarity index 100%
rename from modules/analytics/distribution/src/bin/wso2server.bat
rename to modules-old/analytics/distribution/src/bin/wso2server.bat
diff --git a/modules/analytics/distribution/src/bin/wso2server.sh b/modules-old/analytics/distribution/src/bin/wso2server.sh
similarity index 100%
rename from modules/analytics/distribution/src/bin/wso2server.sh
rename to modules-old/analytics/distribution/src/bin/wso2server.sh
diff --git a/modules/analytics/distribution/src/main/resources/LICENSE.txt b/modules-old/analytics/distribution/src/main/resources/LICENSE.txt
similarity index 100%
rename from modules/analytics/distribution/src/main/resources/LICENSE.txt
rename to modules-old/analytics/distribution/src/main/resources/LICENSE.txt
diff --git a/modules/analytics/distribution/src/repository/conf/analytics/spark/spark-udf-config.xml b/modules-old/analytics/distribution/src/repository/conf/analytics/spark/spark-udf-config.xml
similarity index 100%
rename from modules/analytics/distribution/src/repository/conf/analytics/spark/spark-udf-config.xml
rename to modules-old/analytics/distribution/src/repository/conf/analytics/spark/spark-udf-config.xml
diff --git a/modules/analytics/distribution/src/repository/conf/carbon.xml b/modules-old/analytics/distribution/src/repository/conf/carbon.xml
similarity index 100%
rename from modules/analytics/distribution/src/repository/conf/carbon.xml
rename to modules-old/analytics/distribution/src/repository/conf/carbon.xml
diff --git a/modules/analytics/distribution/src/repository/conf/jndi.properties b/modules-old/analytics/distribution/src/repository/conf/jndi.properties
similarity index 100%
rename from modules/analytics/distribution/src/repository/conf/jndi.properties
rename to modules-old/analytics/distribution/src/repository/conf/jndi.properties
diff --git a/modules/analytics/distribution/src/repository/conf/log4j.properties b/modules-old/analytics/distribution/src/repository/conf/log4j.properties
similarity index 100%
rename from modules/analytics/distribution/src/repository/conf/log4j.properties
rename to modules-old/analytics/distribution/src/repository/conf/log4j.properties
diff --git a/modules/analytics/distribution/src/repository/conf/registry.xml b/modules-old/analytics/distribution/src/repository/conf/registry.xml
similarity index 100%
rename from modules/analytics/distribution/src/repository/conf/registry.xml
rename to modules-old/analytics/distribution/src/repository/conf/registry.xml
diff --git a/modules/analytics/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties b/modules-old/analytics/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties
similarity index 100%
rename from modules/analytics/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties
rename to modules-old/analytics/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties
diff --git a/modules/analytics/distribution/src/repository/conf/security/authenticators.xml b/modules-old/analytics/distribution/src/repository/conf/security/authenticators.xml
similarity index 100%
rename from modules/analytics/distribution/src/repository/conf/security/authenticators.xml
rename to modules-old/analytics/distribution/src/repository/conf/security/authenticators.xml
diff --git a/modules/analytics/distribution/src/repository/conf/security/cipher-text.properties b/modules-old/analytics/distribution/src/repository/conf/security/cipher-text.properties
similarity index 100%
rename from modules/analytics/distribution/src/repository/conf/security/cipher-text.properties
rename to modules-old/analytics/distribution/src/repository/conf/security/cipher-text.properties
diff --git a/modules/analytics/distribution/src/repository/conf/security/cipher-tool.properties b/modules-old/analytics/distribution/src/repository/conf/security/cipher-tool.properties
similarity index 100%
rename from modules/analytics/distribution/src/repository/conf/security/cipher-tool.properties
rename to modules-old/analytics/distribution/src/repository/conf/security/cipher-tool.properties
diff --git a/modules/analytics/distribution/src/repository/jaggeryapps/portal/jaggery.conf b/modules-old/analytics/distribution/src/repository/jaggeryapps/portal/jaggery.conf
similarity index 100%
rename from modules/analytics/distribution/src/repository/jaggeryapps/portal/jaggery.conf
rename to modules-old/analytics/distribution/src/repository/jaggeryapps/portal/jaggery.conf
diff --git a/modules/analytics/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handler-utils.js b/modules-old/analytics/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handler-utils.js
similarity index 100%
rename from modules/analytics/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handler-utils.js
rename to modules-old/analytics/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handler-utils.js
diff --git a/modules/analytics/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handlers.js b/modules-old/analytics/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handlers.js
similarity index 100%
rename from modules/analytics/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handlers.js
rename to modules-old/analytics/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handlers.js
diff --git a/modules/analytics/distribution/src/repository/resources/geodashboard/events.csv b/modules-old/analytics/distribution/src/repository/resources/geodashboard/events.csv
similarity index 100%
rename from modules/analytics/distribution/src/repository/resources/geodashboard/events.csv
rename to modules-old/analytics/distribution/src/repository/resources/geodashboard/events.csv
diff --git a/modules/analytics/distribution/src/repository/resources/geodashboard/events_streamConfiguration.xml b/modules-old/analytics/distribution/src/repository/resources/geodashboard/events_streamConfiguration.xml
similarity index 100%
rename from modules/analytics/distribution/src/repository/resources/geodashboard/events_streamConfiguration.xml
rename to modules-old/analytics/distribution/src/repository/resources/geodashboard/events_streamConfiguration.xml
diff --git a/modules/analytics/distribution/src/repository/resources/portal/libs/VizGrammar_2.js b/modules-old/analytics/distribution/src/repository/resources/portal/libs/VizGrammar_2.js
similarity index 100%
rename from modules/analytics/distribution/src/repository/resources/portal/libs/VizGrammar_2.js
rename to modules-old/analytics/distribution/src/repository/resources/portal/libs/VizGrammar_2.js
diff --git a/modules/analytics/distribution/src/repository/resources/portal/libs/iot-gadget-utils.js b/modules-old/analytics/distribution/src/repository/resources/portal/libs/iot-gadget-utils.js
similarity index 100%
rename from modules/analytics/distribution/src/repository/resources/portal/libs/iot-gadget-utils.js
rename to modules-old/analytics/distribution/src/repository/resources/portal/libs/iot-gadget-utils.js
diff --git a/modules/analytics/distribution/src/ues/designer.json b/modules-old/analytics/distribution/src/ues/designer.json
similarity index 100%
rename from modules/analytics/distribution/src/ues/designer.json
rename to modules-old/analytics/distribution/src/ues/designer.json
diff --git a/modules/analytics/p2-profile-gen/carbon.product b/modules-old/analytics/p2-profile-gen/carbon.product
similarity index 100%
rename from modules/analytics/p2-profile-gen/carbon.product
rename to modules-old/analytics/p2-profile-gen/carbon.product
diff --git a/modules/analytics/p2-profile-gen/pom.xml b/modules-old/analytics/p2-profile-gen/pom.xml
similarity index 100%
rename from modules/analytics/p2-profile-gen/pom.xml
rename to modules-old/analytics/p2-profile-gen/pom.xml
diff --git a/modules/analytics/pom.xml b/modules-old/analytics/pom.xml
similarity index 100%
rename from modules/analytics/pom.xml
rename to modules-old/analytics/pom.xml
diff --git a/modules/broker/distribution/lib/home/images/bottom.gif b/modules-old/broker/distribution/lib/home/images/bottom.gif
similarity index 100%
rename from modules/broker/distribution/lib/home/images/bottom.gif
rename to modules-old/broker/distribution/lib/home/images/bottom.gif
diff --git a/modules/broker/distribution/lib/home/images/content-bg.gif b/modules-old/broker/distribution/lib/home/images/content-bg.gif
similarity index 100%
rename from modules/broker/distribution/lib/home/images/content-bg.gif
rename to modules-old/broker/distribution/lib/home/images/content-bg.gif
diff --git a/modules/broker/distribution/lib/home/images/favicon.ico b/modules-old/broker/distribution/lib/home/images/favicon.ico
similarity index 100%
rename from modules/broker/distribution/lib/home/images/favicon.ico
rename to modules-old/broker/distribution/lib/home/images/favicon.ico
diff --git a/modules/broker/distribution/lib/home/images/feature-01-icon.gif b/modules-old/broker/distribution/lib/home/images/feature-01-icon.gif
similarity index 100%
rename from modules/broker/distribution/lib/home/images/feature-01-icon.gif
rename to modules-old/broker/distribution/lib/home/images/feature-01-icon.gif
diff --git a/modules/broker/distribution/lib/home/images/feature-02-icon.gif b/modules-old/broker/distribution/lib/home/images/feature-02-icon.gif
similarity index 100%
rename from modules/broker/distribution/lib/home/images/feature-02-icon.gif
rename to modules-old/broker/distribution/lib/home/images/feature-02-icon.gif
diff --git a/modules/broker/distribution/lib/home/images/feature-03-icon.gif b/modules-old/broker/distribution/lib/home/images/feature-03-icon.gif
similarity index 100%
rename from modules/broker/distribution/lib/home/images/feature-03-icon.gif
rename to modules-old/broker/distribution/lib/home/images/feature-03-icon.gif
diff --git a/modules/broker/distribution/lib/home/images/intro-bg.gif b/modules-old/broker/distribution/lib/home/images/intro-bg.gif
similarity index 100%
rename from modules/broker/distribution/lib/home/images/intro-bg.gif
rename to modules-old/broker/distribution/lib/home/images/intro-bg.gif
diff --git a/modules/broker/distribution/lib/home/images/logo.gif b/modules-old/broker/distribution/lib/home/images/logo.gif
similarity index 100%
rename from modules/broker/distribution/lib/home/images/logo.gif
rename to modules-old/broker/distribution/lib/home/images/logo.gif
diff --git a/modules/broker/distribution/lib/home/images/powered-logo.gif b/modules-old/broker/distribution/lib/home/images/powered-logo.gif
similarity index 100%
rename from modules/broker/distribution/lib/home/images/powered-logo.gif
rename to modules-old/broker/distribution/lib/home/images/powered-logo.gif
diff --git a/modules/broker/distribution/lib/home/images/register.gif b/modules-old/broker/distribution/lib/home/images/register.gif
similarity index 100%
rename from modules/broker/distribution/lib/home/images/register.gif
rename to modules-old/broker/distribution/lib/home/images/register.gif
diff --git a/modules/broker/distribution/lib/home/images/sign-in.gif b/modules-old/broker/distribution/lib/home/images/sign-in.gif
similarity index 100%
rename from modules/broker/distribution/lib/home/images/sign-in.gif
rename to modules-old/broker/distribution/lib/home/images/sign-in.gif
diff --git a/modules/broker/distribution/lib/home/images/title-bg.gif b/modules-old/broker/distribution/lib/home/images/title-bg.gif
similarity index 100%
rename from modules/broker/distribution/lib/home/images/title-bg.gif
rename to modules-old/broker/distribution/lib/home/images/title-bg.gif
diff --git a/modules/broker/distribution/lib/home/images/top.gif b/modules-old/broker/distribution/lib/home/images/top.gif
similarity index 100%
rename from modules/broker/distribution/lib/home/images/top.gif
rename to modules-old/broker/distribution/lib/home/images/top.gif
diff --git a/modules/broker/distribution/lib/home/index.html b/modules-old/broker/distribution/lib/home/index.html
similarity index 100%
rename from modules/broker/distribution/lib/home/index.html
rename to modules-old/broker/distribution/lib/home/index.html
diff --git a/modules/broker/distribution/lib/home/style.css b/modules-old/broker/distribution/lib/home/style.css
similarity index 100%
rename from modules/broker/distribution/lib/home/style.css
rename to modules-old/broker/distribution/lib/home/style.css
diff --git a/modules/broker/distribution/pom.xml b/modules-old/broker/distribution/pom.xml
similarity index 100%
rename from modules/broker/distribution/pom.xml
rename to modules-old/broker/distribution/pom.xml
diff --git a/modules/broker/distribution/src/main/assembly/bin.xml b/modules-old/broker/distribution/src/main/assembly/bin.xml
similarity index 100%
rename from modules/broker/distribution/src/main/assembly/bin.xml
rename to modules-old/broker/distribution/src/main/assembly/bin.xml
diff --git a/modules/broker/distribution/src/main/assembly/dist.xml b/modules-old/broker/distribution/src/main/assembly/dist.xml
similarity index 100%
rename from modules/broker/distribution/src/main/assembly/dist.xml
rename to modules-old/broker/distribution/src/main/assembly/dist.xml
diff --git a/modules/broker/distribution/src/main/assembly/filter.properties b/modules-old/broker/distribution/src/main/assembly/filter.properties
similarity index 100%
rename from modules/broker/distribution/src/main/assembly/filter.properties
rename to modules-old/broker/distribution/src/main/assembly/filter.properties
diff --git a/modules/broker/distribution/src/main/conf/axis2.xml b/modules-old/broker/distribution/src/main/conf/axis2.xml
similarity index 100%
rename from modules/broker/distribution/src/main/conf/axis2.xml
rename to modules-old/broker/distribution/src/main/conf/axis2.xml
diff --git a/modules/broker/distribution/src/main/conf/broker.xml b/modules-old/broker/distribution/src/main/conf/broker.xml
similarity index 100%
rename from modules/broker/distribution/src/main/conf/broker.xml
rename to modules-old/broker/distribution/src/main/conf/broker.xml
diff --git a/modules/broker/distribution/src/main/conf/carbon.xml b/modules-old/broker/distribution/src/main/conf/carbon.xml
similarity index 100%
rename from modules/broker/distribution/src/main/conf/carbon.xml
rename to modules-old/broker/distribution/src/main/conf/carbon.xml
diff --git a/modules/broker/distribution/src/main/conf/cipher-text.properties b/modules-old/broker/distribution/src/main/conf/cipher-text.properties
similarity index 100%
rename from modules/broker/distribution/src/main/conf/cipher-text.properties
rename to modules-old/broker/distribution/src/main/conf/cipher-text.properties
diff --git a/modules/broker/distribution/src/main/conf/cipher-tool.properties b/modules-old/broker/distribution/src/main/conf/cipher-tool.properties
similarity index 100%
rename from modules/broker/distribution/src/main/conf/cipher-tool.properties
rename to modules-old/broker/distribution/src/main/conf/cipher-tool.properties
diff --git a/modules/broker/distribution/src/main/conf/hazelcast.properties b/modules-old/broker/distribution/src/main/conf/hazelcast.properties
similarity index 100%
rename from modules/broker/distribution/src/main/conf/hazelcast.properties
rename to modules-old/broker/distribution/src/main/conf/hazelcast.properties
diff --git a/modules/broker/distribution/src/main/conf/master-datasources.xml b/modules-old/broker/distribution/src/main/conf/master-datasources.xml
similarity index 100%
rename from modules/broker/distribution/src/main/conf/master-datasources.xml
rename to modules-old/broker/distribution/src/main/conf/master-datasources.xml
diff --git a/modules/broker/distribution/src/main/conf/messaging-event-broker.xml b/modules-old/broker/distribution/src/main/conf/messaging-event-broker.xml
similarity index 100%
rename from modules/broker/distribution/src/main/conf/messaging-event-broker.xml
rename to modules-old/broker/distribution/src/main/conf/messaging-event-broker.xml
diff --git a/modules/broker/distribution/src/main/conf/metrics.xml b/modules-old/broker/distribution/src/main/conf/metrics.xml
similarity index 100%
rename from modules/broker/distribution/src/main/conf/metrics.xml
rename to modules-old/broker/distribution/src/main/conf/metrics.xml
diff --git a/modules/broker/distribution/src/main/conf/web.xml b/modules-old/broker/distribution/src/main/conf/web.xml
similarity index 100%
rename from modules/broker/distribution/src/main/conf/web.xml
rename to modules-old/broker/distribution/src/main/conf/web.xml
diff --git a/modules/broker/distribution/src/main/resources/LICENSE.txt b/modules-old/broker/distribution/src/main/resources/LICENSE.txt
similarity index 100%
rename from modules/broker/distribution/src/main/resources/LICENSE.txt
rename to modules-old/broker/distribution/src/main/resources/LICENSE.txt
diff --git a/modules/broker/distribution/src/main/resources/README.md b/modules-old/broker/distribution/src/main/resources/README.md
similarity index 100%
rename from modules/broker/distribution/src/main/resources/README.md
rename to modules-old/broker/distribution/src/main/resources/README.md
diff --git a/modules/broker/distribution/src/main/resources/README.txt b/modules-old/broker/distribution/src/main/resources/README.txt
similarity index 100%
rename from modules/broker/distribution/src/main/resources/README.txt
rename to modules-old/broker/distribution/src/main/resources/README.txt
diff --git a/modules/broker/distribution/src/main/resources/launch.ini b/modules-old/broker/distribution/src/main/resources/launch.ini
similarity index 100%
rename from modules/broker/distribution/src/main/resources/launch.ini
rename to modules-old/broker/distribution/src/main/resources/launch.ini
diff --git a/modules/broker/distribution/src/main/resources/log4j.properties b/modules-old/broker/distribution/src/main/resources/log4j.properties
similarity index 100%
rename from modules/broker/distribution/src/main/resources/log4j.properties
rename to modules-old/broker/distribution/src/main/resources/log4j.properties
diff --git a/modules/broker/distribution/src/main/resources/release-notes.xml b/modules-old/broker/distribution/src/main/resources/release-notes.xml
similarity index 100%
rename from modules/broker/distribution/src/main/resources/release-notes.xml
rename to modules-old/broker/distribution/src/main/resources/release-notes.xml
diff --git a/modules/broker/distribution/src/main/resources/wso2server.bat b/modules-old/broker/distribution/src/main/resources/wso2server.bat
similarity index 100%
rename from modules/broker/distribution/src/main/resources/wso2server.bat
rename to modules-old/broker/distribution/src/main/resources/wso2server.bat
diff --git a/modules/broker/distribution/src/main/resources/wso2server.sh b/modules-old/broker/distribution/src/main/resources/wso2server.sh
similarity index 100%
rename from modules/broker/distribution/src/main/resources/wso2server.sh
rename to modules-old/broker/distribution/src/main/resources/wso2server.sh
diff --git a/modules/broker/p2-profile/carbon.product b/modules-old/broker/p2-profile/carbon.product
similarity index 100%
rename from modules/broker/p2-profile/carbon.product
rename to modules-old/broker/p2-profile/carbon.product
diff --git a/modules/broker/p2-profile/pom.xml b/modules-old/broker/p2-profile/pom.xml
similarity index 100%
rename from modules/broker/p2-profile/pom.xml
rename to modules-old/broker/p2-profile/pom.xml
diff --git a/modules/broker/pom.xml b/modules-old/broker/pom.xml
similarity index 100%
rename from modules/broker/pom.xml
rename to modules-old/broker/pom.xml
diff --git a/modules/core/distribution/INSTALL.txt b/modules-old/core/distribution/INSTALL.txt
similarity index 100%
rename from modules/core/distribution/INSTALL.txt
rename to modules-old/core/distribution/INSTALL.txt
diff --git a/modules/core/distribution/LICENSE.txt b/modules-old/core/distribution/LICENSE.txt
similarity index 100%
rename from modules/core/distribution/LICENSE.txt
rename to modules-old/core/distribution/LICENSE.txt
diff --git a/modules/core/distribution/README.txt b/modules-old/core/distribution/README.txt
similarity index 100%
rename from modules/core/distribution/README.txt
rename to modules-old/core/distribution/README.txt
diff --git a/modules/core/distribution/email-admin-config.xml b/modules-old/core/distribution/email-admin-config.xml
similarity index 100%
rename from modules/core/distribution/email-admin-config.xml
rename to modules-old/core/distribution/email-admin-config.xml
diff --git a/modules/core/distribution/identity-mgt.properties b/modules-old/core/distribution/identity-mgt.properties
similarity index 100%
rename from modules/core/distribution/identity-mgt.properties
rename to modules-old/core/distribution/identity-mgt.properties
diff --git a/modules/core/distribution/identity_config_change.xml b/modules-old/core/distribution/identity_config_change.xml
similarity index 100%
rename from modules/core/distribution/identity_config_change.xml
rename to modules-old/core/distribution/identity_config_change.xml
diff --git a/modules/core/distribution/input-adapter-change.xml b/modules-old/core/distribution/input-adapter-change.xml
similarity index 100%
rename from modules/core/distribution/input-adapter-change.xml
rename to modules-old/core/distribution/input-adapter-change.xml
diff --git a/modules/core/distribution/output-adapter-change.xml b/modules-old/core/distribution/output-adapter-change.xml
similarity index 100%
rename from modules/core/distribution/output-adapter-change.xml
rename to modules-old/core/distribution/output-adapter-change.xml
diff --git a/modules/core/distribution/pom.xml b/modules-old/core/distribution/pom.xml
similarity index 100%
rename from modules/core/distribution/pom.xml
rename to modules-old/core/distribution/pom.xml
diff --git a/modules/core/distribution/release-notes.html b/modules-old/core/distribution/release-notes.html
similarity index 100%
rename from modules/core/distribution/release-notes.html
rename to modules-old/core/distribution/release-notes.html
diff --git a/modules/core/distribution/src/api-resources/api_templates/default_api_template.xml b/modules-old/core/distribution/src/api-resources/api_templates/default_api_template.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/api_templates/default_api_template.xml
rename to modules-old/core/distribution/src/api-resources/api_templates/default_api_template.xml
diff --git a/modules/core/distribution/src/api-resources/api_templates/prototype_template.xml b/modules-old/core/distribution/src/api-resources/api_templates/prototype_template.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/api_templates/prototype_template.xml
rename to modules-old/core/distribution/src/api-resources/api_templates/prototype_template.xml
diff --git a/modules/core/distribution/src/api-resources/api_templates/velocity_template.xml b/modules-old/core/distribution/src/api-resources/api_templates/velocity_template.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/api_templates/velocity_template.xml
rename to modules-old/core/distribution/src/api-resources/api_templates/velocity_template.xml
diff --git a/modules/core/distribution/src/api-resources/customsequences/fault/json_fault.xml b/modules-old/core/distribution/src/api-resources/customsequences/fault/json_fault.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/customsequences/fault/json_fault.xml
rename to modules-old/core/distribution/src/api-resources/customsequences/fault/json_fault.xml
diff --git a/modules/core/distribution/src/api-resources/customsequences/in/json_to_xml_in_message.xml b/modules-old/core/distribution/src/api-resources/customsequences/in/json_to_xml_in_message.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/customsequences/in/json_to_xml_in_message.xml
rename to modules-old/core/distribution/src/api-resources/customsequences/in/json_to_xml_in_message.xml
diff --git a/modules/core/distribution/src/api-resources/customsequences/in/log_in_message.xml b/modules-old/core/distribution/src/api-resources/customsequences/in/log_in_message.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/customsequences/in/log_in_message.xml
rename to modules-old/core/distribution/src/api-resources/customsequences/in/log_in_message.xml
diff --git a/modules/core/distribution/src/api-resources/customsequences/in/preserve_accept_header.xml b/modules-old/core/distribution/src/api-resources/customsequences/in/preserve_accept_header.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/customsequences/in/preserve_accept_header.xml
rename to modules-old/core/distribution/src/api-resources/customsequences/in/preserve_accept_header.xml
diff --git a/modules/core/distribution/src/api-resources/customsequences/in/xml_to_json_in_message.xml b/modules-old/core/distribution/src/api-resources/customsequences/in/xml_to_json_in_message.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/customsequences/in/xml_to_json_in_message.xml
rename to modules-old/core/distribution/src/api-resources/customsequences/in/xml_to_json_in_message.xml
diff --git a/modules/core/distribution/src/api-resources/customsequences/out/apply_accept_header.xml b/modules-old/core/distribution/src/api-resources/customsequences/out/apply_accept_header.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/customsequences/out/apply_accept_header.xml
rename to modules-old/core/distribution/src/api-resources/customsequences/out/apply_accept_header.xml
diff --git a/modules/core/distribution/src/api-resources/customsequences/out/json_to_xml_out_message.xml b/modules-old/core/distribution/src/api-resources/customsequences/out/json_to_xml_out_message.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/customsequences/out/json_to_xml_out_message.xml
rename to modules-old/core/distribution/src/api-resources/customsequences/out/json_to_xml_out_message.xml
diff --git a/modules/core/distribution/src/api-resources/customsequences/out/log_out_message.xml b/modules-old/core/distribution/src/api-resources/customsequences/out/log_out_message.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/customsequences/out/log_out_message.xml
rename to modules-old/core/distribution/src/api-resources/customsequences/out/log_out_message.xml
diff --git a/modules/core/distribution/src/api-resources/customsequences/out/xml_to_json_out_message.xml b/modules-old/core/distribution/src/api-resources/customsequences/out/xml_to_json_out_message.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/customsequences/out/xml_to_json_out_message.xml
rename to modules-old/core/distribution/src/api-resources/customsequences/out/xml_to_json_out_message.xml
diff --git a/modules/core/distribution/src/api-resources/default-tiers/default-app-tiers.xml b/modules-old/core/distribution/src/api-resources/default-tiers/default-app-tiers.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/default-tiers/default-app-tiers.xml
rename to modules-old/core/distribution/src/api-resources/default-tiers/default-app-tiers.xml
diff --git a/modules/core/distribution/src/api-resources/default-tiers/default-res-tiers.xml b/modules-old/core/distribution/src/api-resources/default-tiers/default-res-tiers.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/default-tiers/default-res-tiers.xml
rename to modules-old/core/distribution/src/api-resources/default-tiers/default-res-tiers.xml
diff --git a/modules/core/distribution/src/api-resources/default-tiers/default-tiers.xml b/modules-old/core/distribution/src/api-resources/default-tiers/default-tiers.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/default-tiers/default-tiers.xml
rename to modules-old/core/distribution/src/api-resources/default-tiers/default-tiers.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/api/_API_Application_Registration_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/api/_AuthorizeAPI_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_RevokeAPI_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/api/_RevokeAPI_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/api/_RevokeAPI_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/api/_RevokeAPI_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_TokenAPI_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/api/_TokenAPI_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/api/_TokenAPI_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/api/_TokenAPI_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/api/_UserInfoAPI_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/proxy-services/WorkflowCallbackService.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/proxy-services/WorkflowCallbackService.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/proxy-services/WorkflowCallbackService.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/proxy-services/WorkflowCallbackService.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/registry.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/registry.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/registry.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/registry.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_api_registration_fault_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_api_registration_fault_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_api_registration_fault_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_api_registration_fault_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_auth_failure_handler_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_auth_failure_handler_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_auth_failure_handler_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_auth_failure_handler_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_build_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_build_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_build_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_build_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_cors_request_handler_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_cors_request_handler_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_cors_request_handler_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_cors_request_handler_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_dcr_fault_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_dcr_fault_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_dcr_fault_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_dcr_fault_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_production_key_error_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_production_key_error_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_production_key_error_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_production_key_error_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_resource_mismatch_handler_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_resource_mismatch_handler_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_resource_mismatch_handler_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_resource_mismatch_handler_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_sandbox_key_error_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_sandbox_key_error_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_sandbox_key_error_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_sandbox_key_error_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_throttle_out_handler_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_throttle_out_handler_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_throttle_out_handler_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_throttle_out_handler_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_token_fault_.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_token_fault_.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/sequences/_token_fault_.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/_token_fault_.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/sequences/fault.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/fault.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/sequences/fault.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/fault.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/sequences/main.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/main.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/sequences/main.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/sequences/main.xml
diff --git a/modules/core/distribution/src/api-resources/synapse-configs/default/synapse.xml b/modules-old/core/distribution/src/api-resources/synapse-configs/default/synapse.xml
similarity index 100%
rename from modules/core/distribution/src/api-resources/synapse-configs/default/synapse.xml
rename to modules-old/core/distribution/src/api-resources/synapse-configs/default/synapse.xml
diff --git a/modules/core/distribution/src/assembly/bin.xml b/modules-old/core/distribution/src/assembly/bin.xml
similarity index 100%
rename from modules/core/distribution/src/assembly/bin.xml
rename to modules-old/core/distribution/src/assembly/bin.xml
diff --git a/modules/core/distribution/src/assembly/dist.xml b/modules-old/core/distribution/src/assembly/dist.xml
similarity index 100%
rename from modules/core/distribution/src/assembly/dist.xml
rename to modules-old/core/distribution/src/assembly/dist.xml
diff --git a/modules/core/distribution/src/assembly/docs.xml b/modules-old/core/distribution/src/assembly/docs.xml
similarity index 100%
rename from modules/core/distribution/src/assembly/docs.xml
rename to modules-old/core/distribution/src/assembly/docs.xml
diff --git a/modules/core/distribution/src/assembly/filter.properties b/modules-old/core/distribution/src/assembly/filter.properties
similarity index 100%
rename from modules/core/distribution/src/assembly/filter.properties
rename to modules-old/core/distribution/src/assembly/filter.properties
diff --git a/modules/core/distribution/src/assembly/src.xml b/modules-old/core/distribution/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/assembly/src.xml
rename to modules-old/core/distribution/src/assembly/src.xml
diff --git a/modules/core/distribution/src/repository/bin/wso2server.bat b/modules-old/core/distribution/src/repository/bin/wso2server.bat
similarity index 100%
rename from modules/core/distribution/src/repository/bin/wso2server.bat
rename to modules-old/core/distribution/src/repository/bin/wso2server.bat
diff --git a/modules/core/distribution/src/repository/bin/wso2server.sh b/modules-old/core/distribution/src/repository/bin/wso2server.sh
similarity index 100%
rename from modules/core/distribution/src/repository/bin/wso2server.sh
rename to modules-old/core/distribution/src/repository/bin/wso2server.sh
diff --git a/modules/core/distribution/src/repository/cloud/portal/common.css b/modules-old/core/distribution/src/repository/cloud/portal/common.css
similarity index 100%
rename from modules/core/distribution/src/repository/cloud/portal/common.css
rename to modules-old/core/distribution/src/repository/cloud/portal/common.css
diff --git a/modules/core/distribution/src/repository/cloud/portal/global-navigation.jag b/modules-old/core/distribution/src/repository/cloud/portal/global-navigation.jag
similarity index 100%
rename from modules/core/distribution/src/repository/cloud/portal/global-navigation.jag
rename to modules-old/core/distribution/src/repository/cloud/portal/global-navigation.jag
diff --git a/modules/core/distribution/src/repository/cloud/portal/portal.js b/modules-old/core/distribution/src/repository/cloud/portal/portal.js
similarity index 100%
rename from modules/core/distribution/src/repository/cloud/portal/portal.js
rename to modules-old/core/distribution/src/repository/cloud/portal/portal.js
diff --git a/modules/core/distribution/src/repository/conf/analytics/analytics-data-config.xml b/modules-old/core/distribution/src/repository/conf/analytics/analytics-data-config.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/analytics/analytics-data-config.xml
rename to modules-old/core/distribution/src/repository/conf/analytics/analytics-data-config.xml
diff --git a/modules/core/distribution/src/repository/conf/api-manager.xml b/modules-old/core/distribution/src/repository/conf/api-manager.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/api-manager.xml
rename to modules-old/core/distribution/src/repository/conf/api-manager.xml
diff --git a/modules/core/distribution/src/repository/conf/app-manager.xml b/modules-old/core/distribution/src/repository/conf/app-manager.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/app-manager.xml
rename to modules-old/core/distribution/src/repository/conf/app-manager.xml
diff --git a/modules/core/distribution/src/repository/conf/application-authenticators.xml b/modules-old/core/distribution/src/repository/conf/application-authenticators.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/application-authenticators.xml
rename to modules-old/core/distribution/src/repository/conf/application-authenticators.xml
diff --git a/modules/core/distribution/src/repository/conf/axis2/axis2.xml b/modules-old/core/distribution/src/repository/conf/axis2/axis2.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/axis2/axis2.xml
rename to modules-old/core/distribution/src/repository/conf/axis2/axis2.xml
diff --git a/modules/core/distribution/src/repository/conf/axis2/axis2_client.xml b/modules-old/core/distribution/src/repository/conf/axis2/axis2_client.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/axis2/axis2_client.xml
rename to modules-old/core/distribution/src/repository/conf/axis2/axis2_client.xml
diff --git a/modules/core/distribution/src/repository/conf/carbon.xml b/modules-old/core/distribution/src/repository/conf/carbon.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/carbon.xml
rename to modules-old/core/distribution/src/repository/conf/carbon.xml
diff --git a/modules/core/distribution/src/repository/conf/data-bridge/cassandra-datasink-config.xml b/modules-old/core/distribution/src/repository/conf/data-bridge/cassandra-datasink-config.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/data-bridge/cassandra-datasink-config.xml
rename to modules-old/core/distribution/src/repository/conf/data-bridge/cassandra-datasink-config.xml
diff --git a/modules/core/distribution/src/repository/conf/data-bridge/stream-definitions.xml b/modules-old/core/distribution/src/repository/conf/data-bridge/stream-definitions.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/data-bridge/stream-definitions.xml
rename to modules-old/core/distribution/src/repository/conf/data-bridge/stream-definitions.xml
diff --git a/modules/core/distribution/src/repository/conf/datasources/cdm-datasources.xml b/modules-old/core/distribution/src/repository/conf/datasources/cdm-datasources.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/datasources/cdm-datasources.xml
rename to modules-old/core/distribution/src/repository/conf/datasources/cdm-datasources.xml
diff --git a/modules/core/distribution/src/repository/conf/datasources/master-datasources.xml b/modules-old/core/distribution/src/repository/conf/datasources/master-datasources.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/datasources/master-datasources.xml
rename to modules-old/core/distribution/src/repository/conf/datasources/master-datasources.xml
diff --git a/modules/core/distribution/src/repository/conf/entitlement.properties b/modules-old/core/distribution/src/repository/conf/entitlement.properties
similarity index 100%
rename from modules/core/distribution/src/repository/conf/entitlement.properties
rename to modules-old/core/distribution/src/repository/conf/entitlement.properties
diff --git a/modules/core/distribution/src/repository/conf/etc/device-analytics-config.xml b/modules-old/core/distribution/src/repository/conf/etc/device-analytics-config.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/etc/device-analytics-config.xml
rename to modules-old/core/distribution/src/repository/conf/etc/device-analytics-config.xml
diff --git a/modules/core/distribution/src/repository/conf/etc/launch.ini b/modules-old/core/distribution/src/repository/conf/etc/launch.ini
similarity index 100%
rename from modules/core/distribution/src/repository/conf/etc/launch.ini
rename to modules-old/core/distribution/src/repository/conf/etc/launch.ini
diff --git a/modules/core/distribution/src/repository/conf/etc/webapp-publisher-config.xml b/modules-old/core/distribution/src/repository/conf/etc/webapp-publisher-config.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/etc/webapp-publisher-config.xml
rename to modules-old/core/distribution/src/repository/conf/etc/webapp-publisher-config.xml
diff --git a/modules/core/distribution/src/repository/conf/event-broker.xml b/modules-old/core/distribution/src/repository/conf/event-broker.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/event-broker.xml
rename to modules-old/core/distribution/src/repository/conf/event-broker.xml
diff --git a/modules/core/distribution/src/repository/conf/identity/application-authentication.xml b/modules-old/core/distribution/src/repository/conf/identity/application-authentication.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/identity/application-authentication.xml
rename to modules-old/core/distribution/src/repository/conf/identity/application-authentication.xml
diff --git a/modules/core/distribution/src/repository/conf/identity/identity-providers/default.xml b/modules-old/core/distribution/src/repository/conf/identity/identity-providers/default.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/identity/identity-providers/default.xml
rename to modules-old/core/distribution/src/repository/conf/identity/identity-providers/default.xml
diff --git a/modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml b/modules-old/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
rename to modules-old/core/distribution/src/repository/conf/identity/identity-providers/iot_default.xml
diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml b/modules-old/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml
rename to modules-old/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml
diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/default.xml b/modules-old/core/distribution/src/repository/conf/identity/service-providers/default.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/identity/service-providers/default.xml
rename to modules-old/core/distribution/src/repository/conf/identity/service-providers/default.xml
diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml b/modules-old/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml
rename to modules-old/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml
diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml b/modules-old/core/distribution/src/repository/conf/identity/service-providers/portal.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml
rename to modules-old/core/distribution/src/repository/conf/identity/service-providers/portal.xml
diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml b/modules-old/core/distribution/src/repository/conf/identity/service-providers/publisher.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/identity/service-providers/publisher.xml
rename to modules-old/core/distribution/src/repository/conf/identity/service-providers/publisher.xml
diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/sp_cdm.xml b/modules-old/core/distribution/src/repository/conf/identity/service-providers/sp_cdm.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/identity/service-providers/sp_cdm.xml
rename to modules-old/core/distribution/src/repository/conf/identity/service-providers/sp_cdm.xml
diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/sp_mdm.xml b/modules-old/core/distribution/src/repository/conf/identity/service-providers/sp_mdm.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/identity/service-providers/sp_mdm.xml
rename to modules-old/core/distribution/src/repository/conf/identity/service-providers/sp_mdm.xml
diff --git a/modules/core/distribution/src/repository/conf/identity/service-providers/store.xml b/modules-old/core/distribution/src/repository/conf/identity/service-providers/store.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/identity/service-providers/store.xml
rename to modules-old/core/distribution/src/repository/conf/identity/service-providers/store.xml
diff --git a/modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml b/modules-old/core/distribution/src/repository/conf/identity/sso-idp-config.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/identity/sso-idp-config.xml
rename to modules-old/core/distribution/src/repository/conf/identity/sso-idp-config.xml
diff --git a/modules/core/distribution/src/repository/conf/license-config.xml b/modules-old/core/distribution/src/repository/conf/license-config.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/license-config.xml
rename to modules-old/core/distribution/src/repository/conf/license-config.xml
diff --git a/modules/core/distribution/src/repository/conf/log4j.properties b/modules-old/core/distribution/src/repository/conf/log4j.properties
similarity index 100%
rename from modules/core/distribution/src/repository/conf/log4j.properties
rename to modules-old/core/distribution/src/repository/conf/log4j.properties
diff --git a/modules/core/distribution/src/repository/conf/multitenancy/cloud-services-desc.xml b/modules-old/core/distribution/src/repository/conf/multitenancy/cloud-services-desc.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/multitenancy/cloud-services-desc.xml
rename to modules-old/core/distribution/src/repository/conf/multitenancy/cloud-services-desc.xml
diff --git a/modules/core/distribution/src/repository/conf/nhttp.properties b/modules-old/core/distribution/src/repository/conf/nhttp.properties
similarity index 100%
rename from modules/core/distribution/src/repository/conf/nhttp.properties
rename to modules-old/core/distribution/src/repository/conf/nhttp.properties
diff --git a/modules/core/distribution/src/repository/conf/passthru-http.properties b/modules-old/core/distribution/src/repository/conf/passthru-http.properties
similarity index 100%
rename from modules/core/distribution/src/repository/conf/passthru-http.properties
rename to modules-old/core/distribution/src/repository/conf/passthru-http.properties
diff --git a/modules/core/distribution/src/repository/conf/registry.xml b/modules-old/core/distribution/src/repository/conf/registry.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/registry.xml
rename to modules-old/core/distribution/src/repository/conf/registry.xml
diff --git a/modules/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties b/modules-old/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties
similarity index 100%
rename from modules/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties
rename to modules-old/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.Carbon.properties
diff --git a/modules/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.dashboard.properties b/modules-old/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.dashboard.properties
similarity index 100%
rename from modules/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.dashboard.properties
rename to modules-old/core/distribution/src/repository/conf/security/Owasp.CsrfGuard.dashboard.properties
diff --git a/modules/core/distribution/src/repository/conf/security/authenticators.xml b/modules-old/core/distribution/src/repository/conf/security/authenticators.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/security/authenticators.xml
rename to modules-old/core/distribution/src/repository/conf/security/authenticators.xml
diff --git a/modules/core/distribution/src/repository/conf/shindig.properties b/modules-old/core/distribution/src/repository/conf/shindig.properties
similarity index 100%
rename from modules/core/distribution/src/repository/conf/shindig.properties
rename to modules-old/core/distribution/src/repository/conf/shindig.properties
diff --git a/modules/core/distribution/src/repository/conf/synapse-handlers.xml b/modules-old/core/distribution/src/repository/conf/synapse-handlers.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/synapse-handlers.xml
rename to modules-old/core/distribution/src/repository/conf/synapse-handlers.xml
diff --git a/modules/core/distribution/src/repository/conf/synapse.properties b/modules-old/core/distribution/src/repository/conf/synapse.properties
similarity index 100%
rename from modules/core/distribution/src/repository/conf/synapse.properties
rename to modules-old/core/distribution/src/repository/conf/synapse.properties
diff --git a/modules/core/distribution/src/repository/conf/tomcat/carbon/WEB-INF/web.xml b/modules-old/core/distribution/src/repository/conf/tomcat/carbon/WEB-INF/web.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/tomcat/carbon/WEB-INF/web.xml
rename to modules-old/core/distribution/src/repository/conf/tomcat/carbon/WEB-INF/web.xml
diff --git a/modules/core/distribution/src/repository/conf/tomcat/catalina-server.xml b/modules-old/core/distribution/src/repository/conf/tomcat/catalina-server.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/tomcat/catalina-server.xml
rename to modules-old/core/distribution/src/repository/conf/tomcat/catalina-server.xml
diff --git a/modules/core/distribution/src/repository/conf/tomcat/context.xml b/modules-old/core/distribution/src/repository/conf/tomcat/context.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/tomcat/context.xml
rename to modules-old/core/distribution/src/repository/conf/tomcat/context.xml
diff --git a/modules/core/distribution/src/repository/conf/trusted-idp-config.xml b/modules-old/core/distribution/src/repository/conf/trusted-idp-config.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/trusted-idp-config.xml
rename to modules-old/core/distribution/src/repository/conf/trusted-idp-config.xml
diff --git a/modules/core/distribution/src/repository/conf/user-mgt.xml b/modules-old/core/distribution/src/repository/conf/user-mgt.xml
similarity index 100%
rename from modules/core/distribution/src/repository/conf/user-mgt.xml
rename to modules-old/core/distribution/src/repository/conf/user-mgt.xml
diff --git a/modules/core/distribution/src/repository/conf/wso2permission.jks b/modules-old/core/distribution/src/repository/conf/wso2permission.jks
similarity index 100%
rename from modules/core/distribution/src/repository/conf/wso2permission.jks
rename to modules-old/core/distribution/src/repository/conf/wso2permission.jks
diff --git a/modules/core/distribution/src/repository/jaggeryapps/android-web-agent/jaggery.conf b/modules-old/core/distribution/src/repository/jaggeryapps/android-web-agent/jaggery.conf
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/android-web-agent/jaggery.conf
rename to modules-old/core/distribution/src/repository/jaggeryapps/android-web-agent/jaggery.conf
diff --git a/modules/core/distribution/src/repository/jaggeryapps/api-store/jaggery.conf b/modules-old/core/distribution/src/repository/jaggeryapps/api-store/jaggery.conf
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/api-store/jaggery.conf
rename to modules-old/core/distribution/src/repository/jaggeryapps/api-store/jaggery.conf
diff --git a/modules/core/distribution/src/repository/jaggeryapps/api-store/site/conf/site.json b/modules-old/core/distribution/src/repository/jaggeryapps/api-store/site/conf/site.json
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/api-store/site/conf/site.json
rename to modules-old/core/distribution/src/repository/jaggeryapps/api-store/site/conf/site.json
diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json b/modules-old/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
rename to modules-old/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/jaggery.conf b/modules-old/core/distribution/src/repository/jaggeryapps/portal/jaggery.conf
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/portal/jaggery.conf
rename to modules-old/core/distribution/src/repository/jaggeryapps/portal/jaggery.conf
diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handler-utils.js b/modules-old/core/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handler-utils.js
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handler-utils.js
rename to modules-old/core/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handler-utils.js
diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handlers.js b/modules-old/core/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handlers.js
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handlers.js
rename to modules-old/core/distribution/src/repository/jaggeryapps/portal/modules/oauth/token-handlers.js
diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/css/dashboard.css b/modules-old/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/css/dashboard.css
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/css/dashboard.css
rename to modules-old/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/css/dashboard.css
diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/js/VizGrammarSettings.js b/modules-old/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/js/VizGrammarSettings.js
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/js/VizGrammarSettings.js
rename to modules-old/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/js/VizGrammarSettings.js
diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/js/colorbrewer.js b/modules-old/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/js/colorbrewer.js
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/js/colorbrewer.js
rename to modules-old/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/js/colorbrewer.js
diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/templates/dashboard.jag b/modules-old/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/templates/dashboard.jag
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/templates/dashboard.jag
rename to modules-old/core/distribution/src/repository/jaggeryapps/portal/themes/analytics/templates/dashboard.jag
diff --git a/modules/core/distribution/src/repository/jaggeryapps/portal/uipublisher/websocketSubscriptionEndpoint.jag b/modules-old/core/distribution/src/repository/jaggeryapps/portal/uipublisher/websocketSubscriptionEndpoint.jag
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/portal/uipublisher/websocketSubscriptionEndpoint.jag
rename to modules-old/core/distribution/src/repository/jaggeryapps/portal/uipublisher/websocketSubscriptionEndpoint.jag
diff --git a/modules/core/distribution/src/repository/jaggeryapps/publisher/jaggery.conf b/modules-old/core/distribution/src/repository/jaggeryapps/publisher/jaggery.conf
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/publisher/jaggery.conf
rename to modules-old/core/distribution/src/repository/jaggeryapps/publisher/jaggery.conf
diff --git a/modules/core/distribution/src/repository/jaggeryapps/social/jaggery.conf b/modules-old/core/distribution/src/repository/jaggeryapps/social/jaggery.conf
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/social/jaggery.conf
rename to modules-old/core/distribution/src/repository/jaggeryapps/social/jaggery.conf
diff --git a/modules/core/distribution/src/repository/jaggeryapps/store/jaggery.conf b/modules-old/core/distribution/src/repository/jaggeryapps/store/jaggery.conf
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/store/jaggery.conf
rename to modules-old/core/distribution/src/repository/jaggeryapps/store/jaggery.conf
diff --git a/modules/core/distribution/src/repository/jaggeryapps/windows-web-agent/jaggery.conf b/modules-old/core/distribution/src/repository/jaggeryapps/windows-web-agent/jaggery.conf
similarity index 100%
rename from modules/core/distribution/src/repository/jaggeryapps/windows-web-agent/jaggery.conf
rename to modules-old/core/distribution/src/repository/jaggeryapps/windows-web-agent/jaggery.conf
diff --git a/modules/core/distribution/src/repository/modules/apimstore/module.xml b/modules-old/core/distribution/src/repository/modules/apimstore/module.xml
similarity index 100%
rename from modules/core/distribution/src/repository/modules/apimstore/module.xml
rename to modules-old/core/distribution/src/repository/modules/apimstore/module.xml
diff --git a/modules/core/distribution/src/repository/modules/encode/module.xml b/modules-old/core/distribution/src/repository/modules/encode/module.xml
similarity index 100%
rename from modules/core/distribution/src/repository/modules/encode/module.xml
rename to modules-old/core/distribution/src/repository/modules/encode/module.xml
diff --git a/modules/core/distribution/src/repository/modules/lifecycle/module.xml b/modules-old/core/distribution/src/repository/modules/lifecycle/module.xml
similarity index 100%
rename from modules/core/distribution/src/repository/modules/lifecycle/module.xml
rename to modules-old/core/distribution/src/repository/modules/lifecycle/module.xml
diff --git a/modules/core/distribution/src/repository/modules/lifecycle/scripts/api/api.js b/modules-old/core/distribution/src/repository/modules/lifecycle/scripts/api/api.js
similarity index 100%
rename from modules/core/distribution/src/repository/modules/lifecycle/scripts/api/api.js
rename to modules-old/core/distribution/src/repository/modules/lifecycle/scripts/api/api.js
diff --git a/modules/core/distribution/src/repository/modules/lifecycle/scripts/core/core.js b/modules-old/core/distribution/src/repository/modules/lifecycle/scripts/core/core.js
similarity index 100%
rename from modules/core/distribution/src/repository/modules/lifecycle/scripts/core/core.js
rename to modules-old/core/distribution/src/repository/modules/lifecycle/scripts/core/core.js
diff --git a/modules/core/distribution/src/repository/modules/sso/module.xml b/modules-old/core/distribution/src/repository/modules/sso/module.xml
similarity index 100%
rename from modules/core/distribution/src/repository/modules/sso/module.xml
rename to modules-old/core/distribution/src/repository/modules/sso/module.xml
diff --git a/modules/core/distribution/src/repository/modules/sso/scripts/sso.client.js b/modules-old/core/distribution/src/repository/modules/sso/scripts/sso.client.js
similarity index 100%
rename from modules/core/distribution/src/repository/modules/sso/scripts/sso.client.js
rename to modules-old/core/distribution/src/repository/modules/sso/scripts/sso.client.js
diff --git a/modules/core/distribution/src/repository/modules/tenantmanager/module.xml b/modules-old/core/distribution/src/repository/modules/tenantmanager/module.xml
similarity index 100%
rename from modules/core/distribution/src/repository/modules/tenantmanager/module.xml
rename to modules-old/core/distribution/src/repository/modules/tenantmanager/module.xml
diff --git a/modules/core/distribution/src/repository/modules/utils/module.xml b/modules-old/core/distribution/src/repository/modules/utils/module.xml
similarity index 100%
rename from modules/core/distribution/src/repository/modules/utils/module.xml
rename to modules-old/core/distribution/src/repository/modules/utils/module.xml
diff --git a/modules/core/distribution/src/repository/modules/utils/scripts/xml/xml.js b/modules-old/core/distribution/src/repository/modules/utils/scripts/xml/xml.js
similarity index 100%
rename from modules/core/distribution/src/repository/modules/utils/scripts/xml/xml.js
rename to modules-old/core/distribution/src/repository/modules/utils/scripts/xml/xml.js
diff --git a/modules/core/distribution/src/repository/resources/appm-tenant-conf.xml b/modules-old/core/distribution/src/repository/resources/appm-tenant-conf.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/appm-tenant-conf.xml
rename to modules-old/core/distribution/src/repository/resources/appm-tenant-conf.xml
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/apimgt/db2.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/db2.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/apimgt/db2.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/db2.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/apimgt/h2-sample-data.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/h2-sample-data.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/apimgt/h2-sample-data.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/h2-sample-data.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/apimgt/h2.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/h2.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/apimgt/h2.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/h2.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/apimgt/mssql.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/mssql.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/apimgt/mssql.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/mssql.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/apimgt/mysql.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/mysql.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/apimgt/mysql.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/mysql.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/apimgt/mysql5.7.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/mysql5.7.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/apimgt/mysql5.7.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/mysql5.7.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/apimgt/mysql_cluster.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/mysql_cluster.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/apimgt/mysql_cluster.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/mysql_cluster.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/apimgt/oracle.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/oracle.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/apimgt/oracle.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/oracle.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/apimgt/oracle_rac.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/oracle_rac.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/apimgt/oracle_rac.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/oracle_rac.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/apimgt/postgresql.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/postgresql.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/apimgt/postgresql.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/apimgt/postgresql.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/appmgt/h2-sample-data.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/appmgt/h2-sample-data.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/appmgt/h2-sample-data.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/appmgt/h2-sample-data.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/appmgt/h2.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/appmgt/h2.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/appmgt/h2.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/appmgt/h2.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/appmgt/mssql.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/appmgt/mssql.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/appmgt/mssql.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/appmgt/mssql.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/appmgt/mysql.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/appmgt/mysql.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/appmgt/mysql.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/appmgt/mysql.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/appmgt/oracle.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/appmgt/oracle.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/appmgt/oracle.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/appmgt/oracle.sql
diff --git a/modules/core/distribution/src/repository/resources/dbscripts/appmgt/postgresql.sql b/modules-old/core/distribution/src/repository/resources/dbscripts/appmgt/postgresql.sql
similarity index 100%
rename from modules/core/distribution/src/repository/resources/dbscripts/appmgt/postgresql.sql
rename to modules-old/core/distribution/src/repository/resources/dbscripts/appmgt/postgresql.sql
diff --git a/modules/core/distribution/src/repository/resources/lifecycles/APILifeCycle.xml b/modules-old/core/distribution/src/repository/resources/lifecycles/APILifeCycle.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/lifecycles/APILifeCycle.xml
rename to modules-old/core/distribution/src/repository/resources/lifecycles/APILifeCycle.xml
diff --git a/modules/core/distribution/src/repository/resources/styles/css/main.css b/modules-old/core/distribution/src/repository/resources/styles/css/main.css
similarity index 100%
rename from modules/core/distribution/src/repository/resources/styles/css/main.css
rename to modules-old/core/distribution/src/repository/resources/styles/css/main.css
diff --git a/modules/core/distribution/src/repository/resources/styles/images/logo.png b/modules-old/core/distribution/src/repository/resources/styles/images/logo.png
similarity index 100%
rename from modules/core/distribution/src/repository/resources/styles/images/logo.png
rename to modules-old/core/distribution/src/repository/resources/styles/images/logo.png
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml b/modules-old/core/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml
rename to modules-old/core/distribution/src/repository/resources/synapse-configs/default/api/_AuthorizeAPI_.xml
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml b/modules-old/core/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml
rename to modules-old/core/distribution/src/repository/resources/synapse-configs/default/api/_RevokeAPI_.xml
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml b/modules-old/core/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml
rename to modules-old/core/distribution/src/repository/resources/synapse-configs/default/api/_TokenAPI_.xml
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml b/modules-old/core/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml
rename to modules-old/core/distribution/src/repository/resources/synapse-configs/default/api/_UserInfoAPI_.xml
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/imports/empty.txt b/modules-old/core/distribution/src/repository/resources/synapse-configs/default/imports/empty.txt
similarity index 100%
rename from modules/core/distribution/src/repository/resources/synapse-configs/default/imports/empty.txt
rename to modules-old/core/distribution/src/repository/resources/synapse-configs/default/imports/empty.txt
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/inbound-endpoints/empty.txt b/modules-old/core/distribution/src/repository/resources/synapse-configs/default/inbound-endpoints/empty.txt
similarity index 100%
rename from modules/core/distribution/src/repository/resources/synapse-configs/default/inbound-endpoints/empty.txt
rename to modules-old/core/distribution/src/repository/resources/synapse-configs/default/inbound-endpoints/empty.txt
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/local-entries/empty.txt b/modules-old/core/distribution/src/repository/resources/synapse-configs/default/local-entries/empty.txt
similarity index 100%
rename from modules/core/distribution/src/repository/resources/synapse-configs/default/local-entries/empty.txt
rename to modules-old/core/distribution/src/repository/resources/synapse-configs/default/local-entries/empty.txt
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/proxy-services/empty.txt b/modules-old/core/distribution/src/repository/resources/synapse-configs/default/proxy-services/empty.txt
similarity index 100%
rename from modules/core/distribution/src/repository/resources/synapse-configs/default/proxy-services/empty.txt
rename to modules-old/core/distribution/src/repository/resources/synapse-configs/default/proxy-services/empty.txt
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/registry.xml b/modules-old/core/distribution/src/repository/resources/synapse-configs/default/registry.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/synapse-configs/default/registry.xml
rename to modules-old/core/distribution/src/repository/resources/synapse-configs/default/registry.xml
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/sequences/fault.xml b/modules-old/core/distribution/src/repository/resources/synapse-configs/default/sequences/fault.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/synapse-configs/default/sequences/fault.xml
rename to modules-old/core/distribution/src/repository/resources/synapse-configs/default/sequences/fault.xml
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/sequences/main.xml b/modules-old/core/distribution/src/repository/resources/synapse-configs/default/sequences/main.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/synapse-configs/default/sequences/main.xml
rename to modules-old/core/distribution/src/repository/resources/synapse-configs/default/sequences/main.xml
diff --git a/modules/core/distribution/src/repository/resources/synapse-configs/default/synapse.xml b/modules-old/core/distribution/src/repository/resources/synapse-configs/default/synapse.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/synapse-configs/default/synapse.xml
rename to modules-old/core/distribution/src/repository/resources/synapse-configs/default/synapse.xml
diff --git a/modules/core/distribution/src/repository/resources/web-apps/web-xml/api#certificate-mgt#v1.0/web.xml b/modules-old/core/distribution/src/repository/resources/web-apps/web-xml/api#certificate-mgt#v1.0/web.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/web-apps/web-xml/api#certificate-mgt#v1.0/web.xml
rename to modules-old/core/distribution/src/repository/resources/web-apps/web-xml/api#certificate-mgt#v1.0/web.xml
diff --git a/modules/core/distribution/src/repository/resources/web-apps/web-xml/api#identity#entitlement/web.xml b/modules-old/core/distribution/src/repository/resources/web-apps/web-xml/api#identity#entitlement/web.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/web-apps/web-xml/api#identity#entitlement/web.xml
rename to modules-old/core/distribution/src/repository/resources/web-apps/web-xml/api#identity#entitlement/web.xml
diff --git a/modules/core/distribution/src/repository/resources/web-apps/web-xml/api#scep-mgt#v1.0/web.xml b/modules-old/core/distribution/src/repository/resources/web-apps/web-xml/api#scep-mgt#v1.0/web.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/web-apps/web-xml/api#scep-mgt#v1.0/web.xml
rename to modules-old/core/distribution/src/repository/resources/web-apps/web-xml/api#scep-mgt#v1.0/web.xml
diff --git a/modules/core/distribution/src/repository/resources/web-apps/web-xml/api-application-registration/web.xml b/modules-old/core/distribution/src/repository/resources/web-apps/web-xml/api-application-registration/web.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/web-apps/web-xml/api-application-registration/web.xml
rename to modules-old/core/distribution/src/repository/resources/web-apps/web-xml/api-application-registration/web.xml
diff --git a/modules/core/distribution/src/repository/resources/web-apps/web-xml/authenticationendpoint/web.xml b/modules-old/core/distribution/src/repository/resources/web-apps/web-xml/authenticationendpoint/web.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/web-apps/web-xml/authenticationendpoint/web.xml
rename to modules-old/core/distribution/src/repository/resources/web-apps/web-xml/authenticationendpoint/web.xml
diff --git a/modules/core/distribution/src/repository/resources/web-apps/web-xml/client-registration#v0.11/web.xml b/modules-old/core/distribution/src/repository/resources/web-apps/web-xml/client-registration#v0.11/web.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/web-apps/web-xml/client-registration#v0.11/web.xml
rename to modules-old/core/distribution/src/repository/resources/web-apps/web-xml/client-registration#v0.11/web.xml
diff --git a/modules/core/distribution/src/repository/resources/web-apps/web-xml/oauth2/web.xml b/modules-old/core/distribution/src/repository/resources/web-apps/web-xml/oauth2/web.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/web-apps/web-xml/oauth2/web.xml
rename to modules-old/core/distribution/src/repository/resources/web-apps/web-xml/oauth2/web.xml
diff --git a/modules/core/distribution/src/repository/resources/web-apps/web-xml/secured-websocket/web.xml b/modules-old/core/distribution/src/repository/resources/web-apps/web-xml/secured-websocket/web.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/web-apps/web-xml/secured-websocket/web.xml
rename to modules-old/core/distribution/src/repository/resources/web-apps/web-xml/secured-websocket/web.xml
diff --git a/modules/core/distribution/src/repository/resources/web-apps/web-xml/shindig/web.xml b/modules-old/core/distribution/src/repository/resources/web-apps/web-xml/shindig/web.xml
similarity index 100%
rename from modules/core/distribution/src/repository/resources/web-apps/web-xml/shindig/web.xml
rename to modules-old/core/distribution/src/repository/resources/web-apps/web-xml/shindig/web.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/README.md b/modules-old/core/distribution/src/samples/connectedlap/README.md
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/README.md
rename to modules-old/core/distribution/src/samples/connectedlap/README.md
diff --git a/modules/core/distribution/src/samples/connectedlap/component/agent/pom.xml b/modules-old/core/distribution/src/samples/connectedlap/component/agent/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/agent/pom.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/agent/pom.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/datasense/PushData.java b/modules-old/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/datasense/PushData.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/datasense/PushData.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/datasense/PushData.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandler.java b/modules-old/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandler.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandler.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandler.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandlerException.java b/modules-old/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandlerException.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandlerException.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandlerException.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/ConnectedLapMQttTransportHandler.java b/modules-old/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/ConnectedLapMQttTransportHandler.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/ConnectedLapMQttTransportHandler.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/ConnectedLapMQttTransportHandler.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/MQTTTransportHandler.java b/modules-old/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/MQTTTransportHandler.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/MQTTTransportHandler.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/MQTTTransportHandler.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/agent/src/main/webapp/WEB-INF/web.xml b/modules-old/core/distribution/src/samples/connectedlap/component/agent/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/agent/src/main/webapp/WEB-INF/web.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/agent/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/build.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/build.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/build.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/build.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/pom.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/pom.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/pom.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/assembly/src.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/EventExecution_ConnectedLap.siddhiql b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/EventExecution_ConnectedLap.siddhiql
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/EventExecution_ConnectedLap.siddhiql
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/EventExecution_ConnectedLap.siddhiql
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/EventPublisher_ConnectedLap.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/EventPublisher_ConnectedLap.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/EventPublisher_ConnectedLap.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/EventPublisher_ConnectedLap.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/EventReceiver_ConnectedLap.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/EventReceiver_ConnectedLap.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/EventReceiver_ConnectedLap.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/EventReceiver_ConnectedLap.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/org.wso2.iot.connectedlap_1.0.0.json b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/org.wso2.iot.connectedlap_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/org.wso2.iot.connectedlap_1.0.0.json
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/org.wso2.iot.connectedlap_1.0.0.json
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/Connected_Lap_Script.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/Connected_Lap_Script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/Connected_Lap_Script.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/Connected_Lap_Script.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/artifacts.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/artifacts.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/artifacts.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/EventStream_ConnectedLap_BatteryUsage_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/EventStream_ConnectedLap_BatteryUsage_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/EventStream_ConnectedLap_BatteryUsage_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/EventStream_ConnectedLap_BatteryUsage_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/EventStream_ConnectedLap_BatteryUsage_1.0.0/org.wso2.iot.devices.battery.usage_1.0.0.json b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/EventStream_ConnectedLap_BatteryUsage_1.0.0/org.wso2.iot.devices.battery.usage_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/EventStream_ConnectedLap_BatteryUsage_1.0.0/org.wso2.iot.devices.battery.usage_1.0.0.json
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/EventStream_ConnectedLap_BatteryUsage_1.0.0/org.wso2.iot.devices.battery.usage_1.0.0.json
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/org_wso2_iot_devices_battery_usage.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/org_wso2_iot_devices_battery_usage.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/org_wso2_iot_devices_battery_usage.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/org_wso2_iot_devices_battery_usage.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/artifacts.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/artifacts.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/artifacts.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/EventStream_ConnectedLap_ChargerPluggedIn_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/EventStream_ConnectedLap_ChargerPluggedIn_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/EventStream_ConnectedLap_ChargerPluggedIn_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/EventStream_ConnectedLap_ChargerPluggedIn_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/EventStream_ConnectedLap_ChargerPluggedIn_1.0.0/org.wso2.iot.devices.charger.plugged.in_1.0.0.json b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/EventStream_ConnectedLap_ChargerPluggedIn_1.0.0/org.wso2.iot.devices.charger.plugged.in_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/EventStream_ConnectedLap_ChargerPluggedIn_1.0.0/org.wso2.iot.devices.charger.plugged.in_1.0.0.json
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/EventStream_ConnectedLap_ChargerPluggedIn_1.0.0/org.wso2.iot.devices.charger.plugged.in_1.0.0.json
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/org_wso2_iot_devices_charger_plugged_in.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/org_wso2_iot_devices_charger_plugged_in.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/org_wso2_iot_devices_charger_plugged_in.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/org_wso2_iot_devices_charger_plugged_in.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/artifacts.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/artifacts.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/artifacts.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/EventStream_ConnectedLap_CpuUsage_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/EventStream_ConnectedLap_CpuUsage_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/EventStream_ConnectedLap_CpuUsage_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/EventStream_ConnectedLap_CpuUsage_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/EventStream_ConnectedLap_CpuUsage_1.0.0/org.wso2.iot.devices.cpu.usage_1.0.0.json b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/EventStream_ConnectedLap_CpuUsage_1.0.0/org.wso2.iot.devices.cpu.usage_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/EventStream_ConnectedLap_CpuUsage_1.0.0/org.wso2.iot.devices.cpu.usage_1.0.0.json
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/EventStream_ConnectedLap_CpuUsage_1.0.0/org.wso2.iot.devices.cpu.usage_1.0.0.json
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/org_wso2_iot_devices_cpu_usage.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/org_wso2_iot_devices_cpu_usage.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/org_wso2_iot_devices_cpu_usage.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/org_wso2_iot_devices_cpu_usage.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/artifacts.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/artifacts.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/artifacts.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/EventStream_ConnectedLap_HardDiskUsage_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/EventStream_ConnectedLap_HardDiskUsage_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/EventStream_ConnectedLap_HardDiskUsage_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/EventStream_ConnectedLap_HardDiskUsage_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/EventStream_ConnectedLap_HardDiskUsage_1.0.0/org.wso2.iot.devices.hard.disk.usage_1.0.0.json b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/EventStream_ConnectedLap_HardDiskUsage_1.0.0/org.wso2.iot.devices.hard.disk.usage_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/EventStream_ConnectedLap_HardDiskUsage_1.0.0/org.wso2.iot.devices.hard.disk.usage_1.0.0.json
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/EventStream_ConnectedLap_HardDiskUsage_1.0.0/org.wso2.iot.devices.hard.disk.usage_1.0.0.json
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/org_wso2_iot_devices_hard_disk_usage.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/org_wso2_iot_devices_hard_disk_usage.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/org_wso2_iot_devices_hard_disk_usage.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/org_wso2_iot_devices_hard_disk_usage.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/artifacts.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/artifacts.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/artifacts.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/EventStream_ConnectedLap_MemoryUsage_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/EventStream_ConnectedLap_MemoryUsage_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/EventStream_ConnectedLap_MemoryUsage_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/EventStream_ConnectedLap_MemoryUsage_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/EventStream_ConnectedLap_MemoryUsage_1.0.0/org.wso2.iot.devices.memory.usage_1.0.0.json b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/EventStream_ConnectedLap_MemoryUsage_1.0.0/org.wso2.iot.devices.memory.usage_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/EventStream_ConnectedLap_MemoryUsage_1.0.0/org.wso2.iot.devices.memory.usage_1.0.0.json
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/EventStream_ConnectedLap_MemoryUsage_1.0.0/org.wso2.iot.devices.memory.usage_1.0.0.json
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/org_wso2_iot_devices_memory_usage.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/org_wso2_iot_devices_memory_usage.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/org_wso2_iot_devices_memory_usage.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/org_wso2_iot_devices_memory_usage.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/artifacts.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/artifacts.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/artifacts.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/EventStream_ConnectedLap_NetworkTraffic_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/EventStream_ConnectedLap_NetworkTraffic_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/EventStream_ConnectedLap_NetworkTraffic_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/EventStream_ConnectedLap_NetworkTraffic_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/EventStream_ConnectedLap_NetworkTraffic_1.0.0/org.wso2.iot.devices.network.traffic_1.0.0.json b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/EventStream_ConnectedLap_NetworkTraffic_1.0.0/org.wso2.iot.devices.network.traffic_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/EventStream_ConnectedLap_NetworkTraffic_1.0.0/org.wso2.iot.devices.network.traffic_1.0.0.json
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/EventStream_ConnectedLap_NetworkTraffic_1.0.0/org.wso2.iot.devices.network.traffic_1.0.0.json
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/org_wso2_iot_devices_network_traffic.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/org_wso2_iot_devices_network_traffic.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/org_wso2_iot_devices_network_traffic.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/org_wso2_iot_devices_network_traffic.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/artifacts.xml b/modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/artifacts.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/artifacts.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/pom.xml b/modules-old/core/distribution/src/samples/connectedlap/component/api/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/pom.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/pom.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeService.java b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeService.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeService.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeService.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeServiceImpl.java b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeServiceImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeServiceImpl.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeServiceImpl.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/DeviceJSON.java b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/DeviceJSON.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/DeviceJSON.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/DeviceJSON.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/SensorRecord.java b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/SensorRecord.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/SensorRecord.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/SensorRecord.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/exception/DeviceTypeException.java b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/exception/DeviceTypeException.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/exception/DeviceTypeException.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/exception/DeviceTypeException.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/APIUtil.java b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/APIUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/APIUtil.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/APIUtil.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/Constants.java b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/Constants.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/Constants.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/Constants.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ResponsePayload.java b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ResponsePayload.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ResponsePayload.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ResponsePayload.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ServiceUtils.java b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ServiceUtils.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ServiceUtils.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ServiceUtils.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ZipUtil.java b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ZipUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ZipUtil.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ZipUtil.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/META-INF/permissions.xml b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/META-INF/permissions.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/META-INF/permissions.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/WEB-INF/web.xml b/modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/WEB-INF/web.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/api/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/laptopagent/pom.xml b/modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/laptopagent/pom.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/pom.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/common/Common.java b/modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/common/Common.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/common/Common.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/common/Common.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/config/Configuration.java b/modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/config/Configuration.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/config/Configuration.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/config/Configuration.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/datasense/PushSystemUsage.java b/modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/datasense/PushSystemUsage.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/datasense/PushSystemUsage.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/datasense/PushSystemUsage.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/main/JavaApp.java b/modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/main/JavaApp.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/main/JavaApp.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/main/JavaApp.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/Monitor.java b/modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/Monitor.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/Monitor.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/Monitor.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/exception/OperationalException.java b/modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/exception/OperationalException.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/exception/OperationalException.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/exception/OperationalException.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/infocollector/Collector.java b/modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/infocollector/Collector.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/infocollector/Collector.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/infocollector/Collector.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemSpec.java b/modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemSpec.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemSpec.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemSpec.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemUsage.java b/modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemUsage.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemUsage.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemUsage.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/systembridge/BashRunner.java b/modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/systembridge/BashRunner.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/systembridge/BashRunner.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/systembridge/BashRunner.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/store/RecordStore.java b/modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/store/RecordStore.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/store/RecordStore.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/store/RecordStore.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/pom.xml b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/pom.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/pom.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/constants/DeviceTypeConstants.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/constants/DeviceTypeConstants.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/constants/DeviceTypeConstants.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/constants/DeviceTypeConstants.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/exception/DeviceMgtPluginException.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/exception/DeviceMgtPluginException.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/exception/DeviceMgtPluginException.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/exception/DeviceMgtPluginException.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManager.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManager.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManager.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManagerService.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManagerService.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManagerService.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DataManagerService.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DataManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DataManagerService.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DataManagerService.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManager.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManager.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManager.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManagerService.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManagerService.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManagerService.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/DeviceTypeDAO.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/DeviceTypeDAO.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/DeviceTypeDAO.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/DeviceTypeDAO.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/impl/DeviceTypeDAOImpl.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/feature/DeviceTypeFeatureManager.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/feature/DeviceTypeFeatureManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/feature/DeviceTypeFeatureManager.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/feature/DeviceTypeFeatureManager.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapDevice.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapDevice.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapDevice.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapDevice.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapResponse.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapResponse.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapResponse.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapResponse.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceSchemaInitializer.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceSchemaInitializer.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceSchemaInitializer.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceSchemaInitializer.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeStartupListener.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeStartupListener.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeStartupListener.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeStartupListener.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeUtils.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeUtils.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeUtils.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeUtils.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/DeviceTypeManagementDataHolder.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/DeviceTypeManagementDataHolder.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/DeviceTypeManagementDataHolder.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/DeviceTypeManagementDataHolder.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/ServiceComponent.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/ServiceComponent.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/ServiceComponent.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/ServiceComponent.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/mqtt/MqttConfig.java b/modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/mqtt/MqttConfig.java
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/mqtt/MqttConfig.java
rename to modules-old/core/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/mqtt/MqttConfig.java
diff --git a/modules/core/distribution/src/samples/connectedlap/component/pom.xml b/modules-old/core/distribution/src/samples/connectedlap/component/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/pom.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/pom.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/pom.xml b/modules-old/core/distribution/src/samples/connectedlap/component/ui/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/pom.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/pom.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/assembly/src.xml b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.hbs b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.hbs
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.hbs
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.js b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.js
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.js
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.json b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.json
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.json
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/public/js/connectedlap.js b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/public/js/connectedlap.js
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/public/js/connectedlap.js
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/public/js/connectedlap.js
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.hbs b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.hbs
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.hbs
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.js b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.js
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.js
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.json b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.json
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.json
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/public/images/deviceType.png b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/public/images/deviceType.png
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/public/images/deviceType.png
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/public/images/deviceType.png
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.hbs b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.hbs
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.hbs
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.js b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.js
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.js
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.json b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.json
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.json
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/css/graph.css b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/css/graph.css
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/css/graph.css
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/css/graph.css
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/d3.min.js b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/d3.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/d3.min.js
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/d3.min.js
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/device-stats.js b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/device-stats.js
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/device-stats.js
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/device-stats.js
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/moment.min.js b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/moment.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/moment.min.js
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/moment.min.js
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/rickshaw.min.js b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/rickshaw.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/rickshaw.min.js
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/rickshaw.min.js
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/socket.io.min.js b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/socket.io.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/socket.io.min.js
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/public/js/socket.io.min.js
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/private/config.json b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/private/config.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/private/config.json
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/private/config.json
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/deviceType.png b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/deviceType.png
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/deviceType.png
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/deviceType.png
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/deviceview.png b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/deviceview.png
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/deviceview.png
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/deviceview.png
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/schematicsGuide.png b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/schematicsGuide.png
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/schematicsGuide.png
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/schematicsGuide.png
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/thumb.png b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/thumb.png
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/thumb.png
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/thumb.png
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/js/download.js b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/js/download.js
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/js/download.js
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/js/download.js
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/js/jquery.validate.js b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/js/jquery.validate.js
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/js/jquery.validate.js
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/js/jquery.validate.js
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/type-view.hbs b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/type-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/type-view.hbs
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/type-view.hbs
diff --git a/modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/type-view.json b/modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/type-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/type-view.json
rename to modules-old/core/distribution/src/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/type-view.json
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/pom.xml b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/pom.xml
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/ConnectedLap.run b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/ConnectedLap.run
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/ConnectedLap.run
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/ConnectedLap.run
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/config.properties b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/config.properties
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/config.properties
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/config.properties
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/deviceConfig.properties b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/deviceConfig.properties
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/deviceConfig.properties
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/deviceConfig.properties
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/sketch.properties b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/sketch.properties
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/sketch.properties
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/sketch.properties
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/startagent.sh b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/startagent.sh
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/startagent.sh
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/startagent.sh
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/build.properties b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/build.properties
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/build.properties
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/build.properties
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.json b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.json
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.json
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.json
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.xml b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.xml
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/datasources/CONNECTEDLAP-datasources.xml b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/datasources/CONNECTEDLAP-datasources.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/datasources/CONNECTEDLAP-datasources.xml
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/datasources/CONNECTEDLAP-datasources.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/h2.sql b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/h2.sql
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/h2.sql
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/h2.sql
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mssql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mssql.sql
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mssql.sql
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mysql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mysql.sql
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mysql.sql
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/oracle.sql
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/oracle.sql
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/oracle.sql
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/p2.inf b/modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/p2.inf
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/p2.inf
rename to modules-old/core/distribution/src/samples/connectedlap/feature/feature/src/main/resources/p2.inf
diff --git a/modules/core/distribution/src/samples/connectedlap/feature/pom.xml b/modules-old/core/distribution/src/samples/connectedlap/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/feature/pom.xml
rename to modules-old/core/distribution/src/samples/connectedlap/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/connectedlap/pom.xml b/modules-old/core/distribution/src/samples/connectedlap/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/connectedlap/pom.xml
rename to modules-old/core/distribution/src/samples/connectedlap/pom.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/build.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/build.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/build.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/build.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/pom.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/pom.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/pom.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/assembly/src.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/EventReceiver_current.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/EventReceiver_current.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/EventReceiver_current.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/EventReceiver_current.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/org_wso2_iot_devices_current.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/org_wso2_iot_devices_current.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/org_wso2_iot_devices_current.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/org_wso2_iot_devices_current.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstream_current_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstream_current_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstream_current_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstream_current_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstream_current_1.0.0/org.wso2.iot.devices.current_1.0.0.json b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstream_current_1.0.0/org.wso2.iot.devices.current_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstream_current_1.0.0/org.wso2.iot.devices.current_1.0.0.json
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstream_current_1.0.0/org.wso2.iot.devices.current_1.0.0.json
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/Current_Sensor_Script.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/Current_Sensor_Script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/Current_Sensor_Script.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/Current_Sensor_Script.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/artifacts.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/artifacts.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/artifacts.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/EventReceiver_flowrate.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/EventReceiver_flowrate.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/EventReceiver_flowrate.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/EventReceiver_flowrate.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/org_wso2_iot_devices_flowrate.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/org_wso2_iot_devices_flowrate.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/org_wso2_iot_devices_flowrate.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/org_wso2_iot_devices_flowrate.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstream_flowrate_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstream_flowrate_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstream_flowrate_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstream_flowrate_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstream_flowrate_1.0.0/org.wso2.iot.devices.flowrate_1.0.0.json b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstream_flowrate_1.0.0/org.wso2.iot.devices.flowrate_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstream_flowrate_1.0.0/org.wso2.iot.devices.flowrate_1.0.0.json
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstream_flowrate_1.0.0/org.wso2.iot.devices.flowrate_1.0.0.json
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/Flow_Sensor_Script.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/Flow_Sensor_Script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/Flow_Sensor_Script.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/Flow_Sensor_Script.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/artifacts.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/artifacts.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/artifacts.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/EventReceiver_power.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/EventReceiver_power.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/EventReceiver_power.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/EventReceiver_power.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/org_wso2_iot_devices_power.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/org_wso2_iot_devices_power.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/org_wso2_iot_devices_power.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/org_wso2_iot_devices_power.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstream_power_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstream_power_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstream_power_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstream_power_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstream_power_1.0.0/org.wso2.iot.devices.power_1.0.0.json b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstream_power_1.0.0/org.wso2.iot.devices.power_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstream_power_1.0.0/org.wso2.iot.devices.power_1.0.0.json
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstream_power_1.0.0/org.wso2.iot.devices.power_1.0.0.json
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/Power_Sensor_Script.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/Power_Sensor_Script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/Power_Sensor_Script.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/Power_Sensor_Script.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/artifacts.xml b/modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/artifacts.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/artifacts.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/api/pom.xml b/modules-old/core/distribution/src/samples/currentsensor/component/api/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/api/pom.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/api/pom.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerService.java b/modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerService.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerService.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerServiceImpl.java b/modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerServiceImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerServiceImpl.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerServiceImpl.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerService.java b/modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerService.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerService.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerServiceImpl.java b/modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerServiceImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerServiceImpl.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerServiceImpl.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/dto/DeviceJSON.java b/modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/dto/DeviceJSON.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/dto/DeviceJSON.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/dto/DeviceJSON.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/APIUtil.java b/modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/APIUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/APIUtil.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/APIUtil.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java b/modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/META-INF/permissions.xml b/modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/META-INF/permissions.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/META-INF/permissions.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/WEB-INF/web.xml b/modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/WEB-INF/web.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/api/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/controller/src/main/webapp/META-INF/permissions.xml b/modules-old/core/distribution/src/samples/currentsensor/component/controller/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/controller/src/main/webapp/META-INF/permissions.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/controller/src/main/webapp/META-INF/permissions.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/util/APIUtil.java b/modules-old/core/distribution/src/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/util/APIUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/util/APIUtil.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/util/APIUtil.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/manager/src/main/webapp/META-INF/permissions.xml b/modules-old/core/distribution/src/samples/currentsensor/component/manager/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/manager/src/main/webapp/META-INF/permissions.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/manager/src/main/webapp/META-INF/permissions.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/plugin/pom.xml b/modules-old/core/distribution/src/samples/currentsensor/component/plugin/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/plugin/pom.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/plugin/pom.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java b/modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/exception/CurrentSensorDeviceMgtPluginException.java b/modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/exception/CurrentSensorDeviceMgtPluginException.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/exception/CurrentSensorDeviceMgtPluginException.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/exception/CurrentSensorDeviceMgtPluginException.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java b/modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java b/modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java b/modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDAO.java b/modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDAO.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDAO.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDAO.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java b/modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java b/modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java
rename to modules-old/core/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java
diff --git a/modules/core/distribution/src/samples/currentsensor/component/pom.xml b/modules-old/core/distribution/src/samples/currentsensor/component/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/pom.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/pom.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/pom.xml b/modules-old/core/distribution/src/samples/currentsensor/component/ui/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/pom.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/pom.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/assembly/src.xml b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.hbs b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.hbs
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.hbs
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.js b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.js
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.js
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.json b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.json
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.json
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/public/images/current-sensor.png b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/public/images/current-sensor.png
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/public/images/current-sensor.png
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/public/images/current-sensor.png
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/current-sensor.png b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/current-sensor.png
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/current-sensor.png
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/current-sensor.png
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/myDevices_analytics.png b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/myDevices_analytics.png
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/myDevices_analytics.png
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/myDevices_analytics.png
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/schematicsGuide.png b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/schematicsGuide.png
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/schematicsGuide.png
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/schematicsGuide.png
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/thumb.png b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/thumb.png
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/thumb.png
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/thumb.png
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/js/download.js b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/js/download.js
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/js/download.js
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/js/download.js
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/js/jquery.validate.js b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/js/jquery.validate.js
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/js/jquery.validate.js
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/js/jquery.validate.js
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/type-view.hbs b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/type-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/type-view.hbs
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/type-view.hbs
diff --git a/modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/type-view.json b/modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/type-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/type-view.json
rename to modules-old/core/distribution/src/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/type-view.json
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/pom.xml b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/pom.xml
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/Connect.ino b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/Connect.ino
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/Connect.ino
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/Connect.ino
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.h b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.h
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.h
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.h
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.ino b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.ino
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.ino
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.ino
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/PushData.ino b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/PushData.ino
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/PushData.ino
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/PushData.ino
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/sketch.properties b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/sketch.properties
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/sketch.properties
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/sketch.properties
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/build.properties b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/build.properties
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/build.properties
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/build.properties
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.json b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.json
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.json
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.json
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.xml b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.xml
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/datasources/currentsensor-datasources.xml b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/datasources/currentsensor-datasources.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/datasources/currentsensor-datasources.xml
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/datasources/currentsensor-datasources.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/dbscripts/h2.sql b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/dbscripts/h2.sql
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/dbscripts/h2.sql
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/dbscripts/h2.sql
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/dbscripts/mysql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/dbscripts/mysql.sql
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/dbscripts/mysql.sql
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/p2.inf b/modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/p2.inf
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/p2.inf
rename to modules-old/core/distribution/src/samples/currentsensor/feature/feature/src/main/resources/p2.inf
diff --git a/modules/core/distribution/src/samples/currentsensor/feature/pom.xml b/modules-old/core/distribution/src/samples/currentsensor/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/feature/pom.xml
rename to modules-old/core/distribution/src/samples/currentsensor/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/currentsensor/pom.xml b/modules-old/core/distribution/src/samples/currentsensor/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/currentsensor/pom.xml
rename to modules-old/core/distribution/src/samples/currentsensor/pom.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/pom.xml b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/pom.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/pom.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerService.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerService.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerService.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerServiceImpl.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerServiceImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerServiceImpl.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerServiceImpl.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerService.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerService.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerService.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerServiceImpl.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerServiceImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerServiceImpl.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerServiceImpl.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/dto/DeviceJSON.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/dto/DeviceJSON.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/dto/DeviceJSON.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/dto/DeviceJSON.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/exception/DigitalDisplayException.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/exception/DigitalDisplayException.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/exception/DigitalDisplayException.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/exception/DigitalDisplayException.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/model/ScreenShotModel.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/model/ScreenShotModel.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/model/ScreenShotModel.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/model/ScreenShotModel.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/APIUtil.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/APIUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/APIUtil.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/APIUtil.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/DigitalDisplayMQTTConnector.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/DigitalDisplayMQTTConnector.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/DigitalDisplayMQTTConnector.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/DigitalDisplayMQTTConnector.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/websocket/DigitalDisplayWebSocketServerEndPoint.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/websocket/DigitalDisplayWebSocketServerEndPoint.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/websocket/DigitalDisplayWebSocketServerEndPoint.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/websocket/DigitalDisplayWebSocketServerEndPoint.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/META-INF/permissions.xml b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/META-INF/permissions.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/META-INF/permissions.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/web.xml b/modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/web.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/plugin/pom.xml b/modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/plugin/pom.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/pom.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/constants/DigitalDisplayConstants.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/constants/DigitalDisplayConstants.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/constants/DigitalDisplayConstants.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/constants/DigitalDisplayConstants.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/exception/DigitalDisplayDeviceMgtPluginException.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/exception/DigitalDisplayDeviceMgtPluginException.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/exception/DigitalDisplayDeviceMgtPluginException.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/exception/DigitalDisplayDeviceMgtPluginException.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManager.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManager.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManager.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/DigitalDisplayDAO.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/DigitalDisplayDAO.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/DigitalDisplayDAO.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/DigitalDisplayDAO.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/impl/DigitalDisplayDeviceDAOImpl.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/impl/DigitalDisplayDeviceDAOImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/impl/DigitalDisplayDeviceDAOImpl.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/impl/DigitalDisplayDeviceDAOImpl.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/feature/DigitalDisplayFeatureManager.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/feature/DigitalDisplayFeatureManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/feature/DigitalDisplayFeatureManager.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/feature/DigitalDisplayFeatureManager.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DeviceSchemaInitializer.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DeviceSchemaInitializer.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DeviceSchemaInitializer.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DeviceSchemaInitializer.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DigitalDisplayUtils.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DigitalDisplayUtils.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DigitalDisplayUtils.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DigitalDisplayUtils.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/internal/DigitalDisplayManagementServiceComponent.java b/modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/internal/DigitalDisplayManagementServiceComponent.java
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/internal/DigitalDisplayManagementServiceComponent.java
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/internal/DigitalDisplayManagementServiceComponent.java
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/pom.xml b/modules-old/core/distribution/src/samples/digitaldisplay/component/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/pom.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/pom.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/pom.xml b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/pom.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/pom.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/assembly/src.xml b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.hbs b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.hbs
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.hbs
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.js b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.js
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.js
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.json b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.json
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.json
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/images/default-screen.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/images/default-screen.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/images/default-screen.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/images/default-screen.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/images/display-icon.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/images/display-icon.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/images/display-icon.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/images/display-icon.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/images/thumb.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/images/thumb.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/images/thumb.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/images/thumb.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/js/websocket.js b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/js/websocket.js
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/js/websocket.js
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/public/js/websocket.js
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/display-icon.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/display-icon.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/display-icon.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/display-icon.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/myDevices_analytics.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/myDevices_analytics.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/myDevices_analytics.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/myDevices_analytics.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/add-resource.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/add-resource.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/add-resource.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/add-resource.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/edit-sequence.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/edit-sequence.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/edit-sequence.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/edit-sequence.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/get-content-list.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/get-content-list.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/get-content-list.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/get-content-list.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/get-device-status.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/get-device-status.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/get-device-status.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/get-device-status.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/remove-resource.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/remove-resource.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/remove-resource.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/remove-resource.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/restart-browser.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/restart-browser.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/restart-browser.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/restart-browser.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/restart-display.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/restart-display.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/restart-display.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/restart-display.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/restart-server.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/restart-server.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/restart-server.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/restart-server.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/screenshot.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/screenshot.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/screenshot.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/screenshot.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/terminate-display.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/terminate-display.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/terminate-display.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/terminate-display.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/upload-content.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/upload-content.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/upload-content.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/operations/upload-content.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/schematicsGuide.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/schematicsGuide.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/schematicsGuide.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/schematicsGuide.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/thumb.png b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/thumb.png
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/thumb.png
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/images/thumb.png
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/js/download.js b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/js/download.js
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/js/download.js
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/js/download.js
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/js/jquery.validate.js b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/js/jquery.validate.js
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/js/jquery.validate.js
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/public/js/jquery.validate.js
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs
diff --git a/modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.json b/modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.json
rename to modules-old/core/distribution/src/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.json
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/DigitalDisplay.zip b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/DigitalDisplay.zip
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/DigitalDisplay.zip
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/DigitalDisplay.zip
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/deviceConfig.properties b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/deviceConfig.properties
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/deviceConfig.properties
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/deviceConfig.properties
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/installPackages.sh b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/installPackages.sh
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/installPackages.sh
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/installPackages.sh
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/sketch.properties b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/sketch.properties
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/sketch.properties
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/sketch.properties
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/wso2Agent.sh b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/wso2Agent.sh
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/wso2Agent.sh
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/wso2Agent.sh
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/build.properties b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/build.properties
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/build.properties
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/build.properties
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.json b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.json
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.json
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.json
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.xml b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/datasources/digitaldisplay-datasources.xml b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/datasources/digitaldisplay-datasources.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/datasources/digitaldisplay-datasources.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/datasources/digitaldisplay-datasources.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/h2.sql b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/h2.sql
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/h2.sql
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/h2.sql
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/mysql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/mysql.sql
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/mysql.sql
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/p2.inf b/modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/p2.inf
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/p2.inf
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/p2.inf
diff --git a/modules/core/distribution/src/samples/digitaldisplay/feature/pom.xml b/modules-old/core/distribution/src/samples/digitaldisplay/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/feature/pom.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/digitaldisplay/pom.xml b/modules-old/core/distribution/src/samples/digitaldisplay/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/digitaldisplay/pom.xml
rename to modules-old/core/distribution/src/samples/digitaldisplay/pom.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/build.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/build.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/build.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/build.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/pom.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/pom.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/pom.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/assembly/src.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/artifacts.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/artifacts.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/artifacts.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/smartBulb_mqtt_receiver.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/smartBulb_mqtt_receiver.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/smartBulb_mqtt_receiver.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/smartBulb_mqtt_receiver.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/smartBulb_publisher.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/smartBulb_publisher.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/smartBulb_publisher.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/smartBulb_publisher.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/smartBulb_spark_script.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/smartBulb_spark_script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/smartBulb_spark_script.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/smartBulb_spark_script.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/org_wso2_iot_devices_smartBulb.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/org_wso2_iot_devices_smartBulb.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/org_wso2_iot_devices_smartBulb.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/org_wso2_iot_devices_smartBulb.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_stream_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_stream_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_stream_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_stream_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_stream_1.0.0/org.wso2.iot.devices.smartBulb_1.0.0.json b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_stream_1.0.0/org.wso2.iot.devices.smartBulb_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_stream_1.0.0/org.wso2.iot.devices.smartBulb_1.0.0.json
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_stream_1.0.0/org.wso2.iot.devices.smartBulb_1.0.0.json
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/artifacts.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/artifacts.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/artifacts.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/smartFan_mqtt_receiver.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/smartFan_mqtt_receiver.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/smartFan_mqtt_receiver.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/smartFan_mqtt_receiver.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/smartFan_publisher.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/smartFan_publisher.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/smartFan_publisher.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/smartFan_publisher.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/smartFan_spark_script.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/smartFan_spark_script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/smartFan_spark_script.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/smartFan_spark_script.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/org_wso2_iot_devices_smartFan.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/org_wso2_iot_devices_smartFan.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/org_wso2_iot_devices_smartFan.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/org_wso2_iot_devices_smartFan.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_stream_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_stream_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_stream_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_stream_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_stream_1.0.0/org.wso2.iot.devices.smartFan_1.0.0.json b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_stream_1.0.0/org.wso2.iot.devices.smartFan_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_stream_1.0.0/org.wso2.iot.devices.smartFan_1.0.0.json
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_stream_1.0.0/org.wso2.iot.devices.smartFan_1.0.0.json
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/artifacts.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/artifacts.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/artifacts.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/smartLock_mqtt_receiver.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/smartLock_mqtt_receiver.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/smartLock_mqtt_receiver.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/smartLock_mqtt_receiver.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/smartLock_publisher.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/smartLock_publisher.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/smartLock_publisher.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/smartLock_publisher.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/smartLock_spark_script.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/smartLock_spark_script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/smartLock_spark_script.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/smartLock_spark_script.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/org_wso2_iot_devices_smartLock.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/org_wso2_iot_devices_smartLock.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/org_wso2_iot_devices_smartLock.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/org_wso2_iot_devices_smartLock.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_stream_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_stream_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_stream_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_stream_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_stream_1.0.0/org.wso2.iot.devices.smartLock_1.0.0.json b/modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_stream_1.0.0/org.wso2.iot.devices.smartLock_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_stream_1.0.0/org.wso2.iot.devices.smartLock_1.0.0.json
rename to modules-old/core/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_stream_1.0.0/org.wso2.iot.devices.smartLock_1.0.0.json
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/pom.xml b/modules-old/core/distribution/src/samples/doormanager/component/api/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/pom.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/api/pom.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerService.java b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerService.java
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerService.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerServiceImpl.java b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerServiceImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerServiceImpl.java
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerServiceImpl.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/DeviceJSON.java b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/DeviceJSON.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/DeviceJSON.java
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/DeviceJSON.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/SensorRecord.java b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/SensorRecord.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/SensorRecord.java
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/SensorRecord.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/UserInfo.java b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/UserInfo.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/UserInfo.java
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/UserInfo.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/exception/DoorManagerException.java b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/exception/DoorManagerException.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/exception/DoorManagerException.java
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/exception/DoorManagerException.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/APIUtil.java b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/APIUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/APIUtil.java
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/APIUtil.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/DoorManagerUtilConstants.java b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/DoorManagerUtilConstants.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/DoorManagerUtilConstants.java
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/DoorManagerUtilConstants.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/ZipUtil.java b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/ZipUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/ZipUtil.java
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/ZipUtil.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/webapp/META-INF/permissions.xml b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/webapp/META-INF/permissions.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/webapp/META-INF/permissions.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/api/src/main/webapp/WEB-INF/web.xml b/modules-old/core/distribution/src/samples/doormanager/component/api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/api/src/main/webapp/WEB-INF/web.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/api/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/pom.xml b/modules-old/core/distribution/src/samples/doormanager/component/plugin/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/pom.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/pom.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/constants/DoorManagerConstants.java b/modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/constants/DoorManagerConstants.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/constants/DoorManagerConstants.java
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/constants/DoorManagerConstants.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/exception/DoorManagerDeviceMgtPluginException.java b/modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/exception/DoorManagerDeviceMgtPluginException.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/exception/DoorManagerDeviceMgtPluginException.java
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/exception/DoorManagerDeviceMgtPluginException.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManager.java b/modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManager.java
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManager.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManagerService.java b/modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManagerService.java
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManagerService.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorLockSafe.java b/modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorLockSafe.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorLockSafe.java
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorLockSafe.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorManagerDAO.java b/modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorManagerDAO.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorManagerDAO.java
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorManagerDAO.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/impl/DoorManagerDAOImpl.java b/modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/impl/DoorManagerDAOImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/impl/DoorManagerDAOImpl.java
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/impl/DoorManagerDAOImpl.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/feature/DoorManagerFeatureManager.java b/modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/feature/DoorManagerFeatureManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/feature/DoorManagerFeatureManager.java
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/feature/DoorManagerFeatureManager.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DeviceSchemaInitializer.java b/modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DeviceSchemaInitializer.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DeviceSchemaInitializer.java
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DeviceSchemaInitializer.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DoorManagerUtils.java b/modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DoorManagerUtils.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DoorManagerUtils.java
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DoorManagerUtils.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/DoorManagerManagementDataHolder.java b/modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/DoorManagerManagementDataHolder.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/DoorManagerManagementDataHolder.java
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/DoorManagerManagementDataHolder.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/ServiceComponent.java b/modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/ServiceComponent.java
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/ServiceComponent.java
rename to modules-old/core/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/ServiceComponent.java
diff --git a/modules/core/distribution/src/samples/doormanager/component/pom.xml b/modules-old/core/distribution/src/samples/doormanager/component/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/pom.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/pom.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/pom.xml b/modules-old/core/distribution/src/samples/doormanager/component/ui/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/pom.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/pom.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/assembly/src.xml b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.hbs b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.hbs
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.hbs
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.json b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.json
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.json
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/css/graph.css b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/css/graph.css
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/css/graph.css
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/css/graph.css
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/d3.min.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/d3.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/d3.min.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/d3.min.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/devicetype-graph.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/devicetype-graph.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/devicetype-graph.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/devicetype-graph.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/moment.min.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/moment.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/moment.min.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/moment.min.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/rickshaw.min.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/rickshaw.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/rickshaw.min.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/js/rickshaw.min.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.hbs b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.hbs
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.hbs
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.json b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.json
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.json
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/css/custom-style.css b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/css/custom-style.css
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/css/custom-style.css
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/css/custom-style.css
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/css/jquery-ui.css b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/css/jquery-ui.css
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/css/jquery-ui.css
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/css/jquery-ui.css
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/images/deviceType.png b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/images/deviceType.png
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/images/deviceType.png
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/images/deviceType.png
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/images/lightbulb.png b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/images/lightbulb.png
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/images/lightbulb.png
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/images/lightbulb.png
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/js/jquery-1.8.3.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/js/jquery-1.8.3.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/js/jquery-1.8.3.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/js/jquery-1.8.3.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/js/jquery-ui.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/js/jquery-ui.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/js/jquery-ui.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/js/jquery-ui.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/js/ui-operation.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/js/ui-operation.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/js/ui-operation.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/js/ui-operation.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/configuration.hbs b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/configuration.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/configuration.hbs
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/configuration.hbs
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/configuration.json b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/configuration.json
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/configuration.json
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/configuration.json
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/public/js/platform-configuration.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/public/js/platform-configuration.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/public/js/platform-configuration.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/public/js/platform-configuration.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.hbs b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.hbs
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.hbs
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.json b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.json
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.json
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/css/graph.css b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/css/graph.css
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/css/graph.css
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/css/graph.css
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/d3.min.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/d3.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/d3.min.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/d3.min.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/device-stats.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/device-stats.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/device-stats.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/device-stats.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/moment.min.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/moment.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/moment.min.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/moment.min.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/rickshaw.min.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/rickshaw.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/rickshaw.min.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/rickshaw.min.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/socket.io.min.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/socket.io.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/socket.io.min.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/public/js/socket.io.min.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/private/config.json b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/private/config.json
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/private/config.json
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/private/config.json
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/deviceType.png b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/deviceType.png
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/deviceType.png
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/deviceType.png
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/doormanager-icon.png b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/doormanager-icon.png
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/doormanager-icon.png
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/doormanager-icon.png
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/myDevices_analytics.png b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/myDevices_analytics.png
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/myDevices_analytics.png
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/myDevices_analytics.png
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/schematicsGuide.png b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/schematicsGuide.png
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/schematicsGuide.png
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/schematicsGuide.png
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/thumb.png b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/thumb.png
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/thumb.png
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/thumb.png
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/js/download.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/js/download.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/js/download.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/js/download.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/js/jquery.validate.js b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/js/jquery.validate.js
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/js/jquery.validate.js
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/js/jquery.validate.js
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/type-view.hbs b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/type-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/type-view.hbs
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/type-view.hbs
diff --git a/modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/type-view.json b/modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/type-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/type-view.json
rename to modules-old/core/distribution/src/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/type-view.json
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/pom.xml b/modules-old/core/distribution/src/samples/doormanager/feature/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/pom.xml
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/deviceConfig.properties b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/deviceConfig.properties
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/deviceConfig.properties
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/deviceConfig.properties
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/sketch.properties b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/sketch.properties
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/sketch.properties
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/sketch.properties
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.log b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.log
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.log
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.log
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.py b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.py
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.py
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.py
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/MFRC522.py b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/MFRC522.py
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/MFRC522.py
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/MFRC522.py
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/MQTTHandler.py b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/MQTTHandler.py
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/MQTTHandler.py
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/MQTTHandler.py
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/RFIDReader.py b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/RFIDReader.py
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/RFIDReader.py
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/RFIDReader.py
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/iotUtils.py b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/iotUtils.py
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/iotUtils.py
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/iotUtils.py
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/startService.sh b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/startService.sh
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/startService.sh
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/startService.sh
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/build.properties b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/build.properties
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/build.properties
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/build.properties
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/conf/doormanager-config.xml b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/conf/doormanager-config.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/conf/doormanager-config.xml
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/conf/doormanager-config.xml
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.json b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.json
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.json
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.json
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.xml b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.xml
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.xml
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/datasources/doormanager-datasources.xml b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/datasources/doormanager-datasources.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/datasources/doormanager-datasources.xml
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/datasources/doormanager-datasources.xml
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/h2.sql b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/h2.sql
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/h2.sql
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/h2.sql
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/mssql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/mssql.sql
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/mssql.sql
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/mysql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/mysql.sql
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/mysql.sql
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/oracle.sql
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/oracle.sql
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/oracle.sql
diff --git a/modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/p2.inf b/modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/p2.inf
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/p2.inf
rename to modules-old/core/distribution/src/samples/doormanager/feature/feature/src/main/resources/p2.inf
diff --git a/modules/core/distribution/src/samples/doormanager/feature/pom.xml b/modules-old/core/distribution/src/samples/doormanager/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/feature/pom.xml
rename to modules-old/core/distribution/src/samples/doormanager/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/doormanager/pom.xml b/modules-old/core/distribution/src/samples/doormanager/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/doormanager/pom.xml
rename to modules-old/core/distribution/src/samples/doormanager/pom.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/build.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/build.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/build.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/build.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/pom.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/pom.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/pom.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/assembly/src.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/EventPublisher_droneStats.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/EventPublisher_droneStats.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/EventPublisher_droneStats.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/EventPublisher_droneStats.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/EventReceiver_mqtt_droneStats.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/EventReceiver_mqtt_droneStats.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/EventReceiver_mqtt_droneStats.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/EventReceiver_mqtt_droneStats.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/org_wso2_iot_devices_droneStats.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/org_wso2_iot_devices_droneStats.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/org_wso2_iot_devices_droneStats.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/org_wso2_iot_devices_droneStats.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/org.wso2.iot.devices.droneStats_1.0.0.json b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/org.wso2.iot.devices.droneStats_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/org.wso2.iot.devices.droneStats_1.0.0.json
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/org.wso2.iot.devices.droneStats_1.0.0.json
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/droneStats_Script.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/droneStats_Script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/droneStats_Script.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/droneStats_Script.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/artifacts.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/artifacts.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/artifacts.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/pom.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/pom.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/pom.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerService.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerService.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerService.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerServiceImpl.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerServiceImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerServiceImpl.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerServiceImpl.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/DeviceJSON.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/DeviceJSON.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/DeviceJSON.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/DeviceJSON.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/SensorRecord.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/SensorRecord.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/SensorRecord.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/SensorRecord.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/exception/DroneAnalyzerException.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/exception/DroneAnalyzerException.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/exception/DroneAnalyzerException.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/exception/DroneAnalyzerException.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/APIUtil.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/APIUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/APIUtil.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/APIUtil.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/Constants.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/Constants.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/Constants.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/Constants.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/ZipUtil.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/ZipUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/ZipUtil.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/ZipUtil.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/META-INF/permissions.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/META-INF/permissions.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/META-INF/permissions.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/web.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/web.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/pom.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/pom.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/pom.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/constants/DroneAnalyzerConstants.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/constants/DroneAnalyzerConstants.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/constants/DroneAnalyzerConstants.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/constants/DroneAnalyzerConstants.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/exception/DeviceMgtPluginException.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/exception/DeviceMgtPluginException.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/exception/DeviceMgtPluginException.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/exception/DeviceMgtPluginException.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManager.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManager.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManager.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManagerService.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManagerService.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManagerService.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/DroneAnalyzerDAO.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/DroneAnalyzerDAO.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/DroneAnalyzerDAO.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/DroneAnalyzerDAO.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/impl/DroneAnalyzerDAOImpl.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/impl/DroneAnalyzerDAOImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/impl/DroneAnalyzerDAOImpl.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/impl/DroneAnalyzerDAOImpl.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/feature/DroneAnalyzerFeatureManager.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/feature/DroneAnalyzerFeatureManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/feature/DroneAnalyzerFeatureManager.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/feature/DroneAnalyzerFeatureManager.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DeviceSchemaInitializer.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DeviceSchemaInitializer.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DeviceSchemaInitializer.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DeviceSchemaInitializer.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerStartupListener.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerStartupListener.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerStartupListener.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerStartupListener.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerUtils.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerUtils.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerUtils.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerUtils.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/DroneAnalyzerManagementDataHolder.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/DroneAnalyzerManagementDataHolder.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/DroneAnalyzerManagementDataHolder.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/DroneAnalyzerManagementDataHolder.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/ServiceComponent.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/ServiceComponent.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/ServiceComponent.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/ServiceComponent.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/mqtt/MqttConfig.java b/modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/mqtt/MqttConfig.java
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/mqtt/MqttConfig.java
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/mqtt/MqttConfig.java
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/pom.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/pom.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/pom.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/pom.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/pom.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/pom.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/assembly/src.xml b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.hbs b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.hbs
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.hbs
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.json b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.json
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.json
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/css/graph.css b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/css/graph.css
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/css/graph.css
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/css/graph.css
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/d3.min.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/d3.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/d3.min.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/d3.min.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/drone.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/drone.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/drone.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/drone.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/moment.min.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/moment.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/moment.min.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/moment.min.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/rickshaw.min.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/rickshaw.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/rickshaw.min.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/rickshaw.min.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.hbs b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.hbs
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.hbs
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.json b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.json
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.json
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/public/images/drone-icon.png b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/public/images/drone-icon.png
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/public/images/drone-icon.png
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/public/images/drone-icon.png
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/public/images/thumb.png b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/public/images/thumb.png
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/public/images/thumb.png
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/public/images/thumb.png
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.hbs b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.hbs
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.hbs
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.json b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.json
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.json
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/css/graph.css b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/css/graph.css
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/css/graph.css
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/css/graph.css
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/css/main-app.css b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/css/main-app.css
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/css/main-app.css
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/css/main-app.css
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/drone_position_controller/background_drone.png b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/drone_position_controller/background_drone.png
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/drone_position_controller/background_drone.png
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/drone_position_controller/background_drone.png
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/drone_position_controller/direction_drone.png b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/drone_position_controller/direction_drone.png
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/drone_position_controller/direction_drone.png
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/drone_position_controller/direction_drone.png
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/drone_position_controller/pitch_drone.png b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/drone_position_controller/pitch_drone.png
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/drone_position_controller/pitch_drone.png
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/drone_position_controller/pitch_drone.png
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/no_video_preview.gif b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/no_video_preview.gif
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/no_video_preview.gif
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/images/no_video_preview.gif
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3DDroneController/controler.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3DDroneController/controler.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3DDroneController/controler.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3DDroneController/controler.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/3dObjectControler.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/3dObjectControler.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/3dObjectControler.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/3dObjectControler.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/Coordinates.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/Coordinates.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/Coordinates.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/Coordinates.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/OrbitAndPanControls.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/OrbitAndPanControls.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/OrbitAndPanControls.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/OrbitAndPanControls.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/three.min.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/three.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/three.min.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/3dobject_controller/three.min.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/common/ajaxHandler.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/common/ajaxHandler.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/common/ajaxHandler.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/common/ajaxHandler.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/common/ajax_handler.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/common/ajax_handler.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/common/ajax_handler.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/common/ajax_handler.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/common/general_handler b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/common/general_handler
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/common/general_handler
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/common/general_handler
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/config/config.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/config/config.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/config/config.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/config/config.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/download.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/download.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/download.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/download.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/init.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/init.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/init.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/init.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/jquery.validate.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/jquery.validate.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/jquery.validate.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/jquery.validate.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/Coordinates.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/Coordinates.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/Coordinates.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/Coordinates.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/OrbitAndPanControls.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/OrbitAndPanControls.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/OrbitAndPanControls.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/OrbitAndPanControls.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/d3.min.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/d3.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/d3.min.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/d3.min.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/jQueryRotate.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/jQueryRotate.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/jQueryRotate.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/jQueryRotate.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/moment.min.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/moment.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/moment.min.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/moment.min.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/rickshaw.min.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/rickshaw.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/rickshaw.min.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/rickshaw.min.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/socket.io.min.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/socket.io.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/socket.io.min.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/socket.io.min.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/three.min.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/three.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/three.min.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/libs/three.min.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/mainHandler.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/mainHandler.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/mainHandler.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/mainHandler.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/controller.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/controller.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/controller.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/controller.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/flightDynamics.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/flightDynamics.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/flightDynamics.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/flightDynamics.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/flight_dynamics.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/flight_dynamics.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/flight_dynamics.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/flight_dynamics.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/realtimePlotting.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/realtimePlotting.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/realtimePlotting.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/realtimePlotting.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/realtime_plotting b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/realtime_plotting
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/realtime_plotting
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/public/js/modules/realtime_plotting
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/private/config.json b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/private/config.json
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/private/config.json
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/private/config.json
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/devices_analytics.png b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/devices_analytics.png
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/devices_analytics.png
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/devices_analytics.png
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/drone-icon.png b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/drone-icon.png
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/drone-icon.png
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/drone-icon.png
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/schematicsGuide.png b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/schematicsGuide.png
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/schematicsGuide.png
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/schematicsGuide.png
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/thumb.png b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/thumb.png
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/thumb.png
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/thumb.png
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/js/download.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/js/download.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/js/download.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/js/download.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/js/jquery.validate.js b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/js/jquery.validate.js
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/js/jquery.validate.js
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/js/jquery.validate.js
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/type-view.hbs b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/type-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/type-view.hbs
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/type-view.hbs
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view.hbs b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view.hbs
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view.hbs
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view.json b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view.json
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view.json
diff --git a/modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view1.hbs b/modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view1.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view1.hbs
rename to modules-old/core/distribution/src/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view1.hbs
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/deviceConfig.properties b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/deviceConfig.properties
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/deviceConfig.properties
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/deviceConfig.properties
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/sketch.properties b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/sketch.properties
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/sketch.properties
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/sketch.properties
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/drone.py b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/drone.py
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/drone.py
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/drone.py
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/droneSimulator.py b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/droneSimulator.py
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/droneSimulator.py
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/droneSimulator.py
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/iotUtils.py b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/iotUtils.py
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/iotUtils.py
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/iotUtils.py
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/mqttHandler.py b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/mqttHandler.py
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/mqttHandler.py
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/mqttHandler.py
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/startService.sh b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/startService.sh
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/startService.sh
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/startService.sh
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/build.properties b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/build.properties
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/build.properties
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/build.properties
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.json b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.json
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.json
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.json
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.xml b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/datasources/drone-datasources.xml b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/datasources/drone-datasources.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/datasources/drone-datasources.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/datasources/drone-datasources.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/h2.sql b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/h2.sql
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/h2.sql
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/h2.sql
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mssql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mssql.sql
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mssql.sql
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mysql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mysql.sql
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mysql.sql
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/oracle.sql
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/oracle.sql
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/oracle.sql
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/p2.inf b/modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/p2.inf
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/p2.inf
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/p2.inf
diff --git a/modules/core/distribution/src/samples/droneanalyzer/feature/pom.xml b/modules-old/core/distribution/src/samples/droneanalyzer/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/feature/pom.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/droneanalyzer/pom.xml b/modules-old/core/distribution/src/samples/droneanalyzer/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/droneanalyzer/pom.xml
rename to modules-old/core/distribution/src/samples/droneanalyzer/pom.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/build.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/build.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/build.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/build.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/pom.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/pom.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/pom.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/assembly/src.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/artifacts.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/artifacts.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/artifacts.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/firealarm_execution.siddhiql b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/firealarm_execution.siddhiql
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/firealarm_execution.siddhiql
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/firealarm_execution.siddhiql
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/firealarm_publisher.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/firealarm_publisher.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/firealarm_publisher.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/firealarm_publisher.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/firealarm_receiver.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/firealarm_receiver.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/firealarm_receiver.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/firealarm_receiver.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/org.wso2.iot.firealarm_1.0.0.json b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/org.wso2.iot.firealarm_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/org.wso2.iot.firealarm_1.0.0.json
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/org.wso2.iot.firealarm_1.0.0.json
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/humidity_receiver.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/humidity_receiver.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/humidity_receiver.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/humidity_receiver.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/humidity_script.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/humidity_script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/humidity_script.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/humidity_script.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/org_wso2_iot_devices_humidity.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/org_wso2_iot_devices_humidity.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/org_wso2_iot_devices_humidity.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/org_wso2_iot_devices_humidity.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/org.wso2.iot.devices.humidity_1.0.0.json b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/org.wso2.iot.devices.humidity_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/org.wso2.iot.devices.humidity_1.0.0.json
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/org.wso2.iot.devices.humidity_1.0.0.json
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/artifacts.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/artifacts.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/artifacts.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/temperature_publisher.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/temperature_publisher.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/temperature_publisher.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/temperature_publisher.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/temperature_receiver.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/temperature_receiver.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/temperature_receiver.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/temperature_receiver.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/temperature_script.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/temperature_script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/temperature_script.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/temperature_script.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/org_wso2_iot_devices_temperature.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/org_wso2_iot_devices_temperature.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/org_wso2_iot_devices_temperature.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/org_wso2_iot_devices_temperature.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/artifact.xml b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/artifact.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/artifact.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/org.wso2.iot.devices.temperature_1.0.0.json b/modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/org.wso2.iot.devices.temperature_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/org.wso2.iot.devices.temperature_1.0.0.json
rename to modules-old/core/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/org.wso2.iot.devices.temperature_1.0.0.json
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/pom.xml b/modules-old/core/distribution/src/samples/firealarm/component/api/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/pom.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/api/pom.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeService.java b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeService.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeService.java
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeService.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeServiceImpl.java b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeServiceImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeServiceImpl.java
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeServiceImpl.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/DeviceJSON.java b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/DeviceJSON.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/DeviceJSON.java
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/DeviceJSON.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/SensorRecord.java b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/SensorRecord.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/SensorRecord.java
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/SensorRecord.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/exception/DeviceTypeException.java b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/exception/DeviceTypeException.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/exception/DeviceTypeException.java
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/exception/DeviceTypeException.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/APIUtil.java b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/APIUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/APIUtil.java
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/APIUtil.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/Constants.java b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/Constants.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/Constants.java
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/Constants.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ResponsePayload.java b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ResponsePayload.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ResponsePayload.java
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ResponsePayload.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ZipUtil.java b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ZipUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ZipUtil.java
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ZipUtil.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/webapp/META-INF/permissions.xml b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/webapp/META-INF/permissions.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/webapp/META-INF/permissions.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/api/src/main/webapp/WEB-INF/web.xml b/modules-old/core/distribution/src/samples/firealarm/component/api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/api/src/main/webapp/WEB-INF/web.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/api/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/pom.xml b/modules-old/core/distribution/src/samples/firealarm/component/plugin/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/pom.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/pom.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/constants/DeviceTypeConstants.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/constants/DeviceTypeConstants.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/constants/DeviceTypeConstants.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/constants/DeviceTypeConstants.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/exception/DeviceMgtPluginException.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/exception/DeviceMgtPluginException.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/exception/DeviceMgtPluginException.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/exception/DeviceMgtPluginException.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManager.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManager.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManager.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManagerService.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManagerService.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManagerService.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/DeviceTypeDAO.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/DeviceTypeDAO.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/DeviceTypeDAO.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/DeviceTypeDAO.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/impl/DeviceTypeDAOImpl.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/feature/DeviceTypeFeatureManager.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/feature/DeviceTypeFeatureManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/feature/DeviceTypeFeatureManager.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/feature/DeviceTypeFeatureManager.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceSchemaInitializer.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceSchemaInitializer.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceSchemaInitializer.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceSchemaInitializer.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeStartupListener.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeStartupListener.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeStartupListener.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeStartupListener.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeUtils.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeUtils.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeUtils.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeUtils.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/DeviceTypeManagementDataHolder.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/DeviceTypeManagementDataHolder.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/DeviceTypeManagementDataHolder.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/DeviceTypeManagementDataHolder.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/ServiceComponent.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/ServiceComponent.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/ServiceComponent.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/ServiceComponent.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/mqtt/MqttConfig.java b/modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/mqtt/MqttConfig.java
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/mqtt/MqttConfig.java
rename to modules-old/core/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/mqtt/MqttConfig.java
diff --git a/modules/core/distribution/src/samples/firealarm/component/pom.xml b/modules-old/core/distribution/src/samples/firealarm/component/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/pom.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/pom.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/pom.xml b/modules-old/core/distribution/src/samples/firealarm/component/ui/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/pom.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/pom.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/assembly/src.xml b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.hbs b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.hbs
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.hbs
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.js b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.js
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.js
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.json b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.json
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.json
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/public/js/firealarm.js b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/public/js/firealarm.js
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/public/js/firealarm.js
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/public/js/firealarm.js
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.hbs b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.hbs
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.hbs
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.js b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.js
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.js
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.json b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.json
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.json
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/public/images/deviceType.png b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/public/images/deviceType.png
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/public/images/deviceType.png
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/public/images/deviceType.png
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.hbs b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.hbs
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.hbs
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.js b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.js
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.js
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.json b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.json
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.json
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/public/js/device-stats.js b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/public/js/device-stats.js
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/public/js/device-stats.js
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/public/js/device-stats.js
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/public/js/moment.min.js b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/public/js/moment.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/public/js/moment.min.js
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/public/js/moment.min.js
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/public/js/socket.io.min.js b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/public/js/socket.io.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/public/js/socket.io.min.js
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/public/js/socket.io.min.js
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/private/config.json b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/private/config.json
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/private/config.json
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/private/config.json
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/deviceType.png b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/deviceType.png
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/deviceType.png
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/deviceType.png
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/myDevices_analytics.png b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/myDevices_analytics.png
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/myDevices_analytics.png
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/myDevices_analytics.png
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/schematicsGuide.png b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/schematicsGuide.png
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/schematicsGuide.png
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/schematicsGuide.png
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/thumb.png b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/thumb.png
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/thumb.png
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/thumb.png
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/js/download.js b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/js/download.js
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/js/download.js
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/js/download.js
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/js/jquery.validate.js b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/js/jquery.validate.js
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/js/jquery.validate.js
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/js/jquery.validate.js
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/type-view.hbs b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/type-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/type-view.hbs
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/type-view.hbs
diff --git a/modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/type-view.json b/modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/type-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/type-view.json
rename to modules-old/core/distribution/src/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/type-view.json
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/pom.xml b/modules-old/core/distribution/src/samples/firealarm/feature/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/pom.xml
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/dht_lib.lua b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/dht_lib.lua
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/dht_lib.lua
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/dht_lib.lua
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/init.lua b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/init.lua
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/init.lua
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/init.lua
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/read-sensor.lua b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/read-sensor.lua
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/read-sensor.lua
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/read-sensor.lua
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/sketch.properties b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/sketch.properties
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/sketch.properties
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/sketch.properties
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/wifi-connect.lua b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/wifi-connect.lua
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/wifi-connect.lua
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/wifi-connect.lua
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/build.properties b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/build.properties
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/build.properties
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/build.properties
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/configs/firealarm.xml b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/configs/firealarm.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/configs/firealarm.xml
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/configs/firealarm.xml
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/datasources/firealarm-datasources.xml b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/datasources/firealarm-datasources.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/datasources/firealarm-datasources.xml
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/datasources/firealarm-datasources.xml
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/h2.sql b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/h2.sql
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/h2.sql
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/h2.sql
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/mssql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/mssql.sql
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/mssql.sql
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/mysql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/mysql.sql
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/mysql.sql
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/oracle.sql
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/oracle.sql
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/oracle.sql
diff --git a/modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/p2.inf b/modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/p2.inf
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/p2.inf
rename to modules-old/core/distribution/src/samples/firealarm/feature/feature/src/main/resources/p2.inf
diff --git a/modules/core/distribution/src/samples/firealarm/feature/pom.xml b/modules-old/core/distribution/src/samples/firealarm/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/feature/pom.xml
rename to modules-old/core/distribution/src/samples/firealarm/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/firealarm/pom.xml b/modules-old/core/distribution/src/samples/firealarm/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/firealarm/pom.xml
rename to modules-old/core/distribution/src/samples/firealarm/pom.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/build.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/build.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/build.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/build.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/pom.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/pom.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/pom.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/assembly/src.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/artifacts.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/artifacts.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/artifacts.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/geolocation_execution.siddhiql b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/geolocation_execution.siddhiql
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/geolocation_execution.siddhiql
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/geolocation_execution.siddhiql
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/geolocation_mqtt_receiver.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/geolocation_mqtt_receiver.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/geolocation_mqtt_receiver.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/geolocation_mqtt_receiver.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/geolocation_publisher.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/geolocation_publisher.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/geolocation_publisher.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/geolocation_publisher.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/geolocation_spark_script.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/geolocation_spark_script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/geolocation_spark_script.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/geolocation_spark_script.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/org_wso2_iot_devices_geolocation.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/org_wso2_iot_devices_geolocation.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/org_wso2_iot_devices_geolocation.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/org_wso2_iot_devices_geolocation.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_stream_1.0.0/artifact.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_stream_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_stream_1.0.0/artifact.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_stream_1.0.0/artifact.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_stream_1.0.0/org.wso2.iot.devices.geolocation_1.0.0.json b/modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_stream_1.0.0/org.wso2.iot.devices.geolocation_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_stream_1.0.0/org.wso2.iot.devices.geolocation_1.0.0.json
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_stream_1.0.0/org.wso2.iot.devices.geolocation_1.0.0.json
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/pom.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/pom.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/pom.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerService.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerService.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerService.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerServiceImpl.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerServiceImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerServiceImpl.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerServiceImpl.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/DeviceJSON.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/DeviceJSON.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/DeviceJSON.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/DeviceJSON.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/SensorRecord.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/SensorRecord.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/SensorRecord.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/SensorRecord.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/exception/GeoLocationTrackerException.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/exception/GeoLocationTrackerException.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/exception/GeoLocationTrackerException.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/exception/GeoLocationTrackerException.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/APIUtil.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/APIUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/APIUtil.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/APIUtil.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/Constants.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/Constants.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/Constants.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/Constants.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/ZipUtil.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/ZipUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/ZipUtil.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/ZipUtil.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/META-INF/permissions.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/META-INF/permissions.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/META-INF/permissions.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/web.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/web.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/plugin/pom.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/plugin/pom.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/pom.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/constants/GeoLocationTrackerConstants.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/constants/GeoLocationTrackerConstants.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/constants/GeoLocationTrackerConstants.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/constants/GeoLocationTrackerConstants.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/exception/DeviceMgtPluginException.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/exception/DeviceMgtPluginException.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/exception/DeviceMgtPluginException.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/exception/DeviceMgtPluginException.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManager.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManager.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManager.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManagerService.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManagerService.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManagerService.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/GeoLocationTrackerDAO.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/GeoLocationTrackerDAO.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/GeoLocationTrackerDAO.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/GeoLocationTrackerDAO.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/impl/GeoLocationTrackerDAOImpl.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/impl/GeoLocationTrackerDAOImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/impl/GeoLocationTrackerDAOImpl.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/impl/GeoLocationTrackerDAOImpl.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/feature/GeoLocationTrackerFeatureManager.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/feature/GeoLocationTrackerFeatureManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/feature/GeoLocationTrackerFeatureManager.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/feature/GeoLocationTrackerFeatureManager.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/DeviceSchemaInitializer.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/DeviceSchemaInitializer.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/DeviceSchemaInitializer.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/DeviceSchemaInitializer.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/GeoLocationTrackerUtils.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/GeoLocationTrackerUtils.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/GeoLocationTrackerUtils.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/GeoLocationTrackerUtils.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/GeoLocationTrackerManagementDataHolder.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/GeoLocationTrackerManagementDataHolder.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/GeoLocationTrackerManagementDataHolder.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/GeoLocationTrackerManagementDataHolder.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/ServiceComponent.java b/modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/ServiceComponent.java
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/ServiceComponent.java
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/ServiceComponent.java
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/pom.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/pom.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/pom.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/pom.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/pom.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/pom.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/assembly/src.xml b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.hbs b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.hbs
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.hbs
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.json b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.json
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.json
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/css/graph.css b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/css/graph.css
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/css/graph.css
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/css/graph.css
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/d3.min.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/d3.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/d3.min.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/d3.min.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/devicetype-graph.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/devicetype-graph.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/devicetype-graph.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/devicetype-graph.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/moment.min.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/moment.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/moment.min.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/moment.min.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/rickshaw.min.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/rickshaw.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/rickshaw.min.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/js/rickshaw.min.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.hbs b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.hbs
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.hbs
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.json b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.json
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.json
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/public/images/deviceType.png b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/public/images/deviceType.png
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/public/images/deviceType.png
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/public/images/deviceType.png
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/configuration.hbs b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/configuration.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/configuration.hbs
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/configuration.hbs
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/configuration.json b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/configuration.json
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/configuration.json
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/configuration.json
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/public/js/platform-configuration.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/public/js/platform-configuration.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/public/js/platform-configuration.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/public/js/platform-configuration.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.hbs b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.hbs
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.hbs
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.json b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.json
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.json
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/css/graph.css b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/css/graph.css
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/css/graph.css
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/css/graph.css
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/d3.min.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/d3.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/d3.min.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/d3.min.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/device-stats.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/device-stats.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/device-stats.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/device-stats.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/moment.min.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/moment.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/moment.min.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/moment.min.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/rickshaw.min.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/rickshaw.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/rickshaw.min.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/rickshaw.min.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/socket.io.min.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/socket.io.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/socket.io.min.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/public/js/socket.io.min.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/private/config.json b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/private/config.json
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/private/config.json
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/private/config.json
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/deviceType.png b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/deviceType.png
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/deviceType.png
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/deviceType.png
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/schematicsGuide.png b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/schematicsGuide.png
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/schematicsGuide.png
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/schematicsGuide.png
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/thumb.png b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/thumb.png
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/thumb.png
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/thumb.png
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/js/download.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/js/download.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/js/download.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/js/download.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/js/jquery.validate.js b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/js/jquery.validate.js
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/js/jquery.validate.js
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/js/jquery.validate.js
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/type-view.hbs b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/type-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/type-view.hbs
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/type-view.hbs
diff --git a/modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/type-view.json b/modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/type-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/type-view.json
rename to modules-old/core/distribution/src/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/type-view.json
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/deviceConfig.properties b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/deviceConfig.properties
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/deviceConfig.properties
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/deviceConfig.properties
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/sketch.properties b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/sketch.properties
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/sketch.properties
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/sketch.properties
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/agent.py b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/agent.py
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/agent.py
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/agent.py
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/deviceConfig.properties b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/deviceConfig.properties
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/deviceConfig.properties
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/deviceConfig.properties
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/iotUtils.py b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/iotUtils.py
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/iotUtils.py
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/iotUtils.py
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/mqttHandler.py b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/mqttHandler.py
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/mqttHandler.py
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/mqttHandler.py
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/startService.sh b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/startService.sh
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/startService.sh
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/startService.sh
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/build.properties b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/build.properties
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/build.properties
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/build.properties
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/conf/geolocationTracker-config.xml b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/conf/geolocationTracker-config.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/conf/geolocationTracker-config.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/conf/geolocationTracker-config.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.json b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.json
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.json
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.json
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.xml b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/datasources/geolocationTracker-datasources.xml b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/datasources/geolocationTracker-datasources.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/datasources/geolocationTracker-datasources.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/datasources/geolocationTracker-datasources.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/h2.sql b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/h2.sql
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/h2.sql
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/h2.sql
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mssql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mssql.sql
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mssql.sql
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mysql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mysql.sql
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mysql.sql
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/oracle.sql
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/oracle.sql
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/oracle.sql
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/p2.inf b/modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/p2.inf
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/p2.inf
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/p2.inf
diff --git a/modules/core/distribution/src/samples/geolocationTracker/feature/pom.xml b/modules-old/core/distribution/src/samples/geolocationTracker/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/feature/pom.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/geolocationTracker/pom.xml b/modules-old/core/distribution/src/samples/geolocationTracker/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/geolocationTracker/pom.xml
rename to modules-old/core/distribution/src/samples/geolocationTracker/pom.xml
diff --git a/modules/core/distribution/src/samples/installer/device-deployer.xml b/modules-old/core/distribution/src/samples/installer/device-deployer.xml
similarity index 100%
rename from modules/core/distribution/src/samples/installer/device-deployer.xml
rename to modules-old/core/distribution/src/samples/installer/device-deployer.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/build.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/build.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/build.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/build.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/pom.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/pom.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/pom.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/assembly/src.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/artifacts.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/artifacts.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/artifacts.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/relay_publisher.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/relay_publisher.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/relay_publisher.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/relay_publisher.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/relay_receiver.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/relay_receiver.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/relay_receiver.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/relay_receiver.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/relay_script.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/relay_script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/relay_script.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/relay_script.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/org_wso2_iot_devices_relay.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/org_wso2_iot_devices_relay.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/org_wso2_iot_devices_relay.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/org_wso2_iot_devices_relay.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/org.wso2.iot.devices.relay_1.0.0.json b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/org.wso2.iot.devices.relay_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/org.wso2.iot.devices.relay_1.0.0.json
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/org.wso2.iot.devices.relay_1.0.0.json
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/artifacts.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/artifacts.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/artifacts.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/waterlevel_receiver.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/waterlevel_receiver.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/waterlevel_receiver.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/waterlevel_receiver.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/waterlevel_script.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/waterlevel_script.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/waterlevel_script.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/waterlevel_script.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/org_wso2_iot_devices_waterlevel.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/org_wso2_iot_devices_waterlevel.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/org_wso2_iot_devices_waterlevel.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/org_wso2_iot_devices_waterlevel.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/org.wso2.iot.devices.waterlevel_1.0.0.json b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/org.wso2.iot.devices.waterlevel_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/org.wso2.iot.devices.waterlevel_1.0.0.json
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/org.wso2.iot.devices.waterlevel_1.0.0.json
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/artifacts.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/artifacts.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/artifacts.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/org_wso2_iot_devices_waterlevel_summary.siddhiql b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/org_wso2_iot_devices_waterlevel_summary.siddhiql
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/org_wso2_iot_devices_waterlevel_summary.siddhiql
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/org_wso2_iot_devices_waterlevel_summary.siddhiql
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/org_wso2_iot_devices_waterlevel_summary.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/org_wso2_iot_devices_waterlevel_summary.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/org_wso2_iot_devices_waterlevel_summary.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/org_wso2_iot_devices_waterlevel_summary.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_stream/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_stream/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_stream/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_stream/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_stream/org.wso2.iot.devices.waterlevel.stats_1.0.0.json b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_stream/org.wso2.iot.devices.waterlevel.stats_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_stream/org.wso2.iot.devices.waterlevel.stats_1.0.0.json
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_stream/org.wso2.iot.devices.waterlevel.stats_1.0.0.json
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/artifacts.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/artifacts.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/artifacts.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/artifacts.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/watertank_execution.siddhiql b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/watertank_execution.siddhiql
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/watertank_execution.siddhiql
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/watertank_execution.siddhiql
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/watertank_publisher.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/watertank_publisher.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/watertank_publisher.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/watertank_publisher.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/watertank_receiver.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/watertank_receiver.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/watertank_receiver.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/watertank_receiver.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/artifact.xml b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/artifact.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/artifact.xml
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/artifact.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/org.wso2.iot.watertank_1.0.0.json b/modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/org.wso2.iot.watertank_1.0.0.json
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/org.wso2.iot.watertank_1.0.0.json
rename to modules-old/core/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/org.wso2.iot.watertank_1.0.0.json
diff --git a/modules/core/distribution/src/samples/watertank/component/api/pom.xml b/modules-old/core/distribution/src/samples/watertank/component/api/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/pom.xml
rename to modules-old/core/distribution/src/samples/watertank/component/api/pom.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeService.java b/modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeService.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeService.java
rename to modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeService.java
diff --git a/modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeServiceImpl.java b/modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeServiceImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeServiceImpl.java
rename to modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeServiceImpl.java
diff --git a/modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/DeviceJSON.java b/modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/DeviceJSON.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/DeviceJSON.java
rename to modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/DeviceJSON.java
diff --git a/modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/SensorRecord.java b/modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/SensorRecord.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/SensorRecord.java
rename to modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/SensorRecord.java
diff --git a/modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/exception/DeviceTypeException.java b/modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/exception/DeviceTypeException.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/exception/DeviceTypeException.java
rename to modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/exception/DeviceTypeException.java
diff --git a/modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/APIUtil.java b/modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/APIUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/APIUtil.java
rename to modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/APIUtil.java
diff --git a/modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/Constants.java b/modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/Constants.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/Constants.java
rename to modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/Constants.java
diff --git a/modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/ZipUtil.java b/modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/ZipUtil.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/ZipUtil.java
rename to modules-old/core/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/ZipUtil.java
diff --git a/modules/core/distribution/src/samples/watertank/component/api/src/main/webapp/META-INF/permissions.xml b/modules-old/core/distribution/src/samples/watertank/component/api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/src/main/webapp/META-INF/permissions.xml
rename to modules-old/core/distribution/src/samples/watertank/component/api/src/main/webapp/META-INF/permissions.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules-old/core/distribution/src/samples/watertank/component/api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules-old/core/distribution/src/samples/watertank/component/api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules-old/core/distribution/src/samples/watertank/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules-old/core/distribution/src/samples/watertank/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/api/src/main/webapp/WEB-INF/web.xml b/modules-old/core/distribution/src/samples/watertank/component/api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/api/src/main/webapp/WEB-INF/web.xml
rename to modules-old/core/distribution/src/samples/watertank/component/api/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/pom.xml b/modules-old/core/distribution/src/samples/watertank/component/plugin/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/pom.xml
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/pom.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/constants/DeviceTypeConstants.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/constants/DeviceTypeConstants.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/constants/DeviceTypeConstants.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/constants/DeviceTypeConstants.java
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/exception/DeviceMgtPluginException.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/exception/DeviceMgtPluginException.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/exception/DeviceMgtPluginException.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/exception/DeviceMgtPluginException.java
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManager.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManager.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManager.java
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManagerService.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManagerService.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManagerService.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManagerService.java
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/DeviceTypeDAO.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/DeviceTypeDAO.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/DeviceTypeDAO.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/DeviceTypeDAO.java
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/impl/DeviceTypeDAOImpl.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/feature/DeviceTypeFeatureManager.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/feature/DeviceTypeFeatureManager.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/feature/DeviceTypeFeatureManager.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/feature/DeviceTypeFeatureManager.java
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceSchemaInitializer.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceSchemaInitializer.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceSchemaInitializer.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceSchemaInitializer.java
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeStartupListener.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeStartupListener.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeStartupListener.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeStartupListener.java
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeUtils.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeUtils.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeUtils.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeUtils.java
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/DeviceTypeManagementDataHolder.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/DeviceTypeManagementDataHolder.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/DeviceTypeManagementDataHolder.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/DeviceTypeManagementDataHolder.java
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/ServiceComponent.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/ServiceComponent.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/ServiceComponent.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/ServiceComponent.java
diff --git a/modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/mqtt/MqttConfig.java b/modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/mqtt/MqttConfig.java
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/mqtt/MqttConfig.java
rename to modules-old/core/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/mqtt/MqttConfig.java
diff --git a/modules/core/distribution/src/samples/watertank/component/pom.xml b/modules-old/core/distribution/src/samples/watertank/component/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/pom.xml
rename to modules-old/core/distribution/src/samples/watertank/component/pom.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/pom.xml b/modules-old/core/distribution/src/samples/watertank/component/ui/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/pom.xml
rename to modules-old/core/distribution/src/samples/watertank/component/ui/pom.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/assembly/src.xml b/modules-old/core/distribution/src/samples/watertank/component/ui/src/assembly/src.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/assembly/src.xml
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/assembly/src.xml
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.hbs b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.hbs
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.hbs
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.js b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.js
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.js
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.json b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.json
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.json
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/public/js/watertank.js b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/public/js/watertank.js
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/public/js/watertank.js
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/public/js/watertank.js
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.hbs b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.hbs
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.hbs
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.js b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.js
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.js
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.json b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.json
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.json
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/public/images/deviceType.png b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/public/images/deviceType.png
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/public/images/deviceType.png
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/public/images/deviceType.png
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.hbs b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.hbs
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.hbs
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.js b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.js
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.js
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.json b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.json
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.json
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/css/water-level.css b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/css/water-level.css
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/css/water-level.css
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/css/water-level.css
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/device-stats.js b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/device-stats.js
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/device-stats.js
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/device-stats.js
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/libs/htmlpreview.min.js b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/libs/htmlpreview.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/libs/htmlpreview.min.js
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/libs/htmlpreview.min.js
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/libs/jquery.min.js b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/libs/jquery.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/libs/jquery.min.js
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/libs/jquery.min.js
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/moment.min.js b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/moment.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/moment.min.js
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/moment.min.js
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/socket.io.min.js b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/socket.io.min.js
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/socket.io.min.js
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/public/js/socket.io.min.js
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/private/config.json b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/private/config.json
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/private/config.json
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/private/config.json
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/deviceType.png b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/deviceType.png
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/deviceType.png
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/deviceType.png
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/myDevices_analytics.png b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/myDevices_analytics.png
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/myDevices_analytics.png
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/myDevices_analytics.png
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/schematicsGuide.png b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/schematicsGuide.png
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/schematicsGuide.png
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/schematicsGuide.png
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/thumb.png b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/thumb.png
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/thumb.png
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/thumb.png
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/js/download.js b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/js/download.js
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/js/download.js
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/js/download.js
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/js/jquery.validate.js b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/js/jquery.validate.js
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/js/jquery.validate.js
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/js/jquery.validate.js
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/type-view.hbs b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/type-view.hbs
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/type-view.hbs
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/type-view.hbs
diff --git a/modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/type-view.json b/modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/type-view.json
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/type-view.json
rename to modules-old/core/distribution/src/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/type-view.json
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/pom.xml b/modules-old/core/distribution/src/samples/watertank/feature/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/pom.xml
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/init.lua b/modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/init.lua
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/init.lua
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/init.lua
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/sketch.properties b/modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/sketch.properties
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/sketch.properties
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/sketch.properties
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/water-tank.lua b/modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/water-tank.lua
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/water-tank.lua
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/water-tank.lua
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/wifi-connect.lua b/modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/wifi-connect.lua
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/wifi-connect.lua
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/wifi-connect.lua
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/build.properties b/modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/build.properties
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/build.properties
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/build.properties
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/configs/watertank.xml b/modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/configs/watertank.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/configs/watertank.xml
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/configs/watertank.xml
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/datasources/watertank-datasources.xml b/modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/datasources/watertank-datasources.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/datasources/watertank-datasources.xml
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/datasources/watertank-datasources.xml
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/h2.sql b/modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/h2.sql
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/h2.sql
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/h2.sql
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/mssql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/mssql.sql
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/mssql.sql
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/mysql.sql
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/mysql.sql
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/mysql.sql
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/oracle.sql
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/oracle.sql
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/oracle.sql
diff --git a/modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/p2.inf b/modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/p2.inf
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/feature/src/main/resources/p2.inf
rename to modules-old/core/distribution/src/samples/watertank/feature/feature/src/main/resources/p2.inf
diff --git a/modules/core/distribution/src/samples/watertank/feature/pom.xml b/modules-old/core/distribution/src/samples/watertank/feature/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/feature/pom.xml
rename to modules-old/core/distribution/src/samples/watertank/feature/pom.xml
diff --git a/modules/core/distribution/src/samples/watertank/pom.xml b/modules-old/core/distribution/src/samples/watertank/pom.xml
similarity index 100%
rename from modules/core/distribution/src/samples/watertank/pom.xml
rename to modules-old/core/distribution/src/samples/watertank/pom.xml
diff --git a/modules/core/distribution/user-api-publisher-config.xml b/modules-old/core/distribution/user-api-publisher-config.xml
similarity index 100%
rename from modules/core/distribution/user-api-publisher-config.xml
rename to modules-old/core/distribution/user-api-publisher-config.xml
diff --git a/modules/core/distribution/user_mgt_config_change.xml b/modules-old/core/distribution/user_mgt_config_change.xml
similarity index 100%
rename from modules/core/distribution/user_mgt_config_change.xml
rename to modules-old/core/distribution/user_mgt_config_change.xml
diff --git a/modules/core/features/org.wso2.iot.core.styles.feature/pom.xml b/modules-old/core/features/org.wso2.iot.core.styles.feature/pom.xml
similarity index 100%
rename from modules/core/features/org.wso2.iot.core.styles.feature/pom.xml
rename to modules-old/core/features/org.wso2.iot.core.styles.feature/pom.xml
diff --git a/modules/core/features/pom.xml b/modules-old/core/features/pom.xml
similarity index 100%
rename from modules/core/features/pom.xml
rename to modules-old/core/features/pom.xml
diff --git a/modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml b/modules-old/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
similarity index 100%
rename from modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
rename to modules-old/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
diff --git a/modules/core/iot-extensions/pom.xml b/modules-old/core/iot-extensions/pom.xml
similarity index 100%
rename from modules/core/iot-extensions/pom.xml
rename to modules-old/core/iot-extensions/pom.xml
diff --git a/modules/core/iotserver-ui/pom.xml b/modules-old/core/iotserver-ui/pom.xml
similarity index 100%
rename from modules/core/iotserver-ui/pom.xml
rename to modules-old/core/iotserver-ui/pom.xml
diff --git a/modules/core/iotserver-ui/src/main/resources/META-INF/product.xml b/modules-old/core/iotserver-ui/src/main/resources/META-INF/product.xml
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/META-INF/product.xml
rename to modules-old/core/iotserver-ui/src/main/resources/META-INF/product.xml
diff --git a/modules/core/iotserver-ui/src/main/resources/web/product/about.html b/modules-old/core/iotserver-ui/src/main/resources/web/product/about.html
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/product/about.html
rename to modules-old/core/iotserver-ui/src/main/resources/web/product/about.html
diff --git a/modules/core/iotserver-ui/src/main/resources/web/styles/css/main.css b/modules-old/core/iotserver-ui/src/main/resources/web/styles/css/main.css
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/styles/css/main.css
rename to modules-old/core/iotserver-ui/src/main/resources/web/styles/css/main.css
diff --git a/modules/core/iotserver-ui/src/main/resources/web/styles/images/logo.png b/modules-old/core/iotserver-ui/src/main/resources/web/styles/images/logo.png
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/styles/images/logo.png
rename to modules-old/core/iotserver-ui/src/main/resources/web/styles/images/logo.png
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/css/dashboard-common.css b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/css/dashboard-common.css
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/css/dashboard-common.css
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/css/dashboard-common.css
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/css/main.css b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/css/main.css
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/css/main.css
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/css/main.css
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/docs/images/dashboard.png b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/docs/images/dashboard.png
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/docs/images/dashboard.png
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/docs/images/dashboard.png
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/docs/userguide.html b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/docs/userguide.html
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/docs/userguide.html
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/docs/userguide.html
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/dashboard-title-bg.gif b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/dashboard-title-bg.gif
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/dashboard-title-bg.gif
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/dashboard-title-bg.gif
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/java2wsdl.png b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/java2wsdl.png
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/java2wsdl.png
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/java2wsdl.png
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/message-tracing.png b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/message-tracing.png
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/message-tracing.png
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/message-tracing.png
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/modules.png b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/modules.png
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/modules.png
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/modules.png
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/service-hosting.png b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/service-hosting.png
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/service-hosting.png
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/service-hosting.png
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/service-testing.png b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/service-testing.png
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/service-testing.png
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/service-testing.png
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/tip-back.png b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/tip-back.png
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/tip-back.png
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/tip-back.png
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/tip-bottom.png b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/tip-bottom.png
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/tip-bottom.png
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/tip-bottom.png
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/web-applications.png b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/web-applications.png
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/web-applications.png
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/web-applications.png
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/wsdl-validator.png b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/wsdl-validator.png
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/wsdl-validator.png
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/wsdl-validator.png
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/wsdl2java.png b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/wsdl2java.png
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/wsdl2java.png
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/images/wsdl2java.png
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/index-old.jsp b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/index-old.jsp
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/index-old.jsp
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/index-old.jsp
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/index.jsp b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/index.jsp
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/index.jsp
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/index.jsp
diff --git a/modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/system_stats_ajaxprocessor.jsp b/modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/system_stats_ajaxprocessor.jsp
similarity index 100%
rename from modules/core/iotserver-ui/src/main/resources/web/tenant-dashboard/system_stats_ajaxprocessor.jsp
rename to modules-old/core/iotserver-ui/src/main/resources/web/tenant-dashboard/system_stats_ajaxprocessor.jsp
diff --git a/modules/core/p2-profile-gen/carbon.product b/modules-old/core/p2-profile-gen/carbon.product
similarity index 100%
rename from modules/core/p2-profile-gen/carbon.product
rename to modules-old/core/p2-profile-gen/carbon.product
diff --git a/modules/core/p2-profile-gen/pom.xml b/modules-old/core/p2-profile-gen/pom.xml
similarity index 100%
rename from modules/core/p2-profile-gen/pom.xml
rename to modules-old/core/p2-profile-gen/pom.xml
diff --git a/modules/core/pom.xml b/modules-old/core/pom.xml
similarity index 100%
rename from modules/core/pom.xml
rename to modules-old/core/pom.xml
diff --git a/modules/core/scripts/mobile-qsg/pom.xml b/modules-old/core/scripts/mobile-qsg/pom.xml
similarity index 100%
rename from modules/core/scripts/mobile-qsg/pom.xml
rename to modules-old/core/scripts/mobile-qsg/pom.xml
diff --git a/modules/core/scripts/mobile-qsg/resources/Readme.txt b/modules-old/core/scripts/mobile-qsg/resources/Readme.txt
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/Readme.txt
rename to modules-old/core/scripts/mobile-qsg/resources/Readme.txt
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/android/catalog.apk b/modules-old/core/scripts/mobile-qsg/resources/apps/android/catalog.apk
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/apps/android/catalog.apk
rename to modules-old/core/scripts/mobile-qsg/resources/apps/android/catalog.apk
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/android/images/banner.jpg b/modules-old/core/scripts/mobile-qsg/resources/apps/android/images/banner.jpg
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/apps/android/images/banner.jpg
rename to modules-old/core/scripts/mobile-qsg/resources/apps/android/images/banner.jpg
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/android/images/icon.jpg b/modules-old/core/scripts/mobile-qsg/resources/apps/android/images/icon.jpg
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/apps/android/images/icon.jpg
rename to modules-old/core/scripts/mobile-qsg/resources/apps/android/images/icon.jpg
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/android/images/screen1.jpg b/modules-old/core/scripts/mobile-qsg/resources/apps/android/images/screen1.jpg
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/apps/android/images/screen1.jpg
rename to modules-old/core/scripts/mobile-qsg/resources/apps/android/images/screen1.jpg
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/android/images/screen2.jpg b/modules-old/core/scripts/mobile-qsg/resources/apps/android/images/screen2.jpg
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/apps/android/images/screen2.jpg
rename to modules-old/core/scripts/mobile-qsg/resources/apps/android/images/screen2.jpg
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/android/images/screen3.jpg b/modules-old/core/scripts/mobile-qsg/resources/apps/android/images/screen3.jpg
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/apps/android/images/screen3.jpg
rename to modules-old/core/scripts/mobile-qsg/resources/apps/android/images/screen3.jpg
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/ios/PNDemo.ipa b/modules-old/core/scripts/mobile-qsg/resources/apps/ios/PNDemo.ipa
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/apps/ios/PNDemo.ipa
rename to modules-old/core/scripts/mobile-qsg/resources/apps/ios/PNDemo.ipa
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/ios/images/banner.jpg b/modules-old/core/scripts/mobile-qsg/resources/apps/ios/images/banner.jpg
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/apps/ios/images/banner.jpg
rename to modules-old/core/scripts/mobile-qsg/resources/apps/ios/images/banner.jpg
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/ios/images/icon.jpg b/modules-old/core/scripts/mobile-qsg/resources/apps/ios/images/icon.jpg
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/apps/ios/images/icon.jpg
rename to modules-old/core/scripts/mobile-qsg/resources/apps/ios/images/icon.jpg
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen1.jpg b/modules-old/core/scripts/mobile-qsg/resources/apps/ios/images/screen1.jpg
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen1.jpg
rename to modules-old/core/scripts/mobile-qsg/resources/apps/ios/images/screen1.jpg
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen2.jpg b/modules-old/core/scripts/mobile-qsg/resources/apps/ios/images/screen2.jpg
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen2.jpg
rename to modules-old/core/scripts/mobile-qsg/resources/apps/ios/images/screen2.jpg
diff --git a/modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen3.jpg b/modules-old/core/scripts/mobile-qsg/resources/apps/ios/images/screen3.jpg
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/apps/ios/images/screen3.jpg
rename to modules-old/core/scripts/mobile-qsg/resources/apps/ios/images/screen3.jpg
diff --git a/modules/core/scripts/mobile-qsg/resources/config.properties b/modules-old/core/scripts/mobile-qsg/resources/config.properties
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/config.properties
rename to modules-old/core/scripts/mobile-qsg/resources/config.properties
diff --git a/modules/core/scripts/mobile-qsg/resources/mobile-qsg.sh b/modules-old/core/scripts/mobile-qsg/resources/mobile-qsg.sh
similarity index 100%
rename from modules/core/scripts/mobile-qsg/resources/mobile-qsg.sh
rename to modules-old/core/scripts/mobile-qsg/resources/mobile-qsg.sh
diff --git a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/AppOperations.java b/modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/AppOperations.java
similarity index 100%
rename from modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/AppOperations.java
rename to modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/AppOperations.java
diff --git a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/PolicyOperations.java b/modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/PolicyOperations.java
similarity index 100%
rename from modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/PolicyOperations.java
rename to modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/PolicyOperations.java
diff --git a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java b/modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java
similarity index 100%
rename from modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java
rename to modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/QSGExecutor.java
diff --git a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/UserOperations.java b/modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/UserOperations.java
similarity index 100%
rename from modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/UserOperations.java
rename to modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/UserOperations.java
diff --git a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/ClientCredentials.java b/modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/ClientCredentials.java
similarity index 100%
rename from modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/ClientCredentials.java
rename to modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/ClientCredentials.java
diff --git a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/EMMQSGConfig.java b/modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/EMMQSGConfig.java
similarity index 100%
rename from modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/EMMQSGConfig.java
rename to modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/EMMQSGConfig.java
diff --git a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/HTTPResponse.java b/modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/HTTPResponse.java
similarity index 100%
rename from modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/HTTPResponse.java
rename to modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/HTTPResponse.java
diff --git a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/MobileApplication.java b/modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/MobileApplication.java
similarity index 100%
rename from modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/MobileApplication.java
rename to modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/dto/MobileApplication.java
diff --git a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/utils/Constants.java b/modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/utils/Constants.java
similarity index 100%
rename from modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/utils/Constants.java
rename to modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/utils/Constants.java
diff --git a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/utils/HTTPInvoker.java b/modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/utils/HTTPInvoker.java
similarity index 100%
rename from modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/utils/HTTPInvoker.java
rename to modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/utils/HTTPInvoker.java
diff --git a/modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/utils/QSGUtils.java b/modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/utils/QSGUtils.java
similarity index 100%
rename from modules/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/utils/QSGUtils.java
rename to modules-old/core/scripts/mobile-qsg/src/main/java/org/wso2/mdm/qsg/utils/QSGUtils.java
diff --git a/modules/core/scripts/pom.xml b/modules-old/core/scripts/pom.xml
similarity index 100%
rename from modules/core/scripts/pom.xml
rename to modules-old/core/scripts/pom.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/README.md b/modules-old/core/tools/cdmf-devicetype-archetype/README.md
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/README.md
rename to modules-old/core/tools/cdmf-devicetype-archetype/README.md
diff --git a/modules/core/tools/cdmf-devicetype-archetype/pom.xml b/modules-old/core/tools/cdmf-devicetype-archetype/pom.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/pom.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/pom.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/build.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/build.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/build.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/build.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/pom.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/pom.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/pom.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/pom.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/assembly/src.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/assembly/src.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/assembly/src.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/assembly/src.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventpublisher___nameOfTheSensor___1.0.0/EventPublisher___nameOfTheSensor__.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventpublisher___nameOfTheSensor___1.0.0/EventPublisher___nameOfTheSensor__.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventpublisher___nameOfTheSensor___1.0.0/EventPublisher___nameOfTheSensor__.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventpublisher___nameOfTheSensor___1.0.0/EventPublisher___nameOfTheSensor__.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventpublisher___nameOfTheSensor___1.0.0/artifact.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventpublisher___nameOfTheSensor___1.0.0/artifact.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventpublisher___nameOfTheSensor___1.0.0/artifact.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventpublisher___nameOfTheSensor___1.0.0/artifact.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventreceiver_mqtt___nameOfTheSensor___1.0.0/EventReceiver_mqtt___nameOfTheSensor__.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventreceiver_mqtt___nameOfTheSensor___1.0.0/EventReceiver_mqtt___nameOfTheSensor__.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventreceiver_mqtt___nameOfTheSensor___1.0.0/EventReceiver_mqtt___nameOfTheSensor__.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventreceiver_mqtt___nameOfTheSensor___1.0.0/EventReceiver_mqtt___nameOfTheSensor__.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventreceiver_mqtt___nameOfTheSensor___1.0.0/artifact.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventreceiver_mqtt___nameOfTheSensor___1.0.0/artifact.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventreceiver_mqtt___nameOfTheSensor___1.0.0/artifact.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventreceiver_mqtt___nameOfTheSensor___1.0.0/artifact.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstore___nameOfTheSensor___1.0.0/artifact.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstore___nameOfTheSensor___1.0.0/artifact.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstore___nameOfTheSensor___1.0.0/artifact.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstore___nameOfTheSensor___1.0.0/artifact.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstore___nameOfTheSensor___1.0.0/org_wso2_iot_devices___nameOfTheSensor__.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstore___nameOfTheSensor___1.0.0/org_wso2_iot_devices___nameOfTheSensor__.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstore___nameOfTheSensor___1.0.0/org_wso2_iot_devices___nameOfTheSensor__.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstore___nameOfTheSensor___1.0.0/org_wso2_iot_devices___nameOfTheSensor__.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstream___nameOfTheSensor___1.0.0/artifact.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstream___nameOfTheSensor___1.0.0/artifact.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstream___nameOfTheSensor___1.0.0/artifact.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstream___nameOfTheSensor___1.0.0/artifact.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstream___nameOfTheSensor___1.0.0/org.wso2.iot.devices.__nameOfTheSensor___1.0.0.json b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstream___nameOfTheSensor___1.0.0/org.wso2.iot.devices.__nameOfTheSensor___1.0.0.json
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstream___nameOfTheSensor___1.0.0/org.wso2.iot.devices.__nameOfTheSensor___1.0.0.json
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Eventstream___nameOfTheSensor___1.0.0/org.wso2.iot.devices.__nameOfTheSensor___1.0.0.json
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Sparkscripts_1.0.0/__nameOfTheSensor___Script.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Sparkscripts_1.0.0/__nameOfTheSensor___Script.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Sparkscripts_1.0.0/__nameOfTheSensor___Script.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Sparkscripts_1.0.0/__nameOfTheSensor___Script.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Sparkscripts_1.0.0/artifact.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Sparkscripts_1.0.0/artifact.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Sparkscripts_1.0.0/artifact.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/Sparkscripts_1.0.0/artifact.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/artifacts.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/artifacts.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/artifacts.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/analytics/src/main/resources/carbonapps/__nameOfTheSensor__/artifacts.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/pom.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/pom.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/pom.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/pom.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/DeviceTypeService.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/DeviceTypeService.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/DeviceTypeService.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/DeviceTypeService.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/DeviceTypeServiceImpl.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/DeviceTypeServiceImpl.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/DeviceTypeServiceImpl.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/DeviceTypeServiceImpl.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/dto/DeviceJSON.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/dto/DeviceJSON.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/dto/DeviceJSON.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/dto/DeviceJSON.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/dto/SensorRecord.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/dto/SensorRecord.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/dto/SensorRecord.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/dto/SensorRecord.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/exception/DeviceTypeException.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/exception/DeviceTypeException.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/exception/DeviceTypeException.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/exception/DeviceTypeException.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/APIUtil.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/APIUtil.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/APIUtil.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/APIUtil.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/Constants.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/Constants.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/Constants.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/Constants.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/ResponsePayload.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/ResponsePayload.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/ResponsePayload.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/ResponsePayload.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/ServiceUtils.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/ServiceUtils.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/ServiceUtils.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/ServiceUtils.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/ZipUtil.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/ZipUtil.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/ZipUtil.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/java/__groupId__/__rootArtifactId__/api/util/ZipUtil.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/META-INF/permissions.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/META-INF/permissions.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/META-INF/permissions.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/WEB-INF/web.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/WEB-INF/web.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/api/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/pom.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/pom.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/pom.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/pom.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/constants/DeviceTypeConstants.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/constants/DeviceTypeConstants.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/constants/DeviceTypeConstants.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/constants/DeviceTypeConstants.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/exception/DeviceMgtPluginException.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/exception/DeviceMgtPluginException.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/exception/DeviceMgtPluginException.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/exception/DeviceMgtPluginException.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/DeviceTypeManager.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/DeviceTypeManager.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/DeviceTypeManager.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/DeviceTypeManager.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/DeviceTypeManagerService.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/DeviceTypeManagerService.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/DeviceTypeManagerService.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/DeviceTypeManagerService.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/dao/DeviceTypeDAO.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/dao/DeviceTypeDAO.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/dao/DeviceTypeDAO.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/dao/DeviceTypeDAO.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/dao/impl/DeviceTypeDAOImpl.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/dao/impl/DeviceTypeDAOImpl.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/feature/DeviceTypeFeatureManager.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/feature/DeviceTypeFeatureManager.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/feature/DeviceTypeFeatureManager.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/feature/DeviceTypeFeatureManager.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/util/DeviceSchemaInitializer.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/util/DeviceSchemaInitializer.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/util/DeviceSchemaInitializer.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/util/DeviceSchemaInitializer.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/util/DeviceTypeStartupListener.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/util/DeviceTypeStartupListener.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/util/DeviceTypeStartupListener.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/util/DeviceTypeStartupListener.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/util/DeviceTypeUtils.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/util/DeviceTypeUtils.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/util/DeviceTypeUtils.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/impl/util/DeviceTypeUtils.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/internal/DeviceTypeManagementDataHolder.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/internal/DeviceTypeManagementDataHolder.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/internal/DeviceTypeManagementDataHolder.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/internal/DeviceTypeManagementDataHolder.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/internal/ServiceComponent.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/internal/ServiceComponent.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/internal/ServiceComponent.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/internal/ServiceComponent.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/mqtt/MqttConfig.java b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/mqtt/MqttConfig.java
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/mqtt/MqttConfig.java
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/plugin/src/main/java/__groupId__/__rootArtifactId__/plugin/mqtt/MqttConfig.java
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/pom.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/pom.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/pom.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/pom.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/pom.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/pom.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/pom.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/pom.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/assembly/src.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/assembly/src.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/assembly/src.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/assembly/src.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/analytics-view.hbs b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/analytics-view.hbs
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/analytics-view.hbs
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/analytics-view.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/analytics-view.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/analytics-view.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/analytics-view.json b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/analytics-view.json
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/analytics-view.json
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/css/graph.css b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/css/graph.css
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/css/graph.css
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/css/graph.css
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/d3.min.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/d3.min.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/d3.min.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/d3.min.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/devicetype-graph.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/devicetype-graph.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/devicetype-graph.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/devicetype-graph.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/moment.min.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/moment.min.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/moment.min.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/moment.min.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/rickshaw.min.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/rickshaw.min.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/rickshaw.min.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.analytics-view/public/js/rickshaw.min.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.hbs b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.hbs
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.hbs
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.hbs
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.json b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.json
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.json
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/device-view.json
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/public/images/deviceType.png b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/public/images/deviceType.png
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/public/images/deviceType.png
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.device-view/public/images/deviceType.png
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/analytics-view.hbs b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/analytics-view.hbs
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/analytics-view.hbs
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/analytics-view.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/analytics-view.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/analytics-view.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/analytics-view.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/analytics-view.json b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/analytics-view.json
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/analytics-view.json
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/analytics-view.json
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/css/graph.css b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/css/graph.css
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/css/graph.css
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/css/graph.css
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/d3.min.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/d3.min.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/d3.min.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/d3.min.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/device-stats.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/device-stats.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/device-stats.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/device-stats.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/moment.min.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/moment.min.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/moment.min.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/moment.min.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/rickshaw.min.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/rickshaw.min.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/rickshaw.min.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/rickshaw.min.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/socket.io.min.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/socket.io.min.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/socket.io.min.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.realtime.analytics-view/public/js/socket.io.min.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/private/config.json b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/private/config.json
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/private/config.json
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/private/config.json
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/images/deviceType.png b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/images/deviceType.png
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/images/deviceType.png
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/images/deviceType.png
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/images/schematicsGuide.png b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/images/schematicsGuide.png
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/images/schematicsGuide.png
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/images/schematicsGuide.png
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/images/thumb.png b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/images/thumb.png
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/images/thumb.png
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/images/thumb.png
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/js/download.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/js/download.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/js/download.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/js/download.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/js/jquery.validate.js b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/js/jquery.validate.js
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/js/jquery.validate.js
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/public/js/jquery.validate.js
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/type-view.hbs b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/type-view.hbs
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/type-view.hbs
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/type-view.hbs
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/type-view.json b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/type-view.json
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/type-view.json
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.__deviceType__.type-view/type-view.json
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/pom.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/deviceConfig.properties b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/deviceConfig.properties
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/deviceConfig.properties
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/deviceConfig.properties
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/sketch.properties b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/sketch.properties
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/sketch.properties
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/sketch.properties
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/agent.log b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/agent.log
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/agent.log
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/agent.log
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/agent.py b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/agent.py
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/agent.py
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/agent.py
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/iotUtils.py b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/iotUtils.py
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/iotUtils.py
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/iotUtils.py
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/mqttHandler.py b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/mqttHandler.py
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/mqttHandler.py
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/src/mqttHandler.py
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/startService.sh b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/startService.sh
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/startService.sh
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/agent/startService.sh
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/build.properties b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/build.properties
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/build.properties
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/build.properties
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/configs/__deviceType__.json b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/configs/__deviceType__.json
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/configs/__deviceType__.json
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/configs/__deviceType__.json
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/configs/__deviceType__.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/configs/__deviceType__.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/configs/__deviceType__.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/configs/__deviceType__.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/datasources/__deviceType__-datasources.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/datasources/__deviceType__-datasources.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/datasources/__deviceType__-datasources.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/datasources/__deviceType__-datasources.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/h2.sql b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/h2.sql
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/h2.sql
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/h2.sql
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/mssql.sql
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/mssql.sql
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/mssql.sql
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/mysql.sql
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/mysql.sql
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/mysql.sql
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/oracle.sql
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/oracle.sql
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/dbscripts/oracle.sql
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/p2.inf b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/p2.inf
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/p2.inf
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/p2.inf
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/pom.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/pom.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/pom.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/pom.xml
diff --git a/modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml b/modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml
similarity index 100%
rename from modules/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml
rename to modules-old/core/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/pom.xml
diff --git a/modules/core/tools/pom.xml b/modules-old/core/tools/pom.xml
similarity index 100%
rename from modules/core/tools/pom.xml
rename to modules-old/core/tools/pom.xml
diff --git a/modules/distribution/pom.xml b/modules-old/distribution/pom.xml
similarity index 100%
rename from modules/distribution/pom.xml
rename to modules-old/distribution/pom.xml
diff --git a/modules/distribution/src/assembly/dist.xml b/modules-old/distribution/src/assembly/dist.xml
similarity index 100%
rename from modules/distribution/src/assembly/dist.xml
rename to modules-old/distribution/src/assembly/dist.xml
diff --git a/modules/distribution/src/resources/bin/start-all.sh b/modules-old/distribution/src/resources/bin/start-all.sh
similarity index 100%
rename from modules/distribution/src/resources/bin/start-all.sh
rename to modules-old/distribution/src/resources/bin/start-all.sh
diff --git a/modules/distribution/src/resources/bin/stop-all.sh b/modules-old/distribution/src/resources/bin/stop-all.sh
similarity index 100%
rename from modules/distribution/src/resources/bin/stop-all.sh
rename to modules-old/distribution/src/resources/bin/stop-all.sh
diff --git a/modules/distribution/src/resources/plugins/plugins-deployer.xml b/modules-old/distribution/src/resources/plugins/plugins-deployer.xml
similarity index 100%
rename from modules/distribution/src/resources/plugins/plugins-deployer.xml
rename to modules-old/distribution/src/resources/plugins/plugins-deployer.xml
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/activity_data.csv b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/activity_data.csv
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/activity_data.csv
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/activity_data.csv
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/activity_data_streamConfiguration.xml b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/activity_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/activity_data_streamConfiguration.xml
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/activity_data_streamConfiguration.xml
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/audio_data.csv b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/audio_data.csv
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/audio_data.csv
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/audio_data.csv
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/audio_data_streamConfiguration.xml b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/audio_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/audio_data_streamConfiguration.xml
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/audio_data_streamConfiguration.xml
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/battery_data.csv b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/battery_data.csv
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/battery_data.csv
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/battery_data.csv
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/battery_data_streamConfiguration.xml b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/battery_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/battery_data_streamConfiguration.xml
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/battery_data_streamConfiguration.xml
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/call_data.csv b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/call_data.csv
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/call_data.csv
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/call_data.csv
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/call_data_streamConfiguration.xml b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/call_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/call_data_streamConfiguration.xml
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/call_data_streamConfiguration.xml
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/location_data.csv b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/location_data.csv
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/location_data.csv
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/location_data.csv
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/location_data_streamConfiguration.xml b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/location_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/location_data_streamConfiguration.xml
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/location_data_streamConfiguration.xml
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/network_data.csv b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/network_data.csv
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/network_data.csv
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/network_data.csv
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/network_data_streamConfiguration.xml b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/network_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/network_data_streamConfiguration.xml
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/network_data_streamConfiguration.xml
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/screen_data.csv b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/screen_data.csv
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/screen_data.csv
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/screen_data.csv
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/screen_data_streamConfiguration.xml b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/screen_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/screen_data_streamConfiguration.xml
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/screen_data_streamConfiguration.xml
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/sms_data.csv b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/sms_data.csv
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/sms_data.csv
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/sms_data.csv
diff --git a/modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/sms_data_streamConfiguration.xml b/modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/sms_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/sms_data_streamConfiguration.xml
rename to modules-old/distribution/src/resources/plugins/resources/analytics/eventsimulatorfiles/sms_data_streamConfiguration.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/pom.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/pom.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/pom.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/pom.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandler.java b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandler.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandler.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandler.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandlerException.java b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandlerException.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandlerException.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandlerException.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/MQTTTransportHandler.java b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/MQTTTransportHandler.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/MQTTTransportHandler.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/MQTTTransportHandler.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/WEB-INF/web.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/WEB-INF/web.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/css/coffee.css b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/css/coffee.css
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/css/coffee.css
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/css/coffee.css
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/index.jsp b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/index.jsp
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/index.jsp
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/index.jsp
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/js/coffee.js b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/js/coffee.js
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/js/coffee.js
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/js/coffee.js
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/js/libs/htmlpreview.min.js b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/js/libs/htmlpreview.min.js
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/js/libs/htmlpreview.min.js
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/js/libs/htmlpreview.min.js
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/js/libs/jquery.min.js b/modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/js/libs/jquery.min.js
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/js/libs/jquery.min.js
rename to modules-old/distribution/src/resources/samples/connectedcup/component/agent/src/main/webapp/js/libs/jquery.min.js
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/build.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/build.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/build.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/build.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/pom.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/pom.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/pom.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/pom.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/assembly/src.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/assembly/src.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/assembly/src.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/assembly/src.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/artifacts.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/artifacts.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/artifacts.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/artifacts.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/artifact.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/artifact.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/artifact.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/artifact.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/coffee_level_receiver.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/coffee_level_receiver.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/coffee_level_receiver.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/coffee_level_receiver.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/artifact.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/artifact.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/artifact.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/artifact.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/org_wso2_iot_devices_coffeelevel.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/org_wso2_iot_devices_coffeelevel.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/org_wso2_iot_devices_coffeelevel.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/org_wso2_iot_devices_coffeelevel.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/artifact.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/artifact.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/artifact.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/artifact.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/org.wso2.iot.devices.coffeelevel_1.0.0.json b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/org.wso2.iot.devices.coffeelevel_1.0.0.json
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/org.wso2.iot.devices.coffeelevel_1.0.0.json
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/org.wso2.iot.devices.coffeelevel_1.0.0.json
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/artifacts.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/artifacts.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/artifacts.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/artifacts.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/artifact.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/artifact.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/artifact.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/artifact.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/connected_cup_execution.siddhiql b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/connected_cup_execution.siddhiql
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/connected_cup_execution.siddhiql
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/connected_cup_execution.siddhiql
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/artifact.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/artifact.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/artifact.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/artifact.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/connected_cup_publisher.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/connected_cup_publisher.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/connected_cup_publisher.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/connected_cup_publisher.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/artifact.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/artifact.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/artifact.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/artifact.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/artifact.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/artifact.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/artifact.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/artifact.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/org.wso2.iot.connectedcup_1.0.0.json b/modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/org.wso2.iot.connectedcup_1.0.0.json
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/org.wso2.iot.connectedcup_1.0.0.json
rename to modules-old/distribution/src/resources/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/org.wso2.iot.connectedcup_1.0.0.json
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/api/pom.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/api/pom.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/api/pom.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/api/pom.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java b/modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java b/modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/exception/ConnectedCupException.java b/modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/exception/ConnectedCupException.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/exception/ConnectedCupException.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/exception/ConnectedCupException.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/APIUtil.java b/modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/APIUtil.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/APIUtil.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/APIUtil.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/SensorRecord.java b/modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/SensorRecord.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/SensorRecord.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/SensorRecord.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/META-INF/permissions.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/META-INF/permissions.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/META-INF/permissions.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/META-INF/permissions.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/WEB-INF/web.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/WEB-INF/web.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/api/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/plugin/pom.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/plugin/pom.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/plugin/pom.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/plugin/pom.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/constants/ConnectedCupConstants.java b/modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/constants/ConnectedCupConstants.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/constants/ConnectedCupConstants.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/constants/ConnectedCupConstants.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/exception/ConnectedCupDeviceMgtPluginException.java b/modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/exception/ConnectedCupDeviceMgtPluginException.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/exception/ConnectedCupDeviceMgtPluginException.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/exception/ConnectedCupDeviceMgtPluginException.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupFeatureManager.java b/modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupFeatureManager.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupFeatureManager.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupFeatureManager.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java b/modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManager.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java b/modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/ConnectedCupManagerService.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/ConnectedCupDAO.java b/modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/ConnectedCupDAO.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/ConnectedCupDAO.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/ConnectedCupDAO.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/ConnectedCupDAOUtil.java b/modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/ConnectedCupDAOUtil.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/ConnectedCupDAOUtil.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/ConnectedCupDAOUtil.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/util/ConnectedCupUtils.java b/modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/util/ConnectedCupUtils.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/util/ConnectedCupUtils.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/impl/dao/util/ConnectedCupUtils.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/internal/ConnectedCupServiceComponent.java b/modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/internal/ConnectedCupServiceComponent.java
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/internal/ConnectedCupServiceComponent.java
rename to modules-old/distribution/src/resources/samples/connectedcup/component/plugin/src/main/java/org/coffeeking/connectedcup/plugin/internal/ConnectedCupServiceComponent.java
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/pom.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/pom.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/pom.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/pom.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/pom.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/pom.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/pom.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/pom.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/assembly/src.xml b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/assembly/src.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/assembly/src.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/assembly/src.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.hbs b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.hbs
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.hbs
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.js b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.js
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.js
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.js
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.json b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.json
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.json
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.json
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/connectedcup.js b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/connectedcup.js
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/connectedcup.js
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/connectedcup.js
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.json b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.json
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.json
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.json
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/public/images/thumb.png b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/public/images/thumb.png
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/public/images/thumb.png
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/public/images/thumb.png
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.hbs b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.hbs
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.hbs
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.hbs
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.js b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.js
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.js
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.js
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.json b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.json
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.json
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.json
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/device-stats.js b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/device-stats.js
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/device-stats.js
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/device-stats.js
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/moment.min.js b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/moment.min.js
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/moment.min.js
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/moment.min.js
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/socket.io.min.js b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/socket.io.min.js
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/socket.io.min.js
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/public/js/socket.io.min.js
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/private/config.json b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/private/config.json
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/private/config.json
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/private/config.json
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/css/styles.css b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/css/styles.css
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/css/styles.css
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/css/styles.css
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffee_stats.png b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffee_stats.png
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffee_stats.png
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffee_stats.png
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffeecup.png b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffeecup.png
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffeecup.png
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffeecup.png
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/thumb.png b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/thumb.png
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/thumb.png
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/thumb.png
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/download.js b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/download.js
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/download.js
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/download.js
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/jquery.validate.js b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/jquery.validate.js
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/jquery.validate.js
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/jquery.validate.js
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.hbs b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.hbs
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.hbs
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.hbs
diff --git a/modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json b/modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json
rename to modules-old/distribution/src/resources/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json
diff --git a/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/pom.xml b/modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/pom.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/pom.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/pom.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/deviceConfig.properties b/modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/deviceConfig.properties
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/deviceConfig.properties
rename to modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/deviceConfig.properties
diff --git a/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/sketch.properties b/modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/sketch.properties
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/sketch.properties
rename to modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/sketch.properties
diff --git a/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/start-device.sh b/modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/start-device.sh
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/start-device.sh
rename to modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/start-device.sh
diff --git a/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/build.properties b/modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/build.properties
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/build.properties
rename to modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/build.properties
diff --git a/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/configs/connectedcup.xml b/modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/configs/connectedcup.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/configs/connectedcup.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/configs/connectedcup.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/datasources/connectedcup-datasources.xml b/modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/datasources/connectedcup-datasources.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/datasources/connectedcup-datasources.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/datasources/connectedcup-datasources.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/dbscripts/h2.sql b/modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/dbscripts/h2.sql
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/dbscripts/h2.sql
rename to modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/dbscripts/h2.sql
diff --git a/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/dbscripts/mysql.sql b/modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/dbscripts/mysql.sql
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/dbscripts/mysql.sql
rename to modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/dbscripts/mysql.sql
diff --git a/modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf b/modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf
rename to modules-old/distribution/src/resources/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf
diff --git a/modules/distribution/src/resources/samples/connectedcup/feature/pom.xml b/modules-old/distribution/src/resources/samples/connectedcup/feature/pom.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/feature/pom.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/feature/pom.xml
diff --git a/modules/distribution/src/resources/samples/connectedcup/pom.xml b/modules-old/distribution/src/resources/samples/connectedcup/pom.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/connectedcup/pom.xml
rename to modules-old/distribution/src/resources/samples/connectedcup/pom.xml
diff --git a/modules/distribution/src/resources/samples/samples-deployer.xml b/modules-old/distribution/src/resources/samples/samples-deployer.xml
similarity index 100%
rename from modules/distribution/src/resources/samples/samples-deployer.xml
rename to modules-old/distribution/src/resources/samples/samples-deployer.xml
diff --git a/modules/integration/pom.xml b/modules-old/integration/pom.xml
similarity index 100%
rename from modules/integration/pom.xml
rename to modules-old/integration/pom.xml
diff --git a/modules/integration/tests-artifacts/pom.xml b/modules-old/integration/tests-artifacts/pom.xml
similarity index 100%
rename from modules/integration/tests-artifacts/pom.xml
rename to modules-old/integration/tests-artifacts/pom.xml
diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules-old/integration/tests-common/admin-clients/pom.xml
similarity index 100%
rename from modules/integration/tests-common/admin-clients/pom.xml
rename to modules-old/integration/tests-common/admin-clients/pom.xml
diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules-old/integration/tests-common/integration-test-utils/pom.xml
similarity index 100%
rename from modules/integration/tests-common/integration-test-utils/pom.xml
rename to modules-old/integration/tests-common/integration-test-utils/pom.xml
diff --git a/modules/integration/tests-common/pom.xml b/modules-old/integration/tests-common/pom.xml
similarity index 100%
rename from modules/integration/tests-common/pom.xml
rename to modules-old/integration/tests-common/pom.xml
diff --git a/modules/integration/tests-common/web-ui-pages/pom.xml b/modules-old/integration/tests-common/web-ui-pages/pom.xml
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/pom.xml
rename to modules-old/integration/tests-common/web-ui-pages/pom.xml
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIElementMapper.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/UIUtils.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/DevicesPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/devices/EnrollDevicePage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/error/IOTErrorPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/error/IOTErrorPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/error/IOTErrorPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/error/IOTErrorPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/Graph.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/GraphHandler.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/GraphHandler.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/GraphHandler.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/graphs/GraphHandler.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceAddGroupPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/groups/DeviceGroupsPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTAdminDashboard.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/home/IOTHomePage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/login/LoginPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceInterface.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceTypeViewPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/samples/ConnectedCupDeviceViewPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/AddUserPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/EditUserPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/NewUserRegisterPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserAddedConfirmationPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/UserListingPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java b/modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java
rename to modules-old/integration/tests-common/web-ui-pages/src/main/java/org/wso2/iot/integration/ui/pages/uesr/ViewUserPage.java
diff --git a/modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties b/modules-old/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties
similarity index 100%
rename from modules/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties
rename to modules-old/integration/tests-common/web-ui-pages/src/main/resources/mapper.properties
diff --git a/modules/integration/tests-integration/pom.xml b/modules-old/integration/tests-integration/pom.xml
similarity index 100%
rename from modules/integration/tests-integration/pom.xml
rename to modules-old/integration/tests-integration/pom.xml
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/AssertUtil.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/AssertUtil.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/AssertUtil.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/AssertUtil.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/Constants.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/Constants.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/Constants.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/Constants.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/IOTHttpClient.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/IOTHttpClient.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/IOTHttpClient.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/IOTHttpClient.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/IOTResponse.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/IOTResponse.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/IOTResponse.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/IOTResponse.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/OAuthUtil.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/PayloadGenerator.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/PayloadGenerator.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/PayloadGenerator.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/PayloadGenerator.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/RestClient.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/RestClient.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/RestClient.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/RestClient.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/TestBase.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/TestBase.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/TestBase.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/common/TestBase.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/configuration/ConfigurationManagement.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/configuration/ConfigurationManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/configuration/ConfigurationManagement.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/configuration/ConfigurationManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/configuration/AndroidConfigurationManagement.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/configuration/AndroidConfigurationManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/configuration/AndroidConfigurationManagement.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/configuration/AndroidConfigurationManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/enrollment/AndroidEnrollment.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/enrollment/AndroidEnrollment.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/enrollment/AndroidEnrollment.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/enrollment/AndroidEnrollment.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/enrollment/WindowsEnrollment.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/enrollment/WindowsEnrollment.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/enrollment/WindowsEnrollment.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/enrollment/WindowsEnrollment.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/mgt/AndroidDeviceManagement.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/mgt/AndroidDeviceManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/mgt/AndroidDeviceManagement.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/mgt/AndroidDeviceManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/operation/AndroidOperation.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/operation/AndroidOperation.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/operation/AndroidOperation.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/operation/AndroidOperation.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/policy/AndroidPolicy.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/policy/AndroidPolicy.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/policy/AndroidPolicy.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/device/policy/AndroidPolicy.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/AnalyticsServerExtension.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/AnalyticsServerExtension.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/AnalyticsServerExtension.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/AnalyticsServerExtension.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/BrokerServerExtension.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/BrokerServerExtension.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/BrokerServerExtension.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/BrokerServerExtension.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/CustomTestServerManager.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/CustomTestServerManager.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/CustomTestServerManager.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/CustomTestServerManager.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/IOTServerExtension.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/IOTServerExtension.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/IOTServerExtension.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/extensions/IOTServerExtension.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/feature/FeatureManagement.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/feature/FeatureManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/feature/FeatureManagement.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/feature/FeatureManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/license/LicenseManagement.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/license/LicenseManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/license/LicenseManagement.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/license/LicenseManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagement.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagement.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/notification/NotificationManagement.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/notification/NotificationManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/notification/NotificationManagement.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/notification/NotificationManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/operation/OperationManagement.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/operation/OperationManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/operation/OperationManagement.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/operation/OperationManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/policy/PolicyManagement.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/policy/PolicyManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/policy/PolicyManagement.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/policy/PolicyManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/role/RoleManagement.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/role/RoleManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/role/RoleManagement.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/role/RoleManagement.java
diff --git a/modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/user/UserManagement.java b/modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/user/UserManagement.java
similarity index 100%
rename from modules/integration/tests-integration/src/test/java/org/wso2/iot/integration/user/UserManagement.java
rename to modules-old/integration/tests-integration/src/test/java/org/wso2/iot/integration/user/UserManagement.java
diff --git a/modules/integration/tests-integration/src/test/resources/automation.xml b/modules-old/integration/tests-integration/src/test/resources/automation.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/automation.xml
rename to modules-old/integration/tests-integration/src/test/resources/automation.xml
diff --git a/modules/integration/tests-integration/src/test/resources/automationSchema.xsd b/modules-old/integration/tests-integration/src/test/resources/automationSchema.xsd
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/automationSchema.xsd
rename to modules-old/integration/tests-integration/src/test/resources/automationSchema.xsd
diff --git a/modules/integration/tests-integration/src/test/resources/filters.txt b/modules-old/integration/tests-integration/src/test/resources/filters.txt
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/filters.txt
rename to modules-old/integration/tests-integration/src/test/resources/filters.txt
diff --git a/modules/integration/tests-integration/src/test/resources/instrumentation.txt b/modules-old/integration/tests-integration/src/test/resources/instrumentation.txt
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/instrumentation.txt
rename to modules-old/integration/tests-integration/src/test/resources/instrumentation.txt
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks b/modules-old/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks
rename to modules-old/integration/tests-integration/src/test/resources/keystores/products/client-truststore.jks
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks b/modules-old/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks
rename to modules-old/integration/tests-integration/src/test/resources/keystores/products/wso2carbon.jks
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks b/modules-old/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks
rename to modules-old/integration/tests-integration/src/test/resources/keystores/products/wso2certs.jks
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/products/wso2mdm.jks b/modules-old/integration/tests-integration/src/test/resources/keystores/products/wso2mdm.jks
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/keystores/products/wso2mdm.jks
rename to modules-old/integration/tests-integration/src/test/resources/keystores/products/wso2mdm.jks
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks b/modules-old/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks
rename to modules-old/integration/tests-integration/src/test/resources/keystores/stratos/client-truststore.jks
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks b/modules-old/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks
rename to modules-old/integration/tests-integration/src/test/resources/keystores/stratos/wso2carbon.jks
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2certs.jks b/modules-old/integration/tests-integration/src/test/resources/keystores/stratos/wso2certs.jks
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2certs.jks
rename to modules-old/integration/tests-integration/src/test/resources/keystores/stratos/wso2certs.jks
diff --git a/modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2emm.jks b/modules-old/integration/tests-integration/src/test/resources/keystores/stratos/wso2emm.jks
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/keystores/stratos/wso2emm.jks
rename to modules-old/integration/tests-integration/src/test/resources/keystores/stratos/wso2emm.jks
diff --git a/modules/integration/tests-integration/src/test/resources/log4j.properties b/modules-old/integration/tests-integration/src/test/resources/log4j.properties
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/log4j.properties
rename to modules-old/integration/tests-integration/src/test/resources/log4j.properties
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-config-response-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/android-config-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-config-response-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/android-config-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-configuration-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/android-configuration-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-configuration-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/android-configuration-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-device-mgt-response-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/android-device-mgt-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-device-mgt-response-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/android-device-mgt-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/android-enrollment-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/android-enrollment-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/android-enrollment-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-operation-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/android-operation-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-operation-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/android-operation-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/android-policy-response-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/android-policy-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/android-policy-response-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/android-policy-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/configuration-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/configuration-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/configuration-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/configuration-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/configuration-response-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/configuration-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/configuration-response-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/configuration-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/get-notifications-response-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/get-notifications-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/get-notifications-response-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/get-notifications-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/license-response-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/license-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/license-response-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/license-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/mobile-device-mgt-view-device-types-response-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/mobile-device-mgt-view-device-types-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/mobile-device-mgt-view-device-types-response-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/mobile-device-mgt-view-device-types-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/notification-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/notification-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/notification-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/notification-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/notification-response-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/notification-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/notification-response-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/notification-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/permissions.json b/modules-old/integration/tests-integration/src/test/resources/payloads/permissions.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/permissions.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/permissions.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/policy-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/policy-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/policy-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/policy-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/policy-response-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/policy-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/policy-response-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/policy-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/role-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/role-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/role-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/role-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/user-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/user-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/user-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/user-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json b/modules-old/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json
rename to modules-old/integration/tests-integration/src/test/resources/payloads/user-response-payloads.json
diff --git a/modules/integration/tests-integration/src/test/resources/testng-server-mgt.xml b/modules-old/integration/tests-integration/src/test/resources/testng-server-mgt.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/testng-server-mgt.xml
rename to modules-old/integration/tests-integration/src/test/resources/testng-server-mgt.xml
diff --git a/modules/integration/tests-integration/src/test/resources/testng.xml b/modules-old/integration/tests-integration/src/test/resources/testng.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/testng.xml
rename to modules-old/integration/tests-integration/src/test/resources/testng.xml
diff --git a/modules/integration/tests-integration/src/test/resources/windows/enrollment/additional_device_info.xml b/modules-old/integration/tests-integration/src/test/resources/windows/enrollment/additional_device_info.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/windows/enrollment/additional_device_info.xml
rename to modules-old/integration/tests-integration/src/test/resources/windows/enrollment/additional_device_info.xml
diff --git a/modules/integration/tests-integration/src/test/resources/windows/enrollment/discovery-post.xml b/modules-old/integration/tests-integration/src/test/resources/windows/enrollment/discovery-post.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/windows/enrollment/discovery-post.xml
rename to modules-old/integration/tests-integration/src/test/resources/windows/enrollment/discovery-post.xml
diff --git a/modules/integration/tests-integration/src/test/resources/windows/enrollment/inital_device_info.xml b/modules-old/integration/tests-integration/src/test/resources/windows/enrollment/inital_device_info.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/windows/enrollment/inital_device_info.xml
rename to modules-old/integration/tests-integration/src/test/resources/windows/enrollment/inital_device_info.xml
diff --git a/modules/integration/tests-integration/src/test/resources/windows/enrollment/ms_xcep.xml b/modules-old/integration/tests-integration/src/test/resources/windows/enrollment/ms_xcep.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/windows/enrollment/ms_xcep.xml
rename to modules-old/integration/tests-integration/src/test/resources/windows/enrollment/ms_xcep.xml
diff --git a/modules/integration/tests-integration/src/test/resources/windows/enrollment/wstep.xml b/modules-old/integration/tests-integration/src/test/resources/windows/enrollment/wstep.xml
similarity index 100%
rename from modules/integration/tests-integration/src/test/resources/windows/enrollment/wstep.xml
rename to modules-old/integration/tests-integration/src/test/resources/windows/enrollment/wstep.xml
diff --git a/modules/integration/tests-iot-web-ui/pom.xml b/modules-old/integration/tests-iot-web-ui/pom.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/pom.xml
rename to modules-old/integration/tests-iot-web-ui/pom.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/Constants.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/Constants.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/Constants.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/Constants.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/IOTIntegrationUIBaseTestCase.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/IOTIntegrationUIBaseTestCase.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/IOTIntegrationUIBaseTestCase.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/IOTIntegrationUIBaseTestCase.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/LoginUtils.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/LoginUtils.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/LoginUtils.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/common/LoginUtils.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/error/InitialErrorTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/error/InitialErrorTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/error/InitialErrorTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/error/InitialErrorTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/AnalyticsServerExtension.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/AnalyticsServerExtension.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/AnalyticsServerExtension.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/AnalyticsServerExtension.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/BrokerServerExtension.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/BrokerServerExtension.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/BrokerServerExtension.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/BrokerServerExtension.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/CustomTestServerManager.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/CustomTestServerManager.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/CustomTestServerManager.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/CustomTestServerManager.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/IOTServerExtension.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/IOTServerExtension.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/IOTServerExtension.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/extension/IOTServerExtension.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupFailTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupFailTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupFailTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupFailTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/group/DeviceGroupTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginFormValidationTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginFormValidationTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginFormValidationTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginFormValidationTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/login/LoginTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrollmentTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrollmentTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrollmentTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrollmentTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrolmentVerificationTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrolmentVerificationTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrolmentVerificationTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleEnrolmentVerificationTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleFunctionalityTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleFunctionalityTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleFunctionalityTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleFunctionalityTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationVerification.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationVerification.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationVerification.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/samples/SampleInstallationVerification.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AddUserFormValidationTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AddUserFormValidationTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AddUserFormValidationTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AddUserFormValidationTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AdminFunctionsTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AdminFunctionsTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AdminFunctionsTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/AdminFunctionsTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/NewUserRegistrationTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/NewUserRegistrationTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/NewUserRegistrationTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/NewUserRegistrationTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/RegistrationFormValidationTest.java b/modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/RegistrationFormValidationTest.java
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/RegistrationFormValidationTest.java
rename to modules-old/integration/tests-iot-web-ui/src/test/java/org/wso2/carbon/iot/integration/web/ui/test/user/RegistrationFormValidationTest.java
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/automation.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/automation.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/automation.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/automation.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/automationXMLSchema.xsd b/modules-old/integration/tests-iot-web-ui/src/test/resources/automationXMLSchema.xsd
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/automationXMLSchema.xsd
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/automationXMLSchema.xsd
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/axis2config/axis2_client.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/axis2config/axis2_client.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/axis2config/axis2_client.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/axis2config/axis2_client.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v10.mar b/modules-old/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v10.mar
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v10.mar
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v10.mar
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v11-20140908.185829-596.mar b/modules-old/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v11-20140908.185829-596.mar
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v11-20140908.185829-596.mar
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v11-20140908.185829-596.mar
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v15.mar b/modules-old/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v15.mar
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v15.mar
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/client/modules/addressing-1.6.1-wso2v15.mar
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/client/modules/rampart-1.6.1-wso2v8.mar b/modules-old/integration/tests-iot-web-ui/src/test/resources/client/modules/rampart-1.6.1-wso2v8.mar
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/client/modules/rampart-1.6.1-wso2v8.mar
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/client/modules/rampart-1.6.1-wso2v8.mar
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/emma.properties b/modules-old/integration/tests-iot-web-ui/src/test/resources/emma.properties
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/emma.properties
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/emma.properties
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/filters.txt b/modules-old/integration/tests-iot-web-ui/src/test/resources/filters.txt
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/filters.txt
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/filters.txt
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/instrumentation.txt b/modules-old/integration/tests-iot-web-ui/src/test/resources/instrumentation.txt
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/instrumentation.txt
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/instrumentation.txt
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks b/modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/products/client-truststore.jks
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks b/modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2carbon.jks
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2certs.jks b/modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2certs.jks
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2certs.jks
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2certs.jks
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2mdm.jks b/modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2mdm.jks
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2mdm.jks
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/products/wso2mdm.jks
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks b/modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/client-truststore.jks
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks b/modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2carbon.jks
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2certs.jks b/modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2certs.jks
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2certs.jks
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2certs.jks
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2emm.jks b/modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2emm.jks
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2emm.jks
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/keystores/stratos/wso2emm.jks
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/log4j.properties b/modules-old/integration/tests-iot-web-ui/src/test/resources/log4j.properties
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/log4j.properties
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/log4j.properties
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario-config.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario-config.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario-config.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario-config.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario1-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario1-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario1-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario1-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario10-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario10-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario10-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario10-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario11-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario11-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario11-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario11-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario12-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario12-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario12-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario12-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario13-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario13-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario13-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario13-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario14-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario14-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario14-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario14-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario15-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario15-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario15-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario15-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario16-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario16-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario16-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario16-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario17-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario17-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario17-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario17-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario2-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario2-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario2-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario2-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario3-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario3-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario3-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario3-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario4-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario4-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario4-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario4-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario5-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario5-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario5-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario5-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario6-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario6-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario6-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario6-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario7-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario7-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario7-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario7-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario8-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario8-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario8-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario8-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario9-policy.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario9-policy.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario9-policy.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/security/policies/scenario9-policy.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/testng-server-mgt.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/testng-server-mgt.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/testng-server-mgt.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/testng-server-mgt.xml
diff --git a/modules/integration/tests-iot-web-ui/src/test/resources/testng.xml b/modules-old/integration/tests-iot-web-ui/src/test/resources/testng.xml
similarity index 100%
rename from modules/integration/tests-iot-web-ui/src/test/resources/testng.xml
rename to modules-old/integration/tests-iot-web-ui/src/test/resources/testng.xml
diff --git a/modules/integration/tests-platform/pom.xml b/modules-old/integration/tests-platform/pom.xml
similarity index 100%
rename from modules/integration/tests-platform/pom.xml
rename to modules-old/integration/tests-platform/pom.xml
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/build.xml b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/build.xml
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/build.xml
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/build.xml
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/pom.xml b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/pom.xml
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/pom.xml
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/pom.xml
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/assembly/src.xml b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/assembly/src.xml
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/assembly/src.xml
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/assembly/src.xml
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/artifacts.xml b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/artifacts.xml
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/artifacts.xml
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/artifacts.xml
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_dashboard/artifact.xml b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_dashboard/artifact.xml
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_dashboard/artifact.xml
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_dashboard/artifact.xml
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_dashboard/location-data-dashboard.json b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_dashboard/location-data-dashboard.json
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_dashboard/location-data-dashboard.json
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_dashboard/location-data-dashboard.json
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/artifact.xml b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/artifact.xml
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/artifact.xml
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/artifact.xml
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/css/style.css b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/css/style.css
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/css/style.css
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/css/style.css
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/floor.jpg b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/floor.jpg
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/floor.jpg
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/floor.jpg
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/gadget.json b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/gadget.json
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/gadget.json
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/gadget.json
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/img/floor.jpg b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/img/floor.jpg
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/img/floor.jpg
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/img/floor.jpg
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/index.jpg b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/index.jpg
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/index.jpg
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/index.jpg
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/index.xml b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/index.xml
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/index.xml
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/index.xml
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/js/RestCaller.js b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/js/RestCaller.js
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/js/RestCaller.js
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/js/RestCaller.js
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/js/graph.js b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/js/graph.js
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/js/graph.js
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/js/graph.js
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/js/traffic.js b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/js/traffic.js
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/js/traffic.js
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/js/traffic.js
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/css/bootstrap.css b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/css/bootstrap.css
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/css/bootstrap.css
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/css/bootstrap.css
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/bootstrap.js b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/bootstrap.js
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/bootstrap.js
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/bootstrap.js
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/d3.js b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/d3.js
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/d3.js
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/d3.js
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/d3tip.js b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/d3tip.js
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/d3tip.js
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/d3tip.js
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/floor.jpg b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/floor.jpg
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/floor.jpg
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/floor.jpg
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/jquery.js b/modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/jquery.js
similarity index 100%
rename from modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/jquery.js
rename to modules-old/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics/src/main/resources/carbonapps/locationTraker/location_data_visualizer_gadget/location-data-visualizer/lib/js/jquery.js
diff --git a/modules/p2-profile/analytics-profile/carbon.product b/modules/p2-profile/analytics-profile/carbon.product
new file mode 100644
index 00000000..1889d675
--- /dev/null
+++ b/modules/p2-profile/analytics-profile/carbon.product
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application" version="4.4.0.SNAPSHOT" useFeatures="true" includeLaunchers="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+   </launcherArgs>
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="org.wso2.carbon.core.runtime" version="4.3.0.SNAPSHOT"/>
+   </features>
+
+  <configurations>
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+      
+      <!-- Disable update manager. It seems as if this could be achieved by the first line, but in 
+           fact the second line sets reconcile to false (see org.eclipse.equinox.p2.publisher.eclipse.ConfigCUsAction#publishBundleCUs) -->
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="4"/>      
+
+      <property name="org.eclipse.equinox.simpleconfigurator.useReference" value="true" />                                        
+   </configurations>
+   
+</product>
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
new file mode 100644
index 00000000..1cd27e0a
--- /dev/null
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -0,0 +1,861 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<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/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.wso2.iot</groupId>
+        <artifactId>wso2iot-p2-profile</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wso2iot-analytics-p2-profile</artifactId>
+    <name>WSO2 IoT - Analytics - P2 Profile Gen</name>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>unpack-equinox-executable</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.eclipse.equinox</groupId>
+                                    <artifactId>org.eclipse.equinox.executable</artifactId>
+                                    <version>3.5.0.v20110530-7P7NFUFFLWUl76mart</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>target</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>2-p2-repo-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-repo-gen</goal>
+                        </goals>
+                        <configuration>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <publishArtifacts>true</publishArtifacts>
+                            <publishArtifactRepository>true</publishArtifactRepository>
+                            <featureArtifacts>
+                                <!-- START - Analytics Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.core.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.datasource.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.restapi.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.spark.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.api.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.spark.commons.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <!-- END - Analytics features -->
+
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics.cdmf:org.wso2.carbon.analytics.cdmf.feature:${cdmf.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.analytics.gadget.template.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.dashboard.ui.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.deployment.feature:${carbon.dashboard.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.messageconsole.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.activitydashboard.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.webservice.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.jsservice.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.kernel.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.das:org.wso2.das.styles.feature:${product.das.version}
+                                </featureArtifactDef>
+
+                                <!-- ********* START - Registry related  *********** -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.core.feature:${carbon.registry.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.ui.menu.feature:${carbon.registry.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.resource.properties.feature:${carbon.registry.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.contentsearch.feature:${carbon.registry.version}
+                                </featureArtifactDef>
+                                <!-- ********* END - Registry related  *********** -->
+
+                                <!-- ************** START - User Management ********* -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.user.mgt.feature:${carbon.identity.framework.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.core.ui.feature:${carbon.identity.framework.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.core.server.feature:${carbon.identity.framework.version}
+                                </featureArtifactDef>
+                                <!-- ************** END - User Management ********* -->
+
+                                <!-- ************** START - Deployment Synchronizer ********* -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.event.server.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <!-- ************** END - Deployment Synchronizer ********* -->
+
+                                <!-- ************** START - Capp Management ********* -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <!-- ************** END - Capp Management ********* -->
+
+                                <!-- ************** START - Data Bridge ************ -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.datareceiver.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.streamdefn.filesystem.server.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.datapublisher.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.eventsink.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.eventtable.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <!-- ************** END - Data Bridge ************ -->
+
+                                <!-- ************** START - WebApp Deployment ************ -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.server.feature:${carbon.deployment.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.deployment:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.deployment.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <!-- ************** END - WebApp Deployment ************ -->
+
+                                <!-- ************** START - Jaggery feature ************ -->
+                                <featureArtifactDef>
+                                    org.jaggeryjs:org.jaggeryjs.feature:${jaggery.version}
+                                </featureArtifactDef>
+                                <!-- ************** END - Jaggery feature ************ -->
+
+                                <!-- Multitenancy related -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.feature:${carbon.multitenancy.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${identity.carbon.auth.saml2.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${identity.carbon.auth.saml2.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.security.mgt.feature:${carbon.identity.framework.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.das:org.wso2.das.multitenancy.dashboard.ui.feature:${product.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.tenant.mgt.common.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <!-- END - Multitenancy related -->
+
+                                <!-- START - JMX agent -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.analytics.common.jmx.agent.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.ntask.core.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <!-- END - JMX agent -->
+
+                                <!-- START - Data source related -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.ndatasource.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.data:org.wso2.carbon.datasource.reader.hadoop.server.feature:${carbon.data.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.data:org.wso2.carbon.datasource.reader.cassandra.server.feature:${carbon.data.version}
+                                </featureArtifactDef>
+                                <!-- END - Data source related -->
+
+                                <!-- ************** START - EVENT PROCESSING FEATURES *********** -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.receiver.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.publisher.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.event-processing:org.wso2.carbon.event.processor.feature:${carbon.event-processing.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.tracer.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.event-processing:org.wso2.carbon.event.flow.feature:${carbon.event-processing.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.statistics.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.stream.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.event-processing:org.wso2.carbon.event.simulator.feature:${carbon.event-processing.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.application.deployer.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.processor.manager.core.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.processor.manager.commons.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.stream.persistence.server.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.template.manager.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.spark.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.stream.template.deployer.server.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.gadget.template.deployer.server.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.dashboard.template.deployer.server.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.eventsink.template.deployer.server.feature:${carbon.analytics.das.version}
+                                </featureArtifactDef>
+                                <!-- ************** END - EVENT PROCESSING FEATURES ************ -->
+
+                                <!-- START - UES Features -->
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:carbon.feature:${jaggery.extensions.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:process.feature:${jaggery.extensions.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:i18n.feature:${jaggery.extensions.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:sso.feature:${jaggery.extensions.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:ws.feature:${jaggery.extensions.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs:org.jaggeryjs.server.feature:${jaggery.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.shindig.feature:${carbon.dashboard.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.portal.feature:${carbon.dashboard.version}
+                                </featureArtifactDef>
+                                <!-- END - UES Features -->
+
+                                <!-- Transport Adapters -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <!--End Transport Adapters -->
+                                <!-- Carbon metrics -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version}
+                                </featureArtifactDef>
+
+                                <!-- START - Tools -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.tryit.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.event-processing:org.wso2.carbon.siddhi.tryit.feature:${carbon.event-processing.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.ciphertool:org.wso2.ciphertool.feature:${cipher.tool.version}
+                                </featureArtifactDef>
+                                <!-- END - Tools -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.identity.jwt.client.extension.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <!-- Geo Dashboard feature -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics.shared:org.wso2.carbon.analytics.shared.spark.common.udf.feature:${analytics.shared.version}
+                                </featureArtifactDef>
+                                <!-- Siddhi extension feature -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+								<featureArtifactDef>
+									org.wso2.carbon.identity:org.wso2.carbon.identity.authenticator.mutualssl.feature:${identity.carbon.auth.mutual.ssl.version}
+								</featureArtifactDef>
+                            </featureArtifacts>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>publishing products</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>publish-product</goal>
+                        </goals>
+                        <configuration>
+                            <productConfigurationFile>${basedir}/carbon.product</productConfigurationFile>
+                            <executable>
+                                ${basedir}/target/org.eclipse.equinox.executable_3.5.0.v20110530-7P7NFUFFLWUl76mart
+                            </executable>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>materialize-analytics-default-profile</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>materialize-product</goal>
+                        </goals>
+                        <configuration>
+                            <productConfigurationFile>${basedir}/carbon.product
+                            </productConfigurationFile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <targetPath>file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components</targetPath>
+                            <profile>analytics-default</profile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>p2-profile-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-profile-gen</goal>
+                        </goals>
+                        <configuration>
+                            <profile>analytics-default</profile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <destination>
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
+                            </destination>
+                            <deleteOldProfileFiles>true</deleteOldProfileFiles>
+                            <features>
+                                <!-- START - Analytics Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.core.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.datasource.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.restapi.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.spark.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.api.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.spark.commons.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.stream.template.deployer.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.gadget.template.deployer.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dashboard.template.deployer.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <!-- END - Analytics features -->
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.dashboard.ui.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.dashboard.deployment.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.cdmf.feature.group</id>
+                                    <version>${cdmf.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.messageconsole.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.activitydashboard.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.webservice.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.jsservice.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.runtime.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.ui.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.das.styles.feature.group</id>
+                                    <version>${product.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.shared.spark.common.udf.feature.group</id>
+                                    <version>${analytics.shared.version}</version>
+                                </feature>
+
+                                <!-- ********* START - Registry related  *********** -->
+                                <feature>
+                                    <id>org.wso2.carbon.registry.core.feature.group</id>
+                                    <version>${carbon.registry.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ui.menu.feature.group</id>
+                                    <version>${carbon.registry.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.resource.properties.feature.group</id>
+                                    <version>${carbon.registry.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.contentsearch.feature.group</id>
+                                    <version>${carbon.registry.version}</version>
+                                </feature>
+                                <!-- ********* END - Registry related  *********** -->
+
+                                <!-- ************** START - User Management ********* -->
+                                <feature>
+                                    <id>org.wso2.carbon.user.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.core.ui.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.core.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
+                                <!-- ************** END - User Management ********* -->
+
+                                <!-- ************** START - Deployment Synchronizer ********* -->
+                                <feature>
+                                    <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <!-- ************** END - Deployment Synchronizer ********* -->
+
+                                <!-- ************** START - Capp Management ********* -->
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <!-- ************** END - Capp Management ********* -->
+
+                                <!-- ************** START - Data Bridge ************ -->
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.datareceiver.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.streamdefn.filesystem.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.eventsink.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.eventtable.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <!-- ************** END - Data Bridge ************ -->
+
+                                <!-- ************** START - WebApp Deployment ************ -->
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <!-- ************** END - WebApp Deployment ************* -->
+
+
+                                <!-- ************** jaggery feature groups ***************-->
+                                <feature>
+                                    <id>org.jaggeryjs.feature.group</id>
+                                    <version>${jaggery.version}</version>
+                                </feature>
+                                <!-- ***************feature groups end *******************-->
+
+                                <!-- START - Multitenancy related -->
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.common.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.security.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.das.multitenancy.dashboard.ui.feature.group</id>
+                                    <version>${product.das.version}</version>
+                                </feature>
+                                <!-- END - Multitenancy related -->
+
+                                <!-- START - JMX agent -->
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.common.jmx.agent.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.ntask.core.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <!-- END - JMX agent -->
+
+                                <!-- START - Data source related -->
+                                <feature>
+                                    <id>org.wso2.carbon.ndatasource.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.datasource.reader.hadoop.server.feature.group</id>
+                                    <version>${carbon.data.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.datasource.reader.cassandra.server.feature.group</id>
+                                    <version>${carbon.data.version}</version>
+                                </feature>
+                                <!-- END - Data source related -->
+
+                                <!-- ************** START - EVENT PROCESSING FEATURES ************ -->
+                                <feature>
+                                    <id>org.wso2.carbon.event.receiver.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.publisher.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.processor.feature.group</id>
+                                    <version>${carbon.event-processing.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.processor.server.feature.group</id>
+                                    <version>${carbon.event-processing.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.tracer.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.flow.feature.group</id>
+                                    <version>${carbon.event-processing.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.statistics.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.stream.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.simulator.feature.group</id>
+                                    <version>${carbon.event-processing.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.application.deployer.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.processor.manager.core.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.processor.manager.commons.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.stream.persistence.server.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.template.manager.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.spark.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.eventsink.template.deployer.server.feature.group</id>
+                                    <version>${carbon.analytics.das.version}</version>
+                                </feature>
+
+                                <!-- ************** END - EVENT PROCESSING FEATURES ************ -->
+
+                                <!-- START - UES Features -->
+                                <feature>
+                                    <id>org.jaggeryjs.modules.carbon.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.process.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.i18n.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.sso.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.ws.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dashboards.shindig.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dashboards.portal.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dashboard.deployment.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <!-- END - UES Features -->
+
+                                <!-- carbon metrics -->
+                                <feature>
+                                    <id>org.wso2.carbon.metrics.feature.group</id>
+                                    <version>${carbon.metrics.version}</version>
+                                </feature>
+
+                                <!--START - Tools-->
+                                <feature>
+                                    <id>org.wso2.carbon.tryit.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.siddhi.tryit.feature.group</id>
+                                    <version>${carbon.event-processing.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.ciphertool.feature.group</id>
+                                    <version>${cipher.tool.version}</version>
+                                </feature>
+                                <!--END - Tools-->
+                                <!-- Transport Adapters -->
+                               <feature>
+                                    <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End Transport Adapters -->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <!-- IoT Analytics Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.cdmf.feature.group</id>
+                                    <version>${cdmf.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.gadget.template.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+
+                                <!-- End of IoT Analytics Features -->
+
+                                <!-- Geo Dashboard Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.iot.geo.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of Geo Dashboard Feature -->
+
+                                <!-- Siddhi extension Feature -->
+                                <feature>
+                                    <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                            </features>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>creating-required-resources</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/etc/bundle-config/hadoop-client" />
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf/analytics/spark" />
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server" />
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <replace token="false" value="true" dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/components">
+                                    <include name="**/bundles.info" />
+                                </replace>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <properties>
+    </properties>
+</project>
diff --git a/modules/p2-profile/iot-core-profile/carbon.product b/modules/p2-profile/iot-core-profile/carbon.product
new file mode 100644
index 00000000..c3ac5fa7
--- /dev/null
+++ b/modules/p2-profile/iot-core-profile/carbon.product
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Carbon Product" uid="carbon.product.id" id="carbon.product" application="carbon.application"
+version="4.4.14" useFeatures="true" includeLaunchers="true">
+
+   <configIni use="default">
+   </configIni>
+
+   <launcherArgs>
+   </launcherArgs>
+
+   <plugins>
+   </plugins>
+
+   <features>
+      <feature id="org.wso2.carbon.core.runtime" version="4.4.14"/>
+   </features>
+
+  <configurations>
+      <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+      <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+      <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+
+      <!-- Disable update manager. It seems as if this could be achieved by the first line, but in
+           fact the second line sets reconcile to false (see org.eclipse.equinox.p2.publisher.eclipse.ConfigCUsAction#publishBundleCUs) -->
+      <property name="org.eclipse.update.reconcile" value="false" />
+      <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="4"/>
+
+      <property name="org.eclipse.equinox.simpleconfigurator.useReference" value="true" />
+   </configurations>
+
+</product>
diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
new file mode 100644
index 00000000..1945ccd6
--- /dev/null
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -0,0 +1,3872 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<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">
+    <parent>
+        <groupId>org.wso2.iot</groupId>
+        <artifactId>wso2iot-p2-profile</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wso2iot-core-p2-profile</artifactId>
+    <name>WSO2 IoT - Core - P2 Profile Gen</name>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <inherited>false</inherited>
+                <executions>
+                    <execution>
+                        <id>unpack-equinox-executable</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.eclipse.equinox</groupId>
+                                    <artifactId>org.eclipse.equinox.executable</artifactId>
+                                    <version>3.5.0.v20110530-7P7NFUFFLWUl76mart</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>target</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+
+                <executions>
+                    <execution>
+                        <id>2-p2-repo-generation</id>
+                        <phase>package</phase>
+
+                        <goals>
+                            <goal>p2-repo-gen</goal>
+                        </goals>
+
+                        <configuration>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <publishArtifacts>true</publishArtifacts>
+                            <publishArtifactRepository>true</publishArtifactRepository>
+
+                            <featureArtifacts>
+                                <!-- Device Management Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.policy.mgt.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.api.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.cert.admin.api.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.api.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.certificate.mgt.cert.admin.api.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.webapp.authenticator.framework.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.dynamic.client.registration.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.oauth.extensions.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.webapp.publisher.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.data.publisher.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.identity.jwt.client.extension.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.application.extension.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.integration.client.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.handler.server.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.email.sender.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <!-- End of Device Management Features -->
+
+                                <!-- Device Management Plugin Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.android.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.mobile.windows.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <!-- End of Device Management Plugin Features -->
+
+                                <!-- IoT Device Management Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.adapter.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <!-- IoT Device Management Features -->
+
+                                <!-- Carbon Deployment Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.deployment:org.wso2.carbon.webapp.mgt.feature:${carbon.deployment.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.feature:${carbon.deployment.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.deployment:org.wso2.carbon.as.runtimes.cxf.feature:${carbon.deployment.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.deployment:org.wso2.carbon.service.mgt.server.feature:${carbon.deployment.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.deployment:org.wso2.carbon.application.deployer.webapp.feature:${carbon.deployment.version}
+                                </featureArtifactDef>
+                                <!-- End of Carbon Deployment Features -->
+
+                                <!-- Jaggery Features -->
+                                <featureArtifactDef>
+                                    org.jaggeryjs:org.jaggeryjs.feature:${jaggery.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:carbon.feature:${jaggery.extensions.carbon.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:process.feature:${jaggery.extensions.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:uuid.feature:${jaggery.extensions.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:sso.feature:${jaggery.extensions.sso.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:i18n.feature:${jaggery.extensions.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.jaggeryjs.modules:ws.feature:${jaggery.extensions.version}
+                                </featureArtifactDef>
+                                <!-- End of Jaggery Features -->
+
+                                <!-- API Management Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.core.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.gateway.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.keymanager.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.forum.server.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
+                                <!-- End of API Management Features -->
+
+                                <!-- Carbon Commons Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.logging.mgt.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.ntask.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.tenant.mgt.common.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <!-- End of Carbon Commons Features -->
+
+                                <!-- Carbon Analytics Common Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.datapublisher.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <!-- End of Carbon Analytics Common Features -->
+
+                                <!-- Carbon Multi-tenancy Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.usage.agent.feature:${carbon.multitenancy.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.throttling.agent.feature:${carbon.multitenancy.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.deployment.feature:${carbon.multitenancy.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.common.feature:${carbon.multitenancy.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.multitenancy:org.wso2.carbon.tenant.mgt.core.feature:${carbon.multitenancy.version}
+                                </featureArtifactDef>
+                                <!-- End of Carbon Multi-tenancy Features -->
+
+                                <!-- Identity Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.security.mgt.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.user.ws:org.wso2.carbon.um.ws.service.feature:${identity.user.ws.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.inbound.auth.oauth2:org.wso2.carbon.identity.oauth.feature:${identity.inbound.auth.oauth.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.provider.server.feature:${identity.inbound.auth.openid.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.core.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.idp.mgt.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <!-- SSO -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.application.auth.basic:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${identity.local.auth.basicauth.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.application.authentication.framework.server.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.carbon.auth.saml2:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${identity.carbon.auth.saml2.version.iotcore}
+                                </featureArtifactDef>
+                                <feaureArtifactDef>
+                                    org.wso2.carbon.identity.inbound.auth.saml2:org.wso2.carbon.identity.sso.saml.feature:${identity.inbound.auth.saml.version.iotcore}
+                                </feaureArtifactDef>
+                                <!-- SSO Fix-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.user.profile.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.application.mgt.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.claim.mgt.server.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.claim.mgt.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.inbound.auth.oauth2:org.wso2.carbon.identity.oauth.ui.feature:${identity.inbound.auth.oauth.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.notification.mgt.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.user.mgt.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.directory.service.mgr.server.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.user.registration.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.xacml.server.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <!-- Authenticators -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature:${identity.outbound.auth.requestpath.basicauth.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature:${identity.outbound.auth.requestpath.oauth.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.application.auth.basic:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:${identity.local.auth.basicauth.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.outbound.auth.saml2:org.wso2.carbon.identity.application.authenticator.samlsso.server.feature:${identity.outbound.auth.samlsso.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.carbon.auth.saml2:org.wso2.carbon.identity.authenticator.saml2.sso.feature:${identity.carbon.auth.saml2.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.thrift.authentication.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.inbound.metadata.saml2.server.feature:0.1.1
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.metadata.saml2:org.wso2.carbon.identity.sp.metadata.saml2.server.feature:${identity.metadata.saml2.version}
+                                </featureArtifactDef>
+                                <!--<featureArtifactDef>-->
+                                <!--org.wso2.carbon.identity.framework:org.wso2.carbon.identity.base:${carbon.identity.framework.version.iotcore}-->
+                                <!--</featureArtifactDef>-->
+
+                                <!-- End of Identity Features -->
+
+                                <!-- Registry Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.core.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.ui.menu.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.resource.properties.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.associations.dependencies.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.community.features.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.ws.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.ui.menu.governance.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.contentsearch.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.task.server.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+
+                                <!-- Governance Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.governance:org.wso2.carbon.governance.metadata.feature:${carbon.governance.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.governance:org.wso2.carbon.governance.lifecycle.management.feature:${carbon.governance.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.governance:org.wso2.carbon.registry.extensions.feature:${carbon.governance.version}
+                                </featureArtifactDef>
+                                <!-- End of Governance Features -->
+
+                                <!-- Notification Support: Mail -->
+                                <featureArtifactDef>
+                                    org.apache.axis2.transport:org.apache.axis2.transport.mail.feature:${axis2-transports.wso2.version}
+                                </featureArtifactDef>
+
+                                <!-- IoT Server Features -->
+                                <featureArtifactDef>
+                                    org.wso2.iot:org.wso2.iot.core.styles.feature:${product.iot.version}
+                                </featureArtifactDef>
+
+                                <!-- Mobile Device Management Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.osgiconnector.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.appmgt.mdm.restconnector.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <!-- Mobile Device Management Features END -->
+
+                                <!-- APPM Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.core.feature:${appmgt.feature.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mdm.wso2emm.feature:${appmgt.feature.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.mobile.feature:${appmgt.feature.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.publisher.feature:${appmgt.feature.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.services.api.feature:${appmgt.feature.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.store:org.wso2.store.feature:${carbon.store.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.appmgt:org.wso2.carbon.appmgt.store.feature:${appmgt.feature.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.store:org.wso2.carbon.social.feature:${carbon.store.version}
+                                </featureArtifactDef>
+                                <!-- APPM Features END -->
+
+                                <!-- Dashboards Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.shindig.feature:${carbon.dashboard.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.portal.feature:${carbon.dashboard.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.dashboards:org.wso2.carbon.dashboards.deployment.feature:${carbon.dashboard.version}
+                                </featureArtifactDef>
+                                <!-- End of Dashboards Features -->
+
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics.cdmf:org.wso2.carbon.analytics.cdmf.feature:${cdmf.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.device.statistics.dashboard.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+
+                                <!-- Mediation Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.apache.synapse.wso2.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.apache.synapse.transport.nhttp.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediation.initializer.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediation.ntask.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.inbound.endpoints.server.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediators.server.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediation.admin.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.task.server.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediation.ui.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediator.cache.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <!-- End of Mediation Features -->
+
+                                <!-- App Manager features-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.event.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <!-- End of app manager feature-->
+
+                                <!-- ************** START - Capp Management ********* -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <!-- ************** END - Capp Management ********* -->
+
+                                <!-- Cipher tools feature -->
+
+                                <featureArtifactDef>
+                                    org.wso2.ciphertool:org.wso2.ciphertool.feature:${cipher.tool.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    caramel:caramel.feature:1.0.1
+                                </featureArtifactDef>
+
+                                <!-- End of cipher tools feature -->
+
+                                <!--********************************************-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.core.feature:${carbon.kernel.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.core.runtime.feature:${carbon.kernel.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon:org.wso2.carbon.core.ui.feature:${carbon.kernel.version}
+                                </featureArtifactDef>
+
+                                <!-- Carbon Commons Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.ndatasource.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.ntask.core.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.message.flows.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.ndatasource.capp.deployer.server.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+
+                                <!-- Identity Features -->
+                                <!-- SSO -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.carbon.auth.saml2:org.wso2.carbon.identity.authenticator.saml2.sso.server.feature:${identity.carbon.auth.saml2.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.carbon.auth.saml2:org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature:${identity.carbon.auth.saml2.version.iotcore}
+                                </featureArtifactDef>
+                                <!-- SSO Fix-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.application.mgt.server.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.idp.mgt.server.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <!-- Directory server related features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.directory.service.mgr.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+                                <!-- End of SSO Fixes -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.user.registration.server.feature:${carbon.identity.framework.version.iotcore}
+                                </featureArtifactDef>
+
+                                <!-- Registry features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.community.features.server.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.community.features.ui.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+                                <!-- End of Registry Features -->
+
+                                <!-- Governance Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.governance:org.wso2.carbon.registry.extensions.server.feature:${carbon.governance.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.governance:org.wso2.carbon.governance.lifecycle.management.server.feature:${carbon.governance.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.governance:org.wso2.carbon.governance.metadata.server.feature:${carbon.governance.version}
+                                </featureArtifactDef>
+
+                                <!-- API Management Features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.store.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.authenticator.oidc.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.hostobjects.oidc.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.rest.api.dcr.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.rest.api.publisher.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.apimgt:org.wso2.carbon.apimgt.rest.api.store.feature:${carbon.api.mgt.version}
+                                </featureArtifactDef>
+                                <!-- End of API Management Features -->
+
+                                <!-- TCP Transport -->
+                                <featureArtifactDef>
+                                    org.apache.axis2.transport:org.apache.axis2.transport.tcp.feature:${axis2-transports.wso2.version}
+                                </featureArtifactDef>
+
+                                <!-- Registry task feature and dependencies -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.task.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+
+                                <!-- Carbon Deployment Features -->
+                                <!--+++++++++++++++++++++++++++++++++++++++++++++-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.deployment:org.wso2.carbon.module.mgt.server.feature:${carbon.deployment.version}
+                                </featureArtifactDef>
+                                <!-- End of Carbon Deployment Features -->
+
+                                <!-- Registry Features -->
+                                <!--+++++++++++++++++++++++++++++++++++++++++++++-->
+
+                                <featureArtifactDef>
+                                    org.wso2.carbon.registry:org.wso2.carbon.registry.contentsearch.server.feature:${carbon.registry.version.iotcore}
+                                </featureArtifactDef>
+
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.application.mgt.synapse.server.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.application.deployer.synapse.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.mediation.configadmin.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.mediation:org.wso2.carbon.relay.feature:${carbon.mediation.version}
+                                </featureArtifactDef>
+                                <!--APIM feature-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.system.statistics.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <!--End of APIM Feature-->
+
+                                <!-- ************** START - Capp Management ********* -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.application.mgt.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <!-- ************** END - Capp Management ********* -->
+
+                                <!-- ************** START - Data Bridge ************ -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.streamdefn.filesystem.server.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.databridge.core.server.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <!-- ************** END - Data Bridge ************ -->
+
+                                <!-- ************** START - EVENT PROCESSING FEATURES *********** -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.stream.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.application.deployer.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.input.adapter.server.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics-common:org.wso2.carbon.event.output.adapter.server.feature:${carbon.analytics.common.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.commons:org.wso2.carbon.deployment.synchronizer.feature:${carbon.commons.version}
+                                </featureArtifactDef>
+                                <!-- *************** END OF EVENT PROCESSING FEATURES ********************** -->
+
+                                <!-- *************** DAS Client *************** -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.api.client.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics:org.wso2.carbon.analytics.jsservice.feature:${carbon.analytics.version}
+                                </featureArtifactDef>
+                                <!-- *************** End of DAS Client *************** -->
+
+                                <featureArtifactDef>
+                                    org.wso2.carbon.metrics:org.wso2.carbon.metrics.feature:${carbon.metrics.version}
+                                </featureArtifactDef>
+                                <!--JWT grant type handler-->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity:org.wso2.carbon.identity.oauth2.grant.jwt.feature:${identity.jwt.extension.version}
+                                </featureArtifactDef>
+                                <!-- Analytics related features -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.analytics.dashboard.feature:${carbon.device.mgt.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.wso2.carbon.analytics.cdmf:org.wso2.carbon.analytics.cdmf.feature:${cdmf.analytics.version}
+                                </featureArtifactDef>
+                            </featureArtifacts>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>publishing product</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>publish-product</goal>
+                        </goals>
+                        <configuration>
+                            <productConfigurationFile>${basedir}/carbon.product
+                            </productConfigurationFile>
+                            <executable>
+                                ${basedir}/target/org.eclipse.equinox.executable_3.5.0.v20110530-7P7NFUFFLWUl76mart
+                            </executable>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>p2-profile-generation-default-profile</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>materialize-product</goal>
+                        </goals>
+                        <configuration>
+                            <productConfigurationFile>${basedir}/carbon.product</productConfigurationFile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <targetPath>
+                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
+                            </targetPath>
+                            <profile>default</profile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>p2-profile-generation-http-gateway-profile</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>materialize-product</goal>
+                        </goals>
+                        <configuration>
+                            <productConfigurationFile>${basedir}/carbon.product</productConfigurationFile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <targetPath>
+                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
+                            </targetPath>
+                            <profile>http-gateway</profile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>p2-profile-generation-key-manager-profile</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>materialize-product</goal>
+                        </goals>
+                        <configuration>
+                            <productConfigurationFile>${basedir}/carbon.product</productConfigurationFile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <targetPath>
+                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
+                            </targetPath>
+                            <profile>device-key-manager</profile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>p2-profile-generation-device-manager-profile</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>materialize-product</goal>
+                        </goals>
+                        <configuration>
+                            <productConfigurationFile>${basedir}/carbon.product</productConfigurationFile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <targetPath>
+                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
+                            </targetPath>
+                            <profile>device-manager</profile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>p2-profile-generation-device-backend-profile</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>materialize-product</goal>
+                        </goals>
+                        <configuration>
+                            <productConfigurationFile>${basedir}/carbon.product</productConfigurationFile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <targetPath>
+                                file:${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
+                            </targetPath>
+                            <profile>device-backend</profile>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>3-p2-profile-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-profile-gen</goal>
+                        </goals>
+                        <configuration>
+                            <profile>default</profile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <destination>
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
+                            </destination>
+                            <deleteOldProfileFiles>true</deleteOldProfileFiles>
+                            <features>
+                                <!-- IoTServer Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.inbound.metadata.saml2.server.feature.group</id>
+                                    <version>0.1.1</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.sp.metadata.saml2.server.feature.group</id>
+                                    <version>${identity.metadata.saml2.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.iot.core.styles.feature.group</id>
+                                    <version>${product.iot.version}</version>
+                                </feature>
+                                <!-- End of IoTServer Features -->
+                                <!-- Mobile Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of Mobile Features -->
+
+                                <!-- App management features-->
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.core.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.publisher.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.store.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.store.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.social.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <!-- End of app management features-->
+
+                                <!-- Device Management Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.email.sender.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.handler.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of Device Management Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- Carbon Deployment Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.module.mgt.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.service.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.deployer.webapp.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <!-- End of Carbon Deployment Features -->
+
+                                <!-- Jaggery Features -->
+                                <feature>
+                                    <id>org.jaggeryjs.feature.group</id>
+                                    <version>${jaggery.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.carbon.feature.group</id>
+                                    <version>${jaggery.extensions.carbon.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.process.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.uuid.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.sso.feature.group</id>
+                                    <version>${jaggery.extensions.sso.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.i18n.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.ws.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <!-- End of Jaggery Features -->
+
+                                <!-- Dashboard Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.dashboards.shindig.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dashboards.portal.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dashboard.deployment.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.iot.device.statistics.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of Dashboard Features -->
+
+                                <!-- API Management Features -->
+
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.keymanager.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.core.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.rest.api.dcr.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.rest.api.publisher.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.rest.api.store.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <!-- API Manager Publisher and Store Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.forum.server.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <!-- End of API Management Features -->
+
+                                <!-- Carbon Analytics Common Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <!-- End of Carbon Analytics Common Features -->
+
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+
+                                <!-- Carbon Commons Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.logging.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <!--feature>
+                                    <id>org.wso2.carbon.event.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.ntask.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <!-- End of Carbon Commons Features -->
+
+                                <!-- Carbon Multi-tenancy Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.usage.agent.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.throttling.agent.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.deployment.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.common.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.mgt.core.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <!-- End of Carbon Multi-tenancy Features -->
+
+                                <!-- Identity Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.security.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.um.ws.service.feature.group</id>
+                                    <version>${identity.user.ws.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth.server.feature.group</id>
+                                    <version>${identity.inbound.auth.oauth.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.provider.server.feature.group</id>
+                                    <version>${identity.inbound.auth.openid.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.thrift.authentication.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.core.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.idp.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.user.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.directory.service.mgr.server.feature.group
+                                    </id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <!-- SSO Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
+                                    <version>${identity.local.auth.basicauth.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.sso.saml.feature.group</id>
+                                    <version>${identity.inbound.auth.saml.version.iotcore}</version>
+                                </feature>
+                                <!-- SSO Fix-->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.profile.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.claim.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.claim.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth.ui.feature.group</id>
+                                    <version>${identity.inbound.auth.oauth.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.notification.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.identity.xacml.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.registration.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
+                                    <version>${identity.local.auth.basicauth.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authenticator.requestpath.basicauth.server.feature.group</id>
+                                    <version>${identity.outbound.auth.requestpath.basicauth.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>
+                                        org.wso2.carbon.identity.application.authenticator.requestpath.oauth.server.feature.group
+                                    </id>
+                                    <version>${identity.outbound.auth.requestpath.oauth.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authenticator.samlsso.server.feature.group</id>
+                                    <version>${identity.outbound.auth.samlsso.version}</version>
+                                </feature>
+                                <!-- End of Identity Features -->
+
+                                <!-- Registry Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.registry.core.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ui.menu.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.resource.properties.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.associations.dependencies.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.community.features.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ws.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.contentsearch.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ui.menu.governance.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.task.server.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <!-- End of Registry Features -->
+
+                                <!-- Governance Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.governance.metadata.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.lifecycle.management.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <!-- End of Governance Features -->
+                                <!-- Notification Support: Mail -->
+                                <feature>
+                                    <id>org.apache.axis2.transport.mail.feature.group</id>
+                                    <version>${axis2-transports.wso2.version}</version>
+                                </feature>
+
+                                <!-- Mediation Features -->
+                                <feature>
+                                    <id>org.apache.synapse.wso2.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.transport.nhttp.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.initializer.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.ntask.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.inbound.endpoints.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediators.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.admin.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.task.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.ui.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediator.cache.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <!-- End of Mediation Features -->
+
+                                <!-- Cipher tool feature -->
+
+                                <feature>
+                                    <id>org.wso2.ciphertool.feature.group</id>
+                                    <version>${cipher.tool.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>caramel.feature.group</id>
+                                    <version>1.0.1</version>
+                                </feature>
+                                <!--feature>
+                                    <id>org.wso2.carbon.event.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature-->
+                                <!--********************************************-->
+                                <feature>
+                                    <id>org.wso2.carbon.core.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.runtime.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.ui.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+
+                                <!-- Carbon Deployment Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.module.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <!-- End of Carbon Deployment Features -->
+
+                                <!-- Carbon Commons Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.ndatasource.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.ndatasource.capp.deployer.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.ntask.core.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+
+                                <!-- Identity Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version.iotcore}</version>
+                                </feature>
+                                <!-- SSO Fix-->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.directory.service.mgr.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.idp.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth.feature.group</id>
+                                    <version>${identity.inbound.auth.oauth.version.iotcore}</version>
+                                </feature>
+                                <!-- End of Identity Features -->
+
+                                <!-- Registry Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.community.features.ui.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <!-- End of Registry Features -->
+
+                                <!-- Governance features -->
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.server.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.lifecycle.management.server.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.metadata.server.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <!-- End of Governance Features -->
+
+                                <!-- API Manager Publisher and Store Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.store.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.authenticator.oidc.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.hostobjects.oidc.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.synapse.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.deployer.synapse.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <!-- TCP transport Synapse -->
+                                <feature>
+                                    <id>org.apache.axis2.transport.tcp.feature.group</id>
+                                    <version>${axis2-transports.wso2.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.relay.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.configadmin.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <!-- End of API Management Features -->
+
+                                <!-- Carbon Deployment Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <!-- End of Carbon Deployment Features -->
+
+                                <!--APIM feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.system.statistics.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+
+                                <!-- ************** START - Data Bridge ************ -->
+
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.streamdefn.filesystem.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <!-- ************** END - Data Bridge ************ -->
+
+
+                                <!-- *************** START - DAS Client *************** -->
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.api.client.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.jsservice.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <!-- *************** END - DAS Client *************** -->
+
+                                <!-- ************** START - EVENT PROCESSING FEATURES ************ -->
+                                <feature>
+                                    <id>org.wso2.carbon.event.stream.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.application.deployer.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+
+                                <!-- ************** END - EVENT PROCESSING FEATURES ************ -->
+
+                                <feature>
+                                    <id>org.wso2.carbon.metrics.feature.group</id>
+                                    <version>${carbon.metrics.version}</version>
+                                </feature>
+                                <!--jwt grant type handler-->
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
+                                    <version>${identity.jwt.extension.version}</version>
+                                </feature>
+                                <!-- Analytics related features -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.cdmf.feature.group</id>
+                                    <version>${cdmf.analytics.version}</version>
+                                </feature>
+                            </features>
+                        </configuration>
+                    </execution>
+                    <!--Http Gateway Profile-->
+                    <execution>
+                        <id>5-p2-profile-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-profile-gen</goal>
+                        </goals>
+                        <configuration>
+                            <profile>http-gateway</profile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <destination>
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
+                            </destination>
+                            <deleteOldProfileFiles>true</deleteOldProfileFiles>
+                            <features>
+                                <feature>
+                                    <id>org.wso2.iot.core.styles.feature.group</id>
+                                    <version>${product.iot.version}</version>
+                                </feature>
+                                <!-- App management features-->
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.core.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of app management features-->
+                                <feature>
+                                    <id>org.apache.axis2.transport.mail.feature.group</id>
+                                    <version>${axis2-transports.wso2.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.common.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.server.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.runtime.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.ntask.core.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.module.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.databridge.datapublisher.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.wso2.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.transport.nhttp.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.task.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.initializer.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <!-- >feature>
+                                    <id>org.wso2.carbon.mediation.statistics.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.admin.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.inbound.endpoints.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.configadmin.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.mediator.cache.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <!--feature>
+                                    <id>org.wso2.carbon.mediation.tracer.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.synapse.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.deployer.synapse.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.security.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.security.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.service.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.message.flows.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.core.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.core.server.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ui.menu.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ui.menu.governance.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.resource.properties.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediators.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.relay.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.common.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.associations.dependencies.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.provider.server.feature.group</id>
+                                    <version>${identity.inbound.auth.openid.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.community.features.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth.feature.group</id>
+                                    <version>${identity.inbound.auth.oauth.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ws.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.server.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.metadata.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.lifecycle.management.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.user.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.core.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
+                                    <version>${identity.user.ws.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.um.ws.service.client.feature.group</id>
+                                    <version>${identity.user.ws.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.directory.service.mgr.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.core.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.server.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.contentsearch.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.mgt.common.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.common.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.usage.agent.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.ndatasource.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.authenticator.oidc.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.hostobjects.oidc.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.metrics.feature.group</id>
+                                    <version>${carbon.metrics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.profile.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+
+                                <!--required for context.xml-->
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <!--end required for context.xml-->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <!--<feature>-->
+                                <!--<id>org.wso2.carbon.apimgt.handler.server.feature.group</id>-->
+                                <!--<version>${carbon.device.mgt.version}</version>-->
+                                <!--</feature>-->
+                                <feature>
+                                    <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.api.client.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                            </features>
+                        </configuration>
+                    </execution>
+                    <!--Key Manager Profile-->
+                    <execution>
+                        <id>6-p2-profile-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-profile-gen</goal>
+                        </goals>
+                        <configuration>
+                            <profile>device-key-manager</profile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <destination>
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
+                            </destination>
+                            <deleteOldProfileFiles>true</deleteOldProfileFiles>
+                            <features>
+                                <!-- IoTServer Features -->
+                                <feature>
+                                    <id>org.wso2.iot.core.styles.feature.group</id>
+                                    <version>${product.iot.version}</version>
+                                </feature>
+                                <!-- End of IoTServer Features -->
+                                <!-- App management features-->
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.core.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of app management features-->
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.axis2.transport.mail.feature.group</id>
+                                    <version>${axis2-transports.wso2.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.notification.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.xacml.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.thrift.authentication.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
+                                    <version>${identity.jwt.extension.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.common.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.usage.agent.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.throttling.agent.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.deployment.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group
+                                    </id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.mgt.common.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
+                                    <version>${identity.local.auth.basicauth.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authenticator.samlsso.server.feature.group</id>
+                                    <version>${identity.outbound.auth.samlsso.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.common.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
+                                    <version>${identity.user.ws.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.server.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.runtime.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.ntask.core.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.module.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.wso2.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.transport.nhttp.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.task.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.initializer.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.admin.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.inbound.endpoints.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.configadmin.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediator.cache.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <!--feature>
+                                    <id>org.wso2.carbon.mediation.statistics.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature-->
+                                <!--feature>
+                                    <id>org.wso2.carbon.mediation.tracer.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.synapse.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.deployer.synapse.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.system.statistics.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.security.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.security.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.service.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.message.flows.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.registry.core.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.core.server.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ui.menu.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ui.menu.governance.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.resource.properties.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediators.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.relay.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.provider.server.feature.group</id>
+                                    <version>${identity.inbound.auth.openid.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.common.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.associations.dependencies.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.community.features.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth.feature.group</id>
+                                    <version>${identity.inbound.auth.oauth.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ws.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.server.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.metadata.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.lifecycle.management.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.user.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.core.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
+                                    <version>${identity.user.ws.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.um.ws.service.client.feature.group</id>
+                                    <version>${identity.user.ws.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.directory.service.mgr.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.core.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.keymanager.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.server.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.contentsearch.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.idp.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.ndatasource.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.authenticator.oidc.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.hostobjects.oidc.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.metrics.feature.group</id>
+                                    <version>${carbon.metrics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.profile.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+
+                                <!--required for context.xml-->
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <!--end required for context.xml-->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.api.client.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                            </features>
+                        </configuration>
+                    </execution>
+                    <!--Device Type Publisher Profile-->
+                    <execution>
+                        <id>7-p2-profile-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-profile-gen</goal>
+                        </goals>
+                        <configuration>
+                            <profile>device-manager</profile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <destination>
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
+                            </destination>
+                            <deleteOldProfileFiles>true</deleteOldProfileFiles>
+                            <features>
+                                <!-- IoTServer Features -->
+                                <feature>
+                                    <id>org.wso2.iot.core.styles.feature.group</id>
+                                    <version>${product.iot.version}</version>
+                                </feature>
+                                <!-- End of IoTServer Features -->
+                                <!-- App management features-->
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.core.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of app management features-->
+
+                                <!-- Dashboard Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.dashboards.shindig.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dashboards.portal.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dashboard.deployment.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.iot.device.statistics.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of Dashboard Features -->
+
+
+                                <!-- Device Management Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.email.sender.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <!-- End of Device Management Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
+                                    <version>${identity.jwt.extension.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.axis2.transport.mail.feature.group</id>
+                                    <version>${axis2-transports.wso2.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.notification.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.xacml.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.thrift.authentication.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.common.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.user.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.profile.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.server.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.runtime.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.ui.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.ntask.core.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.module.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.wso2.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.transport.nhttp.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.task.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.initializer.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.admin.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.inbound.endpoints.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.configadmin.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediator.cache.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <!--feature>
+                                    <id>org.wso2.carbon.mediation.statistics.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature-->
+
+                                <!--feature>
+                                    <id>org.wso2.carbon.mediation.tracer.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature-->
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.synapse.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.deployer.synapse.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.system.statistics.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.security.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.security.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.service.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.message.flows.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+
+
+                                <feature>
+                                    <id>org.wso2.carbon.registry.core.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.core.server.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ui.menu.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ui.menu.governance.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.resource.properties.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediators.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.relay.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.common.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.associations.dependencies.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.community.features.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.provider.server.feature.group</id>
+                                    <version>${identity.inbound.auth.openid.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth.feature.group</id>
+                                    <version>${identity.inbound.auth.oauth.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
+                                    <version>${identity.local.auth.basicauth.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authenticator.samlsso.server.feature.group</id>
+                                    <version>${identity.outbound.auth.samlsso.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group
+                                    </id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.mgt.common.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ws.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.feature.group</id>
+                                    <version>${jaggery.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.carbon.feature.group</id>
+                                    <version>${jaggery.extensions.carbon.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.process.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.uuid.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.sso.feature.group</id>
+                                    <version>${jaggery.extensions.sso.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.i18n.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.ws.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.rest.api.dcr.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.rest.api.publisher.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.rest.api.store.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.core.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.store.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.server.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.metadata.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.lifecycle.management.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.user.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.core.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
+                                    <version>${identity.user.ws.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.um.ws.service.client.feature.group</id>
+                                    <version>${identity.user.ws.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.directory.service.mgr.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.claim.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.contentsearch.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.forum.server.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.common.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.usage.agent.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.throttling.agent.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.ndatasource.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.ndatasource.capp.deployer.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.authenticator.oidc.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.hostobjects.oidc.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.metrics.feature.group</id>
+                                    <version>${carbon.metrics.version}</version>
+                                </feature>
+                                <!--required for context.xml-->
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.deployer.webapp.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <!--end required for context.xml-->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.stream.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.output.adapter.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.application.deployer.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.api.client.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.jsservice.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <!-- SSO Features -->
+
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.sso.saml.feature.group</id>
+                                    <version>${identity.inbound.auth.saml.version.iotcore}</version>
+                                </feature>
+                                <!-- SSO Fix-->
+                            </features>
+                        </configuration>
+                    </execution>
+                    <!--Device Type Worker Profile-->
+                    <execution>
+                        <id>8-p2-profile-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-profile-gen</goal>
+                        </goals>
+                        <configuration>
+                            <profile>device-backend</profile>
+                            <metadataRepository>file:${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:${basedir}/target/p2-repo</artifactRepository>
+                            <destination>
+                                ${basedir}/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
+                            </destination>
+                            <deleteOldProfileFiles>true</deleteOldProfileFiles>
+                            <features>
+                                <!-- IoTServer Features -->
+                                <feature>
+                                    <id>org.wso2.iot.core.styles.feature.group</id>
+                                    <version>${product.iot.version}</version>
+                                </feature>
+                                <!-- End of IoTServer Features -->
+
+                                <!-- App management features-->
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.core.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.wso2emm.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mobile.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.publisher.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.services.api.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.store.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.store.feature.group</id>
+                                    <version>${appmgt.feature.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.social.feature.group</id>
+                                    <version>${carbon.store.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.osgiconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.appmgt.mdm.restconnector.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of app management features-->
+
+                                <!-- Device Management Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.email.sender.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.authenticator.framework.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.data.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <!-- End of Device Management Features -->
+
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.adapter.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth2.grant.jwt.feature.group</id>
+                                    <version>${identity.jwt.extension.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.mgt.common.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.axis2.transport.mail.feature.group</id>
+                                    <version>${axis2-transports.wso2.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.notification.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.xacml.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.thrift.authentication.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.common.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.user.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.profile.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.server.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.runtime.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.core.ui.feature.group</id>
+                                    <version>${carbon.kernel.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.as.runtimes.cxf.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+
+                                <feature>
+                                    <id>org.wso2.carbon.ntask.core.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.logging.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.module.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.wso2.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.apache.synapse.transport.nhttp.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.task.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.initializer.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.admin.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.inbound.endpoints.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediation.configadmin.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.synapse.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.mgt.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.deployer.synapse.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.system.statistics.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.security.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.security.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.service.mgt.server.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.message.flows.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.core.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.core.server.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ui.menu.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ui.menu.governance.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.resource.properties.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediators.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.relay.server.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.common.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.associations.dependencies.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.community.features.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.provider.server.feature.group</id>
+                                    <version>${identity.inbound.auth.openid.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.oauth.feature.group</id>
+                                    <version>${identity.inbound.auth.oauth.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
+                                    <version>${identity.local.auth.basicauth.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authenticator.samlsso.server.feature.group</id>
+                                    <version>${identity.outbound.auth.samlsso.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group
+                                    </id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.mgt.common.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.user.registration.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.deployment.synchronizer.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.community.features.server.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.ws.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.feature.group</id>
+                                    <version>${jaggery.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.carbon.feature.group</id>
+                                    <version>${jaggery.extensions.carbon.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.process.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.uuid.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.sso.feature.group</id>
+                                    <version>${jaggery.extensions.sso.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.i18n.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.jaggeryjs.modules.ws.feature.group</id>
+                                    <version>${jaggery.extensions.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.core.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.store.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.rest.api.dcr.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.rest.api.publisher.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.rest.api.store.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.extensions.server.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.metadata.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.governance.lifecycle.management.feature.group</id>
+                                    <version>${carbon.governance.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.user.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.core.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.um.ws.service.server.feature.group</id>
+                                    <version>${identity.user.ws.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.um.ws.service.client.feature.group</id>
+                                    <version>${identity.user.ws.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.directory.service.mgr.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.claim.mgt.feature.group</id>
+                                    <version>${carbon.identity.framework.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.server.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.ui.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.registry.contentsearch.feature.group</id>
+                                    <version>${carbon.registry.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.forum.server.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.common.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.usage.agent.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.tenant.throttling.agent.feature.group</id>
+                                    <version>${carbon.multitenancy.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.ndatasource.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.ndatasource.capp.deployer.server.feature.group</id>
+                                    <version>${carbon.commons.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.authenticator.oidc.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.hostobjects.oidc.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.metrics.feature.group</id>
+                                    <version>${carbon.metrics.version}</version>
+                                </feature>
+                                <!--required for context.xml-->
+                                <feature>
+                                    <id>org.wso2.carbon.webapp.mgt.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.application.deployer.webapp.feature.group</id>
+                                    <version>${carbon.deployment.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.webapp.publisher.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dynamic.client.registration.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.oauth.extensions.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <!--end required for context.xml-->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.android.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.mobile.windows.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.gateway.feature.group</id>
+                                    <version>${carbon.api.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.policy.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.application.extension.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.apimgt.integration.client.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.server.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.certificate.mgt.cert.admin.api.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.stream.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.input.adapter.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.output.adapter.server.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.event.application.deployer.feature.group</id>
+                                    <version>${carbon.analytics.common.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.api.client.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.analytics.jsservice.feature.group</id>
+                                    <version>${carbon.analytics.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.mediator.cache.feature.group</id>
+                                    <version>${carbon.mediation.version}</version>
+                                </feature>
+                                <!-- SSO Features -->
+
+                                <feature>
+                                    <id>org.wso2.carbon.identity.authenticator.saml2.sso.feature.group</id>
+                                    <version>${identity.carbon.auth.saml2.version.iotcore}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.sso.saml.feature.group</id>
+                                    <version>${identity.inbound.auth.saml.version.iotcore}</version>
+                                </feature>
+                                <!-- SSO Fix-->
+
+                                <!-- Dashboard Features -->
+                                <feature>
+                                    <id>org.wso2.carbon.dashboards.shindig.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dashboards.portal.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.dashboard.deployment.feature.group</id>
+                                    <version>${carbon.dashboard.version}</version>
+                                </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.iot.device.statistics.dashboard.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                            </features>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.1</version>
+                <executions>
+                    <execution>
+                        <id>copying-conf-dir</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/conf" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>creating-required-resources</id>
+                        <phase>generate-resources</phase>
+                        <configuration>
+                            <tasks>
+                                <mkdir dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server" />
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <phase>package</phase>
+                        <configuration>
+                            <tasks>
+                                <replace token="false" value="true" dir="target/wso2carbon-core-${carbon.kernel.version}/wso2/components">
+                                    <include name="**/bundles.info" />
+                                </replace>
+                            </tasks>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/modules/p2-profile/pom.xml b/modules/p2-profile/pom.xml
new file mode 100644
index 00000000..47072fb2
--- /dev/null
+++ b/modules/p2-profile/pom.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<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/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.iot</groupId>
+        <artifactId>wso2iot-parent</artifactId>
+        <version>3.1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>wso2iot-p2-profile</artifactId>
+    <packaging>pom</packaging>
+    <name>WSO2 IoT Server - P2 Profile Module</name>
+    <url>http://wso2.org</url>
+
+    <modules>
+        <module>iot-core-profile</module>
+    </modules>
+
+</project>
diff --git a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics.data b/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics.data
deleted file mode 160000
index ec24a6d5..00000000
--- a/modules/samples/location-data-plugin/org.wso2.carbon.device.mgt.iot.location.analytics.data
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ec24a6d552876d517c2070fdce5ccbff1b4c15bb
diff --git a/pom.xml b/pom.xml
index 4ee1ae97..47a5f492 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,11 +35,7 @@
     </parent>
 
     <modules>
-        <module>modules/broker</module>
-        <module>modules/core</module>
-        <module>modules/analytics</module>
-        <module>modules/distribution</module>
-        <module>modules/integration</module>
+        <module>modules/p2-profile</module>
     </modules>
 
     <dependencyManagement>
@@ -1459,7 +1455,7 @@
     <properties>
 
         <!--Carbon kernel versions-->
-        <carbon.kernel.version>4.4.11</carbon.kernel.version>
+        <carbon.kernel.version>4.4.14</carbon.kernel.version>
         <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
 
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>