diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml index 8f56d39c..f6b1596a 100644 --- a/modules/distribution/pom.xml +++ b/modules/distribution/pom.xml @@ -233,32 +233,6 @@ d - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/modules/distribution/samples/p2-repo/META-INF/DEPENDENCIES b/modules/distribution/samples/p2-repo/META-INF/DEPENDENCIES new file mode 100644 index 00000000..9c269626 --- /dev/null +++ b/modules/distribution/samples/p2-repo/META-INF/DEPENDENCIES @@ -0,0 +1,11 @@ +// ------------------------------------------------------------------ +// Transitive dependencies of this project determined from the +// maven pom organized by organization. +// ------------------------------------------------------------------ + +Creating custom distribution + + + + + diff --git a/modules/distribution/samples/p2-repo/META-INF/LICENSE b/modules/distribution/samples/p2-repo/META-INF/LICENSE new file mode 100644 index 00000000..d6456956 --- /dev/null +++ b/modules/distribution/samples/p2-repo/META-INF/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/modules/distribution/samples/p2-repo/META-INF/NOTICE b/modules/distribution/samples/p2-repo/META-INF/NOTICE new file mode 100644 index 00000000..7059b030 --- /dev/null +++ b/modules/distribution/samples/p2-repo/META-INF/NOTICE @@ -0,0 +1,8 @@ + +Creating custom distribution +Copyright 2016 WSO2 + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + + diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml index 230ddd00..946dceb9 100644 --- a/modules/distribution/src/assembly/bin.xml +++ b/modules/distribution/src/assembly/bin.xml @@ -647,6 +647,24 @@ **/* + + src/samples + ${pom.artifactId}-${pom.version}/samples + + **/*.iml + **/.DS_Store + **/target/ + **/currentsensor/** + **/digitaldisplay/** + **/doormanager/** + **/droneanalyzer/** + **/connectedlap/** + **/firealarm/** + **/geolocationTracker/** + **/watertank/** + + true + diff --git a/modules/distribution/src/assembly/dist.xml b/modules/distribution/src/assembly/dist.xml index 3a46fb28..1cc58910 100644 --- a/modules/distribution/src/assembly/dist.xml +++ b/modules/distribution/src/assembly/dist.xml @@ -35,23 +35,5 @@ features/** - - ../samples - ${pom.artifactId}-${pom.version}/samples - - **/*.iml - **/.DS_Store - **/target/ - **/currentsensor/** - **/digitaldisplay/** - **/doormanager/** - **/droneanalyzer/** - **/connectedlap/** - **/firealarm/** - **/geolocationTracker/** - **/watertank/** - - true - diff --git a/modules/samples/connectedcup/component/agent/pom.xml b/modules/distribution/src/samples/connectedcup/component/agent/pom.xml similarity index 100% rename from modules/samples/connectedcup/component/agent/pom.xml rename to modules/distribution/src/samples/connectedcup/component/agent/pom.xml diff --git a/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java b/modules/distribution/src/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java similarity index 100% rename from modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java rename to modules/distribution/src/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushLevel.java diff --git a/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java b/modules/distribution/src/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java similarity index 100% rename from modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java rename to modules/distribution/src/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/datasense/PushTemperature.java diff --git a/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandler.java b/modules/distribution/src/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandler.java similarity index 100% rename from modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandler.java rename to modules/distribution/src/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandler.java diff --git a/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandlerException.java b/modules/distribution/src/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandlerException.java similarity index 100% rename from modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandlerException.java rename to modules/distribution/src/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/TransportHandlerException.java diff --git a/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java b/modules/distribution/src/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java similarity index 100% rename from modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java rename to modules/distribution/src/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/ConnectedCupMQttTransportHandler.java diff --git a/modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/MQTTTransportHandler.java b/modules/distribution/src/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/MQTTTransportHandler.java similarity index 100% rename from modules/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/MQTTTransportHandler.java rename to modules/distribution/src/samples/connectedcup/component/agent/src/main/java/org/coffeeking/agent/transport/mqtt/MQTTTransportHandler.java diff --git a/modules/samples/connectedcup/component/agent/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/connectedcup/component/agent/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from modules/samples/connectedcup/component/agent/src/main/webapp/WEB-INF/web.xml rename to modules/distribution/src/samples/connectedcup/component/agent/src/main/webapp/WEB-INF/web.xml diff --git a/modules/samples/connectedcup/component/agent/src/main/webapp/css/coffee.css b/modules/distribution/src/samples/connectedcup/component/agent/src/main/webapp/css/coffee.css similarity index 100% rename from modules/samples/connectedcup/component/agent/src/main/webapp/css/coffee.css rename to modules/distribution/src/samples/connectedcup/component/agent/src/main/webapp/css/coffee.css diff --git a/modules/samples/connectedcup/component/agent/src/main/webapp/index.jsp b/modules/distribution/src/samples/connectedcup/component/agent/src/main/webapp/index.jsp similarity index 100% rename from modules/samples/connectedcup/component/agent/src/main/webapp/index.jsp rename to modules/distribution/src/samples/connectedcup/component/agent/src/main/webapp/index.jsp diff --git a/modules/samples/connectedcup/component/agent/src/main/webapp/js/coffee.js b/modules/distribution/src/samples/connectedcup/component/agent/src/main/webapp/js/coffee.js similarity index 100% rename from modules/samples/connectedcup/component/agent/src/main/webapp/js/coffee.js rename to modules/distribution/src/samples/connectedcup/component/agent/src/main/webapp/js/coffee.js diff --git a/modules/samples/connectedcup/component/agent/src/main/webapp/js/libs/htmlpreview.min.js b/modules/distribution/src/samples/connectedcup/component/agent/src/main/webapp/js/libs/htmlpreview.min.js similarity index 100% rename from modules/samples/connectedcup/component/agent/src/main/webapp/js/libs/htmlpreview.min.js rename to modules/distribution/src/samples/connectedcup/component/agent/src/main/webapp/js/libs/htmlpreview.min.js diff --git a/modules/samples/connectedcup/component/agent/src/main/webapp/js/libs/jquery.min.js b/modules/distribution/src/samples/connectedcup/component/agent/src/main/webapp/js/libs/jquery.min.js similarity index 100% rename from modules/samples/connectedcup/component/agent/src/main/webapp/js/libs/jquery.min.js rename to modules/distribution/src/samples/connectedcup/component/agent/src/main/webapp/js/libs/jquery.min.js diff --git a/modules/samples/connectedcup/component/analytics/build.xml b/modules/distribution/src/samples/connectedcup/component/analytics/build.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/build.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/build.xml diff --git a/modules/samples/connectedcup/component/analytics/pom.xml b/modules/distribution/src/samples/connectedcup/component/analytics/pom.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/pom.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/pom.xml diff --git a/modules/samples/connectedcup/component/analytics/src/assembly/src.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/assembly/src.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/assembly/src.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/assembly/src.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/artifacts.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/artifacts.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/artifacts.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/artifacts.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/artifact.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/artifact.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/artifact.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/artifact.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/coffee_level_receiver.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/coffee_level_receiver.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/coffee_level_receiver.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_receiver/coffee_level_receiver.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/artifact.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_script/coffee_level_script.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/artifact.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/artifact.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/artifact.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/artifact.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/org_wso2_iot_devices_coffeelevel.xml b/modules/distribution/src/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/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/org_wso2_iot_devices_coffeelevel.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_store/org_wso2_iot_devices_coffeelevel.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/artifact.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/artifact.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/artifact.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/artifact.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/coffee_level/coffee_level_stream/org.wso2.iot.devices.coffeelevel_1.0.0.json b/modules/distribution/src/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/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/distribution/src/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/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/artifacts.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/artifacts.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/artifacts.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/artifacts.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/artifact.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/artifact.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/artifact.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/artifact.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/connected_cup_execution.siddhiql b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/connected_cup_execution.siddhiql similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/connected_cup_execution.siddhiql rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_execution/connected_cup_execution.siddhiql diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/artifact.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/artifact.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/artifact.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/artifact.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/connected_cup_publisher.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/connected_cup_publisher.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/connected_cup_publisher.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_publisher/connected_cup_publisher.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/artifact.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/artifact.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/artifact.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/artifact.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_receiver/connected_cup_receiver.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/artifact.xml b/modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/artifact.xml similarity index 100% rename from modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/artifact.xml rename to modules/distribution/src/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/artifact.xml diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/org.wso2.iot.connectedcup_1.0.0.json b/modules/distribution/src/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/samples/connectedcup/component/analytics/src/main/resources/carbonapps/connected_cup/connected_cup_stream/org.wso2.iot.connectedcup_1.0.0.json rename to modules/distribution/src/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/samples/connectedcup/component/api/pom.xml b/modules/distribution/src/samples/connectedcup/component/api/pom.xml similarity index 100% rename from modules/samples/connectedcup/component/api/pom.xml rename to modules/distribution/src/samples/connectedcup/component/api/pom.xml diff --git a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java b/modules/distribution/src/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java similarity index 100% rename from modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java rename to modules/distribution/src/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupService.java diff --git a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java b/modules/distribution/src/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java similarity index 100% rename from modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java rename to modules/distribution/src/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/ConnectedCupServiceImpl.java diff --git a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/constants/ConnectedCupConstants.java b/modules/distribution/src/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/constants/ConnectedCupConstants.java similarity index 100% rename from modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/constants/ConnectedCupConstants.java rename to modules/distribution/src/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/constants/ConnectedCupConstants.java diff --git a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/exception/ConnectedCupException.java b/modules/distribution/src/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/exception/ConnectedCupException.java similarity index 100% rename from modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/exception/ConnectedCupException.java rename to modules/distribution/src/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/exception/ConnectedCupException.java diff --git a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/APIUtil.java b/modules/distribution/src/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/APIUtil.java similarity index 100% rename from modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/APIUtil.java rename to modules/distribution/src/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/APIUtil.java diff --git a/modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/SensorRecord.java b/modules/distribution/src/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/SensorRecord.java similarity index 100% rename from modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/SensorRecord.java rename to modules/distribution/src/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/SensorRecord.java diff --git a/modules/samples/connectedcup/component/api/src/main/webapp/META-INF/permissions.xml b/modules/distribution/src/samples/connectedcup/component/api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from modules/samples/connectedcup/component/api/src/main/webapp/META-INF/permissions.xml rename to modules/distribution/src/samples/connectedcup/component/api/src/main/webapp/META-INF/permissions.xml diff --git a/modules/samples/connectedcup/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules/distribution/src/samples/connectedcup/component/api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from modules/samples/connectedcup/component/api/src/main/webapp/META-INF/webapp-classloading.xml rename to modules/distribution/src/samples/connectedcup/component/api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/modules/samples/connectedcup/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/distribution/src/samples/connectedcup/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from modules/samples/connectedcup/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to modules/distribution/src/samples/connectedcup/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/modules/samples/connectedcup/component/api/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/connectedcup/component/api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from modules/samples/connectedcup/component/api/src/main/webapp/WEB-INF/web.xml rename to modules/distribution/src/samples/connectedcup/component/api/src/main/webapp/WEB-INF/web.xml diff --git a/modules/samples/connectedcup/component/pom.xml b/modules/distribution/src/samples/connectedcup/component/pom.xml similarity index 100% rename from modules/samples/connectedcup/component/pom.xml rename to modules/distribution/src/samples/connectedcup/component/pom.xml diff --git a/modules/samples/connectedcup/component/ui/pom.xml b/modules/distribution/src/samples/connectedcup/component/ui/pom.xml similarity index 100% rename from modules/samples/connectedcup/component/ui/pom.xml rename to modules/distribution/src/samples/connectedcup/component/ui/pom.xml diff --git a/modules/samples/connectedcup/component/ui/src/assembly/src.xml b/modules/distribution/src/samples/connectedcup/component/ui/src/assembly/src.xml similarity index 100% rename from modules/samples/connectedcup/component/ui/src/assembly/src.xml rename to modules/distribution/src/samples/connectedcup/component/ui/src/assembly/src.xml diff --git a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.hbs b/modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.hbs rename to modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.js b/modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.js rename to modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.json b/modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/analytics-view.json rename to modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view/public/js/connectedcup.js b/modules/distribution/src/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/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/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs b/modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs rename to modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js b/modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js rename to modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.json b/modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.json rename to modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/public/images/thumb.png b/modules/distribution/src/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/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/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.hbs b/modules/distribution/src/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/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/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.js b/modules/distribution/src/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/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/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view/analytics-view.json b/modules/distribution/src/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/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/distribution/src/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/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/distribution/src/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/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/distribution/src/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/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/distribution/src/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/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/distribution/src/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/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/distribution/src/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/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/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/private/config.json b/modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/private/config.json rename to modules/distribution/src/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/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/distribution/src/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/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/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffeecup.png b/modules/distribution/src/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/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/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/thumb.png b/modules/distribution/src/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/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/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/download.js b/modules/distribution/src/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/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/distribution/src/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/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/distribution/src/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/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/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.hbs b/modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.hbs rename to modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json b/modules/distribution/src/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/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json rename to modules/distribution/src/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/samples/connectedcup/feature/connectedcup-feature/pom.xml b/modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/pom.xml similarity index 100% rename from modules/samples/connectedcup/feature/connectedcup-feature/pom.xml rename to modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/pom.xml diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/deviceConfig.properties b/modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/deviceConfig.properties similarity index 100% rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/deviceConfig.properties rename to modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/deviceConfig.properties diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/sketch.properties b/modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/sketch.properties similarity index 100% rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/sketch.properties rename to modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/sketch.properties diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/start-device.sh b/modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/start-device.sh similarity index 100% rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/start-device.sh rename to modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/start-device.sh diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/build.properties b/modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/src/main/resources/build.properties similarity index 100% rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/build.properties rename to modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/src/main/resources/build.properties diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/devicetypes/connectedcup.xml b/modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/src/main/resources/devicetypes/connectedcup.xml similarity index 100% rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/devicetypes/connectedcup.xml rename to modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/src/main/resources/devicetypes/connectedcup.xml diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf b/modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf similarity index 100% rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf rename to modules/distribution/src/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf diff --git a/modules/samples/connectedcup/feature/pom.xml b/modules/distribution/src/samples/connectedcup/feature/pom.xml similarity index 100% rename from modules/samples/connectedcup/feature/pom.xml rename to modules/distribution/src/samples/connectedcup/feature/pom.xml diff --git a/modules/samples/connectedcup/pom.xml b/modules/distribution/src/samples/connectedcup/pom.xml similarity index 100% rename from modules/samples/connectedcup/pom.xml rename to modules/distribution/src/samples/connectedcup/pom.xml diff --git a/modules/samples/connectedlap/README.md b/modules/distribution/src/samples/connectedlap/README.md similarity index 100% rename from modules/samples/connectedlap/README.md rename to modules/distribution/src/samples/connectedlap/README.md diff --git a/modules/samples/connectedlap/component/agent/pom.xml b/modules/distribution/src/samples/connectedlap/component/agent/pom.xml similarity index 100% rename from modules/samples/connectedlap/component/agent/pom.xml rename to modules/distribution/src/samples/connectedlap/component/agent/pom.xml diff --git a/modules/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/datasense/PushData.java b/modules/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/datasense/PushData.java similarity index 100% rename from modules/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/datasense/PushData.java rename to modules/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/datasense/PushData.java diff --git a/modules/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandler.java b/modules/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandler.java similarity index 100% rename from modules/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandler.java rename to modules/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandler.java diff --git a/modules/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandlerException.java b/modules/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandlerException.java similarity index 100% rename from modules/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandlerException.java rename to modules/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/TransportHandlerException.java diff --git a/modules/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/ConnectedLapMQttTransportHandler.java b/modules/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/ConnectedLapMQttTransportHandler.java similarity index 100% rename from modules/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/ConnectedLapMQttTransportHandler.java rename to modules/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/ConnectedLapMQttTransportHandler.java diff --git a/modules/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/MQTTTransportHandler.java b/modules/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/MQTTTransportHandler.java similarity index 100% rename from modules/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/MQTTTransportHandler.java rename to modules/distribution/src/samples/connectedlap/component/agent/src/main/java/org/wso2/agent/transport/mqtt/MQTTTransportHandler.java diff --git a/modules/samples/connectedlap/component/agent/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/connectedlap/component/agent/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from modules/samples/connectedlap/component/agent/src/main/webapp/WEB-INF/web.xml rename to modules/distribution/src/samples/connectedlap/component/agent/src/main/webapp/WEB-INF/web.xml diff --git a/modules/samples/connectedlap/component/analytics/build.xml b/modules/distribution/src/samples/connectedlap/component/analytics/build.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/build.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/build.xml diff --git a/modules/samples/connectedlap/component/analytics/pom.xml b/modules/distribution/src/samples/connectedlap/component/analytics/pom.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/pom.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/pom.xml diff --git a/modules/samples/connectedlap/component/analytics/src/assembly/src.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/assembly/src.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/assembly/src.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/assembly/src.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/EventExecution_ConnectedLap.siddhiql b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/EventExecution_ConnectedLap.siddhiql rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/EventExecution_ConnectedLap.siddhiql diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/artifact.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/artifact.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventExecution_ConnectedLap_1.0.0/artifact.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/EventPublisher_ConnectedLap.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/EventPublisher_ConnectedLap.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/EventPublisher_ConnectedLap.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/artifact.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/artifact.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventPublisher_ConnectedLap_1.0.0/artifact.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/EventReceiver_ConnectedLap.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/EventReceiver_ConnectedLap.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/EventReceiver_ConnectedLap.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/artifact.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/artifact.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventReceiver_ConnectedLap_1.0.0/artifact.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/artifact.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/artifact.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/artifact.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/EventStream_ConnectedLap_1.0.0/org.wso2.iot.connectedlap_1.0.0.json b/modules/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/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/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/Connected_Lap_Script.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/Connected_Lap_Script.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/Connected_Lap_Script.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/artifact.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/Sparkscripts_1.0.0/artifact.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/artifacts.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/artifacts.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/artifacts.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLap/artifacts.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/EventStream_ConnectedLap_BatteryUsage_1.0.0/artifact.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/EventStream_ConnectedLap_BatteryUsage_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/EventStream_ConnectedLap_BatteryUsage_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/artifact.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/artifact.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/artifact.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/org_wso2_iot_devices_battery_usage.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/Eventstore_batteryusage_1.0.0/org_wso2_iot_devices_battery_usage.xml rename to modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/artifacts.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/artifacts.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/artifacts.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapBatteryUsage/artifacts.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/EventStream_ConnectedLap_ChargerPluggedIn_1.0.0/artifact.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/EventStream_ConnectedLap_ChargerPluggedIn_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/EventStream_ConnectedLap_ChargerPluggedIn_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/artifact.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/artifact.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/artifact.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/org_wso2_iot_devices_charger_plugged_in.xml b/modules/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/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/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/Eventstore_chargerpluggedin_1.0.0/org_wso2_iot_devices_charger_plugged_in.xml~ b/modules/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/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/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/artifacts.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/artifacts.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/artifacts.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapChargerPluggedIn/artifacts.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/EventStream_ConnectedLap_CpuUsage_1.0.0/artifact.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/EventStream_ConnectedLap_CpuUsage_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/EventStream_ConnectedLap_CpuUsage_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/artifact.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/artifact.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/artifact.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/org_wso2_iot_devices_cpu_usage.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/Eventstore_cpuusage_1.0.0/org_wso2_iot_devices_cpu_usage.xml rename to modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/artifacts.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/artifacts.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/artifacts.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapCpuUsage/artifacts.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/EventStream_ConnectedLap_HardDiskUsage_1.0.0/artifact.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/EventStream_ConnectedLap_HardDiskUsage_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/EventStream_ConnectedLap_HardDiskUsage_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/artifact.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/artifact.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/artifact.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/Eventstore_harddiskusage_1.0.0/org_wso2_iot_devices_hard_disk_usage.xml b/modules/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/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/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/artifacts.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/artifacts.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/artifacts.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapHardDiskUsage/artifacts.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/EventStream_ConnectedLap_MemoryUsage_1.0.0/artifact.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/EventStream_ConnectedLap_MemoryUsage_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/EventStream_ConnectedLap_MemoryUsage_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/artifact.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/artifact.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/artifact.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/org_wso2_iot_devices_memory_usage.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/Eventstore_memoryusage_1.0.0/org_wso2_iot_devices_memory_usage.xml rename to modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/artifacts.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/artifacts.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/artifacts.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapMemoryUsage/artifacts.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/EventStream_ConnectedLap_NetworkTraffic_1.0.0/artifact.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/EventStream_ConnectedLap_NetworkTraffic_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/EventStream_ConnectedLap_NetworkTraffic_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/artifact.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/artifact.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/artifact.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/artifact.xml diff --git a/modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/org_wso2_iot_devices_network_traffic.xml b/modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/Eventstore_networktraffic_1.0.0/org_wso2_iot_devices_network_traffic.xml rename to modules/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/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/artifacts.xml b/modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/artifacts.xml similarity index 100% rename from modules/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/artifacts.xml rename to modules/distribution/src/samples/connectedlap/component/analytics/src/main/resources/carbonapps/ConnectedLapNetworkTraffic/artifacts.xml diff --git a/modules/samples/connectedlap/component/api/pom.xml b/modules/distribution/src/samples/connectedlap/component/api/pom.xml similarity index 100% rename from modules/samples/connectedlap/component/api/pom.xml rename to modules/distribution/src/samples/connectedlap/component/api/pom.xml diff --git a/modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeService.java b/modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeService.java similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeService.java rename to modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeService.java diff --git a/modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeServiceImpl.java b/modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeServiceImpl.java similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeServiceImpl.java rename to modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/DeviceTypeServiceImpl.java diff --git a/modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/DeviceJSON.java b/modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/DeviceJSON.java similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/DeviceJSON.java rename to modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/DeviceJSON.java diff --git a/modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/SensorRecord.java b/modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/SensorRecord.java similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/SensorRecord.java rename to modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/dto/SensorRecord.java diff --git a/modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/exception/DeviceTypeException.java b/modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/exception/DeviceTypeException.java similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/exception/DeviceTypeException.java rename to modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/exception/DeviceTypeException.java diff --git a/modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/APIUtil.java b/modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/APIUtil.java similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/APIUtil.java rename to modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/APIUtil.java diff --git a/modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/Constants.java b/modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/Constants.java similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/Constants.java rename to modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/Constants.java diff --git a/modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ResponsePayload.java b/modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ResponsePayload.java similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ResponsePayload.java rename to modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ResponsePayload.java diff --git a/modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ServiceUtils.java b/modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ServiceUtils.java similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ServiceUtils.java rename to modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ServiceUtils.java diff --git a/modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ZipUtil.java b/modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ZipUtil.java similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ZipUtil.java rename to modules/distribution/src/samples/connectedlap/component/api/src/main/java/org.wso2/connectedlap/api/util/ZipUtil.java diff --git a/modules/samples/connectedlap/component/api/src/main/webapp/META-INF/permissions.xml b/modules/distribution/src/samples/connectedlap/component/api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/webapp/META-INF/permissions.xml rename to modules/distribution/src/samples/connectedlap/component/api/src/main/webapp/META-INF/permissions.xml diff --git a/modules/samples/connectedlap/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules/distribution/src/samples/connectedlap/component/api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/webapp/META-INF/webapp-classloading.xml rename to modules/distribution/src/samples/connectedlap/component/api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/modules/samples/connectedlap/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/distribution/src/samples/connectedlap/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to modules/distribution/src/samples/connectedlap/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/modules/samples/connectedlap/component/api/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/connectedlap/component/api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from modules/samples/connectedlap/component/api/src/main/webapp/WEB-INF/web.xml rename to modules/distribution/src/samples/connectedlap/component/api/src/main/webapp/WEB-INF/web.xml diff --git a/modules/samples/connectedlap/component/laptopagent/pom.xml b/modules/distribution/src/samples/connectedlap/component/laptopagent/pom.xml similarity index 100% rename from modules/samples/connectedlap/component/laptopagent/pom.xml rename to modules/distribution/src/samples/connectedlap/component/laptopagent/pom.xml diff --git a/modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/common/Common.java b/modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/common/Common.java similarity index 100% rename from modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/common/Common.java rename to modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/common/Common.java diff --git a/modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/config/Configuration.java b/modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/config/Configuration.java similarity index 100% rename from modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/config/Configuration.java rename to modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/config/Configuration.java diff --git a/modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/datasense/PushSystemUsage.java b/modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/datasense/PushSystemUsage.java similarity index 100% rename from modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/datasense/PushSystemUsage.java rename to modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/datasense/PushSystemUsage.java diff --git a/modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/main/JavaApp.java b/modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/main/JavaApp.java similarity index 100% rename from modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/main/JavaApp.java rename to modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/main/JavaApp.java diff --git a/modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/Monitor.java b/modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/Monitor.java similarity index 100% rename from modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/Monitor.java rename to modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/Monitor.java diff --git a/modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/exception/OperationalException.java b/modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/exception/OperationalException.java similarity index 100% rename from modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/exception/OperationalException.java rename to modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/exception/OperationalException.java diff --git a/modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/infocollector/Collector.java b/modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/infocollector/Collector.java similarity index 100% rename from modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/infocollector/Collector.java rename to modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/infocollector/Collector.java diff --git a/modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemSpec.java b/modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemSpec.java similarity index 100% rename from modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemSpec.java rename to modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemSpec.java diff --git a/modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemUsage.java b/modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemUsage.java similarity index 100% rename from modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemUsage.java rename to modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/pojo/SystemUsage.java diff --git a/modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/systembridge/BashRunner.java b/modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/systembridge/BashRunner.java similarity index 100% rename from modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/systembridge/BashRunner.java rename to modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/resourcemonitor/systembridge/BashRunner.java diff --git a/modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/store/RecordStore.java b/modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/store/RecordStore.java similarity index 100% rename from modules/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/store/RecordStore.java rename to modules/distribution/src/samples/connectedlap/component/laptopagent/src/main/java/org/wso2/agent/store/RecordStore.java diff --git a/modules/samples/connectedlap/component/plugin/pom.xml b/modules/distribution/src/samples/connectedlap/component/plugin/pom.xml similarity index 100% rename from modules/samples/connectedlap/component/plugin/pom.xml rename to modules/distribution/src/samples/connectedlap/component/plugin/pom.xml diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/constants/DeviceTypeConstants.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/constants/DeviceTypeConstants.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/constants/DeviceTypeConstants.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/constants/DeviceTypeConstants.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/exception/DeviceMgtPluginException.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/exception/DeviceMgtPluginException.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/exception/DeviceMgtPluginException.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/exception/DeviceMgtPluginException.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManager.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManager.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManager.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManager.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManagerService.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManagerService.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManagerService.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/ConnectedLapDataManagerService.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DataManagerService.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DataManagerService.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DataManagerService.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DataManagerService.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManager.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManager.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManager.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManager.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManagerService.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManagerService.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManagerService.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/DeviceTypeManagerService.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/DeviceTypeDAO.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/DeviceTypeDAO.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/DeviceTypeDAO.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/DeviceTypeDAO.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/impl/DeviceTypeDAOImpl.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/impl/DeviceTypeDAOImpl.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/impl/DeviceTypeDAOImpl.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/dao/impl/DeviceTypeDAOImpl.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/feature/DeviceTypeFeatureManager.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/feature/DeviceTypeFeatureManager.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/feature/DeviceTypeFeatureManager.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/feature/DeviceTypeFeatureManager.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapDevice.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapDevice.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapDevice.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapDevice.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapResponse.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapResponse.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapResponse.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/ConnectedLapResponse.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceSchemaInitializer.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceSchemaInitializer.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceSchemaInitializer.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceSchemaInitializer.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeStartupListener.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeStartupListener.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeStartupListener.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeStartupListener.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeUtils.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeUtils.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeUtils.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/impl/util/DeviceTypeUtils.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/DeviceTypeManagementDataHolder.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/DeviceTypeManagementDataHolder.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/DeviceTypeManagementDataHolder.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/DeviceTypeManagementDataHolder.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/ServiceComponent.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/ServiceComponent.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/ServiceComponent.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/internal/ServiceComponent.java diff --git a/modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/mqtt/MqttConfig.java b/modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/mqtt/MqttConfig.java similarity index 100% rename from modules/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/mqtt/MqttConfig.java rename to modules/distribution/src/samples/connectedlap/component/plugin/src/main/java/org.wso2/connectedlap/plugin/mqtt/MqttConfig.java diff --git a/modules/samples/connectedlap/component/pom.xml b/modules/distribution/src/samples/connectedlap/component/pom.xml similarity index 100% rename from modules/samples/connectedlap/component/pom.xml rename to modules/distribution/src/samples/connectedlap/component/pom.xml diff --git a/modules/samples/connectedlap/component/ui/pom.xml b/modules/distribution/src/samples/connectedlap/component/ui/pom.xml similarity index 100% rename from modules/samples/connectedlap/component/ui/pom.xml rename to modules/distribution/src/samples/connectedlap/component/ui/pom.xml diff --git a/modules/samples/connectedlap/component/ui/src/assembly/src.xml b/modules/distribution/src/samples/connectedlap/component/ui/src/assembly/src.xml similarity index 100% rename from modules/samples/connectedlap/component/ui/src/assembly/src.xml rename to modules/distribution/src/samples/connectedlap/component/ui/src/assembly/src.xml diff --git a/modules/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.hbs b/modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.hbs rename to modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.js b/modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.js rename to modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.json b/modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/analytics-view.json rename to modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.analytics-view/public/js/connectedlap.js b/modules/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/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/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.hbs b/modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.hbs rename to modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.js b/modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.js rename to modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.json b/modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/device-view.json rename to modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.device-view/public/images/deviceType.png b/modules/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/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/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.hbs b/modules/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/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/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.js b/modules/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/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/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.realtime.analytics-view/analytics-view.json b/modules/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/private/config.json b/modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/private/config.json rename to modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/deviceType.png b/modules/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/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/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/deviceview.png b/modules/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/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/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/schematicsGuide.png b/modules/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/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/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/images/thumb.png b/modules/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/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/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/public/js/download.js b/modules/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/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/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/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/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/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/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/type-view.hbs b/modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/type-view.hbs rename to modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/type-view.json b/modules/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/samples/connectedlap/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.CONNECTEDLAP.type-view/type-view.json rename to modules/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/samples/connectedlap/feature/feature/pom.xml b/modules/distribution/src/samples/connectedlap/feature/feature/pom.xml similarity index 100% rename from modules/samples/connectedlap/feature/feature/pom.xml rename to modules/distribution/src/samples/connectedlap/feature/feature/pom.xml diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/agent/ConnectedLap.run b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/ConnectedLap.run similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/agent/ConnectedLap.run rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/ConnectedLap.run diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/agent/config.properties b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/config.properties similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/agent/config.properties rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/config.properties diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/agent/deviceConfig.properties b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/deviceConfig.properties similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/agent/deviceConfig.properties rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/deviceConfig.properties diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/agent/sketch.properties b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/sketch.properties similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/agent/sketch.properties rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/sketch.properties diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/agent/startagent.sh b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/startagent.sh similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/agent/startagent.sh rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/agent/startagent.sh diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/build.properties b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/build.properties similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/build.properties rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/build.properties diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.json b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.json similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.json rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.json diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.xml b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.xml similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.xml rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/configs/CONNECTEDLAP.xml diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/datasources/CONNECTEDLAP-datasources.xml b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/datasources/CONNECTEDLAP-datasources.xml similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/datasources/CONNECTEDLAP-datasources.xml rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/datasources/CONNECTEDLAP-datasources.xml diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/dbscripts/h2.sql b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/h2.sql similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/dbscripts/h2.sql rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/h2.sql diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mssql.sql similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mssql.sql rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mssql.sql diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mysql.sql similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mysql.sql rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/mysql.sql diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/oracle.sql similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/dbscripts/oracle.sql rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/dbscripts/oracle.sql diff --git a/modules/samples/connectedlap/feature/feature/src/main/resources/p2.inf b/modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/p2.inf similarity index 100% rename from modules/samples/connectedlap/feature/feature/src/main/resources/p2.inf rename to modules/distribution/src/samples/connectedlap/feature/feature/src/main/resources/p2.inf diff --git a/modules/samples/connectedlap/feature/pom.xml b/modules/distribution/src/samples/connectedlap/feature/pom.xml similarity index 100% rename from modules/samples/connectedlap/feature/pom.xml rename to modules/distribution/src/samples/connectedlap/feature/pom.xml diff --git a/modules/samples/connectedlap/pom.xml b/modules/distribution/src/samples/connectedlap/pom.xml similarity index 100% rename from modules/samples/connectedlap/pom.xml rename to modules/distribution/src/samples/connectedlap/pom.xml diff --git a/modules/samples/currentsensor/component/analytics/build.xml b/modules/distribution/src/samples/currentsensor/component/analytics/build.xml similarity index 100% rename from modules/samples/currentsensor/component/analytics/build.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/build.xml diff --git a/modules/samples/currentsensor/component/analytics/pom.xml b/modules/distribution/src/samples/currentsensor/component/analytics/pom.xml similarity index 100% rename from modules/samples/currentsensor/component/analytics/pom.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/pom.xml diff --git a/modules/samples/currentsensor/component/analytics/src/assembly/src.xml b/modules/distribution/src/samples/currentsensor/component/analytics/src/assembly/src.xml similarity index 100% rename from modules/samples/currentsensor/component/analytics/src/assembly/src.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/assembly/src.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/EventReceiver_current.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/EventReceiver_current.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/EventReceiver_current.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/artifact.xml b/modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/artifact.xml similarity index 100% rename from modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/artifact.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventreceiver_current_1.0.0/artifact.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/artifact.xml b/modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/artifact.xml similarity index 100% rename from modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/artifact.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/artifact.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/org_wso2_iot_devices_current.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstore_current_1.0.0/org_wso2_iot_devices_current.xml rename to modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstream_current_1.0.0/artifact.xml b/modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstream_current_1.0.0/artifact.xml similarity index 100% rename from modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstream_current_1.0.0/artifact.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Eventstream_current_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/Current_Sensor_Script.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/Current_Sensor_Script.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/Current_Sensor_Script.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/artifact.xml similarity index 100% rename from modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/artifact.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/Sparkscripts_1.0.0/artifact.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/artifacts.xml b/modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/artifacts.xml similarity index 100% rename from modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/artifacts.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Current/artifacts.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/EventReceiver_flowrate.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/EventReceiver_flowrate.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/EventReceiver_flowrate.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/artifact.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/artifact.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventreceiver_flowrate_1.0.0/artifact.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/artifact.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/artifact.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/artifact.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/org_wso2_iot_devices_flowrate.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstore_flowrate_1.0.0/org_wso2_iot_devices_flowrate.xml rename to modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstream_flowrate_1.0.0/artifact.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstream_flowrate_1.0.0/artifact.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Eventstream_flowrate_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/Flow_Sensor_Script.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/Flow_Sensor_Script.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/Flow_Sensor_Script.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/artifact.xml similarity index 100% rename from modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/artifact.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/Sparkscripts_1.0.0/artifact.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/artifacts.xml b/modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/artifacts.xml similarity index 100% rename from modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/artifacts.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Flow_Sensor/artifacts.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/EventReceiver_power.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/EventReceiver_power.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/EventReceiver_power.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/artifact.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/artifact.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventreceiver_power_1.0.0/artifact.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/artifact.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/artifact.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/artifact.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/org_wso2_iot_devices_power.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstore_power_1.0.0/org_wso2_iot_devices_power.xml rename to modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstream_power_1.0.0/artifact.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstream_power_1.0.0/artifact.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Eventstream_power_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/Power_Sensor_Script.xml b/modules/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/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/Power_Sensor_Script.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/Power_Sensor_Script.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/artifact.xml similarity index 100% rename from modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/artifact.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/Sparkscripts_1.0.0/artifact.xml diff --git a/modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/artifacts.xml b/modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/artifacts.xml similarity index 100% rename from modules/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/artifacts.xml rename to modules/distribution/src/samples/currentsensor/component/analytics/src/main/resources/carbonapps/Power_Sensor/artifacts.xml diff --git a/modules/samples/currentsensor/component/api/pom.xml b/modules/distribution/src/samples/currentsensor/component/api/pom.xml similarity index 100% rename from modules/samples/currentsensor/component/api/pom.xml rename to modules/distribution/src/samples/currentsensor/component/api/pom.xml diff --git a/modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerService.java b/modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerService.java similarity index 100% rename from modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerService.java rename to modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerService.java diff --git a/modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerServiceImpl.java b/modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerServiceImpl.java similarity index 100% rename from modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerServiceImpl.java rename to modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorControllerServiceImpl.java diff --git a/modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerService.java b/modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerService.java similarity index 100% rename from modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerService.java rename to modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerService.java diff --git a/modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerServiceImpl.java b/modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerServiceImpl.java similarity index 100% rename from modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerServiceImpl.java rename to modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/CurrentSensorManagerServiceImpl.java diff --git a/modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/dto/DeviceJSON.java b/modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/dto/DeviceJSON.java similarity index 100% rename from modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/dto/DeviceJSON.java rename to modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/dto/DeviceJSON.java diff --git a/modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/APIUtil.java b/modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/APIUtil.java similarity index 100% rename from modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/APIUtil.java rename to modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/APIUtil.java diff --git a/modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java b/modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java similarity index 100% rename from modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java rename to modules/distribution/src/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java diff --git a/modules/samples/currentsensor/component/api/src/main/webapp/META-INF/permissions.xml b/modules/distribution/src/samples/currentsensor/component/api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from modules/samples/currentsensor/component/api/src/main/webapp/META-INF/permissions.xml rename to modules/distribution/src/samples/currentsensor/component/api/src/main/webapp/META-INF/permissions.xml diff --git a/modules/samples/currentsensor/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules/distribution/src/samples/currentsensor/component/api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from modules/samples/currentsensor/component/api/src/main/webapp/META-INF/webapp-classloading.xml rename to modules/distribution/src/samples/currentsensor/component/api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/modules/samples/currentsensor/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/distribution/src/samples/currentsensor/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from modules/samples/currentsensor/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to modules/distribution/src/samples/currentsensor/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/modules/samples/currentsensor/component/api/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/currentsensor/component/api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from modules/samples/currentsensor/component/api/src/main/webapp/WEB-INF/web.xml rename to modules/distribution/src/samples/currentsensor/component/api/src/main/webapp/WEB-INF/web.xml diff --git a/modules/samples/currentsensor/component/controller/src/main/webapp/META-INF/permissions.xml b/modules/distribution/src/samples/currentsensor/component/controller/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from modules/samples/currentsensor/component/controller/src/main/webapp/META-INF/permissions.xml rename to modules/distribution/src/samples/currentsensor/component/controller/src/main/webapp/META-INF/permissions.xml diff --git a/modules/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/util/APIUtil.java b/modules/distribution/src/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/util/APIUtil.java similarity index 100% rename from modules/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/util/APIUtil.java rename to modules/distribution/src/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/util/APIUtil.java diff --git a/modules/samples/currentsensor/component/manager/src/main/webapp/META-INF/permissions.xml b/modules/distribution/src/samples/currentsensor/component/manager/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from modules/samples/currentsensor/component/manager/src/main/webapp/META-INF/permissions.xml rename to modules/distribution/src/samples/currentsensor/component/manager/src/main/webapp/META-INF/permissions.xml diff --git a/modules/samples/currentsensor/component/plugin/pom.xml b/modules/distribution/src/samples/currentsensor/component/plugin/pom.xml similarity index 100% rename from modules/samples/currentsensor/component/plugin/pom.xml rename to modules/distribution/src/samples/currentsensor/component/plugin/pom.xml diff --git a/modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java b/modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java similarity index 100% rename from modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java rename to modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java diff --git a/modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/exception/CurrentSensorDeviceMgtPluginException.java b/modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/exception/CurrentSensorDeviceMgtPluginException.java similarity index 100% rename from modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/exception/CurrentSensorDeviceMgtPluginException.java rename to modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/exception/CurrentSensorDeviceMgtPluginException.java diff --git a/modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java b/modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java similarity index 100% rename from modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java rename to modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java diff --git a/modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java b/modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java similarity index 100% rename from modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java rename to modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java diff --git a/modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java b/modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java similarity index 100% rename from modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java rename to modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java diff --git a/modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDAO.java b/modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDAO.java similarity index 100% rename from modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDAO.java rename to modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDAO.java diff --git a/modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java b/modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java similarity index 100% rename from modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java rename to modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java diff --git a/modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java b/modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java similarity index 100% rename from modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java rename to modules/distribution/src/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java diff --git a/modules/samples/currentsensor/component/pom.xml b/modules/distribution/src/samples/currentsensor/component/pom.xml similarity index 100% rename from modules/samples/currentsensor/component/pom.xml rename to modules/distribution/src/samples/currentsensor/component/pom.xml diff --git a/modules/samples/currentsensor/component/ui/pom.xml b/modules/distribution/src/samples/currentsensor/component/ui/pom.xml similarity index 100% rename from modules/samples/currentsensor/component/ui/pom.xml rename to modules/distribution/src/samples/currentsensor/component/ui/pom.xml diff --git a/modules/samples/currentsensor/component/ui/src/assembly/src.xml b/modules/distribution/src/samples/currentsensor/component/ui/src/assembly/src.xml similarity index 100% rename from modules/samples/currentsensor/component/ui/src/assembly/src.xml rename to modules/distribution/src/samples/currentsensor/component/ui/src/assembly/src.xml diff --git a/modules/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.hbs b/modules/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/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.hbs rename to modules/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/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.js b/modules/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/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.js rename to modules/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/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.json b/modules/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/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.device-view/device-view.json rename to modules/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/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/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/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/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/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/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/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/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/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/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/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/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/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/schematicsGuide.png b/modules/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/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/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/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/images/thumb.png b/modules/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/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/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/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/public/js/download.js b/modules/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/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/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/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/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/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/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/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/type-view.hbs b/modules/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/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/type-view.hbs rename to modules/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/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/type-view.json b/modules/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/samples/currentsensor/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.currentsensor.type-view/type-view.json rename to modules/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/samples/currentsensor/feature/feature/pom.xml b/modules/distribution/src/samples/currentsensor/feature/feature/pom.xml similarity index 100% rename from modules/samples/currentsensor/feature/feature/pom.xml rename to modules/distribution/src/samples/currentsensor/feature/feature/pom.xml diff --git a/modules/samples/currentsensor/feature/feature/src/main/resources/agent/Connect.ino b/modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/Connect.ino similarity index 100% rename from modules/samples/currentsensor/feature/feature/src/main/resources/agent/Connect.ino rename to modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/Connect.ino diff --git a/modules/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.h b/modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.h similarity index 100% rename from modules/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.h rename to modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.h diff --git a/modules/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.ino b/modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.ino similarity index 100% rename from modules/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.ino rename to modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/CurrentSensor.ino diff --git a/modules/samples/currentsensor/feature/feature/src/main/resources/agent/PushData.ino b/modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/PushData.ino similarity index 100% rename from modules/samples/currentsensor/feature/feature/src/main/resources/agent/PushData.ino rename to modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/PushData.ino diff --git a/modules/samples/currentsensor/feature/feature/src/main/resources/agent/sketch.properties b/modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/sketch.properties similarity index 100% rename from modules/samples/currentsensor/feature/feature/src/main/resources/agent/sketch.properties rename to modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/agent/sketch.properties diff --git a/modules/samples/currentsensor/feature/feature/src/main/resources/build.properties b/modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/build.properties similarity index 100% rename from modules/samples/currentsensor/feature/feature/src/main/resources/build.properties rename to modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/build.properties diff --git a/modules/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.json b/modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.json similarity index 100% rename from modules/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.json rename to modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.json diff --git a/modules/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.xml b/modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.xml similarity index 100% rename from modules/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.xml rename to modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/configs/currentsensor.xml diff --git a/modules/samples/currentsensor/feature/feature/src/main/resources/datasources/currentsensor-datasources.xml b/modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/datasources/currentsensor-datasources.xml similarity index 100% rename from modules/samples/currentsensor/feature/feature/src/main/resources/datasources/currentsensor-datasources.xml rename to modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/datasources/currentsensor-datasources.xml diff --git a/modules/samples/currentsensor/feature/feature/src/main/resources/dbscripts/h2.sql b/modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/dbscripts/h2.sql similarity index 100% rename from modules/samples/currentsensor/feature/feature/src/main/resources/dbscripts/h2.sql rename to modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/dbscripts/h2.sql diff --git a/modules/samples/currentsensor/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/dbscripts/mysql.sql similarity index 100% rename from modules/samples/currentsensor/feature/feature/src/main/resources/dbscripts/mysql.sql rename to modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/dbscripts/mysql.sql diff --git a/modules/samples/currentsensor/feature/feature/src/main/resources/p2.inf b/modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/p2.inf similarity index 100% rename from modules/samples/currentsensor/feature/feature/src/main/resources/p2.inf rename to modules/distribution/src/samples/currentsensor/feature/feature/src/main/resources/p2.inf diff --git a/modules/samples/currentsensor/feature/pom.xml b/modules/distribution/src/samples/currentsensor/feature/pom.xml similarity index 100% rename from modules/samples/currentsensor/feature/pom.xml rename to modules/distribution/src/samples/currentsensor/feature/pom.xml diff --git a/modules/samples/currentsensor/pom.xml b/modules/distribution/src/samples/currentsensor/pom.xml similarity index 100% rename from modules/samples/currentsensor/pom.xml rename to modules/distribution/src/samples/currentsensor/pom.xml diff --git a/modules/samples/digitaldisplay/component/api/pom.xml b/modules/distribution/src/samples/digitaldisplay/component/api/pom.xml similarity index 100% rename from modules/samples/digitaldisplay/component/api/pom.xml rename to modules/distribution/src/samples/digitaldisplay/component/api/pom.xml diff --git a/modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerService.java b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerService.java similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerService.java rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerService.java diff --git a/modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerServiceImpl.java b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerServiceImpl.java similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerServiceImpl.java rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayControllerServiceImpl.java diff --git a/modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerService.java b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerService.java similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerService.java rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerService.java diff --git a/modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerServiceImpl.java b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerServiceImpl.java similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerServiceImpl.java rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/DigitalDisplayManagerServiceImpl.java diff --git a/modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/dto/DeviceJSON.java b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/dto/DeviceJSON.java similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/dto/DeviceJSON.java rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/dto/DeviceJSON.java diff --git a/modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/exception/DigitalDisplayException.java b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/exception/DigitalDisplayException.java similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/exception/DigitalDisplayException.java rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/exception/DigitalDisplayException.java diff --git a/modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/model/ScreenShotModel.java b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/model/ScreenShotModel.java similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/model/ScreenShotModel.java rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/model/ScreenShotModel.java diff --git a/modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/APIUtil.java b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/APIUtil.java similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/APIUtil.java rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/APIUtil.java diff --git a/modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/DigitalDisplayMQTTConnector.java b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/DigitalDisplayMQTTConnector.java similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/DigitalDisplayMQTTConnector.java rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/util/DigitalDisplayMQTTConnector.java diff --git a/modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/websocket/DigitalDisplayWebSocketServerEndPoint.java b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/websocket/DigitalDisplayWebSocketServerEndPoint.java similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/websocket/DigitalDisplayWebSocketServerEndPoint.java rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/java/org/homeautomation/digitaldisplay/api/websocket/DigitalDisplayWebSocketServerEndPoint.java diff --git a/modules/samples/digitaldisplay/component/api/src/main/webapp/META-INF/permissions.xml b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/webapp/META-INF/permissions.xml rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/META-INF/permissions.xml diff --git a/modules/samples/digitaldisplay/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/webapp/META-INF/webapp-classloading.xml rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/modules/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/modules/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from modules/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/web.xml rename to modules/distribution/src/samples/digitaldisplay/component/api/src/main/webapp/WEB-INF/web.xml diff --git a/modules/samples/digitaldisplay/component/plugin/pom.xml b/modules/distribution/src/samples/digitaldisplay/component/plugin/pom.xml similarity index 100% rename from modules/samples/digitaldisplay/component/plugin/pom.xml rename to modules/distribution/src/samples/digitaldisplay/component/plugin/pom.xml diff --git a/modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/constants/DigitalDisplayConstants.java b/modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/constants/DigitalDisplayConstants.java similarity index 100% rename from modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/constants/DigitalDisplayConstants.java rename to modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/constants/DigitalDisplayConstants.java diff --git a/modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/exception/DigitalDisplayDeviceMgtPluginException.java b/modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/exception/DigitalDisplayDeviceMgtPluginException.java similarity index 100% rename from modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/exception/DigitalDisplayDeviceMgtPluginException.java rename to modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/exception/DigitalDisplayDeviceMgtPluginException.java diff --git a/modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManager.java b/modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManager.java similarity index 100% rename from modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManager.java rename to modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManager.java diff --git a/modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java b/modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java similarity index 100% rename from modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java rename to modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java diff --git a/modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/DigitalDisplayDAO.java b/modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/DigitalDisplayDAO.java similarity index 100% rename from modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/DigitalDisplayDAO.java rename to modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/DigitalDisplayDAO.java diff --git a/modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/impl/DigitalDisplayDeviceDAOImpl.java b/modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/impl/DigitalDisplayDeviceDAOImpl.java similarity index 100% rename from modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/impl/DigitalDisplayDeviceDAOImpl.java rename to modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/dao/impl/DigitalDisplayDeviceDAOImpl.java diff --git a/modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/feature/DigitalDisplayFeatureManager.java b/modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/feature/DigitalDisplayFeatureManager.java similarity index 100% rename from modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/feature/DigitalDisplayFeatureManager.java rename to modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/feature/DigitalDisplayFeatureManager.java diff --git a/modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DeviceSchemaInitializer.java b/modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DeviceSchemaInitializer.java similarity index 100% rename from modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DeviceSchemaInitializer.java rename to modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DeviceSchemaInitializer.java diff --git a/modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DigitalDisplayUtils.java b/modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DigitalDisplayUtils.java similarity index 100% rename from modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DigitalDisplayUtils.java rename to modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/impl/util/DigitalDisplayUtils.java diff --git a/modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/internal/DigitalDisplayManagementServiceComponent.java b/modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/internal/DigitalDisplayManagementServiceComponent.java similarity index 100% rename from modules/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/internal/DigitalDisplayManagementServiceComponent.java rename to modules/distribution/src/samples/digitaldisplay/component/plugin/src/main/java/org/homeautomation/digitaldisplay/plugin/internal/DigitalDisplayManagementServiceComponent.java diff --git a/modules/samples/digitaldisplay/component/pom.xml b/modules/distribution/src/samples/digitaldisplay/component/pom.xml similarity index 100% rename from modules/samples/digitaldisplay/component/pom.xml rename to modules/distribution/src/samples/digitaldisplay/component/pom.xml diff --git a/modules/samples/digitaldisplay/component/ui/pom.xml b/modules/distribution/src/samples/digitaldisplay/component/ui/pom.xml similarity index 100% rename from modules/samples/digitaldisplay/component/ui/pom.xml rename to modules/distribution/src/samples/digitaldisplay/component/ui/pom.xml diff --git a/modules/samples/digitaldisplay/component/ui/src/assembly/src.xml b/modules/distribution/src/samples/digitaldisplay/component/ui/src/assembly/src.xml similarity index 100% rename from modules/samples/digitaldisplay/component/ui/src/assembly/src.xml rename to modules/distribution/src/samples/digitaldisplay/component/ui/src/assembly/src.xml diff --git a/modules/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.hbs b/modules/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/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/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/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.js b/modules/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/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/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/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.device-view/device-view.json b/modules/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.hbs b/modules/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/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/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/samples/digitaldisplay/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.digital_display.type-view/type-view.json b/modules/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/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/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/samples/digitaldisplay/feature/feature/pom.xml b/modules/distribution/src/samples/digitaldisplay/feature/feature/pom.xml similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/pom.xml rename to modules/distribution/src/samples/digitaldisplay/feature/feature/pom.xml diff --git a/modules/samples/digitaldisplay/feature/feature/src/main/resources/agent/DigitalDisplay.zip b/modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/DigitalDisplay.zip similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/src/main/resources/agent/DigitalDisplay.zip rename to modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/DigitalDisplay.zip diff --git a/modules/samples/digitaldisplay/feature/feature/src/main/resources/agent/deviceConfig.properties b/modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/deviceConfig.properties similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/src/main/resources/agent/deviceConfig.properties rename to modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/deviceConfig.properties diff --git a/modules/samples/digitaldisplay/feature/feature/src/main/resources/agent/installPackages.sh b/modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/installPackages.sh similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/src/main/resources/agent/installPackages.sh rename to modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/installPackages.sh diff --git a/modules/samples/digitaldisplay/feature/feature/src/main/resources/agent/sketch.properties b/modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/sketch.properties similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/src/main/resources/agent/sketch.properties rename to modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/sketch.properties diff --git a/modules/samples/digitaldisplay/feature/feature/src/main/resources/agent/wso2Agent.sh b/modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/wso2Agent.sh similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/src/main/resources/agent/wso2Agent.sh rename to modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/agent/wso2Agent.sh diff --git a/modules/samples/digitaldisplay/feature/feature/src/main/resources/build.properties b/modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/build.properties similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/src/main/resources/build.properties rename to modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/build.properties diff --git a/modules/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.json b/modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.json similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.json rename to modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.json diff --git a/modules/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.xml b/modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.xml similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.xml rename to modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/configs/digital_display.xml diff --git a/modules/samples/digitaldisplay/feature/feature/src/main/resources/datasources/digitaldisplay-datasources.xml b/modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/datasources/digitaldisplay-datasources.xml similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/src/main/resources/datasources/digitaldisplay-datasources.xml rename to modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/datasources/digitaldisplay-datasources.xml diff --git a/modules/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/h2.sql b/modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/h2.sql similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/h2.sql rename to modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/h2.sql diff --git a/modules/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/mysql.sql similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/mysql.sql rename to modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/dbscripts/mysql.sql diff --git a/modules/samples/digitaldisplay/feature/feature/src/main/resources/p2.inf b/modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/p2.inf similarity index 100% rename from modules/samples/digitaldisplay/feature/feature/src/main/resources/p2.inf rename to modules/distribution/src/samples/digitaldisplay/feature/feature/src/main/resources/p2.inf diff --git a/modules/samples/digitaldisplay/feature/pom.xml b/modules/distribution/src/samples/digitaldisplay/feature/pom.xml similarity index 100% rename from modules/samples/digitaldisplay/feature/pom.xml rename to modules/distribution/src/samples/digitaldisplay/feature/pom.xml diff --git a/modules/samples/digitaldisplay/pom.xml b/modules/distribution/src/samples/digitaldisplay/pom.xml similarity index 100% rename from modules/samples/digitaldisplay/pom.xml rename to modules/distribution/src/samples/digitaldisplay/pom.xml diff --git a/modules/samples/doormanager/component/analytics/build.xml b/modules/distribution/src/samples/doormanager/component/analytics/build.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/build.xml rename to modules/distribution/src/samples/doormanager/component/analytics/build.xml diff --git a/modules/samples/doormanager/component/analytics/pom.xml b/modules/distribution/src/samples/doormanager/component/analytics/pom.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/pom.xml rename to modules/distribution/src/samples/doormanager/component/analytics/pom.xml diff --git a/modules/samples/doormanager/component/analytics/src/assembly/src.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/assembly/src.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/assembly/src.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/assembly/src.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/artifacts.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/artifacts.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/artifacts.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/artifacts.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/artifact.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/artifact.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/smartBulb_mqtt_receiver.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_mqtt_receiver_1.0.0/smartBulb_mqtt_receiver.xml rename to modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/artifact.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/artifact.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/artifact.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/smartBulb_publisher.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/smartBulb_publisher.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_publisher_1.0.0/smartBulb_publisher.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/artifact.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/artifact.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/smartBulb_spark_script.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_spark_script_1.0.0/smartBulb_spark_script.xml rename to modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/artifact.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/artifact.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/artifact.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/org_wso2_iot_devices_smartBulb.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_store_1.0.0/org_wso2_iot_devices_smartBulb.xml rename to modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_stream_1.0.0/artifact.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_stream_1.0.0/artifact.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_stream_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartBulb/smartBulb_stream_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/artifacts.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/artifacts.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/artifacts.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/artifacts.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/artifact.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/artifact.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/smartFan_mqtt_receiver.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_mqtt_receiver_1.0.0/smartFan_mqtt_receiver.xml rename to modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/artifact.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/artifact.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/artifact.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/smartFan_publisher.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/smartFan_publisher.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_publisher_1.0.0/smartFan_publisher.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/artifact.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/artifact.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/smartFan_spark_script.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_spark_script_1.0.0/smartFan_spark_script.xml rename to modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/artifact.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/artifact.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/artifact.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/org_wso2_iot_devices_smartFan.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_store_1.0.0/org_wso2_iot_devices_smartFan.xml rename to modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_stream_1.0.0/artifact.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_stream_1.0.0/artifact.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_stream_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartFan/smartFan_stream_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/artifacts.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/artifacts.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/artifacts.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/artifacts.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/artifact.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/artifact.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/smartLock_mqtt_receiver.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_mqtt_receiver_1.0.0/smartLock_mqtt_receiver.xml rename to modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/artifact.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/artifact.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/artifact.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/smartLock_publisher.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/smartLock_publisher.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_publisher_1.0.0/smartLock_publisher.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/artifact.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/artifact.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/smartLock_spark_script.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_spark_script_1.0.0/smartLock_spark_script.xml rename to modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/artifact.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/artifact.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/artifact.xml diff --git a/modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/org_wso2_iot_devices_smartLock.xml b/modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_store_1.0.0/org_wso2_iot_devices_smartLock.xml rename to modules/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/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_stream_1.0.0/artifact.xml b/modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_stream_1.0.0/artifact.xml similarity index 100% rename from modules/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_stream_1.0.0/artifact.xml rename to modules/distribution/src/samples/doormanager/component/analytics/src/main/resources/carbonapps/smartLock/smartLock_stream_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/doormanager/component/api/pom.xml b/modules/distribution/src/samples/doormanager/component/api/pom.xml similarity index 100% rename from modules/samples/doormanager/component/api/pom.xml rename to modules/distribution/src/samples/doormanager/component/api/pom.xml diff --git a/modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerService.java b/modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerService.java similarity index 100% rename from modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerService.java rename to modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerService.java diff --git a/modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerServiceImpl.java b/modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerServiceImpl.java similarity index 100% rename from modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerServiceImpl.java rename to modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/DoorManagerServiceImpl.java diff --git a/modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/DeviceJSON.java b/modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/DeviceJSON.java similarity index 100% rename from modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/DeviceJSON.java rename to modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/DeviceJSON.java diff --git a/modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/SensorRecord.java b/modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/SensorRecord.java similarity index 100% rename from modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/SensorRecord.java rename to modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/SensorRecord.java diff --git a/modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/UserInfo.java b/modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/UserInfo.java similarity index 100% rename from modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/UserInfo.java rename to modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/dto/UserInfo.java diff --git a/modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/exception/DoorManagerException.java b/modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/exception/DoorManagerException.java similarity index 100% rename from modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/exception/DoorManagerException.java rename to modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/exception/DoorManagerException.java diff --git a/modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/APIUtil.java b/modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/APIUtil.java similarity index 100% rename from modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/APIUtil.java rename to modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/APIUtil.java diff --git a/modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/DoorManagerUtilConstants.java b/modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/DoorManagerUtilConstants.java similarity index 100% rename from modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/DoorManagerUtilConstants.java rename to modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/DoorManagerUtilConstants.java diff --git a/modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/ZipUtil.java b/modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/ZipUtil.java similarity index 100% rename from modules/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/ZipUtil.java rename to modules/distribution/src/samples/doormanager/component/api/src/main/java/org.homeautomation/doormanager/api/util/ZipUtil.java diff --git a/modules/samples/doormanager/component/api/src/main/webapp/META-INF/permissions.xml b/modules/distribution/src/samples/doormanager/component/api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from modules/samples/doormanager/component/api/src/main/webapp/META-INF/permissions.xml rename to modules/distribution/src/samples/doormanager/component/api/src/main/webapp/META-INF/permissions.xml diff --git a/modules/samples/doormanager/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules/distribution/src/samples/doormanager/component/api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from modules/samples/doormanager/component/api/src/main/webapp/META-INF/webapp-classloading.xml rename to modules/distribution/src/samples/doormanager/component/api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/modules/samples/doormanager/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/distribution/src/samples/doormanager/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from modules/samples/doormanager/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to modules/distribution/src/samples/doormanager/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/modules/samples/doormanager/component/api/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/doormanager/component/api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from modules/samples/doormanager/component/api/src/main/webapp/WEB-INF/web.xml rename to modules/distribution/src/samples/doormanager/component/api/src/main/webapp/WEB-INF/web.xml diff --git a/modules/samples/doormanager/component/plugin/pom.xml b/modules/distribution/src/samples/doormanager/component/plugin/pom.xml similarity index 100% rename from modules/samples/doormanager/component/plugin/pom.xml rename to modules/distribution/src/samples/doormanager/component/plugin/pom.xml diff --git a/modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/constants/DoorManagerConstants.java b/modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/constants/DoorManagerConstants.java similarity index 100% rename from modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/constants/DoorManagerConstants.java rename to modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/constants/DoorManagerConstants.java diff --git a/modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/exception/DoorManagerDeviceMgtPluginException.java b/modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/exception/DoorManagerDeviceMgtPluginException.java similarity index 100% rename from modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/exception/DoorManagerDeviceMgtPluginException.java rename to modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/exception/DoorManagerDeviceMgtPluginException.java diff --git a/modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManager.java b/modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManager.java similarity index 100% rename from modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManager.java rename to modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManager.java diff --git a/modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManagerService.java b/modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManagerService.java similarity index 100% rename from modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManagerService.java rename to modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/DoorManagerManagerService.java diff --git a/modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorLockSafe.java b/modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorLockSafe.java similarity index 100% rename from modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorLockSafe.java rename to modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorLockSafe.java diff --git a/modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorManagerDAO.java b/modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorManagerDAO.java similarity index 100% rename from modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorManagerDAO.java rename to modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/DoorManagerDAO.java diff --git a/modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/impl/DoorManagerDAOImpl.java b/modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/impl/DoorManagerDAOImpl.java similarity index 100% rename from modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/impl/DoorManagerDAOImpl.java rename to modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/dao/impl/DoorManagerDAOImpl.java diff --git a/modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/feature/DoorManagerFeatureManager.java b/modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/feature/DoorManagerFeatureManager.java similarity index 100% rename from modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/feature/DoorManagerFeatureManager.java rename to modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/feature/DoorManagerFeatureManager.java diff --git a/modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DeviceSchemaInitializer.java b/modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DeviceSchemaInitializer.java similarity index 100% rename from modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DeviceSchemaInitializer.java rename to modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DeviceSchemaInitializer.java diff --git a/modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DoorManagerUtils.java b/modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DoorManagerUtils.java similarity index 100% rename from modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DoorManagerUtils.java rename to modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/impl/util/DoorManagerUtils.java diff --git a/modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/DoorManagerManagementDataHolder.java b/modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/DoorManagerManagementDataHolder.java similarity index 100% rename from modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/DoorManagerManagementDataHolder.java rename to modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/DoorManagerManagementDataHolder.java diff --git a/modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/ServiceComponent.java b/modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/ServiceComponent.java similarity index 100% rename from modules/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/ServiceComponent.java rename to modules/distribution/src/samples/doormanager/component/plugin/src/main/java/org.homeautomation/doormanager/plugin/internal/ServiceComponent.java diff --git a/modules/samples/doormanager/component/pom.xml b/modules/distribution/src/samples/doormanager/component/pom.xml similarity index 100% rename from modules/samples/doormanager/component/pom.xml rename to modules/distribution/src/samples/doormanager/component/pom.xml diff --git a/modules/samples/doormanager/component/ui/pom.xml b/modules/distribution/src/samples/doormanager/component/ui/pom.xml similarity index 100% rename from modules/samples/doormanager/component/ui/pom.xml rename to modules/distribution/src/samples/doormanager/component/ui/pom.xml diff --git a/modules/samples/doormanager/component/ui/src/assembly/src.xml b/modules/distribution/src/samples/doormanager/component/ui/src/assembly/src.xml similarity index 100% rename from modules/samples/doormanager/component/ui/src/assembly/src.xml rename to modules/distribution/src/samples/doormanager/component/ui/src/assembly/src.xml diff --git a/modules/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.hbs b/modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.hbs rename to modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.js b/modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.js rename to modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.json b/modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/analytics-view.json rename to modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.analytics-view/public/css/graph.css b/modules/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.hbs b/modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.hbs rename to modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.js b/modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.js rename to modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.json b/modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/device-view.json rename to modules/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/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/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/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/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/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/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/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/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/images/deviceType.png b/modules/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/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/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.device-view/public/images/lightbulb.png b/modules/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/configuration.hbs b/modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/configuration.hbs rename to modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/configuration.json b/modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.platform.configuration/configuration.json rename to modules/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/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/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/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/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.hbs b/modules/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/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/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.js b/modules/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/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/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.realtime.analytics-view/analytics-view.json b/modules/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/private/config.json b/modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/private/config.json rename to modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/deviceType.png b/modules/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/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/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/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/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/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/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/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/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/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/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/schematicsGuide.png b/modules/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/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/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/images/thumb.png b/modules/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/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/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/public/js/download.js b/modules/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/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/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/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/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/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/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/type-view.hbs b/modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/type-view.hbs rename to modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/type-view.json b/modules/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/samples/doormanager/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.doormanager.type-view/type-view.json rename to modules/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/samples/doormanager/feature/feature/pom.xml b/modules/distribution/src/samples/doormanager/feature/feature/pom.xml similarity index 100% rename from modules/samples/doormanager/feature/feature/pom.xml rename to modules/distribution/src/samples/doormanager/feature/feature/pom.xml diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/agent/deviceConfig.properties b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/deviceConfig.properties similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/agent/deviceConfig.properties rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/deviceConfig.properties diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/agent/sketch.properties b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/sketch.properties similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/agent/sketch.properties rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/sketch.properties diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.log b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.log similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.log rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.log diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.py b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.py similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.py rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/DoorManagerAgent.py diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/agent/src/MFRC522.py b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/MFRC522.py similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/agent/src/MFRC522.py rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/MFRC522.py diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/agent/src/MQTTHandler.py b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/MQTTHandler.py similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/agent/src/MQTTHandler.py rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/MQTTHandler.py diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/agent/src/RFIDReader.py b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/RFIDReader.py similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/agent/src/RFIDReader.py rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/RFIDReader.py diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/agent/src/iotUtils.py b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/iotUtils.py similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/agent/src/iotUtils.py rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/src/iotUtils.py diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/agent/startService.sh b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/startService.sh similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/agent/startService.sh rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/agent/startService.sh diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/build.properties b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/build.properties similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/build.properties rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/build.properties diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/conf/doormanager-config.xml b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/conf/doormanager-config.xml similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/conf/doormanager-config.xml rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/conf/doormanager-config.xml diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.json b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.json similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.json rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.json diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.xml b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.xml similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.xml rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/configs/doormanager.xml diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/datasources/doormanager-datasources.xml b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/datasources/doormanager-datasources.xml similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/datasources/doormanager-datasources.xml rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/datasources/doormanager-datasources.xml diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/dbscripts/h2.sql b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/h2.sql similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/dbscripts/h2.sql rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/h2.sql diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/mssql.sql similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/dbscripts/mssql.sql rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/mssql.sql diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/mysql.sql similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/dbscripts/mysql.sql rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/mysql.sql diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/oracle.sql similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/dbscripts/oracle.sql rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/dbscripts/oracle.sql diff --git a/modules/samples/doormanager/feature/feature/src/main/resources/p2.inf b/modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/p2.inf similarity index 100% rename from modules/samples/doormanager/feature/feature/src/main/resources/p2.inf rename to modules/distribution/src/samples/doormanager/feature/feature/src/main/resources/p2.inf diff --git a/modules/samples/doormanager/feature/pom.xml b/modules/distribution/src/samples/doormanager/feature/pom.xml similarity index 100% rename from modules/samples/doormanager/feature/pom.xml rename to modules/distribution/src/samples/doormanager/feature/pom.xml diff --git a/modules/samples/doormanager/pom.xml b/modules/distribution/src/samples/doormanager/pom.xml similarity index 100% rename from modules/samples/doormanager/pom.xml rename to modules/distribution/src/samples/doormanager/pom.xml diff --git a/modules/samples/droneanalyzer/component/analytics/build.xml b/modules/distribution/src/samples/droneanalyzer/component/analytics/build.xml similarity index 100% rename from modules/samples/droneanalyzer/component/analytics/build.xml rename to modules/distribution/src/samples/droneanalyzer/component/analytics/build.xml diff --git a/modules/samples/droneanalyzer/component/analytics/pom.xml b/modules/distribution/src/samples/droneanalyzer/component/analytics/pom.xml similarity index 100% rename from modules/samples/droneanalyzer/component/analytics/pom.xml rename to modules/distribution/src/samples/droneanalyzer/component/analytics/pom.xml diff --git a/modules/samples/droneanalyzer/component/analytics/src/assembly/src.xml b/modules/distribution/src/samples/droneanalyzer/component/analytics/src/assembly/src.xml similarity index 100% rename from modules/samples/droneanalyzer/component/analytics/src/assembly/src.xml rename to modules/distribution/src/samples/droneanalyzer/component/analytics/src/assembly/src.xml diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/EventPublisher_droneStats.xml b/modules/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/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/EventPublisher_droneStats.xml rename to modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/EventPublisher_droneStats.xml diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/artifact.xml b/modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/artifact.xml similarity index 100% rename from modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/artifact.xml rename to modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventpublisher_droneStats_1.0.0/artifact.xml diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/EventReceiver_mqtt_droneStats.xml b/modules/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/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/EventReceiver_mqtt_droneStats.xml rename to modules/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/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/artifact.xml b/modules/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/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/artifact.xml rename to modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventreceiver_mqtt_droneStats_1.0.0/artifact.xml diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/artifact.xml b/modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/artifact.xml similarity index 100% rename from modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/artifact.xml rename to modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/artifact.xml diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/org_wso2_iot_devices_droneStats.xml b/modules/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/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstore_droneStats_1.0.0/org_wso2_iot_devices_droneStats.xml rename to modules/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/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/artifact.xml b/modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/artifact.xml similarity index 100% rename from modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/artifact.xml rename to modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Eventstream_droneStats_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/artifact.xml b/modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/artifact.xml similarity index 100% rename from modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/artifact.xml rename to modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/artifact.xml diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/droneStats_Script.xml b/modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/droneStats_Script.xml similarity index 100% rename from modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/droneStats_Script.xml rename to modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/Sparkscripts_1.0.0/droneStats_Script.xml diff --git a/modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/artifacts.xml b/modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/artifacts.xml similarity index 100% rename from modules/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/artifacts.xml rename to modules/distribution/src/samples/droneanalyzer/component/analytics/src/main/resources/carbonapps/droneStats/artifacts.xml diff --git a/modules/samples/droneanalyzer/component/api/pom.xml b/modules/distribution/src/samples/droneanalyzer/component/api/pom.xml similarity index 100% rename from modules/samples/droneanalyzer/component/api/pom.xml rename to modules/distribution/src/samples/droneanalyzer/component/api/pom.xml diff --git a/modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerService.java b/modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerService.java similarity index 100% rename from modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerService.java rename to modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerService.java diff --git a/modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerServiceImpl.java b/modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerServiceImpl.java similarity index 100% rename from modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerServiceImpl.java rename to modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/DroneAnalyzerServiceImpl.java diff --git a/modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/DeviceJSON.java b/modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/DeviceJSON.java similarity index 100% rename from modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/DeviceJSON.java rename to modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/DeviceJSON.java diff --git a/modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/SensorRecord.java b/modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/SensorRecord.java similarity index 100% rename from modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/SensorRecord.java rename to modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/dto/SensorRecord.java diff --git a/modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/exception/DroneAnalyzerException.java b/modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/exception/DroneAnalyzerException.java similarity index 100% rename from modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/exception/DroneAnalyzerException.java rename to modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/exception/DroneAnalyzerException.java diff --git a/modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/APIUtil.java b/modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/APIUtil.java similarity index 100% rename from modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/APIUtil.java rename to modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/APIUtil.java diff --git a/modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/Constants.java b/modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/Constants.java similarity index 100% rename from modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/Constants.java rename to modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/Constants.java diff --git a/modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/ZipUtil.java b/modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/ZipUtil.java similarity index 100% rename from modules/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/ZipUtil.java rename to modules/distribution/src/samples/droneanalyzer/component/api/src/main/java/org.homeautomation/droneanalyzer/api/util/ZipUtil.java diff --git a/modules/samples/droneanalyzer/component/api/src/main/webapp/META-INF/permissions.xml b/modules/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from modules/samples/droneanalyzer/component/api/src/main/webapp/META-INF/permissions.xml rename to modules/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/META-INF/permissions.xml diff --git a/modules/samples/droneanalyzer/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from modules/samples/droneanalyzer/component/api/src/main/webapp/META-INF/webapp-classloading.xml rename to modules/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/modules/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from modules/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to modules/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/modules/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from modules/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/web.xml rename to modules/distribution/src/samples/droneanalyzer/component/api/src/main/webapp/WEB-INF/web.xml diff --git a/modules/samples/droneanalyzer/component/plugin/pom.xml b/modules/distribution/src/samples/droneanalyzer/component/plugin/pom.xml similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/pom.xml rename to modules/distribution/src/samples/droneanalyzer/component/plugin/pom.xml diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/constants/DroneAnalyzerConstants.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/constants/DroneAnalyzerConstants.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/constants/DroneAnalyzerConstants.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/constants/DroneAnalyzerConstants.java diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/exception/DeviceMgtPluginException.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/exception/DeviceMgtPluginException.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/exception/DeviceMgtPluginException.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/exception/DeviceMgtPluginException.java diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManager.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManager.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManager.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManager.java diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManagerService.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManagerService.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManagerService.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/DroneAnalyzerManagerService.java diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/DroneAnalyzerDAO.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/DroneAnalyzerDAO.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/DroneAnalyzerDAO.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/DroneAnalyzerDAO.java diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/impl/DroneAnalyzerDAOImpl.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/impl/DroneAnalyzerDAOImpl.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/impl/DroneAnalyzerDAOImpl.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/dao/impl/DroneAnalyzerDAOImpl.java diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/feature/DroneAnalyzerFeatureManager.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/feature/DroneAnalyzerFeatureManager.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/feature/DroneAnalyzerFeatureManager.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/feature/DroneAnalyzerFeatureManager.java diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DeviceSchemaInitializer.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DeviceSchemaInitializer.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DeviceSchemaInitializer.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DeviceSchemaInitializer.java diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerStartupListener.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerStartupListener.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerStartupListener.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerStartupListener.java diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerUtils.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerUtils.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerUtils.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/impl/util/DroneAnalyzerUtils.java diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/DroneAnalyzerManagementDataHolder.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/DroneAnalyzerManagementDataHolder.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/DroneAnalyzerManagementDataHolder.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/DroneAnalyzerManagementDataHolder.java diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/ServiceComponent.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/ServiceComponent.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/ServiceComponent.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/internal/ServiceComponent.java diff --git a/modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/mqtt/MqttConfig.java b/modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/mqtt/MqttConfig.java similarity index 100% rename from modules/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/mqtt/MqttConfig.java rename to modules/distribution/src/samples/droneanalyzer/component/plugin/src/main/java/org.homeautomation/droneanalyzer/plugin/mqtt/MqttConfig.java diff --git a/modules/samples/droneanalyzer/component/pom.xml b/modules/distribution/src/samples/droneanalyzer/component/pom.xml similarity index 100% rename from modules/samples/droneanalyzer/component/pom.xml rename to modules/distribution/src/samples/droneanalyzer/component/pom.xml diff --git a/modules/samples/droneanalyzer/component/ui/pom.xml b/modules/distribution/src/samples/droneanalyzer/component/ui/pom.xml similarity index 100% rename from modules/samples/droneanalyzer/component/ui/pom.xml rename to modules/distribution/src/samples/droneanalyzer/component/ui/pom.xml diff --git a/modules/samples/droneanalyzer/component/ui/src/assembly/src.xml b/modules/distribution/src/samples/droneanalyzer/component/ui/src/assembly/src.xml similarity index 100% rename from modules/samples/droneanalyzer/component/ui/src/assembly/src.xml rename to modules/distribution/src/samples/droneanalyzer/component/ui/src/assembly/src.xml diff --git a/modules/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.hbs b/modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.hbs rename to modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.js b/modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.js rename to modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.json b/modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/analytics-view.json rename to modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/css/graph.css b/modules/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/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/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/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/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/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/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.analytics-view/public/js/drone.js b/modules/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/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/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/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/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/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/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/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/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/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/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.hbs b/modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.hbs rename to modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.js b/modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.js rename to modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.json b/modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/device-view.json rename to modules/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/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/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/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/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.device-view/public/images/thumb.png b/modules/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/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/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.hbs b/modules/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/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/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.js b/modules/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/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/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.realtime.analytics-view/analytics-view.json b/modules/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/private/config.json b/modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/private/config.json rename to modules/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/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/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/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/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/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/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/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/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/schematicsGuide.png b/modules/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/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/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/images/thumb.png b/modules/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/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/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/js/download.js b/modules/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/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/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/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/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/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/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/public/type-view.hbs b/modules/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/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/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view.hbs b/modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view.hbs rename to modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view.json b/modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view.json rename to modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view1.hbs b/modules/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/samples/droneanalyzer/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.drone.type-view/type-view1.hbs rename to modules/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/samples/droneanalyzer/feature/feature/pom.xml b/modules/distribution/src/samples/droneanalyzer/feature/feature/pom.xml similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/pom.xml rename to modules/distribution/src/samples/droneanalyzer/feature/feature/pom.xml diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/deviceConfig.properties b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/deviceConfig.properties similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/deviceConfig.properties rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/deviceConfig.properties diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/sketch.properties b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/sketch.properties similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/sketch.properties rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/sketch.properties diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/drone.py b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/drone.py similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/drone.py rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/drone.py diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/droneSimulator.py b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/droneSimulator.py similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/droneSimulator.py rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/droneSimulator.py diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/iotUtils.py b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/iotUtils.py similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/iotUtils.py rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/iotUtils.py diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/mqttHandler.py b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/mqttHandler.py similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/mqttHandler.py rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/src/mqttHandler.py diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/startService.sh b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/startService.sh similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/agent/startService.sh rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/agent/startService.sh diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/build.properties b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/build.properties similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/build.properties rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/build.properties diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.json b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.json similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.json rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.json diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.xml b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.xml similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.xml rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/configs/drone.xml diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/datasources/drone-datasources.xml b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/datasources/drone-datasources.xml similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/datasources/drone-datasources.xml rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/datasources/drone-datasources.xml diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/h2.sql b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/h2.sql similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/h2.sql rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/h2.sql diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mssql.sql similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mssql.sql rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mssql.sql diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mysql.sql similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mysql.sql rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/mysql.sql diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/oracle.sql similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/oracle.sql rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/dbscripts/oracle.sql diff --git a/modules/samples/droneanalyzer/feature/feature/src/main/resources/p2.inf b/modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/p2.inf similarity index 100% rename from modules/samples/droneanalyzer/feature/feature/src/main/resources/p2.inf rename to modules/distribution/src/samples/droneanalyzer/feature/feature/src/main/resources/p2.inf diff --git a/modules/samples/droneanalyzer/feature/pom.xml b/modules/distribution/src/samples/droneanalyzer/feature/pom.xml similarity index 100% rename from modules/samples/droneanalyzer/feature/pom.xml rename to modules/distribution/src/samples/droneanalyzer/feature/pom.xml diff --git a/modules/samples/droneanalyzer/pom.xml b/modules/distribution/src/samples/droneanalyzer/pom.xml similarity index 100% rename from modules/samples/droneanalyzer/pom.xml rename to modules/distribution/src/samples/droneanalyzer/pom.xml diff --git a/modules/samples/firealarm/component/analytics/build.xml b/modules/distribution/src/samples/firealarm/component/analytics/build.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/build.xml rename to modules/distribution/src/samples/firealarm/component/analytics/build.xml diff --git a/modules/samples/firealarm/component/analytics/pom.xml b/modules/distribution/src/samples/firealarm/component/analytics/pom.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/pom.xml rename to modules/distribution/src/samples/firealarm/component/analytics/pom.xml diff --git a/modules/samples/firealarm/component/analytics/src/assembly/src.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/assembly/src.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/assembly/src.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/assembly/src.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/artifacts.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/artifacts.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/artifacts.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/artifacts.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/firealarm_execution.siddhiql b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/firealarm_execution.siddhiql similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/firealarm_execution.siddhiql rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_execution/firealarm_execution.siddhiql diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/firealarm_publisher.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/firealarm_publisher.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/firealarm_publisher.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_publisher/firealarm_publisher.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/firealarm_receiver.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/firealarm_receiver.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/firealarm_receiver.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_receiver/firealarm_receiver.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/org.wso2.iot.firealarm_1.0.0.json b/modules/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/samples/firealarm/component/analytics/src/main/resources/carbonapps/firealarm/firealarm_stream/org.wso2.iot.firealarm_1.0.0.json rename to modules/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/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/humidity_receiver.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/humidity_receiver.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/humidity_receiver.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_receiver/humidity_receiver.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/humidity_script.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/humidity_script.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/humidity_script.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_script/humidity_script.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/org_wso2_iot_devices_humidity.xml b/modules/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/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/org_wso2_iot_devices_humidity.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_store/org_wso2_iot_devices_humidity.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/org.wso2.iot.devices.humidity_1.0.0.json b/modules/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/samples/firealarm/component/analytics/src/main/resources/carbonapps/humidity_sensor/humidity_stream/org.wso2.iot.devices.humidity_1.0.0.json rename to modules/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/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/artifacts.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/artifacts.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/artifacts.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/artifacts.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/temperature_publisher.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/temperature_publisher.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/temperature_publisher.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/temperature_publisher.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/temperature_receiver.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/temperature_receiver.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/temperature_receiver.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/temperature_receiver.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/temperature_script.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/temperature_script.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/temperature_script.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/temperature_script.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/org_wso2_iot_devices_temperature.xml b/modules/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/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/org_wso2_iot_devices_temperature.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/org_wso2_iot_devices_temperature.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/artifact.xml b/modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/artifact.xml similarity index 100% rename from modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/artifact.xml rename to modules/distribution/src/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/artifact.xml diff --git a/modules/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/org.wso2.iot.devices.temperature_1.0.0.json b/modules/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/samples/firealarm/component/analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/org.wso2.iot.devices.temperature_1.0.0.json rename to modules/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/samples/firealarm/component/api/pom.xml b/modules/distribution/src/samples/firealarm/component/api/pom.xml similarity index 100% rename from modules/samples/firealarm/component/api/pom.xml rename to modules/distribution/src/samples/firealarm/component/api/pom.xml diff --git a/modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeService.java b/modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeService.java similarity index 100% rename from modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeService.java rename to modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeService.java diff --git a/modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeServiceImpl.java b/modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeServiceImpl.java similarity index 100% rename from modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeServiceImpl.java rename to modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/DeviceTypeServiceImpl.java diff --git a/modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/DeviceJSON.java b/modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/DeviceJSON.java similarity index 100% rename from modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/DeviceJSON.java rename to modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/DeviceJSON.java diff --git a/modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/SensorRecord.java b/modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/SensorRecord.java similarity index 100% rename from modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/SensorRecord.java rename to modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/dto/SensorRecord.java diff --git a/modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/exception/DeviceTypeException.java b/modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/exception/DeviceTypeException.java similarity index 100% rename from modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/exception/DeviceTypeException.java rename to modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/exception/DeviceTypeException.java diff --git a/modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/APIUtil.java b/modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/APIUtil.java similarity index 100% rename from modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/APIUtil.java rename to modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/APIUtil.java diff --git a/modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/Constants.java b/modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/Constants.java similarity index 100% rename from modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/Constants.java rename to modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/Constants.java diff --git a/modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ResponsePayload.java b/modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ResponsePayload.java similarity index 100% rename from modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ResponsePayload.java rename to modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ResponsePayload.java diff --git a/modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ZipUtil.java b/modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ZipUtil.java similarity index 100% rename from modules/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ZipUtil.java rename to modules/distribution/src/samples/firealarm/component/api/src/main/java/org/homeautomation/firealarm/api/util/ZipUtil.java diff --git a/modules/samples/firealarm/component/api/src/main/webapp/META-INF/permissions.xml b/modules/distribution/src/samples/firealarm/component/api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from modules/samples/firealarm/component/api/src/main/webapp/META-INF/permissions.xml rename to modules/distribution/src/samples/firealarm/component/api/src/main/webapp/META-INF/permissions.xml diff --git a/modules/samples/firealarm/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules/distribution/src/samples/firealarm/component/api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from modules/samples/firealarm/component/api/src/main/webapp/META-INF/webapp-classloading.xml rename to modules/distribution/src/samples/firealarm/component/api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/modules/samples/firealarm/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/distribution/src/samples/firealarm/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from modules/samples/firealarm/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to modules/distribution/src/samples/firealarm/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/modules/samples/firealarm/component/api/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/firealarm/component/api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from modules/samples/firealarm/component/api/src/main/webapp/WEB-INF/web.xml rename to modules/distribution/src/samples/firealarm/component/api/src/main/webapp/WEB-INF/web.xml diff --git a/modules/samples/firealarm/component/plugin/pom.xml b/modules/distribution/src/samples/firealarm/component/plugin/pom.xml similarity index 100% rename from modules/samples/firealarm/component/plugin/pom.xml rename to modules/distribution/src/samples/firealarm/component/plugin/pom.xml diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/constants/DeviceTypeConstants.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/constants/DeviceTypeConstants.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/constants/DeviceTypeConstants.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/constants/DeviceTypeConstants.java diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/exception/DeviceMgtPluginException.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/exception/DeviceMgtPluginException.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/exception/DeviceMgtPluginException.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/exception/DeviceMgtPluginException.java diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManager.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManager.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManager.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManager.java diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManagerService.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManagerService.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManagerService.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/DeviceTypeManagerService.java diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/DeviceTypeDAO.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/DeviceTypeDAO.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/DeviceTypeDAO.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/DeviceTypeDAO.java diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/impl/DeviceTypeDAOImpl.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/impl/DeviceTypeDAOImpl.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/impl/DeviceTypeDAOImpl.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/dao/impl/DeviceTypeDAOImpl.java diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/feature/DeviceTypeFeatureManager.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/feature/DeviceTypeFeatureManager.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/feature/DeviceTypeFeatureManager.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/feature/DeviceTypeFeatureManager.java diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceSchemaInitializer.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceSchemaInitializer.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceSchemaInitializer.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceSchemaInitializer.java diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeStartupListener.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeStartupListener.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeStartupListener.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeStartupListener.java diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeUtils.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeUtils.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeUtils.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/impl/util/DeviceTypeUtils.java diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/DeviceTypeManagementDataHolder.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/DeviceTypeManagementDataHolder.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/DeviceTypeManagementDataHolder.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/DeviceTypeManagementDataHolder.java diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/ServiceComponent.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/ServiceComponent.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/ServiceComponent.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/internal/ServiceComponent.java diff --git a/modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/mqtt/MqttConfig.java b/modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/mqtt/MqttConfig.java similarity index 100% rename from modules/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/mqtt/MqttConfig.java rename to modules/distribution/src/samples/firealarm/component/plugin/src/main/java/org/homeautomation/firealarm/plugin/mqtt/MqttConfig.java diff --git a/modules/samples/firealarm/component/pom.xml b/modules/distribution/src/samples/firealarm/component/pom.xml similarity index 100% rename from modules/samples/firealarm/component/pom.xml rename to modules/distribution/src/samples/firealarm/component/pom.xml diff --git a/modules/samples/firealarm/component/ui/pom.xml b/modules/distribution/src/samples/firealarm/component/ui/pom.xml similarity index 100% rename from modules/samples/firealarm/component/ui/pom.xml rename to modules/distribution/src/samples/firealarm/component/ui/pom.xml diff --git a/modules/samples/firealarm/component/ui/src/assembly/src.xml b/modules/distribution/src/samples/firealarm/component/ui/src/assembly/src.xml similarity index 100% rename from modules/samples/firealarm/component/ui/src/assembly/src.xml rename to modules/distribution/src/samples/firealarm/component/ui/src/assembly/src.xml diff --git a/modules/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.hbs b/modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.hbs rename to modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.js b/modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.js rename to modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.json b/modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/analytics-view.json rename to modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.analytics-view/public/js/firealarm.js b/modules/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/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/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.hbs b/modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.hbs rename to modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.js b/modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.js rename to modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.json b/modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/device-view.json rename to modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.device-view/public/images/deviceType.png b/modules/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/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/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.hbs b/modules/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/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/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.js b/modules/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/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/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.realtime.analytics-view/analytics-view.json b/modules/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/private/config.json b/modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/private/config.json rename to modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/deviceType.png b/modules/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/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/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/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/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/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/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/schematicsGuide.png b/modules/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/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/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/images/thumb.png b/modules/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/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/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/public/js/download.js b/modules/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/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/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/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/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/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/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/type-view.hbs b/modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/type-view.hbs rename to modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/type-view.json b/modules/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/samples/firealarm/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.firealarm.type-view/type-view.json rename to modules/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/samples/firealarm/feature/feature/pom.xml b/modules/distribution/src/samples/firealarm/feature/feature/pom.xml similarity index 100% rename from modules/samples/firealarm/feature/feature/pom.xml rename to modules/distribution/src/samples/firealarm/feature/feature/pom.xml diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/agent/dht_lib.lua b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/dht_lib.lua similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/agent/dht_lib.lua rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/dht_lib.lua diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/agent/init.lua b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/init.lua similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/agent/init.lua rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/init.lua diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/agent/read-sensor.lua b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/read-sensor.lua similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/agent/read-sensor.lua rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/read-sensor.lua diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/agent/sketch.properties b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/sketch.properties similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/agent/sketch.properties rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/sketch.properties diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/agent/wifi-connect.lua b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/wifi-connect.lua similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/agent/wifi-connect.lua rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/agent/wifi-connect.lua diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/build.properties b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/build.properties similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/build.properties rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/build.properties diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/configs/firealarm.xml b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/configs/firealarm.xml similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/configs/firealarm.xml rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/configs/firealarm.xml diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/datasources/firealarm-datasources.xml b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/datasources/firealarm-datasources.xml similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/datasources/firealarm-datasources.xml rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/datasources/firealarm-datasources.xml diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/dbscripts/h2.sql b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/h2.sql similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/dbscripts/h2.sql rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/h2.sql diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/mssql.sql similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/dbscripts/mssql.sql rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/mssql.sql diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/mysql.sql similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/dbscripts/mysql.sql rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/mysql.sql diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/oracle.sql similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/dbscripts/oracle.sql rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/dbscripts/oracle.sql diff --git a/modules/samples/firealarm/feature/feature/src/main/resources/p2.inf b/modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/p2.inf similarity index 100% rename from modules/samples/firealarm/feature/feature/src/main/resources/p2.inf rename to modules/distribution/src/samples/firealarm/feature/feature/src/main/resources/p2.inf diff --git a/modules/samples/firealarm/feature/pom.xml b/modules/distribution/src/samples/firealarm/feature/pom.xml similarity index 100% rename from modules/samples/firealarm/feature/pom.xml rename to modules/distribution/src/samples/firealarm/feature/pom.xml diff --git a/modules/samples/firealarm/pom.xml b/modules/distribution/src/samples/firealarm/pom.xml similarity index 100% rename from modules/samples/firealarm/pom.xml rename to modules/distribution/src/samples/firealarm/pom.xml diff --git a/modules/samples/geolocationTracker/component/analytics/build.xml b/modules/distribution/src/samples/geolocationTracker/component/analytics/build.xml similarity index 100% rename from modules/samples/geolocationTracker/component/analytics/build.xml rename to modules/distribution/src/samples/geolocationTracker/component/analytics/build.xml diff --git a/modules/samples/geolocationTracker/component/analytics/pom.xml b/modules/distribution/src/samples/geolocationTracker/component/analytics/pom.xml similarity index 100% rename from modules/samples/geolocationTracker/component/analytics/pom.xml rename to modules/distribution/src/samples/geolocationTracker/component/analytics/pom.xml diff --git a/modules/samples/geolocationTracker/component/analytics/src/assembly/src.xml b/modules/distribution/src/samples/geolocationTracker/component/analytics/src/assembly/src.xml similarity index 100% rename from modules/samples/geolocationTracker/component/analytics/src/assembly/src.xml rename to modules/distribution/src/samples/geolocationTracker/component/analytics/src/assembly/src.xml diff --git a/modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/artifacts.xml b/modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/artifacts.xml similarity index 100% rename from modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/artifacts.xml rename to modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/artifacts.xml diff --git a/modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/artifact.xml b/modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/artifact.xml similarity index 100% rename from modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/artifact.xml rename to modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/artifact.xml diff --git a/modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/geolocation_execution.siddhiql b/modules/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/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/geolocation_execution.siddhiql rename to modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_execution_1.0.0/geolocation_execution.siddhiql diff --git a/modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/artifact.xml b/modules/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/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/artifact.xml rename to modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/artifact.xml diff --git a/modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/geolocation_mqtt_receiver.xml b/modules/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/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_mqtt_receiver_1.0.0/geolocation_mqtt_receiver.xml rename to modules/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/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/artifact.xml b/modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/artifact.xml similarity index 100% rename from modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/artifact.xml rename to modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/artifact.xml diff --git a/modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/geolocation_publisher.xml b/modules/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/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/geolocation_publisher.xml rename to modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_publisher_1.0.0/geolocation_publisher.xml diff --git a/modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/artifact.xml b/modules/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/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/artifact.xml rename to modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/artifact.xml diff --git a/modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/geolocation_spark_script.xml b/modules/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/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_spark_script_1.0.0/geolocation_spark_script.xml rename to modules/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/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/artifact.xml b/modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/artifact.xml similarity index 100% rename from modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/artifact.xml rename to modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/artifact.xml diff --git a/modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/org_wso2_iot_devices_geolocation.xml b/modules/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/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_store_1.0.0/org_wso2_iot_devices_geolocation.xml rename to modules/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/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_stream_1.0.0/artifact.xml b/modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_stream_1.0.0/artifact.xml similarity index 100% rename from modules/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_stream_1.0.0/artifact.xml rename to modules/distribution/src/samples/geolocationTracker/component/analytics/src/main/resources/carbonapps/geolocation/geolocation_stream_1.0.0/artifact.xml diff --git a/modules/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/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/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/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/samples/geolocationTracker/component/api/pom.xml b/modules/distribution/src/samples/geolocationTracker/component/api/pom.xml similarity index 100% rename from modules/samples/geolocationTracker/component/api/pom.xml rename to modules/distribution/src/samples/geolocationTracker/component/api/pom.xml diff --git a/modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerService.java b/modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerService.java similarity index 100% rename from modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerService.java rename to modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerService.java diff --git a/modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerServiceImpl.java b/modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerServiceImpl.java similarity index 100% rename from modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerServiceImpl.java rename to modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/GeoLocationTrackerServiceImpl.java diff --git a/modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/DeviceJSON.java b/modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/DeviceJSON.java similarity index 100% rename from modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/DeviceJSON.java rename to modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/DeviceJSON.java diff --git a/modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/SensorRecord.java b/modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/SensorRecord.java similarity index 100% rename from modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/SensorRecord.java rename to modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/dto/SensorRecord.java diff --git a/modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/exception/GeoLocationTrackerException.java b/modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/exception/GeoLocationTrackerException.java similarity index 100% rename from modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/exception/GeoLocationTrackerException.java rename to modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/exception/GeoLocationTrackerException.java diff --git a/modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/APIUtil.java b/modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/APIUtil.java similarity index 100% rename from modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/APIUtil.java rename to modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/APIUtil.java diff --git a/modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/Constants.java b/modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/Constants.java similarity index 100% rename from modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/Constants.java rename to modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/Constants.java diff --git a/modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/ZipUtil.java b/modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/ZipUtil.java similarity index 100% rename from modules/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/ZipUtil.java rename to modules/distribution/src/samples/geolocationTracker/component/api/src/main/java/org.deviceautomation/geolocationTracker/api/util/ZipUtil.java diff --git a/modules/samples/geolocationTracker/component/api/src/main/webapp/META-INF/permissions.xml b/modules/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from modules/samples/geolocationTracker/component/api/src/main/webapp/META-INF/permissions.xml rename to modules/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/META-INF/permissions.xml diff --git a/modules/samples/geolocationTracker/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from modules/samples/geolocationTracker/component/api/src/main/webapp/META-INF/webapp-classloading.xml rename to modules/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/modules/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from modules/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to modules/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/modules/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from modules/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/web.xml rename to modules/distribution/src/samples/geolocationTracker/component/api/src/main/webapp/WEB-INF/web.xml diff --git a/modules/samples/geolocationTracker/component/plugin/pom.xml b/modules/distribution/src/samples/geolocationTracker/component/plugin/pom.xml similarity index 100% rename from modules/samples/geolocationTracker/component/plugin/pom.xml rename to modules/distribution/src/samples/geolocationTracker/component/plugin/pom.xml diff --git a/modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/constants/GeoLocationTrackerConstants.java b/modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/constants/GeoLocationTrackerConstants.java similarity index 100% rename from modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/constants/GeoLocationTrackerConstants.java rename to modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/constants/GeoLocationTrackerConstants.java diff --git a/modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/exception/DeviceMgtPluginException.java b/modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/exception/DeviceMgtPluginException.java similarity index 100% rename from modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/exception/DeviceMgtPluginException.java rename to modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/exception/DeviceMgtPluginException.java diff --git a/modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManager.java b/modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManager.java similarity index 100% rename from modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManager.java rename to modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManager.java diff --git a/modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManagerService.java b/modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManagerService.java similarity index 100% rename from modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManagerService.java rename to modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/GeoLocationTrackerManagerService.java diff --git a/modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/GeoLocationTrackerDAO.java b/modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/GeoLocationTrackerDAO.java similarity index 100% rename from modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/GeoLocationTrackerDAO.java rename to modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/GeoLocationTrackerDAO.java diff --git a/modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/impl/GeoLocationTrackerDAOImpl.java b/modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/impl/GeoLocationTrackerDAOImpl.java similarity index 100% rename from modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/impl/GeoLocationTrackerDAOImpl.java rename to modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/dao/impl/GeoLocationTrackerDAOImpl.java diff --git a/modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/feature/GeoLocationTrackerFeatureManager.java b/modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/feature/GeoLocationTrackerFeatureManager.java similarity index 100% rename from modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/feature/GeoLocationTrackerFeatureManager.java rename to modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/feature/GeoLocationTrackerFeatureManager.java diff --git a/modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/DeviceSchemaInitializer.java b/modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/DeviceSchemaInitializer.java similarity index 100% rename from modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/DeviceSchemaInitializer.java rename to modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/DeviceSchemaInitializer.java diff --git a/modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/GeoLocationTrackerUtils.java b/modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/GeoLocationTrackerUtils.java similarity index 100% rename from modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/GeoLocationTrackerUtils.java rename to modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/impl/util/GeoLocationTrackerUtils.java diff --git a/modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/GeoLocationTrackerManagementDataHolder.java b/modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/GeoLocationTrackerManagementDataHolder.java similarity index 100% rename from modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/GeoLocationTrackerManagementDataHolder.java rename to modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/GeoLocationTrackerManagementDataHolder.java diff --git a/modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/ServiceComponent.java b/modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/ServiceComponent.java similarity index 100% rename from modules/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/ServiceComponent.java rename to modules/distribution/src/samples/geolocationTracker/component/plugin/src/main/java/org.deviceautomation/geolocationTracker/plugin/internal/ServiceComponent.java diff --git a/modules/samples/geolocationTracker/component/pom.xml b/modules/distribution/src/samples/geolocationTracker/component/pom.xml similarity index 100% rename from modules/samples/geolocationTracker/component/pom.xml rename to modules/distribution/src/samples/geolocationTracker/component/pom.xml diff --git a/modules/samples/geolocationTracker/component/ui/pom.xml b/modules/distribution/src/samples/geolocationTracker/component/ui/pom.xml similarity index 100% rename from modules/samples/geolocationTracker/component/ui/pom.xml rename to modules/distribution/src/samples/geolocationTracker/component/ui/pom.xml diff --git a/modules/samples/geolocationTracker/component/ui/src/assembly/src.xml b/modules/distribution/src/samples/geolocationTracker/component/ui/src/assembly/src.xml similarity index 100% rename from modules/samples/geolocationTracker/component/ui/src/assembly/src.xml rename to modules/distribution/src/samples/geolocationTracker/component/ui/src/assembly/src.xml diff --git a/modules/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.hbs b/modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.hbs rename to modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.js b/modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.js rename to modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.json b/modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/analytics-view.json rename to modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.analytics-view/public/css/graph.css b/modules/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.hbs b/modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.hbs rename to modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.js b/modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.js rename to modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.json b/modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/device-view.json rename to modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.device-view/public/images/deviceType.png b/modules/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/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/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/configuration.hbs b/modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/configuration.hbs rename to modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/configuration.json b/modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.platform.configuration/configuration.json rename to modules/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/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/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/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/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.hbs b/modules/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/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/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.js b/modules/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/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/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.realtime.analytics-view/analytics-view.json b/modules/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/private/config.json b/modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/private/config.json rename to modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/deviceType.png b/modules/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/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/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/schematicsGuide.png b/modules/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/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/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/images/thumb.png b/modules/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/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/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/public/js/download.js b/modules/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/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/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/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/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/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/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/type-view.hbs b/modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/type-view.hbs rename to modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/type-view.json b/modules/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/samples/geolocationTracker/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.geolocationTracker.type-view/type-view.json rename to modules/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/samples/geolocationTracker/feature/feature/pom.xml b/modules/distribution/src/samples/geolocationTracker/feature/feature/pom.xml similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/pom.xml rename to modules/distribution/src/samples/geolocationTracker/feature/feature/pom.xml diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/deviceConfig.properties b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/deviceConfig.properties similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/deviceConfig.properties rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/deviceConfig.properties diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/sketch.properties b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/sketch.properties similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/sketch.properties rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/sketch.properties diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/agent.py b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/agent.py similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/agent.py rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/agent.py diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/deviceConfig.properties b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/deviceConfig.properties similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/deviceConfig.properties rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/deviceConfig.properties diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/iotUtils.py b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/iotUtils.py similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/iotUtils.py rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/iotUtils.py diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/mqttHandler.py b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/mqttHandler.py similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/mqttHandler.py rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/src/mqttHandler.py diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/startService.sh b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/startService.sh similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/agent/startService.sh rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/agent/startService.sh diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/build.properties b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/build.properties similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/build.properties rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/build.properties diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/conf/geolocationTracker-config.xml b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/conf/geolocationTracker-config.xml similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/conf/geolocationTracker-config.xml rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/conf/geolocationTracker-config.xml diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.json b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.json similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.json rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.json diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.xml b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.xml similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.xml rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/configs/geolocationTracker.xml diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/datasources/geolocationTracker-datasources.xml b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/datasources/geolocationTracker-datasources.xml similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/datasources/geolocationTracker-datasources.xml rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/datasources/geolocationTracker-datasources.xml diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/h2.sql b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/h2.sql similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/h2.sql rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/h2.sql diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mssql.sql similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mssql.sql rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mssql.sql diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mysql.sql similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mysql.sql rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/mysql.sql diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/oracle.sql similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/oracle.sql rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/dbscripts/oracle.sql diff --git a/modules/samples/geolocationTracker/feature/feature/src/main/resources/p2.inf b/modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/p2.inf similarity index 100% rename from modules/samples/geolocationTracker/feature/feature/src/main/resources/p2.inf rename to modules/distribution/src/samples/geolocationTracker/feature/feature/src/main/resources/p2.inf diff --git a/modules/samples/geolocationTracker/feature/pom.xml b/modules/distribution/src/samples/geolocationTracker/feature/pom.xml similarity index 100% rename from modules/samples/geolocationTracker/feature/pom.xml rename to modules/distribution/src/samples/geolocationTracker/feature/pom.xml diff --git a/modules/samples/geolocationTracker/pom.xml b/modules/distribution/src/samples/geolocationTracker/pom.xml similarity index 100% rename from modules/samples/geolocationTracker/pom.xml rename to modules/distribution/src/samples/geolocationTracker/pom.xml diff --git a/modules/samples/installer/device-deployer.xml b/modules/distribution/src/samples/installer/device-deployer.xml similarity index 100% rename from modules/samples/installer/device-deployer.xml rename to modules/distribution/src/samples/installer/device-deployer.xml diff --git a/modules/samples/watertank/component/analytics/build.xml b/modules/distribution/src/samples/watertank/component/analytics/build.xml similarity index 100% rename from modules/samples/watertank/component/analytics/build.xml rename to modules/distribution/src/samples/watertank/component/analytics/build.xml diff --git a/modules/samples/watertank/component/analytics/pom.xml b/modules/distribution/src/samples/watertank/component/analytics/pom.xml similarity index 100% rename from modules/samples/watertank/component/analytics/pom.xml rename to modules/distribution/src/samples/watertank/component/analytics/pom.xml diff --git a/modules/samples/watertank/component/analytics/src/assembly/src.xml b/modules/distribution/src/samples/watertank/component/analytics/src/assembly/src.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/assembly/src.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/assembly/src.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/artifacts.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/artifacts.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/artifacts.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/artifacts.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/relay_publisher.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/relay_publisher.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/relay_publisher.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_publisher/relay_publisher.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/relay_receiver.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/relay_receiver.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/relay_receiver.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_receiver/relay_receiver.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/relay_script.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/relay_script.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/relay_script.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_script/relay_script.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/org_wso2_iot_devices_relay.xml b/modules/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/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/org_wso2_iot_devices_relay.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_store/org_wso2_iot_devices_relay.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/org.wso2.iot.devices.relay_1.0.0.json b/modules/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/samples/watertank/component/analytics/src/main/resources/carbonapps/relay_sensor/relay_stream/org.wso2.iot.devices.relay_1.0.0.json rename to modules/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/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/artifacts.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/artifacts.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/artifacts.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/artifacts.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/waterlevel_receiver.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/waterlevel_receiver.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/waterlevel_receiver.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_receiver/waterlevel_receiver.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/waterlevel_script.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/waterlevel_script.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/waterlevel_script.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_script/waterlevel_script.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/org_wso2_iot_devices_waterlevel.xml b/modules/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/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/org_wso2_iot_devices_waterlevel.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_store/org_wso2_iot_devices_waterlevel.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/org.wso2.iot.devices.waterlevel_1.0.0.json b/modules/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/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_sensor/waterlevel_stream/org.wso2.iot.devices.waterlevel_1.0.0.json rename to modules/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/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/artifacts.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/artifacts.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/artifacts.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/artifacts.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/org_wso2_iot_devices_waterlevel_summary.siddhiql b/modules/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/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_execution_pain/org_wso2_iot_devices_waterlevel_summary.siddhiql rename to modules/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/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/org_wso2_iot_devices_waterlevel_summary.xml b/modules/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/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_store/org_wso2_iot_devices_waterlevel_summary.xml rename to modules/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/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_stream/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_stream/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_stream/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/waterlevel_summary/waterlevel_summary_stream/artifact.xml diff --git a/modules/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/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/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/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/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/artifacts.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/artifacts.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/artifacts.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/artifacts.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/watertank_execution.siddhiql b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/watertank_execution.siddhiql similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/watertank_execution.siddhiql rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_execution/watertank_execution.siddhiql diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/watertank_publisher.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/watertank_publisher.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/watertank_publisher.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_publisher/watertank_publisher.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/watertank_receiver.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/watertank_receiver.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/watertank_receiver.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_receiver/watertank_receiver.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/artifact.xml b/modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/artifact.xml similarity index 100% rename from modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/artifact.xml rename to modules/distribution/src/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/artifact.xml diff --git a/modules/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/org.wso2.iot.watertank_1.0.0.json b/modules/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/samples/watertank/component/analytics/src/main/resources/carbonapps/watertank/watertank_stream/org.wso2.iot.watertank_1.0.0.json rename to modules/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/samples/watertank/component/api/pom.xml b/modules/distribution/src/samples/watertank/component/api/pom.xml similarity index 100% rename from modules/samples/watertank/component/api/pom.xml rename to modules/distribution/src/samples/watertank/component/api/pom.xml diff --git a/modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeService.java b/modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeService.java similarity index 100% rename from modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeService.java rename to modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeService.java diff --git a/modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeServiceImpl.java b/modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeServiceImpl.java similarity index 100% rename from modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeServiceImpl.java rename to modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/DeviceTypeServiceImpl.java diff --git a/modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/DeviceJSON.java b/modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/DeviceJSON.java similarity index 100% rename from modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/DeviceJSON.java rename to modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/DeviceJSON.java diff --git a/modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/SensorRecord.java b/modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/SensorRecord.java similarity index 100% rename from modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/SensorRecord.java rename to modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/dto/SensorRecord.java diff --git a/modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/exception/DeviceTypeException.java b/modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/exception/DeviceTypeException.java similarity index 100% rename from modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/exception/DeviceTypeException.java rename to modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/exception/DeviceTypeException.java diff --git a/modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/APIUtil.java b/modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/APIUtil.java similarity index 100% rename from modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/APIUtil.java rename to modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/APIUtil.java diff --git a/modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/Constants.java b/modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/Constants.java similarity index 100% rename from modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/Constants.java rename to modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/Constants.java diff --git a/modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/ZipUtil.java b/modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/ZipUtil.java similarity index 100% rename from modules/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/ZipUtil.java rename to modules/distribution/src/samples/watertank/component/api/src/main/java/org/homeautomation/watertank/api/util/ZipUtil.java diff --git a/modules/samples/watertank/component/api/src/main/webapp/META-INF/permissions.xml b/modules/distribution/src/samples/watertank/component/api/src/main/webapp/META-INF/permissions.xml similarity index 100% rename from modules/samples/watertank/component/api/src/main/webapp/META-INF/permissions.xml rename to modules/distribution/src/samples/watertank/component/api/src/main/webapp/META-INF/permissions.xml diff --git a/modules/samples/watertank/component/api/src/main/webapp/META-INF/webapp-classloading.xml b/modules/distribution/src/samples/watertank/component/api/src/main/webapp/META-INF/webapp-classloading.xml similarity index 100% rename from modules/samples/watertank/component/api/src/main/webapp/META-INF/webapp-classloading.xml rename to modules/distribution/src/samples/watertank/component/api/src/main/webapp/META-INF/webapp-classloading.xml diff --git a/modules/samples/watertank/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/distribution/src/samples/watertank/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml similarity index 100% rename from modules/samples/watertank/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml rename to modules/distribution/src/samples/watertank/component/api/src/main/webapp/WEB-INF/cxf-servlet.xml diff --git a/modules/samples/watertank/component/api/src/main/webapp/WEB-INF/web.xml b/modules/distribution/src/samples/watertank/component/api/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from modules/samples/watertank/component/api/src/main/webapp/WEB-INF/web.xml rename to modules/distribution/src/samples/watertank/component/api/src/main/webapp/WEB-INF/web.xml diff --git a/modules/samples/watertank/component/plugin/pom.xml b/modules/distribution/src/samples/watertank/component/plugin/pom.xml similarity index 100% rename from modules/samples/watertank/component/plugin/pom.xml rename to modules/distribution/src/samples/watertank/component/plugin/pom.xml diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/constants/DeviceTypeConstants.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/constants/DeviceTypeConstants.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/constants/DeviceTypeConstants.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/constants/DeviceTypeConstants.java diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/exception/DeviceMgtPluginException.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/exception/DeviceMgtPluginException.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/exception/DeviceMgtPluginException.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/exception/DeviceMgtPluginException.java diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManager.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManager.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManager.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManager.java diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManagerService.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManagerService.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManagerService.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/DeviceTypeManagerService.java diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/DeviceTypeDAO.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/DeviceTypeDAO.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/DeviceTypeDAO.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/DeviceTypeDAO.java diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/impl/DeviceTypeDAOImpl.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/impl/DeviceTypeDAOImpl.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/impl/DeviceTypeDAOImpl.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/dao/impl/DeviceTypeDAOImpl.java diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/feature/DeviceTypeFeatureManager.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/feature/DeviceTypeFeatureManager.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/feature/DeviceTypeFeatureManager.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/feature/DeviceTypeFeatureManager.java diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceSchemaInitializer.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceSchemaInitializer.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceSchemaInitializer.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceSchemaInitializer.java diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeStartupListener.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeStartupListener.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeStartupListener.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeStartupListener.java diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeUtils.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeUtils.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeUtils.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/impl/util/DeviceTypeUtils.java diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/DeviceTypeManagementDataHolder.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/DeviceTypeManagementDataHolder.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/DeviceTypeManagementDataHolder.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/DeviceTypeManagementDataHolder.java diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/ServiceComponent.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/ServiceComponent.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/ServiceComponent.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/internal/ServiceComponent.java diff --git a/modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/mqtt/MqttConfig.java b/modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/mqtt/MqttConfig.java similarity index 100% rename from modules/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/mqtt/MqttConfig.java rename to modules/distribution/src/samples/watertank/component/plugin/src/main/java/org/homeautomation/watertank/plugin/mqtt/MqttConfig.java diff --git a/modules/samples/watertank/component/pom.xml b/modules/distribution/src/samples/watertank/component/pom.xml similarity index 100% rename from modules/samples/watertank/component/pom.xml rename to modules/distribution/src/samples/watertank/component/pom.xml diff --git a/modules/samples/watertank/component/ui/pom.xml b/modules/distribution/src/samples/watertank/component/ui/pom.xml similarity index 100% rename from modules/samples/watertank/component/ui/pom.xml rename to modules/distribution/src/samples/watertank/component/ui/pom.xml diff --git a/modules/samples/watertank/component/ui/src/assembly/src.xml b/modules/distribution/src/samples/watertank/component/ui/src/assembly/src.xml similarity index 100% rename from modules/samples/watertank/component/ui/src/assembly/src.xml rename to modules/distribution/src/samples/watertank/component/ui/src/assembly/src.xml diff --git a/modules/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.hbs b/modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.hbs rename to modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.js b/modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.js rename to modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.json b/modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/analytics-view.json rename to modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.analytics-view/public/js/watertank.js b/modules/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/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/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.hbs b/modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.hbs rename to modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.js b/modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.js rename to modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.json b/modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/device-view.json rename to modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.device-view/public/images/deviceType.png b/modules/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/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/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.hbs b/modules/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/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/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.js b/modules/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/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/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.realtime.analytics-view/analytics-view.json b/modules/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/private/config.json b/modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/private/config.json rename to modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/deviceType.png b/modules/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/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/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/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/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/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/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/schematicsGuide.png b/modules/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/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/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/images/thumb.png b/modules/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/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/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/public/js/download.js b/modules/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/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/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/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/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/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/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/type-view.hbs b/modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/type-view.hbs rename to modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/type-view.json b/modules/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/samples/watertank/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.watertank.type-view/type-view.json rename to modules/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/samples/watertank/feature/feature/pom.xml b/modules/distribution/src/samples/watertank/feature/feature/pom.xml similarity index 100% rename from modules/samples/watertank/feature/feature/pom.xml rename to modules/distribution/src/samples/watertank/feature/feature/pom.xml diff --git a/modules/samples/watertank/feature/feature/src/main/resources/agent/init.lua b/modules/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/init.lua similarity index 100% rename from modules/samples/watertank/feature/feature/src/main/resources/agent/init.lua rename to modules/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/init.lua diff --git a/modules/samples/watertank/feature/feature/src/main/resources/agent/sketch.properties b/modules/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/sketch.properties similarity index 100% rename from modules/samples/watertank/feature/feature/src/main/resources/agent/sketch.properties rename to modules/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/sketch.properties diff --git a/modules/samples/watertank/feature/feature/src/main/resources/agent/water-tank.lua b/modules/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/water-tank.lua similarity index 100% rename from modules/samples/watertank/feature/feature/src/main/resources/agent/water-tank.lua rename to modules/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/water-tank.lua diff --git a/modules/samples/watertank/feature/feature/src/main/resources/agent/wifi-connect.lua b/modules/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/wifi-connect.lua similarity index 100% rename from modules/samples/watertank/feature/feature/src/main/resources/agent/wifi-connect.lua rename to modules/distribution/src/samples/watertank/feature/feature/src/main/resources/agent/wifi-connect.lua diff --git a/modules/samples/watertank/feature/feature/src/main/resources/build.properties b/modules/distribution/src/samples/watertank/feature/feature/src/main/resources/build.properties similarity index 100% rename from modules/samples/watertank/feature/feature/src/main/resources/build.properties rename to modules/distribution/src/samples/watertank/feature/feature/src/main/resources/build.properties diff --git a/modules/samples/watertank/feature/feature/src/main/resources/configs/watertank.xml b/modules/distribution/src/samples/watertank/feature/feature/src/main/resources/configs/watertank.xml similarity index 100% rename from modules/samples/watertank/feature/feature/src/main/resources/configs/watertank.xml rename to modules/distribution/src/samples/watertank/feature/feature/src/main/resources/configs/watertank.xml diff --git a/modules/samples/watertank/feature/feature/src/main/resources/datasources/watertank-datasources.xml b/modules/distribution/src/samples/watertank/feature/feature/src/main/resources/datasources/watertank-datasources.xml similarity index 100% rename from modules/samples/watertank/feature/feature/src/main/resources/datasources/watertank-datasources.xml rename to modules/distribution/src/samples/watertank/feature/feature/src/main/resources/datasources/watertank-datasources.xml diff --git a/modules/samples/watertank/feature/feature/src/main/resources/dbscripts/h2.sql b/modules/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/h2.sql similarity index 100% rename from modules/samples/watertank/feature/feature/src/main/resources/dbscripts/h2.sql rename to modules/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/h2.sql diff --git a/modules/samples/watertank/feature/feature/src/main/resources/dbscripts/mssql.sql b/modules/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/mssql.sql similarity index 100% rename from modules/samples/watertank/feature/feature/src/main/resources/dbscripts/mssql.sql rename to modules/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/mssql.sql diff --git a/modules/samples/watertank/feature/feature/src/main/resources/dbscripts/mysql.sql b/modules/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/mysql.sql similarity index 100% rename from modules/samples/watertank/feature/feature/src/main/resources/dbscripts/mysql.sql rename to modules/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/mysql.sql diff --git a/modules/samples/watertank/feature/feature/src/main/resources/dbscripts/oracle.sql b/modules/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/oracle.sql similarity index 100% rename from modules/samples/watertank/feature/feature/src/main/resources/dbscripts/oracle.sql rename to modules/distribution/src/samples/watertank/feature/feature/src/main/resources/dbscripts/oracle.sql diff --git a/modules/samples/watertank/feature/feature/src/main/resources/p2.inf b/modules/distribution/src/samples/watertank/feature/feature/src/main/resources/p2.inf similarity index 100% rename from modules/samples/watertank/feature/feature/src/main/resources/p2.inf rename to modules/distribution/src/samples/watertank/feature/feature/src/main/resources/p2.inf diff --git a/modules/samples/watertank/feature/pom.xml b/modules/distribution/src/samples/watertank/feature/pom.xml similarity index 100% rename from modules/samples/watertank/feature/pom.xml rename to modules/distribution/src/samples/watertank/feature/pom.xml diff --git a/modules/samples/watertank/pom.xml b/modules/distribution/src/samples/watertank/pom.xml similarity index 100% rename from modules/samples/watertank/pom.xml rename to modules/distribution/src/samples/watertank/pom.xml