diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index cf520d03..78b8d4a4 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -34,10 +34,6 @@
     <name>WSO2 IoT Server - Distribution</name>
     <description>WSO2 IoT Server Distribution</description>
 
-    <modules>
-        <module>src/samples</module>
-    </modules>
-
     <dependencies>
         <dependency>
             <groupId>com.h2database.wso2</groupId>
@@ -431,7 +427,7 @@
                                 <!--Copy samples to distribution-->
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/samples"
                                       overwrite="true">
-                                    <fileset dir="src/samples">
+                                    <fileset dir="../samples">
                                         <exclude name="**/*.iml"/>
                                         <exclude name="**/.DS_Store"/>
                                         <exclude name="**/target/"/>
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 7438f4c6..ad3b577f 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -37,23 +37,24 @@
         <module>tests-integration</module>
         <!--<module>tests-ui-integration</module>-->
         <module>tests-platform</module>
+        <module>tests-samples</module>
     </modules>
 
-    <build>
-        <plugins>
-            <!--<plugin>
-                <artifactId>maven-clean-plugin</artifactId>
-                <version>2.4.1</version>
-                <executions>
-                    <execution>
-                        <id>auto-clean</id>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>clean</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>-->
-        </plugins>
-    </build>
+    <!--<build>-->
+        <!--<plugins>-->
+            <!--<plugin>-->
+                <!--<artifactId>maven-clean-plugin</artifactId>-->
+                <!--<version>2.4.1</version>-->
+                <!--<executions>-->
+                    <!--<execution>-->
+                        <!--<id>auto-clean</id>-->
+                        <!--<phase>initialize</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>clean</goal>-->
+                        <!--</goals>-->
+                    <!--</execution>-->
+                <!--</executions>-->
+            <!--</plugin>-->
+        <!--</plugins>-->
+    <!--</build>-->
 </project>
diff --git a/modules/integration/tests-artifacts/pom.xml b/modules/integration/tests-artifacts/pom.xml
index 7bc1451b..9e1c44e4 100644
--- a/modules/integration/tests-artifacts/pom.xml
+++ b/modules/integration/tests-artifacts/pom.xml
@@ -16,7 +16,8 @@
  ~ under the License.
  -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <parent>
         <groupId>org.wso2.iot</groupId>
@@ -26,12 +27,8 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.iot</groupId>
     <artifactId>tests-artifacts</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 IoT Server Integration Test Common</name>
-
-    <modules>
-    </modules>
+    <name>WSO2 IoT Server - Integration Test Artifacts</name>
 
 </project>
diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
index e2b29d37..909710e9 100644
--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -27,8 +27,8 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.iot</groupId>
     <artifactId>org.wso2.carbon.iot.integration.common.clients</artifactId>
     <packaging>jar</packaging>
-    <name>WSO2 MDM - Integration Admin Clients</name>
+    <name>WSO2 IoT Server - Integration Test Common Admin Clients</name>
+
 </project>
diff --git a/modules/integration/tests-common/integration-test-utils/pom.xml b/modules/integration/tests-common/integration-test-utils/pom.xml
index 880dfd9c..7894bec2 100644
--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -28,9 +28,8 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.iot.integration.common.utils</artifactId>
-    <groupId>org.wso2.iot</groupId>
     <packaging>jar</packaging>
-    <name>WSO2 IoT Server - Integration Test Utils</name>
+    <name>WSO2 IoT Server - Integration Test Common Utils</name>
 
     <licenses>
         <license>
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index 7b8b66b8..048d805a 100644
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@@ -26,10 +26,9 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.iot</groupId>
     <artifactId>tests-common</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 IoT Server Integration Test Common</name>
+    <name>WSO2 IoT Server - Integration Test Common</name>
 
     <modules>
         <module>admin-clients</module>
diff --git a/modules/integration/tests-common/ui-pages/pom.xml b/modules/integration/tests-common/ui-pages/pom.xml
index 44f49cdc..fef444b4 100644
--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@@ -29,10 +29,9 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.iot</groupId>
     <artifactId>org.wso2.carbon.iot.integration.ui.pages</artifactId>
     <packaging>jar</packaging>
-    <name>WSO2 MDM - Integration Test UI Pages</name>
+    <name>WSO2 IoT Server - Integration Test Common UI Pages</name>
 
     <dependencies>
         <dependency>
diff --git a/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/emm/integration/ui/pages/EMMIntegrationUiBaseTestCase.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/carbon/iot/integration/ui/pages/IntegrationUiBaseTestCase.java
similarity index 89%
rename from modules/integration/tests-common/ui-pages/src/main/java/org/wso2/emm/integration/ui/pages/EMMIntegrationUiBaseTestCase.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/carbon/iot/integration/ui/pages/IntegrationUiBaseTestCase.java
index 04b64702..b5f8f30d 100644
--- a/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/emm/integration/ui/pages/EMMIntegrationUiBaseTestCase.java
+++ b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/carbon/iot/integration/ui/pages/IntegrationUiBaseTestCase.java
@@ -16,7 +16,7 @@
 *under the License.
 */
 
-package org.wso2.emm.integration.ui.pages;
+package org.wso2.carbon.iot.integration.ui.pages;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -31,13 +31,13 @@ import javax.xml.xpath.XPathExpressionException;
 import java.io.IOException;
 import java.rmi.RemoteException;
 
-public class EMMIntegrationUiBaseTestCase {
+public class IntegrationUiBaseTestCase {
 
-    private static final Log log = LogFactory.getLog(EMMIntegrationUiBaseTestCase.class);
+    private static final Log log = LogFactory.getLog(IntegrationUiBaseTestCase.class);
     protected AutomationContext automationContext;
 
     protected void init() throws IOException, XMLStreamException, XPathExpressionException {
-        automationContext = new AutomationContext("EMM", "emm001", TestUserMode.SUPER_TENANT_ADMIN);
+        automationContext = new AutomationContext("IoTServer", "IoT001", TestUserMode.SUPER_TENANT_ADMIN);
     }
 
     protected String getBackendURL() throws XPathExpressionException {
diff --git a/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/emm/integration/ui/pages/UIElementMapper.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/carbon/iot/integration/ui/pages/UIElementMapper.java
similarity index 97%
rename from modules/integration/tests-common/ui-pages/src/main/java/org/wso2/emm/integration/ui/pages/UIElementMapper.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/carbon/iot/integration/ui/pages/UIElementMapper.java
index 1c7435bc..97c4ad45 100644
--- a/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/emm/integration/ui/pages/UIElementMapper.java
+++ b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/carbon/iot/integration/ui/pages/UIElementMapper.java
@@ -16,7 +16,7 @@
 *under the License.
 */
 
-package org.wso2.emm.integration.ui.pages;
+package org.wso2.carbon.iot.integration.ui.pages;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/emm/integration/ui/pages/home/HomePage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/carbon/iot/integration/ui/pages/home/HomePage.java
similarity index 90%
rename from modules/integration/tests-common/ui-pages/src/main/java/org/wso2/emm/integration/ui/pages/home/HomePage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/carbon/iot/integration/ui/pages/home/HomePage.java
index 73205f5e..c401da6e 100644
--- a/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/emm/integration/ui/pages/home/HomePage.java
+++ b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/carbon/iot/integration/ui/pages/home/HomePage.java
@@ -16,16 +16,16 @@
 *under the License.
 */
 
-package org.wso2.emm.integration.ui.pages.home;
+package org.wso2.carbon.iot.integration.ui.pages.home;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
-import org.wso2.emm.integration.ui.pages.UIElementMapper;
+import org.wso2.carbon.iot.integration.ui.pages.UIElementMapper;
+import org.wso2.carbon.iot.integration.ui.pages.login.LoginPage;
 
 import java.io.IOException;
-import org.wso2.emm.integration.ui.pages.login.LoginPage;
 
 /**
  * Home page class holds the information of product page you got once login
diff --git a/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/emm/integration/ui/pages/login/LoginPage.java b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/carbon/iot/integration/ui/pages/login/LoginPage.java
similarity index 92%
rename from modules/integration/tests-common/ui-pages/src/main/java/org/wso2/emm/integration/ui/pages/login/LoginPage.java
rename to modules/integration/tests-common/ui-pages/src/main/java/org/wso2/carbon/iot/integration/ui/pages/login/LoginPage.java
index 07544891..e09313ae 100644
--- a/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/emm/integration/ui/pages/login/LoginPage.java
+++ b/modules/integration/tests-common/ui-pages/src/main/java/org/wso2/carbon/iot/integration/ui/pages/login/LoginPage.java
@@ -16,17 +16,17 @@
 *under the License.
 */
 
-package org.wso2.emm.integration.ui.pages.login;
+package org.wso2.carbon.iot.integration.ui.pages.login;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.wso2.emm.integration.ui.pages.UIElementMapper;
+import org.wso2.carbon.iot.integration.ui.pages.UIElementMapper;
 
 import java.io.IOException;
-import org.wso2.emm.integration.ui.pages.home.HomePage;
+import org.wso2.carbon.iot.integration.ui.pages.home.HomePage;
 
 /**
  * Login page class - contains methods to login to wso2 products.
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index b2afc246..ff62ea7e 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -26,12 +26,8 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.iot</groupId>
     <artifactId>tests-integration</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 IoT Server Integration Tests</name>
-
-    <modules>
-    </modules>
+    <name>WSO2 IoT Server - Integration Test</name>
 
 </project>
diff --git a/modules/integration/tests-platform/pom.xml b/modules/integration/tests-platform/pom.xml
index 0b9b59d4..9f7d00e9 100644
--- a/modules/integration/tests-platform/pom.xml
+++ b/modules/integration/tests-platform/pom.xml
@@ -26,12 +26,8 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.iot</groupId>
     <artifactId>tests-platform</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 IoT Server Integration Tests</name>
-
-    <modules>
-    </modules>
+    <name>WSO2 IoT Server - Integration Test Platform</name>
 
 </project>
diff --git a/modules/integration/tests-samples/pom.xml b/modules/integration/tests-samples/pom.xml
new file mode 100644
index 00000000..75759b84
--- /dev/null
+++ b/modules/integration/tests-samples/pom.xml
@@ -0,0 +1,38 @@
+<!--
+ ~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ ~
+ ~ WSO2 Inc. licenses this file to you under the Apache License,
+ ~ Version 2.0 (the "License"); you may not use this file except
+ ~ in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~    http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied.  See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.iot</groupId>
+        <artifactId>wso2iot-integration</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tests-samples</artifactId>
+    <packaging>pom</packaging>
+    <name>WSO2 IoT Server - Integration Test Samples</name>
+
+    <modules>
+        <module>../../samples</module>
+    </modules>
+
+</project>
diff --git a/modules/distribution/src/samples/android_sense/build.xml b/modules/samples/android_sense/build.xml
similarity index 97%
rename from modules/distribution/src/samples/android_sense/build.xml
rename to modules/samples/android_sense/build.xml
index 83fb5bda..a47db292 100644
--- a/modules/distribution/src/samples/android_sense/build.xml
+++ b/modules/samples/android_sense/build.xml
@@ -1,4 +1,4 @@
-<project name="Arduino" basedir="." default="deploy">
+<project name="Arduino" basedir="" default="deploy">
 
     <import file="../common.xml"/>
 
diff --git a/modules/distribution/src/samples/android_sense/dbscripts/h2_android_sense.sql b/modules/samples/android_sense/dbscripts/h2_android_sense.sql
similarity index 100%
rename from modules/distribution/src/samples/android_sense/dbscripts/h2_android_sense.sql
rename to modules/samples/android_sense/dbscripts/h2_android_sense.sql
diff --git a/modules/distribution/src/samples/android_sense/dbscripts/mysql_android_sense.sql b/modules/samples/android_sense/dbscripts/mysql_android_sense.sql
similarity index 100%
rename from modules/distribution/src/samples/android_sense/dbscripts/mysql_android_sense.sql
rename to modules/samples/android_sense/dbscripts/mysql_android_sense.sql
diff --git a/modules/distribution/src/samples/android_sense/page/android_sense.hbs b/modules/samples/android_sense/page/android_sense.hbs
similarity index 100%
rename from modules/distribution/src/samples/android_sense/page/android_sense.hbs
rename to modules/samples/android_sense/page/android_sense.hbs
diff --git a/modules/distribution/src/samples/android_sense/sketch/android_sense.apk b/modules/samples/android_sense/sketch/android_sense.apk
similarity index 100%
rename from modules/distribution/src/samples/android_sense/sketch/android_sense.apk
rename to modules/samples/android_sense/sketch/android_sense.apk
diff --git a/modules/distribution/src/samples/android_sense/sketch/sketch.properties b/modules/samples/android_sense/sketch/sketch.properties
similarity index 100%
rename from modules/distribution/src/samples/android_sense/sketch/sketch.properties
rename to modules/samples/android_sense/sketch/sketch.properties
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/constants/AndroidSenseConstants.java b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/constants/AndroidSenseConstants.java
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/constants/AndroidSenseConstants.java
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/constants/AndroidSenseConstants.java
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManager.java b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManager.java
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManager.java
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManager.java
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManagerService.java b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManagerService.java
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManagerService.java
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/AndroidSenseManagerService.java
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/dao/AndroidSenseDAO.java b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/dao/AndroidSenseDAO.java
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/dao/AndroidSenseDAO.java
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/dao/AndroidSenseDAO.java
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/dao/impl/AndroidSenseDAOImpl.java b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/dao/impl/AndroidSenseDAOImpl.java
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/dao/impl/AndroidSenseDAOImpl.java
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/dao/impl/AndroidSenseDAOImpl.java
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/util/AndroidSenseUtils.java b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/util/AndroidSenseUtils.java
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/util/AndroidSenseUtils.java
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/impl/util/AndroidSenseUtils.java
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/internal/AndroidSenseManagementServiceComponent.java b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/internal/AndroidSenseManagementServiceComponent.java
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/internal/AndroidSenseManagementServiceComponent.java
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/plugin/internal/AndroidSenseManagementServiceComponent.java
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/service/impl/AndroidSenseControllerService.java b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/service/impl/AndroidSenseControllerService.java
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/service/impl/AndroidSenseControllerService.java
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/service/impl/AndroidSenseControllerService.java
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/service/impl/AndroidSenseManagerService.java b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/service/impl/AndroidSenseManagerService.java
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/service/impl/AndroidSenseManagerService.java
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/service/impl/AndroidSenseManagerService.java
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/service/impl/util/DeviceJSON.java b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/service/impl/util/DeviceJSON.java
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/service/impl/util/DeviceJSON.java
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/android/sense/service/impl/util/DeviceJSON.java
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/webapp/META-INF/webapp-classloading.xml b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/webapp/WEB-INF/web.xml b/modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/webapp/WEB-INF/web.xml
rename to modules/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/distribution/src/samples/android_sense/src/pom.xml b/modules/samples/android_sense/src/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/android_sense/src/pom.xml
rename to modules/samples/android_sense/src/pom.xml
diff --git a/modules/distribution/src/samples/android_sense/units/android_sense.hbs b/modules/samples/android_sense/units/android_sense.hbs
similarity index 100%
rename from modules/distribution/src/samples/android_sense/units/android_sense.hbs
rename to modules/samples/android_sense/units/android_sense.hbs
diff --git a/modules/distribution/src/samples/android_sense/units/android_sense.js b/modules/samples/android_sense/units/android_sense.js
similarity index 100%
rename from modules/distribution/src/samples/android_sense/units/android_sense.js
rename to modules/samples/android_sense/units/android_sense.js
diff --git a/modules/distribution/src/samples/android_sense/units/android_sense.json b/modules/samples/android_sense/units/android_sense.json
similarity index 100%
rename from modules/distribution/src/samples/android_sense/units/android_sense.json
rename to modules/samples/android_sense/units/android_sense.json
diff --git a/modules/distribution/src/samples/android_sense/units/public/images/android_sense-thumb.png b/modules/samples/android_sense/units/public/images/android_sense-thumb.png
similarity index 100%
rename from modules/distribution/src/samples/android_sense/units/public/images/android_sense-thumb.png
rename to modules/samples/android_sense/units/public/images/android_sense-thumb.png
diff --git a/modules/distribution/src/samples/android_sense/units/public/images/android_sense.png b/modules/samples/android_sense/units/public/images/android_sense.png
similarity index 100%
rename from modules/distribution/src/samples/android_sense/units/public/images/android_sense.png
rename to modules/samples/android_sense/units/public/images/android_sense.png
diff --git a/modules/distribution/src/samples/android_sense/units/public/store.json b/modules/samples/android_sense/units/public/store.json
similarity index 100%
rename from modules/distribution/src/samples/android_sense/units/public/store.json
rename to modules/samples/android_sense/units/public/store.json
diff --git a/modules/distribution/src/samples/arduino/build.xml b/modules/samples/arduino/build.xml
similarity index 97%
rename from modules/distribution/src/samples/arduino/build.xml
rename to modules/samples/arduino/build.xml
index 08cbf3a0..43b504f7 100644
--- a/modules/distribution/src/samples/arduino/build.xml
+++ b/modules/samples/arduino/build.xml
@@ -1,4 +1,4 @@
-<project name="Arduino" basedir="." default="deploy">
+<project name="Arduino" basedir="" default="deploy">
 
     <import file="../common.xml"/>
 
diff --git a/modules/distribution/src/samples/arduino/dbscripts/h2_arduino.sql b/modules/samples/arduino/dbscripts/h2_arduino.sql
similarity index 100%
rename from modules/distribution/src/samples/arduino/dbscripts/h2_arduino.sql
rename to modules/samples/arduino/dbscripts/h2_arduino.sql
diff --git a/modules/distribution/src/samples/arduino/dbscripts/mysql_arduino.sql b/modules/samples/arduino/dbscripts/mysql_arduino.sql
similarity index 100%
rename from modules/distribution/src/samples/arduino/dbscripts/mysql_arduino.sql
rename to modules/samples/arduino/dbscripts/mysql_arduino.sql
diff --git a/modules/distribution/src/samples/arduino/page/arduino.hbs b/modules/samples/arduino/page/arduino.hbs
similarity index 100%
rename from modules/distribution/src/samples/arduino/page/arduino.hbs
rename to modules/samples/arduino/page/arduino.hbs
diff --git a/modules/distribution/src/samples/arduino/sketch/ArduinoBoardSketch.h b/modules/samples/arduino/sketch/ArduinoBoardSketch.h
similarity index 100%
rename from modules/distribution/src/samples/arduino/sketch/ArduinoBoardSketch.h
rename to modules/samples/arduino/sketch/ArduinoBoardSketch.h
diff --git a/modules/distribution/src/samples/arduino/sketch/ArduinoBoardSketch.ino b/modules/samples/arduino/sketch/ArduinoBoardSketch.ino
similarity index 100%
rename from modules/distribution/src/samples/arduino/sketch/ArduinoBoardSketch.ino
rename to modules/samples/arduino/sketch/ArduinoBoardSketch.ino
diff --git a/modules/distribution/src/samples/arduino/sketch/Connect.ino b/modules/samples/arduino/sketch/Connect.ino
similarity index 100%
rename from modules/distribution/src/samples/arduino/sketch/Connect.ino
rename to modules/samples/arduino/sketch/Connect.ino
diff --git a/modules/distribution/src/samples/arduino/sketch/PollServer.ino b/modules/samples/arduino/sketch/PollServer.ino
similarity index 100%
rename from modules/distribution/src/samples/arduino/sketch/PollServer.ino
rename to modules/samples/arduino/sketch/PollServer.ino
diff --git a/modules/distribution/src/samples/arduino/sketch/PushData.ino b/modules/samples/arduino/sketch/PushData.ino
similarity index 100%
rename from modules/distribution/src/samples/arduino/sketch/PushData.ino
rename to modules/samples/arduino/sketch/PushData.ino
diff --git a/modules/distribution/src/samples/arduino/sketch/sketch.properties b/modules/samples/arduino/sketch/sketch.properties
similarity index 100%
rename from modules/distribution/src/samples/arduino/sketch/sketch.properties
rename to modules/samples/arduino/sketch/sketch.properties
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/constants/ArduinoConstants.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/constants/ArduinoConstants.java
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/constants/ArduinoConstants.java
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/constants/ArduinoConstants.java
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManager.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManager.java
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManager.java
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManager.java
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManagerService.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManagerService.java
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManagerService.java
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/ArduinoManagerService.java
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/dao/ArduinoDAO.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/dao/ArduinoDAO.java
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/dao/ArduinoDAO.java
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/dao/ArduinoDAO.java
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/dao/impl/ArduinoDeviceDAOImpl.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/dao/impl/ArduinoDeviceDAOImpl.java
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/dao/impl/ArduinoDeviceDAOImpl.java
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/dao/impl/ArduinoDeviceDAOImpl.java
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/util/ArduinoUtils.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/util/ArduinoUtils.java
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/util/ArduinoUtils.java
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/impl/util/ArduinoUtils.java
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/internal/ArduinoManagementServiceComponent.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/internal/ArduinoManagementServiceComponent.java
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/internal/ArduinoManagementServiceComponent.java
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/plugin/internal/ArduinoManagementServiceComponent.java
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoControllerService.java
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoManagerService.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoManagerService.java
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoManagerService.java
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/ArduinoManagerService.java
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/util/DeviceJSON.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/util/DeviceJSON.java
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/util/DeviceJSON.java
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/util/DeviceJSON.java
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/util/MqttArduinoSubscriber.java b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/util/MqttArduinoSubscriber.java
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/util/MqttArduinoSubscriber.java
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/arduino/service/impl/util/MqttArduinoSubscriber.java
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/META-INF/webapp-classloading.xml b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/web.xml b/modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/web.xml
rename to modules/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/distribution/src/samples/arduino/src/pom.xml b/modules/samples/arduino/src/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/arduino/src/pom.xml
rename to modules/samples/arduino/src/pom.xml
diff --git a/modules/distribution/src/samples/arduino/units/arduino.hbs b/modules/samples/arduino/units/arduino.hbs
similarity index 100%
rename from modules/distribution/src/samples/arduino/units/arduino.hbs
rename to modules/samples/arduino/units/arduino.hbs
diff --git a/modules/distribution/src/samples/arduino/units/arduino.js b/modules/samples/arduino/units/arduino.js
similarity index 100%
rename from modules/distribution/src/samples/arduino/units/arduino.js
rename to modules/samples/arduino/units/arduino.js
diff --git a/modules/distribution/src/samples/arduino/units/arduino.json b/modules/samples/arduino/units/arduino.json
similarity index 100%
rename from modules/distribution/src/samples/arduino/units/arduino.json
rename to modules/samples/arduino/units/arduino.json
diff --git a/modules/distribution/src/samples/arduino/units/public/images/arduino-thumb.png b/modules/samples/arduino/units/public/images/arduino-thumb.png
similarity index 100%
rename from modules/distribution/src/samples/arduino/units/public/images/arduino-thumb.png
rename to modules/samples/arduino/units/public/images/arduino-thumb.png
diff --git a/modules/distribution/src/samples/arduino/units/public/images/arduino.png b/modules/samples/arduino/units/public/images/arduino.png
similarity index 100%
rename from modules/distribution/src/samples/arduino/units/public/images/arduino.png
rename to modules/samples/arduino/units/public/images/arduino.png
diff --git a/modules/distribution/src/samples/arduino/units/public/store.json b/modules/samples/arduino/units/public/store.json
similarity index 100%
rename from modules/distribution/src/samples/arduino/units/public/store.json
rename to modules/samples/arduino/units/public/store.json
diff --git a/modules/distribution/src/samples/build.xml b/modules/samples/build.xml
similarity index 72%
rename from modules/distribution/src/samples/build.xml
rename to modules/samples/build.xml
index c12544e7..385a9a84 100644
--- a/modules/distribution/src/samples/build.xml
+++ b/modules/samples/build.xml
@@ -1,9 +1,9 @@
-<project name="IoTServerSamples" basedir="." default="deploy">
+<project name="IoTServerSamples" basedir="" default="deploy">
     <macrodef name="iterate">
         <attribute name="target"/>
         <sequential>
             <subant target="@{target}">
-                <fileset dir="." includes="*/build.xml"/>
+                <fileset dir="" includes="*/build.xml"/>
             </subant>
         </sequential>
     </macrodef>
diff --git a/modules/distribution/src/samples/common.xml b/modules/samples/common.xml
similarity index 100%
rename from modules/distribution/src/samples/common.xml
rename to modules/samples/common.xml
diff --git a/modules/distribution/src/samples/digital_display/build.xml b/modules/samples/digital_display/build.xml
similarity index 97%
rename from modules/distribution/src/samples/digital_display/build.xml
rename to modules/samples/digital_display/build.xml
index 5060e4dd..c54a411f 100644
--- a/modules/distribution/src/samples/digital_display/build.xml
+++ b/modules/samples/digital_display/build.xml
@@ -1,4 +1,4 @@
-<project name="DigitalDisplay" basedir="." default="deploy">
+<project name="DigitalDisplay" basedir="" default="deploy">
 
     <import file="../common.xml"/>
 
diff --git a/modules/distribution/src/samples/digital_display/dbscripts/h2_digital_display.sql b/modules/samples/digital_display/dbscripts/h2_digital_display.sql
similarity index 100%
rename from modules/distribution/src/samples/digital_display/dbscripts/h2_digital_display.sql
rename to modules/samples/digital_display/dbscripts/h2_digital_display.sql
diff --git a/modules/distribution/src/samples/digital_display/dbscripts/mysql_digital_display.sql b/modules/samples/digital_display/dbscripts/mysql_digital_display.sql
similarity index 100%
rename from modules/distribution/src/samples/digital_display/dbscripts/mysql_digital_display.sql
rename to modules/samples/digital_display/dbscripts/mysql_digital_display.sql
diff --git a/modules/distribution/src/samples/digital_display/page/digital_display.hbs b/modules/samples/digital_display/page/digital_display.hbs
similarity index 100%
rename from modules/distribution/src/samples/digital_display/page/digital_display.hbs
rename to modules/samples/digital_display/page/digital_display.hbs
diff --git a/modules/distribution/src/samples/digital_display/sketch/DigitalDisplay.txt b/modules/samples/digital_display/sketch/DigitalDisplay.txt
similarity index 100%
rename from modules/distribution/src/samples/digital_display/sketch/DigitalDisplay.txt
rename to modules/samples/digital_display/sketch/DigitalDisplay.txt
diff --git a/modules/distribution/src/samples/digital_display/sketch/sketch.properties b/modules/samples/digital_display/sketch/sketch.properties
similarity index 100%
rename from modules/distribution/src/samples/digital_display/sketch/sketch.properties
rename to modules/samples/digital_display/sketch/sketch.properties
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/constants/DigitalDisplayConstants.java b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/constants/DigitalDisplayConstants.java
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/constants/DigitalDisplayConstants.java
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/constants/DigitalDisplayConstants.java
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManager.java b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManager.java
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManager.java
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManager.java
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/DigitalDisplayManagerService.java
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/dao/DigitalDisplayDAO.java b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/dao/DigitalDisplayDAO.java
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/dao/DigitalDisplayDAO.java
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/dao/DigitalDisplayDAO.java
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/dao/impl/DigitalDisplayDeviceDAOImpl.java b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/dao/impl/DigitalDisplayDeviceDAOImpl.java
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/dao/impl/DigitalDisplayDeviceDAOImpl.java
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/dao/impl/DigitalDisplayDeviceDAOImpl.java
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/util/DigitalDisplayUtils.java b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/util/DigitalDisplayUtils.java
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/util/DigitalDisplayUtils.java
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/impl/util/DigitalDisplayUtils.java
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/internal/DigitalDisplayManagementServiceComponent.java b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/internal/DigitalDisplayManagementServiceComponent.java
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/internal/DigitalDisplayManagementServiceComponent.java
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/plugin/internal/DigitalDisplayManagementServiceComponent.java
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/service/impl/DigitalDisplayManagerService.java b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/service/impl/DigitalDisplayManagerService.java
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/service/impl/DigitalDisplayManagerService.java
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/digitaldisplay/service/impl/DigitalDisplayManagerService.java
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/webapp/META-INF/webapp-classloading.xml b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/webapp/WEB-INF/web.xml b/modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/webapp/WEB-INF/web.xml
rename to modules/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/distribution/src/samples/digital_display/src/pom.xml b/modules/samples/digital_display/src/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/digital_display/src/pom.xml
rename to modules/samples/digital_display/src/pom.xml
diff --git a/modules/distribution/src/samples/digital_display/units/digital_display.hbs b/modules/samples/digital_display/units/digital_display.hbs
similarity index 100%
rename from modules/distribution/src/samples/digital_display/units/digital_display.hbs
rename to modules/samples/digital_display/units/digital_display.hbs
diff --git a/modules/distribution/src/samples/digital_display/units/digital_display.js b/modules/samples/digital_display/units/digital_display.js
similarity index 100%
rename from modules/distribution/src/samples/digital_display/units/digital_display.js
rename to modules/samples/digital_display/units/digital_display.js
diff --git a/modules/distribution/src/samples/digital_display/units/digital_display.json b/modules/samples/digital_display/units/digital_display.json
similarity index 100%
rename from modules/distribution/src/samples/digital_display/units/digital_display.json
rename to modules/samples/digital_display/units/digital_display.json
diff --git a/modules/distribution/src/samples/digital_display/units/public/images/digital_display-thumb.png b/modules/samples/digital_display/units/public/images/digital_display-thumb.png
similarity index 100%
rename from modules/distribution/src/samples/digital_display/units/public/images/digital_display-thumb.png
rename to modules/samples/digital_display/units/public/images/digital_display-thumb.png
diff --git a/modules/distribution/src/samples/digital_display/units/public/images/digital_display.png b/modules/samples/digital_display/units/public/images/digital_display.png
similarity index 100%
rename from modules/distribution/src/samples/digital_display/units/public/images/digital_display.png
rename to modules/samples/digital_display/units/public/images/digital_display.png
diff --git a/modules/distribution/src/samples/digital_display/units/public/store.json b/modules/samples/digital_display/units/public/store.json
similarity index 100%
rename from modules/distribution/src/samples/digital_display/units/public/store.json
rename to modules/samples/digital_display/units/public/store.json
diff --git a/modules/distribution/src/samples/firealarm/build.xml b/modules/samples/firealarm/build.xml
similarity index 97%
rename from modules/distribution/src/samples/firealarm/build.xml
rename to modules/samples/firealarm/build.xml
index 26ff0c47..e7aa2140 100644
--- a/modules/distribution/src/samples/firealarm/build.xml
+++ b/modules/samples/firealarm/build.xml
@@ -1,4 +1,4 @@
-<project name="FireAlarm" basedir="." default="deploy">
+<project name="FireAlarm" basedir="" default="deploy">
 
     <import file="../common.xml"/>
 
diff --git a/modules/distribution/src/samples/firealarm/dbscripts/h2_firealarm.sql b/modules/samples/firealarm/dbscripts/h2_firealarm.sql
similarity index 100%
rename from modules/distribution/src/samples/firealarm/dbscripts/h2_firealarm.sql
rename to modules/samples/firealarm/dbscripts/h2_firealarm.sql
diff --git a/modules/distribution/src/samples/firealarm/dbscripts/mysql_firealarm.sql b/modules/samples/firealarm/dbscripts/mysql_firealarm.sql
similarity index 100%
rename from modules/distribution/src/samples/firealarm/dbscripts/mysql_firealarm.sql
rename to modules/samples/firealarm/dbscripts/mysql_firealarm.sql
diff --git a/modules/distribution/src/samples/firealarm/page/firealarm.hbs b/modules/samples/firealarm/page/firealarm.hbs
similarity index 100%
rename from modules/distribution/src/samples/firealarm/page/firealarm.hbs
rename to modules/samples/firealarm/page/firealarm.hbs
diff --git a/modules/distribution/src/samples/firealarm/sketch/RaspberryAgent.zip b/modules/samples/firealarm/sketch/RaspberryAgent.zip
similarity index 100%
rename from modules/distribution/src/samples/firealarm/sketch/RaspberryAgent.zip
rename to modules/samples/firealarm/sketch/RaspberryAgent.zip
diff --git a/modules/distribution/src/samples/firealarm/sketch/deviceConfigs.cfg b/modules/samples/firealarm/sketch/deviceConfigs.cfg
similarity index 100%
rename from modules/distribution/src/samples/firealarm/sketch/deviceConfigs.cfg
rename to modules/samples/firealarm/sketch/deviceConfigs.cfg
diff --git a/modules/distribution/src/samples/firealarm/sketch/sketch.properties b/modules/samples/firealarm/sketch/sketch.properties
similarity index 100%
rename from modules/distribution/src/samples/firealarm/sketch/sketch.properties
rename to modules/samples/firealarm/sketch/sketch.properties
diff --git a/modules/distribution/src/samples/firealarm/sketch/startservice.sh b/modules/samples/firealarm/sketch/startservice.sh
similarity index 100%
rename from modules/distribution/src/samples/firealarm/sketch/startservice.sh
rename to modules/samples/firealarm/sketch/startservice.sh
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/constants/FireAlarmConstants.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/constants/FireAlarmConstants.java
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/constants/FireAlarmConstants.java
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/constants/FireAlarmConstants.java
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManager.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManager.java
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManager.java
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManager.java
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManagerService.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManagerService.java
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManagerService.java
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/FireAlarmManagerService.java
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/dao/FireAlarmDAO.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/dao/FireAlarmDAO.java
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/dao/FireAlarmDAO.java
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/dao/FireAlarmDAO.java
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/dao/impl/FireAlarmDeviceDAOImpl.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/dao/impl/FireAlarmDeviceDAOImpl.java
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/dao/impl/FireAlarmDeviceDAOImpl.java
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/dao/impl/FireAlarmDeviceDAOImpl.java
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/util/FireAlarmUtils.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/util/FireAlarmUtils.java
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/util/FireAlarmUtils.java
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/impl/util/FireAlarmUtils.java
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/internal/FirealarmManagementServiceComponent.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/internal/FirealarmManagementServiceComponent.java
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/internal/FirealarmManagementServiceComponent.java
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/plugin/internal/FirealarmManagementServiceComponent.java
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/log4j.properties b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/log4j.properties
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/log4j.properties
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/log4j.properties
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/FireAlarmControllerService.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/FireAlarmControllerService.java
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/FireAlarmControllerService.java
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/FireAlarmControllerService.java
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/FireAlarmManagerService.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/FireAlarmManagerService.java
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/FireAlarmManagerService.java
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/FireAlarmManagerService.java
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/util/DeviceJSON.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/util/DeviceJSON.java
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/util/DeviceJSON.java
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/util/DeviceJSON.java
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/util/MQTTFirealarmSubscriber.java b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/util/MQTTFirealarmSubscriber.java
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/util/MQTTFirealarmSubscriber.java
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/firealarm/service/impl/util/MQTTFirealarmSubscriber.java
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/META-INF/webapp-classloading.xml b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml b/modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml
rename to modules/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/distribution/src/samples/firealarm/src/pom.xml b/modules/samples/firealarm/src/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/firealarm/src/pom.xml
rename to modules/samples/firealarm/src/pom.xml
diff --git a/modules/distribution/src/samples/firealarm/units/firealarm.hbs b/modules/samples/firealarm/units/firealarm.hbs
similarity index 100%
rename from modules/distribution/src/samples/firealarm/units/firealarm.hbs
rename to modules/samples/firealarm/units/firealarm.hbs
diff --git a/modules/distribution/src/samples/firealarm/units/firealarm.js b/modules/samples/firealarm/units/firealarm.js
similarity index 100%
rename from modules/distribution/src/samples/firealarm/units/firealarm.js
rename to modules/samples/firealarm/units/firealarm.js
diff --git a/modules/distribution/src/samples/firealarm/units/firealarm.json b/modules/samples/firealarm/units/firealarm.json
similarity index 100%
rename from modules/distribution/src/samples/firealarm/units/firealarm.json
rename to modules/samples/firealarm/units/firealarm.json
diff --git a/modules/distribution/src/samples/firealarm/units/public/images/firealarm-thumb.png b/modules/samples/firealarm/units/public/images/firealarm-thumb.png
similarity index 100%
rename from modules/distribution/src/samples/firealarm/units/public/images/firealarm-thumb.png
rename to modules/samples/firealarm/units/public/images/firealarm-thumb.png
diff --git a/modules/distribution/src/samples/firealarm/units/public/images/firealarm.png b/modules/samples/firealarm/units/public/images/firealarm.png
similarity index 100%
rename from modules/distribution/src/samples/firealarm/units/public/images/firealarm.png
rename to modules/samples/firealarm/units/public/images/firealarm.png
diff --git a/modules/distribution/src/samples/firealarm/units/public/images/schematicsGuide.png b/modules/samples/firealarm/units/public/images/schematicsGuide.png
similarity index 100%
rename from modules/distribution/src/samples/firealarm/units/public/images/schematicsGuide.png
rename to modules/samples/firealarm/units/public/images/schematicsGuide.png
diff --git a/modules/distribution/src/samples/firealarm/units/public/js/firealarm.js b/modules/samples/firealarm/units/public/js/firealarm.js
similarity index 100%
rename from modules/distribution/src/samples/firealarm/units/public/js/firealarm.js
rename to modules/samples/firealarm/units/public/js/firealarm.js
diff --git a/modules/distribution/src/samples/firealarm/units/public/store.json b/modules/samples/firealarm/units/public/store.json
similarity index 100%
rename from modules/distribution/src/samples/firealarm/units/public/store.json
rename to modules/samples/firealarm/units/public/store.json
diff --git a/modules/distribution/src/samples/lib/xmltask.jar b/modules/samples/lib/xmltask.jar
similarity index 100%
rename from modules/distribution/src/samples/lib/xmltask.jar
rename to modules/samples/lib/xmltask.jar
diff --git a/modules/distribution/src/samples/pom.xml b/modules/samples/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/pom.xml
rename to modules/samples/pom.xml
diff --git a/modules/distribution/src/samples/raspberrypi/build.xml b/modules/samples/raspberrypi/build.xml
similarity index 97%
rename from modules/distribution/src/samples/raspberrypi/build.xml
rename to modules/samples/raspberrypi/build.xml
index 59efd79f..99318ed4 100644
--- a/modules/distribution/src/samples/raspberrypi/build.xml
+++ b/modules/samples/raspberrypi/build.xml
@@ -1,4 +1,4 @@
-<project name="Arduino" basedir="." default="deploy">
+<project name="Arduino" basedir="" default="deploy">
 
     <import file="../common.xml"/>
 
diff --git a/modules/distribution/src/samples/raspberrypi/dbscripts/h2_raspberrypi.sql b/modules/samples/raspberrypi/dbscripts/h2_raspberrypi.sql
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/dbscripts/h2_raspberrypi.sql
rename to modules/samples/raspberrypi/dbscripts/h2_raspberrypi.sql
diff --git a/modules/distribution/src/samples/raspberrypi/dbscripts/mysql_raspberrypi.sql b/modules/samples/raspberrypi/dbscripts/mysql_raspberrypi.sql
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/dbscripts/mysql_raspberrypi.sql
rename to modules/samples/raspberrypi/dbscripts/mysql_raspberrypi.sql
diff --git a/modules/distribution/src/samples/raspberrypi/page/raspberrypi.hbs b/modules/samples/raspberrypi/page/raspberrypi.hbs
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/page/raspberrypi.hbs
rename to modules/samples/raspberrypi/page/raspberrypi.hbs
diff --git a/modules/distribution/src/samples/raspberrypi/sketch/raspberrypi.deb b/modules/samples/raspberrypi/sketch/raspberrypi.deb
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/sketch/raspberrypi.deb
rename to modules/samples/raspberrypi/sketch/raspberrypi.deb
diff --git a/modules/distribution/src/samples/raspberrypi/sketch/sketch.properties b/modules/samples/raspberrypi/sketch/sketch.properties
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/sketch/sketch.properties
rename to modules/samples/raspberrypi/sketch/sketch.properties
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/constants/RaspberrypiConstants.java b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/constants/RaspberrypiConstants.java
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/constants/RaspberrypiConstants.java
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/constants/RaspberrypiConstants.java
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManager.java b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManager.java
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManager.java
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManager.java
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManagerService.java b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManagerService.java
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManagerService.java
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/RaspberrypiManagerService.java
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/dao/RaspberrypiDAO.java b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/dao/RaspberrypiDAO.java
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/dao/RaspberrypiDAO.java
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/dao/RaspberrypiDAO.java
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/dao/impl/RaspberrypiDeviceDAOImpl.java b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/dao/impl/RaspberrypiDeviceDAOImpl.java
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/dao/impl/RaspberrypiDeviceDAOImpl.java
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/dao/impl/RaspberrypiDeviceDAOImpl.java
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/util/RaspberrypiUtils.java b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/util/RaspberrypiUtils.java
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/util/RaspberrypiUtils.java
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/impl/util/RaspberrypiUtils.java
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/internal/RaspberrypiManagementServiceComponent.java b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/internal/RaspberrypiManagementServiceComponent.java
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/internal/RaspberrypiManagementServiceComponent.java
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/plugin/internal/RaspberrypiManagementServiceComponent.java
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/service/impl/RaspberrypiControllerService.java b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/service/impl/RaspberrypiControllerService.java
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/service/impl/RaspberrypiControllerService.java
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/service/impl/RaspberrypiControllerService.java
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/service/impl/RaspberrypiManagerService.java b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/service/impl/RaspberrypiManagerService.java
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/service/impl/RaspberrypiManagerService.java
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/service/impl/RaspberrypiManagerService.java
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/service/impl/util/DeviceJSON.java b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/service/impl/util/DeviceJSON.java
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/service/impl/util/DeviceJSON.java
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/raspberrypi/service/impl/util/DeviceJSON.java
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/webapp/META-INF/webapp-classloading.xml b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/webapp/WEB-INF/web.xml b/modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/webapp/WEB-INF/web.xml
rename to modules/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/distribution/src/samples/raspberrypi/src/pom.xml b/modules/samples/raspberrypi/src/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/src/pom.xml
rename to modules/samples/raspberrypi/src/pom.xml
diff --git a/modules/distribution/src/samples/raspberrypi/units/public/images/raspberrypi-thumb.png b/modules/samples/raspberrypi/units/public/images/raspberrypi-thumb.png
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/units/public/images/raspberrypi-thumb.png
rename to modules/samples/raspberrypi/units/public/images/raspberrypi-thumb.png
diff --git a/modules/distribution/src/samples/raspberrypi/units/public/images/raspberrypi.png b/modules/samples/raspberrypi/units/public/images/raspberrypi.png
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/units/public/images/raspberrypi.png
rename to modules/samples/raspberrypi/units/public/images/raspberrypi.png
diff --git a/modules/distribution/src/samples/raspberrypi/units/public/store.json b/modules/samples/raspberrypi/units/public/store.json
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/units/public/store.json
rename to modules/samples/raspberrypi/units/public/store.json
diff --git a/modules/distribution/src/samples/raspberrypi/units/raspberrypi.hbs b/modules/samples/raspberrypi/units/raspberrypi.hbs
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/units/raspberrypi.hbs
rename to modules/samples/raspberrypi/units/raspberrypi.hbs
diff --git a/modules/distribution/src/samples/raspberrypi/units/raspberrypi.js b/modules/samples/raspberrypi/units/raspberrypi.js
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/units/raspberrypi.js
rename to modules/samples/raspberrypi/units/raspberrypi.js
diff --git a/modules/distribution/src/samples/raspberrypi/units/raspberrypi.json b/modules/samples/raspberrypi/units/raspberrypi.json
similarity index 100%
rename from modules/distribution/src/samples/raspberrypi/units/raspberrypi.json
rename to modules/samples/raspberrypi/units/raspberrypi.json
diff --git a/modules/distribution/src/samples/sample_pom.xml b/modules/samples/sample_pom.xml
similarity index 100%
rename from modules/distribution/src/samples/sample_pom.xml
rename to modules/samples/sample_pom.xml
diff --git a/modules/distribution/src/samples/sensebot/build.xml b/modules/samples/sensebot/build.xml
similarity index 97%
rename from modules/distribution/src/samples/sensebot/build.xml
rename to modules/samples/sensebot/build.xml
index 7c3f3827..e7cea4bd 100644
--- a/modules/distribution/src/samples/sensebot/build.xml
+++ b/modules/samples/sensebot/build.xml
@@ -1,4 +1,4 @@
-<project name="Arduino" basedir="." default="deploy">
+<project name="Arduino" basedir="" default="deploy">
 
     <import file="../common.xml"/>
 
diff --git a/modules/distribution/src/samples/sensebot/dbscripts/h2_sensebot.sql b/modules/samples/sensebot/dbscripts/h2_sensebot.sql
similarity index 100%
rename from modules/distribution/src/samples/sensebot/dbscripts/h2_sensebot.sql
rename to modules/samples/sensebot/dbscripts/h2_sensebot.sql
diff --git a/modules/distribution/src/samples/sensebot/dbscripts/mysql_sensebot.sql b/modules/samples/sensebot/dbscripts/mysql_sensebot.sql
similarity index 100%
rename from modules/distribution/src/samples/sensebot/dbscripts/mysql_sensebot.sql
rename to modules/samples/sensebot/dbscripts/mysql_sensebot.sql
diff --git a/modules/distribution/src/samples/sensebot/page/sensebot.hbs b/modules/samples/sensebot/page/sensebot.hbs
similarity index 100%
rename from modules/distribution/src/samples/sensebot/page/sensebot.hbs
rename to modules/samples/sensebot/page/sensebot.hbs
diff --git a/modules/distribution/src/samples/sensebot/sketch/Connect.ino b/modules/samples/sensebot/sketch/Connect.ino
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch/Connect.ino
rename to modules/samples/sensebot/sketch/Connect.ino
diff --git a/modules/distribution/src/samples/sensebot/sketch/Listener.ino b/modules/samples/sensebot/sketch/Listener.ino
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch/Listener.ino
rename to modules/samples/sensebot/sketch/Listener.ino
diff --git a/modules/distribution/src/samples/sensebot/sketch/MotorControls.ino b/modules/samples/sensebot/sketch/MotorControls.ino
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch/MotorControls.ino
rename to modules/samples/sensebot/sketch/MotorControls.ino
diff --git a/modules/distribution/src/samples/sensebot/sketch/PushData.ino b/modules/samples/sensebot/sketch/PushData.ino
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch/PushData.ino
rename to modules/samples/sensebot/sketch/PushData.ino
diff --git a/modules/distribution/src/samples/sensebot/sketch/SenseBotEthernetAgent.h b/modules/samples/sensebot/sketch/SenseBotEthernetAgent.h
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch/SenseBotEthernetAgent.h
rename to modules/samples/sensebot/sketch/SenseBotEthernetAgent.h
diff --git a/modules/distribution/src/samples/sensebot/sketch/SenseBotEthernetAgent.ino b/modules/samples/sensebot/sketch/SenseBotEthernetAgent.ino
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch/SenseBotEthernetAgent.ino
rename to modules/samples/sensebot/sketch/SenseBotEthernetAgent.ino
diff --git a/modules/distribution/src/samples/sensebot/sketch/Sensors.ino b/modules/samples/sensebot/sketch/Sensors.ino
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch/Sensors.ino
rename to modules/samples/sensebot/sketch/Sensors.ino
diff --git a/modules/distribution/src/samples/sensebot/sketch/sketch.properties b/modules/samples/sensebot/sketch/sketch.properties
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch/sketch.properties
rename to modules/samples/sensebot/sketch/sketch.properties
diff --git a/modules/distribution/src/samples/sensebot/sketch_wifi/Connect.ino b/modules/samples/sensebot/sketch_wifi/Connect.ino
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch_wifi/Connect.ino
rename to modules/samples/sensebot/sketch_wifi/Connect.ino
diff --git a/modules/distribution/src/samples/sensebot/sketch_wifi/Drive.ino b/modules/samples/sensebot/sketch_wifi/Drive.ino
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch_wifi/Drive.ino
rename to modules/samples/sensebot/sketch_wifi/Drive.ino
diff --git a/modules/distribution/src/samples/sensebot/sketch_wifi/HttpServer.ino b/modules/samples/sensebot/sketch_wifi/HttpServer.ino
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch_wifi/HttpServer.ino
rename to modules/samples/sensebot/sketch_wifi/HttpServer.ino
diff --git a/modules/distribution/src/samples/sensebot/sketch_wifi/PushData.ino b/modules/samples/sensebot/sketch_wifi/PushData.ino
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch_wifi/PushData.ino
rename to modules/samples/sensebot/sketch_wifi/PushData.ino
diff --git a/modules/distribution/src/samples/sensebot/sketch_wifi/SenseBotWifiAgent.h b/modules/samples/sensebot/sketch_wifi/SenseBotWifiAgent.h
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch_wifi/SenseBotWifiAgent.h
rename to modules/samples/sensebot/sketch_wifi/SenseBotWifiAgent.h
diff --git a/modules/distribution/src/samples/sensebot/sketch_wifi/SenseBotWifiAgent.ino b/modules/samples/sensebot/sketch_wifi/SenseBotWifiAgent.ino
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch_wifi/SenseBotWifiAgent.ino
rename to modules/samples/sensebot/sketch_wifi/SenseBotWifiAgent.ino
diff --git a/modules/distribution/src/samples/sensebot/sketch_wifi/sketch.properties b/modules/samples/sensebot/sketch_wifi/sketch.properties
similarity index 100%
rename from modules/distribution/src/samples/sensebot/sketch_wifi/sketch.properties
rename to modules/samples/sensebot/sketch_wifi/sketch.properties
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/constants/SensebotConstants.java b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/constants/SensebotConstants.java
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/constants/SensebotConstants.java
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/constants/SensebotConstants.java
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManager.java b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManager.java
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManager.java
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManager.java
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManagerService.java b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManagerService.java
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManagerService.java
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/SensebotManagerService.java
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/dao/SensebotDAO.java b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/dao/SensebotDAO.java
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/dao/SensebotDAO.java
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/dao/SensebotDAO.java
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/dao/impl/SensebotDeviceDAOImpl.java b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/dao/impl/SensebotDeviceDAOImpl.java
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/dao/impl/SensebotDeviceDAOImpl.java
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/dao/impl/SensebotDeviceDAOImpl.java
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/util/SensebotUtils.java b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/util/SensebotUtils.java
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/util/SensebotUtils.java
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/impl/util/SensebotUtils.java
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/internal/SensebotManagementServiceComponent.java b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/internal/SensebotManagementServiceComponent.java
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/internal/SensebotManagementServiceComponent.java
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/plugin/internal/SensebotManagementServiceComponent.java
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/log4j.properties b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/log4j.properties
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/log4j.properties
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/log4j.properties
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/service/impl/SensebotControllerService.java b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/service/impl/SensebotControllerService.java
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/service/impl/SensebotControllerService.java
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/service/impl/SensebotControllerService.java
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/service/impl/SensebotManagerService.java b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/service/impl/SensebotManagerService.java
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/service/impl/SensebotManagerService.java
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/service/impl/SensebotManagerService.java
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/service/impl/util/DeviceJSON.java b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/service/impl/util/DeviceJSON.java
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/service/impl/util/DeviceJSON.java
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/java/org/wso2/carbon/device/mgt/iot/sample/sensebot/service/impl/util/DeviceJSON.java
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/META-INF/webapp-classloading.xml b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/META-INF/webapp-classloading.xml
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/cxf-servlet.xml
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/web.xml b/modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/web.xml
rename to modules/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/web.xml
diff --git a/modules/distribution/src/samples/sensebot/src/pom.xml b/modules/samples/sensebot/src/pom.xml
similarity index 100%
rename from modules/distribution/src/samples/sensebot/src/pom.xml
rename to modules/samples/sensebot/src/pom.xml
diff --git a/modules/distribution/src/samples/sensebot/units/public/images/schematicsGuide.png b/modules/samples/sensebot/units/public/images/schematicsGuide.png
similarity index 100%
rename from modules/distribution/src/samples/sensebot/units/public/images/schematicsGuide.png
rename to modules/samples/sensebot/units/public/images/schematicsGuide.png
diff --git a/modules/distribution/src/samples/sensebot/units/public/images/sensebot-thumb.png b/modules/samples/sensebot/units/public/images/sensebot-thumb.png
similarity index 100%
rename from modules/distribution/src/samples/sensebot/units/public/images/sensebot-thumb.png
rename to modules/samples/sensebot/units/public/images/sensebot-thumb.png
diff --git a/modules/distribution/src/samples/sensebot/units/public/images/sensebot.png b/modules/samples/sensebot/units/public/images/sensebot.png
similarity index 100%
rename from modules/distribution/src/samples/sensebot/units/public/images/sensebot.png
rename to modules/samples/sensebot/units/public/images/sensebot.png
diff --git a/modules/distribution/src/samples/sensebot/units/public/store.json b/modules/samples/sensebot/units/public/store.json
similarity index 100%
rename from modules/distribution/src/samples/sensebot/units/public/store.json
rename to modules/samples/sensebot/units/public/store.json
diff --git a/modules/distribution/src/samples/sensebot/units/sensebot.hbs b/modules/samples/sensebot/units/sensebot.hbs
similarity index 100%
rename from modules/distribution/src/samples/sensebot/units/sensebot.hbs
rename to modules/samples/sensebot/units/sensebot.hbs
diff --git a/modules/distribution/src/samples/sensebot/units/sensebot.js b/modules/samples/sensebot/units/sensebot.js
similarity index 100%
rename from modules/distribution/src/samples/sensebot/units/sensebot.js
rename to modules/samples/sensebot/units/sensebot.js
diff --git a/modules/distribution/src/samples/sensebot/units/sensebot.json b/modules/samples/sensebot/units/sensebot.json
similarity index 100%
rename from modules/distribution/src/samples/sensebot/units/sensebot.json
rename to modules/samples/sensebot/units/sensebot.json
diff --git a/pom.xml b/pom.xml
index 8afbd910..b082b1d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <artifactId>wso2iot-parent</artifactId>
     <packaging>pom</packaging>
     <version>1.0.0-SNAPSHOT</version>
-    <name>WSO2 IoT - Parent</name>
+    <name>WSO2 IoT Server - Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 IoT Server</description>
 
@@ -38,7 +38,7 @@
     <modules>
         <module>modules/p2-profile-gen</module>
         <module>modules/distribution</module>
-        <!--module>modules/integration</module-->
+        <module>modules/integration</module>
     </modules>
 
     <dependencyManagement>
@@ -819,7 +819,7 @@
 
         <!--Eclipse Osgi-->
         <eclipse.equinox.common.version>3.6.100.v20120522-1841</eclipse.equinox.common.version>
-        <eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
+        <eclipse.osgi.version>3.9.1.v20130814-1242</eclipse.osgi.version>
 
         <!--Orbit versions-->