From e5972d1a0395e331fe4d6da37ed91be7e89dbe74 Mon Sep 17 00:00:00 2001
From: ayyoob <ayyoobhamza@gmail.com>
Date: Thu, 13 Aug 2015 01:50:42 +0530
Subject: [PATCH] refactored package and removed unused dependency

---
 README.md                                     |   2 +-
 modules/distribution/pom.xml                  |  28 +-
 modules/distribution/src/assembly/bin.xml     |   2 +-
 modules/distribution/src/assembly/dist.xml    |   2 +-
 modules/distribution/src/assembly/docs.xml    |   4 +-
 .../src/assembly/filter.properties            |   2 +-
 .../jaggeryapps/iotserver/api/device-api.jag  |   8 +-
 .../jaggeryapps/iotserver/api/group-api.jag   |   2 +-
 .../jaggeryapps/iotserver/api/stats-api.jag   |   2 +-
 .../iotserver/modules/constants.js            |   2 +-
 .../jaggeryapps/iotserver/pages/dashboard.hbs |   2 +-
 .../jaggeryapps/iotserver/pages/index.hbs     |   2 +-
 .../jaggeryapps/iotserver/pages/login.hbs     |   2 +-
 .../jaggeryapps/iotserver/pages/register.hbs  |   2 +-
 .../iotserver/units/android/android.hbs       |   2 +-
 .../iotserver/units/android/public/store.json |   2 +-
 .../policy-create/public/js/store-listing.js  |   2 +-
 .../store-listing/public/js/store-listing.js  |   2 +-
 .../iotserver/units/windows/public/store.json |   2 +-
 .../iotserver/units/windows/windows.hbs       |   2 +-
 .../pom.xml                                   |  56 +-
 .../plugin/impl/AndroidSenseManager.java      |  12 +
 .../pom.xml                                   | 190 +++---
 .../android_sense/units/android_sense.hbs     |   2 +-
 .../android_sense/units/public/store.json     |   2 +-
 .../pom.xml                                   | 212 +++----
 .../arduino/plugin/impl/ArduinoManager.java   |  12 +
 .../pom.xml                                   |  25 +-
 .../src/samples/arduino/units/arduino.hbs     |   2 +-
 .../samples/arduino/units/public/store.json   |   2 +-
 .../pom.xml                                   |  60 +-
 .../plugin/impl/DigitalDisplayManager.java    |  12 +
 .../pom.xml                                   | 185 +++---
 .../digital_display/units/digital_display.hbs |   2 +-
 .../digital_display/units/public/store.json   |   2 +-
 .../pom.xml                                   |  57 +-
 .../plugin/impl/FireAlarmManager.java         |  12 +
 .../pom.xml                                   |  18 +-
 .../src/main/webapp/WEB-INF/web.xml           |   4 +-
 .../src/samples/firealarm/units/firealarm.hbs |   2 +-
 .../samples/firealarm/units/public/store.json |   2 +-
 modules/distribution/src/samples/pom.xml      | 577 ++++++++++++++++++
 .../pom.xml                                   |  55 +-
 .../plugin/impl/RaspberrypiManager.java       |  12 +
 .../pom.xml                                   | 186 +++---
 .../raspberrypi/units/public/store.json       |   2 +-
 .../samples/raspberrypi/units/raspberrypi.hbs |   2 +-
 .../pom.xml                                   |  99 ++-
 .../sensebot/plugin/impl/SensebotManager.java |  12 +
 .../pom.xml                                   |  55 +-
 .../src/main/webapp/WEB-INF/web.xml           |   4 +-
 .../samples/sensebot/units/public/store.json  |   2 +-
 .../src/samples/sensebot/units/sensebot.hbs   |   2 +-
 modules/integration/pom.xml                   |   8 +-
 modules/integration/tests-artifacts/pom.xml   |   8 +-
 .../tests-common/admin-clients/pom.xml        |   6 +-
 .../integration-test-utils/pom.xml            |   8 +-
 modules/integration/tests-common/pom.xml      |   8 +-
 .../integration/tests-common/ui-pages/pom.xml |   6 +-
 modules/integration/tests-integration/pom.xml |   8 +-
 modules/integration/tests-platform/pom.xml    |   8 +-
 .../integration/tests-ui-integration/pom.xml  |  24 +-
 modules/p2-profile-gen/pom.xml                |   8 +-
 pom.xml                                       |  15 +-
 64 files changed, 1289 insertions(+), 771 deletions(-)
 create mode 100644 modules/distribution/src/samples/pom.xml

diff --git a/README.md b/README.md
index ba5c59f0..71df3498 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-# product-device-cloud
+# product-iot-server
diff --git a/modules/distribution/pom.xml b/modules/distribution/pom.xml
index 66c45acc..d889730f 100644
--- a/modules/distribution/pom.xml
+++ b/modules/distribution/pom.xml
@@ -21,18 +21,22 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.wso2.dc</groupId>
-        <artifactId>wso2dc-parent</artifactId>
+        <groupId>org.wso2.iot</groupId>
+        <artifactId>wso2iot-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2dc</artifactId>
+    <artifactId>wso2iot</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>WSO2 Device Cloud (DC) - Distribution</name>
-    <description>WSO2 Device Cloud (DC) Distribution</description>
+    <name>WSO2 IoT Server - Distribution</name>
+    <description>WSO2 IoT Server Distribution</description>
+
+    <modules>
+        <module>src/samples</module>
+    </modules>
 
     <dependencies>
         <dependency>
@@ -364,17 +368,17 @@
                                 <!--<property name="shindig.version" value="2.5.0-beta5" />-->
 
                                 <mkdir dir="${tempdir}"/>
-                                <mkdir dir="${tempdir}/wso2dc-${project.version}/repository/components"/>
-                                <mkdir dir="${tempdir}/wso2dc-${project.version}/repository/deployment/server"/>
-                                <mkdir dir="${tempdir}/wso2dc-${project.version}/repository/deployment/server/webapps"/>
+                                <mkdir dir="${tempdir}/wso2iot-${project.version}/repository/components"/>
+                                <mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server"/>
+                                <mkdir dir="${tempdir}/wso2iot-${project.version}/repository/deployment/server/webapps"/>
                                 <unzip dest="${tempdir}">
                                     <fileset dir="target">
-                                        <include name="wso2dc-${project.version}.zip"/>
+                                        <include name="wso2iot-${project.version}.zip"/>
                                     </fileset>
                                 </unzip>
                                 <copy todir="target/wso2carbon-core-${carbon.kernel.version}/repository/components"
                                       overwrite="true">
-                                    <fileset dir="${tempdir}/wso2dc-${project.version}/repository/components"/>
+                                    <fileset dir="${tempdir}/wso2iot-${project.version}/repository/components"/>
                                 </copy>
                                 <!--testing -->
                                 <!--<unzip src="target/shindig/WEB-INF/lib/shindig-common-${shindig.version}.jar" dest="${jardir}/shindig-common-${shindig.version}">
@@ -394,7 +398,7 @@
                                     og4j.logger.net.sf.ehcache=ERROR
                                 </concat>
 
-                                <delete file="target/wso2dc-${project.version}.zip"/>
+                                <delete file="target/wso2iot-${project.version}.zip"/>
                                 <delete dir="${tempdir}"/>
                             </tasks>
                         </configuration>
@@ -513,7 +517,7 @@
                                 <delete dir="target/dependency-maven-plugin-markers"/>
                                 <delete dir="target/maven-archiver"/>
                                 <delete dir="target/wso2carbon-core-${carbon.kernel.version}"/>
-                                <delete file="target/wso2dc-${project.version}.jar"/>
+                                <delete file="target/wso2iot-${project.version}.jar"/>
                                 <delete dir="target/sources"/>
                                 <delete dir="target/site"/>
                                 <delete dir="target/antrun"/>
diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index ad66fc66..1610aae2 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -277,7 +277,7 @@
             </directory>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/deployment/server/webapps</outputDirectory>
             <includes>
-                <include>devicecloud.war</include>
+                <include>common.war</include>
             </includes>
         </fileSet>
 
diff --git a/modules/distribution/src/assembly/dist.xml b/modules/distribution/src/assembly/dist.xml
index 2767e659..5d2be5cb 100644
--- a/modules/distribution/src/assembly/dist.xml
+++ b/modules/distribution/src/assembly/dist.xml
@@ -26,7 +26,7 @@
         <!-- Copying p2 profile and osgi bundles-->
         <fileSet>
             <directory>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/components</directory>
-            <outputDirectory>wso2dc-${pom.version}/repository/components</outputDirectory>
+            <outputDirectory>wso2iot-${pom.version}/repository/components</outputDirectory>
             <excludes>
                 <exclude>**/eclipse.ini</exclude>
                 <exclude>**/*.lock</exclude>
diff --git a/modules/distribution/src/assembly/docs.xml b/modules/distribution/src/assembly/docs.xml
index 5c7ff8ba..9590a630 100644
--- a/modules/distribution/src/assembly/docs.xml
+++ b/modules/distribution/src/assembly/docs.xml
@@ -25,11 +25,11 @@
     <fileSets>
         <fileSet>
             <directory>target/site</directory>
-            <outputDirectory>wso2dc-${pom.version}-docs</outputDirectory>
+            <outputDirectory>wso2iot-${pom.version}-docs</outputDirectory>
         </fileSet>
         <fileSet>
             <directory>../../modules/documentation/src/site/xdoc/user-core</directory>
-            <outputDirectory>wso2dc-${pom.version}-docs/user-core</outputDirectory>
+            <outputDirectory>wso2iot-${pom.version}-docs/user-core</outputDirectory>
             <fileMode>755</fileMode>
             <includes>
                 <include>user-mgt-actdir.xml</include>
diff --git a/modules/distribution/src/assembly/filter.properties b/modules/distribution/src/assembly/filter.properties
index 1dc01fef..9b5c9e59 100644
--- a/modules/distribution/src/assembly/filter.properties
+++ b/modules/distribution/src/assembly/filter.properties
@@ -1,4 +1,4 @@
-product.name=WSO2 Device Cloud
+product.name=WSO2 IoT Server
 product.version=1.0.0-SNAPSHOT
 product.key=DC
 hotdeployment=true
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag
index e7de6454..3ddcd0d3 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/device-api.jag
@@ -118,13 +118,13 @@ if (uriMatcher.match("/{context}/api/device/sketch/download/{downloadId}")) {
 	}
 
 	//URL: https://localhost:9443/devicecloud/manager/devices/username/{username}
-	deviceCloudService = carbonHttpsServletTransport + "/devicecloud/device_manager";
+	deviceCloudService = carbonHttpsServletTransport + "/common/device_manager";
 	listAllDevicesEndPoint = deviceCloudService + "/devices/username/" + user.username;
 	result = get(listAllDevicesEndPoint, {}, "json");
 	var ownDevices = result.data;
 
 	var allDevices = [];
-	deviceCloudService = carbonHttpsServletTransport + "/devicecloud/group_manager";
+	deviceCloudService = carbonHttpsServletTransport + "/common/group_manager";
 	var endPoint = deviceCloudService + "/group/all";
 	var data = {"username": user.username};
 	var groups = get(endPoint, data, "json").data;
@@ -161,13 +161,13 @@ if (uriMatcher.match("/{context}/api/device/sketch/download/{downloadId}")) {
 	}
 
 	//URL: https://localhost:9443/devicecloud/manager/devices/username/{username}
-	deviceCloudService = carbonHttpsServletTransport + "/devicecloud/device_manager";
+	deviceCloudService = carbonHttpsServletTransport + "/common/device_manager";
 	listAllDevicesEndPoint = deviceCloudService + "/devices/username/" + user.username;
 	result = get(listAllDevicesEndPoint, {}, "json");
 	var ownDevices = result.data;
 
 	var allDevices = [];
-	deviceCloudService = carbonHttpsServletTransport + "/devicecloud/group_manager";
+	deviceCloudService = carbonHttpsServletTransport + "/common/group_manager";
 	var endPoint = deviceCloudService + "/group/all";
 	var data = {"username": user.username};
 	var groups = get(endPoint, data, "json").data;
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/group-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/group-api.jag
index f0b419cb..2795e9e0 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/group-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/group-api.jag
@@ -27,7 +27,7 @@ var dcProps = require('/config/dc-props.js').config();
 
 var carbon = require('carbon');
 var carbonHttpsServletTransport = carbon.server.address('https');
-var deviceCloudService = carbonHttpsServletTransport + "/devicecloud/group_manager";
+var deviceCloudService = carbonHttpsServletTransport + "/common/group_manager";
 
 var user = session.get(constants.USER_SESSION_KEY);
 if (!user) {
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag b/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag
index 30655bf0..52000469 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/api/stats-api.jag
@@ -38,7 +38,7 @@ if (!user) {
 
 var carbon = require('carbon');
 var carbonHttpsServletTransport = carbon.server.address('https');
-var deviceCloudService = carbonHttpsServletTransport + "/devicecloud/group_manager";
+var deviceCloudService = carbonHttpsServletTransport + "/common/group_manager";
 
 var statsClient = new Packages.org.wso2.carbon.device.mgt.iot.common.analytics.statistics.IoTUsageStatisticsClient;
 var stats = {};
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/constants.js b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/constants.js
index 0e68d24b..c0cb4516 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/modules/constants.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/modules/constants.js
@@ -16,7 +16,7 @@
  * under the License.
  */
 
-var WEB_APP_TITLE = "WSO2 DC - Device Cloud";
+var WEB_APP_TITLE = "WSO2 IoT - IoT Server";
 var WEB_APP_CONTEXT = "/iotserver";
 var USER_SESSION_KEY = "USER";
 var UNSPECIFIED = "Unspecified";
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/dashboard.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/dashboard.hbs
index 3a282d01..39513dce 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/dashboard.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/dashboard.hbs
@@ -1,7 +1,7 @@
 {{authorized}}
 {{layout "fluid"}}
 {{#zone  "title"}}
-    WSO2 DC | Device Cloud
+    WSO2 IoT | IoT Server
 {{/zone}}
 {{#zone "body"}}
 	{{unit "appbar" title="Dashboard"}}
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/index.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/index.hbs
index 329c878f..4f49ac6d 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/index.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/index.hbs
@@ -1,6 +1,6 @@
 {{layout "fluid"}}
 {{#zone  "title"}}
-    WSO2 DC | Device Cloud
+    WSO2 IoT | IoT Server
 {{/zone}}
 {{#zone "body"}}
 	{{unit "appbar" link="dashboard" title="Device Management"}}
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/login.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/login.hbs
index 3653dae7..3e613f51 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/login.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/login.hbs
@@ -1,6 +1,6 @@
 {{layout "fluid"}}
 {{#zone  "title"}}
-WSO2 Device Cloud | Login
+WSO2 IoT Server | Login
 {{/zone}}
 {{#zone "body"}}
     {{unit "login"}}
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/register.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/register.hbs
index 1edb14be..5ce7b2b4 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/pages/register.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/pages/register.hbs
@@ -1,6 +1,6 @@
 {{layout "fluid"}}
 {{#zone  "title"}}
-WSO2 Device Cloud | Register
+WSO2 IoT Server | Register
 {{/zone}}
 {{#zone "body"}}
     {{unit "register"}}
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs
index 858e1919..7bc67479 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/android.hbs
@@ -6,7 +6,7 @@
                     <h1 class="grey ">Android</h1>
                     <hr>
                     <p  class="margin-bottom-double light-grey ">Connect your Android
-                    to the WSO2 device cloud. </p>
+                    to the WSO2 IoT server. </p>
                 </div>
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
                 <img src="{{self.publicURL}}/images/android.png" class="img-responsive">
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json
index c5c8d764..e9476fe3 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/android/public/store.json
@@ -1,4 +1,4 @@
 {
   "title" : "Android",
-  "description":"Connect Your Android mobile into the WSO2 Device Cloud Platform"
+  "description":"Connect Your Android mobile into the WSO2 IoT Server"
 }
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/policy-create/public/js/store-listing.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/policy-create/public/js/store-listing.js
index 37c03ca9..2e4000b5 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/policy-create/public/js/store-listing.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/policy-create/public/js/store-listing.js
@@ -38,7 +38,7 @@ function loadDeviceTypes() {
 
                 //setting defaults
                 var storeTitle = deviceType.name;
-                var storeDescription = "Connect your " + deviceType.name + " into the WSO2 Device Cloud Platform.";
+                var storeDescription = "Connect your " + deviceType.name + " into the WSO2 IoT Server.";
 
                 if (deviceType.storeTitle != null) {
                     storeTitle = deviceType.storeTitle;
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/store-listing/public/js/store-listing.js b/modules/distribution/src/repository/jaggeryapps/iotserver/units/store-listing/public/js/store-listing.js
index 29e152a3..a10f7ed3 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/store-listing/public/js/store-listing.js
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/store-listing/public/js/store-listing.js
@@ -38,7 +38,7 @@ function loadDeviceTypes() {
 
                 //setting defaults
                 var storeTitle = deviceType.name;
-                var storeDescription = "Connect your " + deviceType.name + " into the WSO2 Device Cloud Platform.";
+                var storeDescription = "Connect your " + deviceType.name + " into the WSO2 IoT Server.";
 
                 if (deviceType.storeTitle != null) {
                     storeTitle = deviceType.storeTitle;
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/public/store.json b/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/public/store.json
index d379da62..a3256aa5 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/public/store.json
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/public/store.json
@@ -1,4 +1,4 @@
 {
   "title" : "Windows",
-  "description":"Connect Your Windows mobile into the WSO2 Device Cloud Platform"
+  "description":"Connect Your Windows mobile into the WSO2 IoT Server"
 }
\ No newline at end of file
diff --git a/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs b/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs
index b19c41d0..51966cb3 100644
--- a/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iotserver/units/windows/windows.hbs
@@ -6,7 +6,7 @@
                     <h1 class="grey ">Windows</h1>
                     <hr>
                     <p  class="margin-bottom-double light-grey ">Connect your Windows Mobile
-                    to the WSO2 device cloud. </p>
+                    to the WSO2 IoT server. </p>
                 </div>
             </div>
             <div class="row margin-bottom-double">
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/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
index 0bebd287..e0b935e4 100644
--- a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl/pom.xml
@@ -11,17 +11,17 @@
 	~ under the License. -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-		<artifactId>devicecloud-mgt</artifactId>
-		<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<artifactId>iot-server-samples</artifactId>
+		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+		<version>${carbon.iot.device.mgt.version}</version>
+		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.wso2.carbon.device.mgt.iot.android.sense.impl</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl</artifactId>
+	<version>${carbon.iot.device.mgt.version}</version>
 	<packaging>bundle</packaging>
 	<name>WSO2 Carbon - Android Sense Management Impl</name>
 	<description>WSO2 Carbon - Android Sense Management and Control Implementation</description>
@@ -51,8 +51,8 @@
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Name>${project.artifactId}</Bundle-Name>
 						<Bundle-Version>${carbon.iot.device.mgt.version}</Bundle-Version>
-						<Bundle-Description>Device Cloud Impl Bundle</Bundle-Description>
-						<Private-Package>org.wso2.carbon.device.mgt.iot.android.sense.internal</Private-Package>
+						<Bundle-Description>IoT Server Impl Bundle</Bundle-Description>
+						<Private-Package>org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.internal</Private-Package>
 						<Import-Package>
 							org.osgi.framework,
 							org.osgi.service.component,
@@ -69,31 +69,16 @@
 							org.wso2.carbon.device.mgt.common,
 							org.wso2.carbon.context.*,
 							org.wso2.carbon.ndatasource.core,
-							org.wso2.carbon.device.mgt.iot.common.*
+							org.wso2.carbon.device.mgt.iot.common.*,
 						</Import-Package>
 
 						<Export-Package>
-							!org.wso2.carbon.device.mgt.iot.android.sense.internal,
-							org.wso2.carbon.device.mgt.iot.android.sense.*
+							!org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.internal,
+							org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.*
 						</Export-Package>
-
 					</instructions>
 				</configuration>
 			</plugin>
-			<!--<plugin>-->
-			<!--<groupId>org.apache.maven.plugins</groupId>-->
-			<!--<artifactId>maven-surefire-plugin</artifactId>-->
-			<!--<version>2.18</version>-->
-			<!--<configuration>-->
-			<!--<systemPropertyVariables>-->
-			<!--<log4j.configuration>file:src/test/resources/log4j.properties-->
-			<!--</log4j.configuration>-->
-			<!--</systemPropertyVariables>-->
-			<!--<suiteXmlFiles>-->
-			<!--<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>-->
-			<!--</suiteXmlFiles>-->
-			<!--</configuration>-->
-			<!--</plugin>-->
 		</plugins>
 	</build>
 
@@ -120,22 +105,15 @@
 			<groupId>org.wso2.carbon</groupId>
 			<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
 		</dependency>
-
-		<!--<dependency>-->
-		<!--<groupId>org.testng</groupId>-->
-		<!--<artifactId>testng</artifactId>-->
-		<!--</dependency>-->
-
-		<!--<dependency>-->
-		<!--<groupId>com.h2database.wso2</groupId>-->
-		<!--<artifactId>h2-database-engine</artifactId>-->
-		<!--<scope>test</scope>-->
-		<!--</dependency>-->
+		
 		<dependency>
 			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
 			<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
 		</dependency>
 
+
+
 	</dependencies>
 
-</project>
+
+</project>
\ No newline at end of file
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/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
index 7e18284d..6f8d48c4 100644
--- 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/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
@@ -26,6 +26,8 @@ import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration;
+import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 import org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl.dao.AndroidSenseDAO;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOFactory;
@@ -208,6 +210,16 @@ public class AndroidSenseManager implements DeviceManager {
         return false;
     }
 
+    @Override
+    public License getLicense(String s) throws LicenseManagementException {
+        return null;
+    }
+
+    @Override
+    public void addLicense(License license) throws LicenseManagementException {
+
+    }
+
     @Override
     public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException {
         boolean status;
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/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
index ed516635..e2a19220 100644
--- a/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
+++ b/modules/distribution/src/samples/android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl/pom.xml
@@ -1,105 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<artifactId>devicecloud-api</artifactId>
-		<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-		<version>1.0.0</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>iot-server-samples</artifactId>
+        <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+        <version>${carbon.iot.device.mgt.version}</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
-	<artifactId>org.wso2.carbon.device.mgt.iot.android.sense.api</artifactId>
-	<version>1.0.0</version>
+    <artifactId>org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl</artifactId>
+    <version>${carbon.iot.device.mgt.version}</version>
 
-	<packaging>war</packaging>
-	<name>WSO2 Carbon - Device Cloud API - Android  SenseAPI</name>
+    <packaging>war</packaging>
+    <name>WSO2 Carbon - Android Sense API - Android Sense API</name>
 
-	<dependencies>
-		<!-- CDM -->
-		<dependency>
-			<groupId>org.wso2.carbon.devicemgt</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-			<scope>provided</scope>
-		</dependency>
+    <dependencies>
+        <!-- CDM -->
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
+        <!--CXF -->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!--MQTT -->
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>mqtt-client</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
-		<!--CXF -->
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxws</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-transports-http</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<!--MQTT -->
-		<dependency>
-			<groupId>org.eclipse.paho</groupId>
-			<artifactId>mqtt-client</artifactId>
-			<scope>provided</scope>
-		</dependency>
+        <!--IOT -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpasyncclient</artifactId>
+            <version>4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.device.mgt.iot</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!--JAX-RS -->
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-jaxrs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-web-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
-		<!--IOT -->
 
-		<dependency>
-			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.android.sense.impl</artifactId>
-			<version>1.0.0-SNAPSHOT</version>
-			<scope>provided</scope>
-		</dependency>
-		<!--JAX-RS -->
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-jaxrs</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-web-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>jsr311-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<encoding>UTF-8</encoding>
-					<source>${wso2.maven.compiler.source}</source>
-					<target>${wso2.maven.compiler.target}</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<warName>android_sense</warName>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <source>${wso2.maven.compiler.source}</source>
+                    <target>${wso2.maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <warName>android_sense</warName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/android_sense/units/android_sense.hbs b/modules/distribution/src/samples/android_sense/units/android_sense.hbs
index 1fc1f783..5fac269c 100644
--- a/modules/distribution/src/samples/android_sense/units/android_sense.hbs
+++ b/modules/distribution/src/samples/android_sense/units/android_sense.hbs
@@ -6,7 +6,7 @@
                     <h1 class="grey ">Android Sense</h1>
                     <hr>
                     <p class="margin-bottom-double light-grey ">Connect your Android Sense
-                        to the WSO2 device cloud. </p>
+                        to the WSO2 IoT server. </p>
                 </div>
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
                     <img src="{{self.publicURL}}/images/android_sense.png" class="img-responsive">
diff --git a/modules/distribution/src/samples/android_sense/units/public/store.json b/modules/distribution/src/samples/android_sense/units/public/store.json
index 555be08e..f6143287 100644
--- a/modules/distribution/src/samples/android_sense/units/public/store.json
+++ b/modules/distribution/src/samples/android_sense/units/public/store.json
@@ -1,4 +1,4 @@
 {
   "title" : "Android Sense",
-  "description":"Connect Your Android Sense into the WSO2 Device Cloud Platform"
+  "description":"Connect Your Android Sense into the WSO2 IoT Server"
 }
\ No newline at end of file
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml
index df04156c..9a074d12 100644
--- a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl/pom.xml
@@ -11,131 +11,109 @@
 	~ under the License. -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <artifactId>devicecloud-mgt</artifactId>
-    <groupId>org.wso2.carbon.device.mgt.iot</groupId>
-    <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>iot-server-samples</artifactId>
+		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+		<version>${carbon.iot.device.mgt.version}</version>
+		<relativePath>../../../pom.xml</relativePath>
+	</parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.wso2.carbon.device.mgt.iot.arduino.impl</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-  <name>WSO2 Carbon - Arduino Management Impl</name>
-  <description>WSO2 Carbon - Arduino Management and Control Implementation</description>
-  <url>http://wso2.org</url>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl</artifactId>
+	<version>${carbon.iot.device.mgt.version}</version>
+	<packaging>bundle</packaging>
+	<name>WSO2 Carbon - Arduino Management Impl</name>
+	<description>WSO2 Carbon - Arduino Management and Control Implementation</description>
+	<url>http://wso2.org</url>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-scr-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-        <version>2.3.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Name>${project.artifactId}</Bundle-Name>
-            <Bundle-Version>${carbon.iot.device.mgt.version}</Bundle-Version>
-            <Bundle-Description>Device Cloud Impl Bundle</Bundle-Description>
-            <Private-Package>org.wso2.carbon.device.mgt.iot.arduino.internal</Private-Package>
-            <Import-Package>
-              org.osgi.framework,
-              org.osgi.service.component,
-              org.apache.commons.logging,
-              javax.xml.bind.*,
-              javax.naming,
-              javax.sql,
-              javax.xml.bind.annotation.*,
-              javax.xml.parsers,
-              javax.net,
-              javax.net.ssl,
-              org.w3c.dom,
-              org.wso2.carbon.device.mgt.common.*,
-              org.wso2.carbon.device.mgt.common,
-              org.wso2.carbon.context.*,
-              org.wso2.carbon.ndatasource.core,
-              org.wso2.carbon.device.mgt.iot.common.*
-            </Import-Package>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-scr-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+				<version>2.3.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>1.4.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+						<Bundle-Name>${project.artifactId}</Bundle-Name>
+						<Bundle-Version>${carbon.iot.device.mgt.version}</Bundle-Version>
+						<Bundle-Description>IoT Server Impl Bundle</Bundle-Description>
+						<Private-Package>org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.internal</Private-Package>
+						<Import-Package>
+							org.osgi.framework,
+							org.osgi.service.component,
+							org.apache.commons.logging,
+							javax.xml.bind.*,
+							javax.naming,
+							javax.sql,
+							javax.xml.bind.annotation.*,
+							javax.xml.parsers,
+							javax.net,
+							javax.net.ssl,
+							org.w3c.dom,
+							org.wso2.carbon.device.mgt.common.*,
+							org.wso2.carbon.device.mgt.common,
+							org.wso2.carbon.context.*,
+							org.wso2.carbon.ndatasource.core,
+							org.wso2.carbon.device.mgt.iot.common.*,
+						</Import-Package>
 
-            <Export-Package>
-              !org.wso2.carbon.device.mgt.iot.arduino.internal,
-              org.wso2.carbon.device.mgt.iot.arduino.*
-            </Export-Package>
+						<Export-Package>
+							!org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.internal,
+							org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.*
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
-          </instructions>
-        </configuration>
-      </plugin>
-      <!--<plugin>-->
-      <!--<groupId>org.apache.maven.plugins</groupId>-->
-      <!--<artifactId>maven-surefire-plugin</artifactId>-->
-      <!--<version>2.18</version>-->
-      <!--<configuration>-->
-      <!--<systemPropertyVariables>-->
-      <!--<log4j.configuration>file:src/test/resources/log4j.properties-->
-      <!--</log4j.configuration>-->
-      <!--</systemPropertyVariables>-->
-      <!--<suiteXmlFiles>-->
-      <!--<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>-->
-      <!--</suiteXmlFiles>-->
-      <!--</configuration>-->
-      <!--</plugin>-->
-    </plugins>
-  </build>
+	<dependencies>
+		<dependency>
+			<groupId>org.eclipse.osgi</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.osgi</groupId>
+			<artifactId>org.eclipse.osgi.services</artifactId>
+		</dependency>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.eclipse.osgi</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.eclipse.osgi</groupId>
-      <artifactId>org.eclipse.osgi.services</artifactId>
-    </dependency>
+		<dependency>
+			<groupId>org.wso2.carbon</groupId>
+			<artifactId>org.wso2.carbon.logging</artifactId>
+		</dependency>
 
-    <dependency>
-      <groupId>org.wso2.carbon</groupId>
-      <artifactId>org.wso2.carbon.logging</artifactId>
-    </dependency>
+		<dependency>
+			<groupId>org.wso2.carbon.devicemgt</groupId>
+			<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.wso2.carbon</groupId>
+			<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
+			<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
+		</dependency>
 
-    <dependency>
-      <groupId>org.wso2.carbon.devicemgt</groupId>
-      <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.wso2.carbon</groupId>
-      <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-    </dependency>
 
-    <!--<dependency>-->
-    <!--<groupId>org.testng</groupId>-->
-    <!--<artifactId>testng</artifactId>-->
-    <!--</dependency>-->
 
-    <!--<dependency>-->
-    <!--<groupId>com.h2database.wso2</groupId>-->
-    <!--<artifactId>h2-database-engine</artifactId>-->
-    <!--<scope>test</scope>-->
-    <!--</dependency>-->
-    <dependency>
-      <groupId>org.wso2.carbon.device.mgt.iot</groupId>
-      <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-    </dependency>
+	</dependencies>
 
-  </dependencies>
 
-</project>
+</project>
\ No newline at end of file
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/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
index 938606c0..724de461 100644
--- 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/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
@@ -26,6 +26,8 @@ import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration;
+import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dto.IotDevice;
@@ -208,6 +210,16 @@ public class ArduinoManager implements DeviceManager {
         return false;
     }
 
+    @Override
+    public License getLicense(String s) throws LicenseManagementException {
+        return null;
+    }
+
+    @Override
+    public void addLicense(License license) throws LicenseManagementException {
+
+    }
+
     @Override
     public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException {
         boolean status;
diff --git a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
index f44efe61..4fdf5f89 100644
--- a/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
+++ b/modules/distribution/src/samples/arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl/pom.xml
@@ -3,18 +3,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
-    <artifactId>devicecloud-api</artifactId>
-    <groupId>org.wso2.carbon.device.mgt.iot</groupId>
-    <version>1.0.0</version>
-    <relativePath>../pom.xml</relativePath>
+    <artifactId>iot-server-samples</artifactId>
+    <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+    <version>${carbon.iot.device.mgt.version}</version>
+    <relativePath>../../../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>org.wso2.carbon.device.mgt.iot.arduino.api</artifactId>
-  <version>1.0.0</version>
+  <artifactId>org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl</artifactId>
+  <version>${carbon.iot.device.mgt.version}</version>
 
   <packaging>war</packaging>
-  <name>WSO2 Carbon - Device Cloud API - Arduiono API</name>
+  <name>WSO2 Carbon - IoT Server API - Arduino API</name>
 
   <dependencies>
     <!-- CDM -->
@@ -24,7 +24,6 @@
       <scope>provided</scope>
     </dependency>
 
-
     <!--CXF -->
     <dependency>
       <groupId>org.apache.cxf</groupId>
@@ -49,15 +48,19 @@
     </dependency>
 
     <!--IOT -->
-
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpasyncclient</artifactId>
+      <version>4.1</version>
+    </dependency>
     <dependency>
       <groupId>org.wso2.carbon.device.mgt.iot</groupId>
       <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.wso2.carbon.device.mgt.iot</groupId>
-      <artifactId>org.wso2.carbon.device.mgt.iot.arduino.impl</artifactId>
+      <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+      <artifactId>org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl</artifactId>
       <scope>provided</scope>
     </dependency>
     <!--JAX-RS -->
diff --git a/modules/distribution/src/samples/arduino/units/arduino.hbs b/modules/distribution/src/samples/arduino/units/arduino.hbs
index 8096c3c6..fcf4c8a1 100644
--- a/modules/distribution/src/samples/arduino/units/arduino.hbs
+++ b/modules/distribution/src/samples/arduino/units/arduino.hbs
@@ -6,7 +6,7 @@
                     <h1 class="grey ">ArduinoUno</h1>
                     <hr>
                     <p  class="margin-bottom-double light-grey ">Connect your Arduino Uno device
-                    to the WSO2 Device Cloud. </p>
+                    to the WSO2 IoT Server. </p>
                 </div>
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
                 <img src="{{self.publicURL}}/images/arduino.png" class="img-responsive">
diff --git a/modules/distribution/src/samples/arduino/units/public/store.json b/modules/distribution/src/samples/arduino/units/public/store.json
index 59b5a9f0..6de40dbe 100644
--- a/modules/distribution/src/samples/arduino/units/public/store.json
+++ b/modules/distribution/src/samples/arduino/units/public/store.json
@@ -1,4 +1,4 @@
 {
   "title" : "Arduino",
-  "description":"Connect Your Arduino into the WSO2 Device Cloud Platform"
+  "description":"Connect Your Arduino into the WSO2 IoT Server"
 }
\ No newline at end of file
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml
index fce18856..6e61e324 100644
--- a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl/pom.xml
@@ -11,20 +11,20 @@
 	~ under the License. -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-		<artifactId>devicecloud-mgt</artifactId>
-		<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<artifactId>iot-server-samples</artifactId>
+		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+		<version>${carbon.iot.device.mgt.version}</version>
+		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.wso2.carbon.device.mgt.iot.digitaldisplay.impl</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl</artifactId>
+	<version>${carbon.iot.device.mgt.version}</version>
 	<packaging>bundle</packaging>
-	<name>WSO2 Carbon - Digital Display Management Impl</name>
-	<description>WSO2 Carbon - digitaldisplay Management and Control Implementation</description>
+	<name>WSO2 Carbon - Digital display Management Impl</name>
+	<description>WSO2 Carbon - Digital display Management and Control Implementation</description>
 	<url>http://wso2.org</url>
 
 	<build>
@@ -51,8 +51,8 @@
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Name>${project.artifactId}</Bundle-Name>
 						<Bundle-Version>${carbon.iot.device.mgt.version}</Bundle-Version>
-						<Bundle-Description>Device Cloud Impl Bundle</Bundle-Description>
-						<Private-Package>org.wso2.carbon.device.mgt.iot.digitaldisplay.internal</Private-Package>
+						<Bundle-Description>IoT Server Impl Bundle</Bundle-Description>
+						<Private-Package>org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.internal</Private-Package>
 						<Import-Package>
 							org.osgi.framework,
 							org.osgi.service.component,
@@ -69,31 +69,16 @@
 							org.wso2.carbon.device.mgt.common,
 							org.wso2.carbon.context.*,
 							org.wso2.carbon.ndatasource.core,
-							org.wso2.carbon.device.mgt.iot.common.*
+							org.wso2.carbon.device.mgt.iot.common.*,
 						</Import-Package>
 
 						<Export-Package>
-							!org.wso2.carbon.device.mgt.iot.digitaldisplay.internal,
-							org.wso2.carbon.device.mgt.iot.digitaldisplay.*
+							!org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.internal,
+							org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.*
 						</Export-Package>
-
 					</instructions>
 				</configuration>
 			</plugin>
-			<!--<plugin>-->
-			<!--<groupId>org.apache.maven.plugins</groupId>-->
-			<!--<artifactId>maven-surefire-plugin</artifactId>-->
-			<!--<version>2.18</version>-->
-			<!--<configuration>-->
-			<!--<systemPropertyVariables>-->
-			<!--<log4j.configuration>file:src/test/resources/log4j.properties-->
-			<!--</log4j.configuration>-->
-			<!--</systemPropertyVariables>-->
-			<!--<suiteXmlFiles>-->
-			<!--<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>-->
-			<!--</suiteXmlFiles>-->
-			<!--</configuration>-->
-			<!--</plugin>-->
 		</plugins>
 	</build>
 
@@ -120,22 +105,15 @@
 			<groupId>org.wso2.carbon</groupId>
 			<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
 		</dependency>
-
-		<!--<dependency>-->
-			<!--<groupId>org.testng</groupId>-->
-			<!--<artifactId>testng</artifactId>-->
-		<!--</dependency>-->
-
-		<!--<dependency>-->
-			<!--<groupId>com.h2database.wso2</groupId>-->
-			<!--<artifactId>h2-database-engine</artifactId>-->
-			<!--<scope>test</scope>-->
-		<!--</dependency>-->
+		
 		<dependency>
 			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
 			<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
 		</dependency>
 
+
+
 	</dependencies>
 
-</project>
+
+</project>
\ No newline at end of file
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/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
index ca57eedf..96fb9ad9 100644
--- 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/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
@@ -28,6 +28,8 @@ import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration;
+import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dto.IotDevice;
@@ -212,6 +214,16 @@ public class DigitalDisplayManager implements DeviceManager
         return false;
     }
 
+    @Override
+    public License getLicense(String s) throws LicenseManagementException {
+        return null;
+    }
+
+    @Override
+    public void addLicense(License license) throws LicenseManagementException {
+
+    }
+
     @Override
     public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException {
         boolean status;
diff --git a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
index 3d86d927..13166fb6 100644
--- a/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
+++ b/modules/distribution/src/samples/digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl/pom.xml
@@ -1,100 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<artifactId>devicecloud-api</artifactId>
-		<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-		<version>1.0.0</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>iot-server-samples</artifactId>
+        <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+        <version>${carbon.iot.device.mgt.version}</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
-	<artifactId>org.wso2.carbon.device.mgt.iot.digitaldisplay.api</artifactId>
-	<version>1.0.0</version>
+    <artifactId>org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl</artifactId>
+    <version>${carbon.iot.device.mgt.version}</version>
 
-	<packaging>war</packaging>
-	<name>WSO2 Carbon - Device Cloud API - Digital Display API</name>
+    <packaging>war</packaging>
+    <name>WSO2 Carbon - Iot Server API - Digital Display API</name>
 
-	<dependencies>
-		<!-- CDM -->
-		<dependency>
-			<groupId>org.wso2.carbon.devicemgt</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-			<scope>provided</scope>
-		</dependency>
+    <dependencies>
+        <!-- CDM -->
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
-		<!--CXF -->
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxws</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-transports-http</artifactId>
-			<scope>provided</scope>
-		</dependency>
+        <!--CXF -->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!--MQTT -->
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>mqtt-client</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
+        <!--IOT -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpasyncclient</artifactId>
+            <version>4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.device.mgt.iot</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!--JAX-RS -->
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-jaxrs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-web-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
 
-		<!--IOT -->
-
-		<dependency>
-			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.digitaldisplay.impl</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<!--JAX-RS -->
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-jaxrs</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-web-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>jsr311-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-	</dependencies>
-
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<encoding>UTF-8</encoding>
-					<source>${wso2.maven.compiler.source}</source>
-					<target>${wso2.maven.compiler.target}</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<warName>digitaldisplay</warName><!--devices.war-->
-					<!--<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>-->
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <source>${wso2.maven.compiler.source}</source>
+                    <target>${wso2.maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <warName>digital_display</warName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/digital_display/units/digital_display.hbs b/modules/distribution/src/samples/digital_display/units/digital_display.hbs
index 983fb891..32e1f8d8 100644
--- a/modules/distribution/src/samples/digital_display/units/digital_display.hbs
+++ b/modules/distribution/src/samples/digital_display/units/digital_display.hbs
@@ -6,7 +6,7 @@
                     <h1 class="grey ">Digital Display</h1>
                     <hr>
                     <p  class="margin-bottom-double light-grey ">Connect your Digital Display device
-                    to the WSO2 device cloud. </p>
+                    to the WSO2 IoT server. </p>
                 </div>
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
                 <img src="{{self.publicURL}}/images/digital_display.png" class="img-responsive">
diff --git a/modules/distribution/src/samples/digital_display/units/public/store.json b/modules/distribution/src/samples/digital_display/units/public/store.json
index a08e07b4..9a136aa2 100644
--- a/modules/distribution/src/samples/digital_display/units/public/store.json
+++ b/modules/distribution/src/samples/digital_display/units/public/store.json
@@ -1,4 +1,4 @@
 {
   "title" : "Digital Display",
-  "description":"Connect Your Digital Display into the WSO2 Device Cloud Platform"
+  "description":"Connect Your Digital Display into the WSO2 IoT Server"
 }
\ No newline at end of file
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
index 647fbe92..24ed5ebb 100644
--- a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl/pom.xml
@@ -13,15 +13,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-		<artifactId>devicecloud-mgt</artifactId>
-		<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<artifactId>iot-server-samples</artifactId>
+		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+		<version>${carbon.iot.device.mgt.version}</version>
+		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.wso2.carbon.device.mgt.iot.firealarm.impl</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl</artifactId>
+	<version>${carbon.iot.device.mgt.version}</version>
 	<packaging>bundle</packaging>
 	<name>WSO2 Carbon - Firealarm Management Impl</name>
 	<description>WSO2 Carbon - Firealarm Management and Control Implementation</description>
@@ -51,8 +51,8 @@
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Name>${project.artifactId}</Bundle-Name>
 						<Bundle-Version>${carbon.iot.device.mgt.version}</Bundle-Version>
-						<Bundle-Description>Device Cloud Impl Bundle</Bundle-Description>
-						<Private-Package>org.wso2.carbon.device.mgt.iot.firealarm.internal</Private-Package>
+						<Bundle-Description>IoT Server Impl Bundle</Bundle-Description>
+						<Private-Package>org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.internal</Private-Package>
 						<Import-Package>
 							org.osgi.framework,
 							org.osgi.service.component,
@@ -73,26 +73,12 @@
 						</Import-Package>
 
 						<Export-Package>
-							!org.wso2.carbon.device.mgt.iot.firealarm.internal,
-							org.wso2.carbon.device.mgt.iot.firealarm.*
+							!org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.internal,
+							org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.*
 						</Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>
-			<!--<plugin>-->
-			<!--<groupId>org.apache.maven.plugins</groupId>-->
-			<!--<artifactId>maven-surefire-plugin</artifactId>-->
-			<!--<version>2.18</version>-->
-			<!--<configuration>-->
-			<!--<systemPropertyVariables>-->
-			<!--<log4j.configuration>file:src/test/resources/log4j.properties-->
-			<!--</log4j.configuration>-->
-			<!--</systemPropertyVariables>-->
-			<!--<suiteXmlFiles>-->
-			<!--<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>-->
-			<!--</suiteXmlFiles>-->
-			<!--</configuration>-->
-			<!--</plugin>-->
 		</plugins>
 	</build>
 
@@ -119,16 +105,7 @@
 			<groupId>org.wso2.carbon</groupId>
 			<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
 		</dependency>
-		<!--<dependency>-->
-		<!--<groupId>org.testng</groupId>-->
-		<!--<artifactId>testng</artifactId>-->
-		<!--</dependency>-->
-
-		<!--<dependency>-->
-		<!--<groupId>com.h2database.wso2</groupId>-->
-		<!--<artifactId>h2-database-engine</artifactId>-->
-		<!--<scope>test</scope>-->
-		<!--</dependency>-->
+		
 		<dependency>
 			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
 			<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
@@ -139,14 +116,4 @@
 	</dependencies>
 
 
-</project>
-<!--<repositories>-->
-<!--<repository>-->
-	<!--<id>Eclipse Paho Repo</id>-->
-	<!--<url>http://repo.spring.io/plugins-release/</url>-->
-<!--</repository>-->
-<!--</repositories>-->
-<!--<dependency>-->
-<!--<groupId>org.eclipse.paho</groupId>-->
-<!--<artifactId>mqtt-client</artifactId>-->
-<!--</dependency>-->
\ No newline at end of file
+</project>
\ No newline at end of file
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/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
index 9a6d0b1b..5aef6611 100644
--- 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/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
@@ -23,6 +23,8 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.*;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration;
+import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 import org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl.dao.FireAlarmDAO;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOFactory;
@@ -205,6 +207,16 @@ public class FireAlarmManager implements DeviceManager {
         return false;
     }
 
+    @Override
+    public License getLicense(String s) throws LicenseManagementException {
+        return null;
+    }
+
+    @Override
+    public void addLicense(License license) throws LicenseManagementException {
+
+    }
+
     @Override
     public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException {
         boolean status;
diff --git a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
index e5618c76..d0644de2 100644
--- a/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
+++ b/modules/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/pom.xml
@@ -3,18 +3,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>devicecloud-api</artifactId>
-        <groupId>org.wso2.carbon.device.mgt.iot</groupId>
-        <version>1.0.0</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>iot-server-samples</artifactId>
+        <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+        <version>${carbon.iot.device.mgt.version}</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>org.wso2.carbon.device.mgt.iot.firealarm.api</artifactId>
-    <version>1.0.0</version>
+    <artifactId>org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl</artifactId>
+    <version>${carbon.iot.device.mgt.version}</version>
 
     <packaging>war</packaging>
-    <name>WSO2 Carbon - Device Cloud API - Firealarm API</name>
+    <name>WSO2 Carbon - IoT Server API - Firealarm API</name>
 
     <dependencies>
         <!-- CDM -->
@@ -59,8 +59,8 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.wso2.carbon.device.mgt.iot</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.iot.firealarm.impl</artifactId>
+            <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl</artifactId>
             <scope>provided</scope>
         </dependency>
         <!--JAX-RS -->
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/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml
index 5cc402a9..ee946a86 100755
--- 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/distribution/src/samples/firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl/src/main/webapp/WEB-INF/web.xml
@@ -4,8 +4,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
          metadata-complete="true">
-	<display-name>WSO2 Device Cloud</display-name>
-	<description>WSO2 Device Cloud</description>
+	<display-name>WSO2 IoT Server</display-name>
+	<description>WSO2 IoT Server</description>
 
 	<servlet>
 		<servlet-name>CXFServlet</servlet-name>
diff --git a/modules/distribution/src/samples/firealarm/units/firealarm.hbs b/modules/distribution/src/samples/firealarm/units/firealarm.hbs
index 55add972..8203eb94 100644
--- a/modules/distribution/src/samples/firealarm/units/firealarm.hbs
+++ b/modules/distribution/src/samples/firealarm/units/firealarm.hbs
@@ -6,7 +6,7 @@
                     <h1 class="grey ">Fire Alarm</h1>
                     <hr>
                     <p  class="margin-bottom-double light-grey ">Connect your Fire Alarm device
-                    to the WSO2 device cloud. </p>
+                    to the WSO2 IoT server. </p>
                 </div>
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
                 <img src="{{self.publicURL}}/images/firealarm.png" class="img-responsive">
diff --git a/modules/distribution/src/samples/firealarm/units/public/store.json b/modules/distribution/src/samples/firealarm/units/public/store.json
index 8fa78df4..64c6ddfe 100644
--- a/modules/distribution/src/samples/firealarm/units/public/store.json
+++ b/modules/distribution/src/samples/firealarm/units/public/store.json
@@ -1,4 +1,4 @@
 {
   "title" : "Firealarm",
-  "description":"Connect Your Firealarm into the WSO2 Device Cloud Platform"
+  "description":"Connect Your Firealarm into the WSO2 IoT Server"
 }
\ No newline at end of file
diff --git a/modules/distribution/src/samples/pom.xml b/modules/distribution/src/samples/pom.xml
new file mode 100644
index 00000000..a92cf1cf
--- /dev/null
+++ b/modules/distribution/src/samples/pom.xml
@@ -0,0 +1,577 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ 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">
+
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+    <artifactId>iot-server-samples</artifactId>
+    <packaging>pom</packaging>
+    <version>${carbon.iot.device.mgt.version}</version>
+    <name>WSO2 Carbon - IoT Server Sample</name>
+    <url>http://wso2.org</url>
+    <description>WSO2 Carbon - IoT Server Sample</description>
+
+    <parent>
+        <groupId>org.wso2</groupId>
+        <artifactId>wso2</artifactId>
+        <version>1</version>
+    </parent>
+
+    <modules>
+        <module>firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl</module>
+        <module>firealarm/src/org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl</module>
+        <module>android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl</module>
+        <module>android_sense/src/org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl</module>
+        <module>arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl</module>
+        <module>arduino/src/org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl</module>
+        <module>digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl</module>
+        <module>digital_display/src/org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl</module>
+        <module>raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl</module>
+        <module>raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl</module>
+        <module>sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl</module>
+        <module>sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl</module>
+    </modules>
+
+    <dependencyManagement>
+        <dependencies>
+
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.logging</artifactId>
+                <version>${carbon.kernel.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.log4j.wso2</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.wso2.carbon</groupId>
+                        <artifactId>org.wso2.carbon.bootstrap</artifactId>
+                    </exclusion>
+                </exclusions>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon</groupId>
+                <artifactId>org.wso2.carbon.ndatasource.core</artifactId>
+                <version>${carbon.kernel.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+
+            <!-- Device Management Core dependencies -->
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <!--IOT dependencies-->
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.sample.firealarm.plugin.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.sample.firealarm.service.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+                <type>war</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.sample.android.sense.plugin.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.sample.android.sense.service.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+                <type>war</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.sample.arduino.plugin.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.sample.arduino.service.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+                <type>war</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.plugin.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.sample.digitaldisplay.service.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+                <type>war</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+                <type>war</type>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+                <artifactId>org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl</artifactId>
+                <version>${carbon.iot.device.mgt.version}</version>
+                <type>war</type>
+            </dependency>
+        
+            <dependency>
+                <groupId>org.eclipse.paho</groupId>
+                <artifactId>mqtt-client</artifactId>
+                <version>${eclipse.paho.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax</groupId>
+                <artifactId>javaee-web-api</artifactId>
+                <version>6.0</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-core-asl</artifactId>
+                <version>${jackson.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.jackson</groupId>
+                <artifactId>jackson-jaxrs</artifactId>
+                <version>${jackson.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <!--Osgi dependencies-->
+            <dependency>
+                <groupId>org.eclipse.osgi</groupId>
+                <artifactId>org.eclipse.osgi</artifactId>
+                <version>${eclipse.osgi.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.equinox</groupId>
+                <artifactId>org.eclipse.equinox.common</artifactId>
+                <version>${eclipse.equinox.common.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>${testng.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>junit</groupId>
+                        <artifactId>junit</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.beanshell</groupId>
+                        <artifactId>bsh</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.yaml</groupId>
+                        <artifactId>snakeyaml</artifactId>
+                    </exclusion>
+                </exclusions>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.eclipse.osgi</groupId>
+                <artifactId>org.eclipse.osgi.services</artifactId>
+                <version>3.3.100.v20120522-1822</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <!--Orbit dependencies-->
+            <dependency>
+                <groupId>com.h2database.wso2</groupId>
+                <artifactId>h2-database-engine</artifactId>
+                <version>${orbit.h2.engine.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.tomcat.wso2</groupId>
+                <artifactId>jdbc-pool</artifactId>
+                <version>${orbit.tomcat.jdbc.pooling.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <!-- CXF dependencies -->
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-frontend-jaxws</artifactId>
+                <version>${cxf.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+                <version>${cxf.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.cxf</groupId>
+                <artifactId>cxf-rt-transports-http</artifactId>
+                <version>${cxf.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>jsr311-api</artifactId>
+                <version>${javax.ws.rs.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+
+            <dependency>
+                <groupId>commons-httpclient.wso2</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>${commons-httpclient.orbit.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+            <dependency>
+                <groupId>org.json.wso2</groupId>
+                <artifactId>json</artifactId>
+                <version>${commons-json.version}</version>
+                <scope>provided</scope>
+            </dependency>
+
+
+        </dependencies>
+    </dependencyManagement>
+
+    <properties>
+        <!-- IoT server version -->
+        <device.mgt.iot.feature.version>1.0.0</device.mgt.iot.feature.version>
+
+
+        <!--Carbon kernel versions-->
+        <carbon.kernel.version>4.4.0</carbon.kernel.version>
+        <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
+
+        <!--<carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>-->
+
+        <!--Maven build number plugin-->
+        <maven-buildnumber-plugin.version>1.3</maven-buildnumber-plugin.version>
+
+        <!--Testing -->
+        <test.framework.version>4.3.1</test.framework.version>
+        <testng.version>6.8</testng.version>
+
+        <!--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>
+
+        <!--Orbit versions-->
+        <orbit.h2.engine.version>1.2.140.wso2v3</orbit.h2.engine.version>
+        <orbit.tomcat.version>7.0.52.wso2v5</orbit.tomcat.version>
+        <orbit.tomcat.jdbc.pooling.version>7.0.34.wso2v2</orbit.tomcat.jdbc.pooling.version>
+
+        <eclipse.paho.version>0.4.0</eclipse.paho.version>
+
+
+
+        <!-- CXF version -->
+        <cxf.version>2.6.1</cxf.version>
+        <jackson.version>1.9.0</jackson.version>
+        <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
+
+
+
+        <!-- Device Management -->
+
+        <carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version.range>[0.8.0, 2.0.0)</carbon.device.mgt.version.range>
+
+        <!-- IOT Device Management -->
+        <carbon.iot.device.mgt.version>1.0.0-SNAPSHOT</carbon.iot.device.mgt.version>
+
+
+        <commons-httpclient.orbit.version>3.1.0.wso2v2</commons-httpclient.orbit.version>
+        <commons-json.version>3.0.0.wso2v1</commons-json.version>
+
+
+
+        <!-- Source code -->
+        <wso2.maven.compiler.source>1.7</wso2.maven.compiler.source>
+        <wso2.maven.compiler.target>1.7</wso2.maven.compiler.target>
+
+    </properties>
+
+
+
+
+    <build>
+        <extensions>
+            <extension>
+                <groupId>org.apache.maven.wagon</groupId>
+                <artifactId>wagon-ssh</artifactId>
+                <version>2.1</version>
+            </extension>
+        </extensions>
+
+        <plugins>
+            <plugin>
+                <groupId>org.jvnet.maven.incrementalbuild</groupId>
+                <artifactId>incremental-build-plugin</artifactId>
+                <version>1.3</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>incremental-build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-release-plugin</artifactId>
+                <configuration>
+                    <preparationGoals>clean install</preparationGoals>
+                    <autoVersionSubmodules>false</autoVersionSubmodules>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+            </plugin>
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-scr-plugin</artifactId>
+                    <version>1.7.2</version>
+                    <executions>
+                        <execution>
+                            <id>generate-scr-scrdescriptor</id>
+                            <goals>
+                                <goal>scr</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>maven-bundle-plugin</artifactId>
+                    <version>2.3.5</version>
+                    <extensions>true</extensions>
+                    <configuration>
+                        <obrRepository>NONE</obrRepository>
+                        <!--<instructions>
+                          <_include>-osgi.bnd</_include>
+                        </instructions>-->
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>2.1.2</version>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>jar-no-fork</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>2.2-beta-2</version>
+                </plugin>
+                <plugin>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>2.6</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-project-info-reports-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>2.4</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>build-helper-maven-plugin</artifactId>
+                    <version>1.8</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <encoding>UTF-8</encoding>
+                        <source>${wso2.maven.compiler.source}</source>
+                        <target>${wso2.maven.compiler.target}</target>
+                    </configuration>
+                    <version>2.3.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.2</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.wso2.maven</groupId>
+                    <artifactId>carbon-p2-plugin</artifactId>
+                    <version>${carbon.p2.plugin.version}</version>
+                </plugin>
+
+            </plugins>
+        </pluginManagement>
+    </build>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>wso2.releases</id>
+            <name>WSO2 internal Repository</name>
+            <url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </pluginRepository>
+
+        <pluginRepository>
+            <id>wso2.snapshots</id>
+            <name>Apache Snapshot Repository</name>
+            <url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </pluginRepository>
+        <pluginRepository>
+            <id>wso2-nexus</id>
+            <name>WSO2 internal Repository</name>
+            <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
+
+
+    <repositories>
+        <!-- Before adding ANYTHING in here, please start a discussion on the dev list.
+             Ideally the Axis2 build should only use Maven central (which is available
+             by default) and nothing else. We had troubles with other repositories in
+             the past. Therefore configuring additional repositories here should be
+             considered very carefully. -->
+        <repository>
+            <id>wso2-nexus</id>
+            <name>WSO2 internal Repository</name>
+            <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
+
+        <repository>
+            <id>wso2.releases</id>
+            <name>WSO2 internal Repository</name>
+            <url>http://maven.wso2.org/nexus/content/repositories/releases/</url>
+            <releases>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+                <checksumPolicy>ignore</checksumPolicy>
+            </releases>
+        </repository>
+
+        <repository>
+            <id>wso2.snapshots</id>
+            <name>WSO2 Snapshot Repository</name>
+            <url>http://maven.wso2.org/nexus/content/repositories/snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>daily</updatePolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+
+    </repositories>
+
+</project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml
index db36fd67..16d34b9d 100644
--- a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl/pom.xml
@@ -11,20 +11,20 @@
 	~ under the License. -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-		<artifactId>devicecloud-mgt</artifactId>
-		<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<artifactId>iot-server-samples</artifactId>
+		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+		<version>${carbon.iot.device.mgt.version}</version>
+		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.wso2.carbon.device.mgt.iot.raspberrypi.impl</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl</artifactId>
+	<version>${carbon.iot.device.mgt.version}</version>
 	<packaging>bundle</packaging>
-	<name>WSO2 Carbon - RaspberryPi Management Impl</name>
-	<description>WSO2 Carbon - Raspberrypi Management and Control Implementation</description>
+	<name>WSO2 Carbon - Raspberry Management Impl</name>
+	<description>WSO2 Carbon - Raspberry Management and Control Implementation</description>
 	<url>http://wso2.org</url>
 
 	<build>
@@ -51,8 +51,8 @@
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Name>${project.artifactId}</Bundle-Name>
 						<Bundle-Version>${carbon.iot.device.mgt.version}</Bundle-Version>
-						<Bundle-Description>Device Cloud Impl Bundle</Bundle-Description>
-						<Private-Package>org.wso2.carbon.device.mgt.iot.raspberrypi.internal</Private-Package>
+						<Bundle-Description>IoT Server Impl Bundle</Bundle-Description>
+						<Private-Package>org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.internal</Private-Package>
 						<Import-Package>
 							org.osgi.framework,
 							org.osgi.service.component,
@@ -73,26 +73,12 @@
 						</Import-Package>
 
 						<Export-Package>
-							!org.wso2.carbon.device.mgt.iot.raspberrypi.internal,
-							org.wso2.carbon.device.mgt.iot.raspberrypi.*
+							!org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.internal,
+							org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.*
 						</Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>
-			<!--<plugin>-->
-			<!--<groupId>org.apache.maven.plugins</groupId>-->
-			<!--<artifactId>maven-surefire-plugin</artifactId>-->
-			<!--<version>2.18</version>-->
-			<!--<configuration>-->
-			<!--<systemPropertyVariables>-->
-			<!--<log4j.configuration>file:src/test/resources/log4j.properties-->
-			<!--</log4j.configuration>-->
-			<!--</systemPropertyVariables>-->
-			<!--<suiteXmlFiles>-->
-			<!--<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>-->
-			<!--</suiteXmlFiles>-->
-			<!--</configuration>-->
-			<!--</plugin>-->
 		</plugins>
 	</build>
 
@@ -119,16 +105,7 @@
 			<groupId>org.wso2.carbon</groupId>
 			<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
 		</dependency>
-		<!--<dependency>-->
-		<!--<groupId>org.testng</groupId>-->
-		<!--<artifactId>testng</artifactId>-->
-		<!--</dependency>-->
-
-		<!--<dependency>-->
-		<!--<groupId>com.h2database.wso2</groupId>-->
-		<!--<artifactId>h2-database-engine</artifactId>-->
-		<!--<scope>test</scope>-->
-		<!--</dependency>-->
+		
 		<dependency>
 			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
 			<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
@@ -137,4 +114,6 @@
 
 
 	</dependencies>
-</project>
+
+
+</project>
\ No newline at end of file
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/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
index 540ec899..83f280b1 100644
--- 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/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
@@ -28,6 +28,8 @@ import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration;
+import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dto.IotDevice;
@@ -211,6 +213,16 @@ public class RaspberrypiManager implements DeviceManager {
         return false;
     }
 
+    @Override
+    public License getLicense(String s) throws LicenseManagementException {
+        return null;
+    }
+
+    @Override
+    public void addLicense(License license) throws LicenseManagementException {
+
+    }
+
     @Override
     public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException {
         boolean status;
diff --git a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
index c9e7024d..d0f8b1ae 100644
--- a/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
+++ b/modules/distribution/src/samples/raspberrypi/src/org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl/pom.xml
@@ -1,101 +1,107 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<parent>
-		<artifactId>devicecloud-api</artifactId>
-		<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-		<version>1.0.0</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>iot-server-samples</artifactId>
+        <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+        <version>${carbon.iot.device.mgt.version}</version>
+        <relativePath>../../../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
-	<artifactId>org.wso2.carbon.device.mgt.iot.raspberrypi.api</artifactId>
-	<version>1.0.0</version>
+    <artifactId>org.wso2.carbon.device.mgt.iot.sample.raspberrypi.service.impl</artifactId>
+    <version>${carbon.iot.device.mgt.version}</version>
 
-	<packaging>war</packaging>
-	<name>WSO2 Carbon - Device Cloud API - Raspberrypi API</name>
+    <packaging>war</packaging>
+    <name>WSO2 Carbon - IoT Server API - RaspberryPi API</name>
 
-	<dependencies>
-		<!-- CDM -->
-		<dependency>
-			<groupId>org.wso2.carbon.devicemgt</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-			<scope>provided</scope>
-		</dependency>
+    <dependencies>
+        <!-- CDM -->
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
-		<!--CXF -->
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxws</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-frontend-jaxrs</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.cxf</groupId>
-			<artifactId>cxf-rt-transports-http</artifactId>
-			<scope>provided</scope>
-		</dependency>
+        <!--CXF -->
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!--MQTT -->
+        <dependency>
+            <groupId>org.eclipse.paho</groupId>
+            <artifactId>mqtt-client</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
-		<!--IOT -->
-
-		<dependency>
-			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-			<artifactId>org.wso2.carbon.device.mgt.iot.raspberrypi.impl</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<!--JAX-RS -->
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-core-asl</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.jackson</groupId>
-			<artifactId>jackson-jaxrs</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax</groupId>
-			<artifactId>javaee-web-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.ws.rs</groupId>
-			<artifactId>jsr311-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-	</dependencies>
-
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<encoding>UTF-8</encoding>
-					<source>${wso2.maven.compiler.source}</source>
-					<target>${wso2.maven.compiler.target}</target>
-				</configuration>
-			</plugin>
-			<plugin>
-				<artifactId>maven-war-plugin</artifactId>
-				<configuration>
-					<warName>raspberrypi</warName><!--devices.war-->
-					<!--<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>-->
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
+        <!--IOT -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpasyncclient</artifactId>
+            <version>4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.device.mgt.iot</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.sample.raspberrypi.plugin.impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <!--JAX-RS -->
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-jaxrs</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax</groupId>
+            <artifactId>javaee-web-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>jsr311-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                    <source>${wso2.maven.compiler.source}</source>
+                    <target>${wso2.maven.compiler.target}</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <warName>raspberrypi</warName>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
\ No newline at end of file
diff --git a/modules/distribution/src/samples/raspberrypi/units/public/store.json b/modules/distribution/src/samples/raspberrypi/units/public/store.json
index 862b7a58..c3672c24 100644
--- a/modules/distribution/src/samples/raspberrypi/units/public/store.json
+++ b/modules/distribution/src/samples/raspberrypi/units/public/store.json
@@ -1,4 +1,4 @@
 {
   "title" : "Raspberry Pi",
-  "description":"Connect Your Raspberry Pi into the WSO2 Device Cloud Platform"
+  "description":"Connect Your Raspberry Pi into the WSO2 IoT Server"
 }
\ No newline at end of file
diff --git a/modules/distribution/src/samples/raspberrypi/units/raspberrypi.hbs b/modules/distribution/src/samples/raspberrypi/units/raspberrypi.hbs
index d5a5185c..8d07ee4c 100644
--- a/modules/distribution/src/samples/raspberrypi/units/raspberrypi.hbs
+++ b/modules/distribution/src/samples/raspberrypi/units/raspberrypi.hbs
@@ -6,7 +6,7 @@
                     <h1 class="grey ">Raspberry Pi</h1>
                     <hr>
                     <p  class="margin-bottom-double light-grey ">Connect your Raspberry Pi device
-                    to the WSO2 Device Cloud. </p>
+                    to the WSO2 IoT Server. </p>
                 </div>
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
                 <img src="{{self.publicURL}}/images/raspberrypi.png" class="img-responsive">
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml
index 9387190f..db19e39b 100644
--- a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml
+++ b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl/pom.xml
@@ -11,17 +11,17 @@
 	~ under the License. -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<parent>
-		<artifactId>devicecloud-mgt</artifactId>
-		<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-		<version>1.0.0-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
+		<artifactId>iot-server-samples</artifactId>
+		<groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+		<version>${carbon.iot.device.mgt.version}</version>
+		<relativePath>../../../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.wso2.carbon.device.mgt.iot.sensebot.impl</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<artifactId>org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl</artifactId>
+	<version>${carbon.iot.device.mgt.version}</version>
 	<packaging>bundle</packaging>
 	<name>WSO2 Carbon - Sensebot Management Impl</name>
 	<description>WSO2 Carbon - Sensebot Management and Control Implementation</description>
@@ -51,8 +51,8 @@
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Name>${project.artifactId}</Bundle-Name>
 						<Bundle-Version>${carbon.iot.device.mgt.version}</Bundle-Version>
-						<Bundle-Description>Device Cloud Impl Bundle</Bundle-Description>
-						<Private-Package>org.wso2.carbon.device.mgt.iot.sensebot.internal</Private-Package>
+						<Bundle-Description>IoT Server Impl Bundle</Bundle-Description>
+						<Private-Package>org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.internal</Private-Package>
 						<Import-Package>
 							org.osgi.framework,
 							org.osgi.service.component,
@@ -73,68 +73,47 @@
 						</Import-Package>
 
 						<Export-Package>
-							!org.wso2.carbon.device.mgt.iot.sensebot.internal,
-							org.wso2.carbon.device.mgt.iot.sensebot.*
+							!org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.internal,
+							org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.*
 						</Export-Package>
 					</instructions>
 				</configuration>
 			</plugin>
-			<!--<plugin>-->
-			<!--<groupId>org.apache.maven.plugins</groupId>-->
-			<!--<artifactId>maven-surefire-plugin</artifactId>-->
-			<!--<version>2.18</version>-->
-			<!--<configuration>-->
-			<!--<systemPropertyVariables>-->
-			<!--<log4j.configuration>file:src/test/resources/log4j.properties-->
-			<!--</log4j.configuration>-->
-			<!--</systemPropertyVariables>-->
-			<!--<suiteXmlFiles>-->
-			<!--<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>-->
-			<!--</suiteXmlFiles>-->
-			<!--</configuration>-->
-			<!--</plugin>-->
 		</plugins>
 	</build>
 
 	<dependencies>
-	<dependency>
-		<groupId>org.eclipse.osgi</groupId>
-		<artifactId>org.eclipse.osgi</artifactId>
-	</dependency>
-	<dependency>
-		<groupId>org.eclipse.osgi</groupId>
-		<artifactId>org.eclipse.osgi.services</artifactId>
-	</dependency>
+		<dependency>
+			<groupId>org.eclipse.osgi</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.osgi</groupId>
+			<artifactId>org.eclipse.osgi.services</artifactId>
+		</dependency>
 
-	<dependency>
-		<groupId>org.wso2.carbon</groupId>
-		<artifactId>org.wso2.carbon.logging</artifactId>
-	</dependency>
+		<dependency>
+			<groupId>org.wso2.carbon</groupId>
+			<artifactId>org.wso2.carbon.logging</artifactId>
+		</dependency>
 
-	<dependency>
-		<groupId>org.wso2.carbon.devicemgt</groupId>
-		<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
-	</dependency>
-	<dependency>
-		<groupId>org.wso2.carbon</groupId>
-		<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
-	</dependency>
-	<!--<dependency>-->
-	<!--<groupId>org.testng</groupId>-->
-	<!--<artifactId>testng</artifactId>-->
-	<!--</dependency>-->
-
-	<!--<dependency>-->
-	<!--<groupId>com.h2database.wso2</groupId>-->
-	<!--<artifactId>h2-database-engine</artifactId>-->
-	<!--<scope>test</scope>-->
-	<!--</dependency>-->
-	<dependency>
-		<groupId>org.wso2.carbon.device.mgt.iot</groupId>
-		<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-	</dependency>
+		<dependency>
+			<groupId>org.wso2.carbon.devicemgt</groupId>
+			<artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.wso2.carbon</groupId>
+			<artifactId>org.wso2.carbon.ndatasource.core</artifactId>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.wso2.carbon.device.mgt.iot</groupId>
+			<artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
+		</dependency>
 
 
 
 	</dependencies>
-</project>
+
+
+</project>
\ No newline at end of file
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/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
index 8145c855..98f26ac3 100644
--- 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/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
@@ -28,6 +28,8 @@ import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.TenantConfiguration;
+import org.wso2.carbon.device.mgt.common.license.mgt.License;
+import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dao.IotDeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.iot.common.util.iotdevice.dto.IotDevice;
@@ -209,6 +211,16 @@ public class SensebotManager implements DeviceManager {
         return false;
     }
 
+    @Override
+    public License getLicense(String s) throws LicenseManagementException {
+        return null;
+    }
+
+    @Override
+    public void addLicense(License license) throws LicenseManagementException {
+
+    }
+
     @Override
     public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException {
         boolean status;
diff --git a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
index 87449a37..5d51dfbf 100644
--- a/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
+++ b/modules/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/pom.xml
@@ -3,19 +3,18 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>devicecloud-api</artifactId>
-        <groupId>org.wso2.carbon.device.mgt.iot</groupId>
-        <version>1.0.0</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>iot-server-samples</artifactId>
+        <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+        <version>${carbon.iot.device.mgt.version}</version>
+        <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-
-    <artifactId>org.wso2.carbon.device.mgt.iot.sensebot.api</artifactId>
-    <version>1.0.0</version>
+    <artifactId>org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl</artifactId>
+    <version>${carbon.iot.device.mgt.version}</version>
 
     <packaging>war</packaging>
-    <name>WSO2 Carbon - Device Cloud API - Sensebot API</name>
+    <name>WSO2 Carbon - IoT Server API - Sensebot API</name>
 
     <dependencies>
         <!-- CDM -->
@@ -25,23 +24,6 @@
             <scope>provided</scope>
         </dependency>
 
-
-        <!--IOT -->
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpasyncclient</artifactId>
-            <version>4.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.device.mgt.iot</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.device.mgt.iot</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.iot.sensebot.impl</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <!--CXF -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
@@ -64,6 +46,23 @@
             <artifactId>mqtt-client</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <!--IOT -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpasyncclient</artifactId>
+            <version>4.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.device.mgt.iot</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.common</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.device.mgt.iot.server.sample</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.iot.sample.sensebot.plugin.impl</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <!--JAX-RS -->
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
@@ -85,12 +84,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>Eclipse Paho Repo</id>
-            <url>http://repo.spring.io/plugins-release/</url>
-        </repository>
-    </repositories>
 
     <build>
         <plugins>
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/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/web.xml
index 5cc402a9..ee946a86 100755
--- 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/distribution/src/samples/sensebot/src/org.wso2.carbon.device.mgt.iot.sample.sensebot.service.impl/src/main/webapp/WEB-INF/web.xml
@@ -4,8 +4,8 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
          metadata-complete="true">
-	<display-name>WSO2 Device Cloud</display-name>
-	<description>WSO2 Device Cloud</description>
+	<display-name>WSO2 IoT Server</display-name>
+	<description>WSO2 IoT Server</description>
 
 	<servlet>
 		<servlet-name>CXFServlet</servlet-name>
diff --git a/modules/distribution/src/samples/sensebot/units/public/store.json b/modules/distribution/src/samples/sensebot/units/public/store.json
index 508e9477..11a10f31 100644
--- a/modules/distribution/src/samples/sensebot/units/public/store.json
+++ b/modules/distribution/src/samples/sensebot/units/public/store.json
@@ -1,4 +1,4 @@
 {
   "title" : "Sensebot",
-  "description":"Connect Your Sensebot into the WSO2 Device Cloud Platform"
+  "description":"Connect Your Sensebot into the WSO2 IoT Server"
 }
\ No newline at end of file
diff --git a/modules/distribution/src/samples/sensebot/units/sensebot.hbs b/modules/distribution/src/samples/sensebot/units/sensebot.hbs
index 01a02016..d4ae8792 100644
--- a/modules/distribution/src/samples/sensebot/units/sensebot.hbs
+++ b/modules/distribution/src/samples/sensebot/units/sensebot.hbs
@@ -6,7 +6,7 @@
                     <h1 class="grey ">Sensebot</h1>
                     <hr>
                     <p  class="margin-bottom-double light-grey ">Connect your Sensebot
-                    to the WSO2 device cloud. </p>
+                    to the WSO2 IoT server. </p>
                 </div>
                 <div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
                 <img src="{{self.publicURL}}/images/sensebot.png" class="img-responsive">
diff --git a/modules/integration/pom.xml b/modules/integration/pom.xml
index 8a722e2b..7438f4c6 100644
--- a/modules/integration/pom.xml
+++ b/modules/integration/pom.xml
@@ -20,15 +20,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.wso2.dc</groupId>
-        <artifactId>wso2dc-parent</artifactId>
+        <groupId>org.wso2.iot</groupId>
+        <artifactId>wso2iot-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2dc-integration</artifactId>
-    <name>WSO2 DC - Integration Tests</name>
+    <artifactId>wso2iot-integration</artifactId>
+    <name>WSO2 IoT Server - Integration Tests</name>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/modules/integration/tests-artifacts/pom.xml b/modules/integration/tests-artifacts/pom.xml
index 1d0c207b..7bc1451b 100644
--- a/modules/integration/tests-artifacts/pom.xml
+++ b/modules/integration/tests-artifacts/pom.xml
@@ -19,17 +19,17 @@
 <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.dc</groupId>
-        <artifactId>wso2dc-integration</artifactId>
+        <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>
-    <groupId>org.wso2.dc</groupId>
+    <groupId>org.wso2.iot</groupId>
     <artifactId>tests-artifacts</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 DC Integration Test Common</name>
+    <name>WSO2 IoT Server Integration Test Common</name>
 
     <modules>
     </modules>
diff --git a/modules/integration/tests-common/admin-clients/pom.xml b/modules/integration/tests-common/admin-clients/pom.xml
index 5b0973e0..e2b29d37 100644
--- a/modules/integration/tests-common/admin-clients/pom.xml
+++ b/modules/integration/tests-common/admin-clients/pom.xml
@@ -20,15 +20,15 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.wso2.dc</groupId>
+        <groupId>org.wso2.iot</groupId>
         <artifactId>tests-common</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.dc</groupId>
-    <artifactId>org.wso2.carbon.dc.integration.common.clients</artifactId>
+    <groupId>org.wso2.iot</groupId>
+    <artifactId>org.wso2.carbon.iot.integration.common.clients</artifactId>
     <packaging>jar</packaging>
     <name>WSO2 MDM - Integration 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 5e1273e1..880dfd9c 100644
--- a/modules/integration/tests-common/integration-test-utils/pom.xml
+++ b/modules/integration/tests-common/integration-test-utils/pom.xml
@@ -20,17 +20,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.wso2.dc</groupId>
+        <groupId>org.wso2.iot</groupId>
         <artifactId>tests-common</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.dc.integration.common.utils</artifactId>
-    <groupId>org.wso2.dc</groupId>
+    <artifactId>org.wso2.carbon.iot.integration.common.utils</artifactId>
+    <groupId>org.wso2.iot</groupId>
     <packaging>jar</packaging>
-    <name>WSO2 DC - Integration Test Utils</name>
+    <name>WSO2 IoT Server - Integration Test Utils</name>
 
     <licenses>
         <license>
diff --git a/modules/integration/tests-common/pom.xml b/modules/integration/tests-common/pom.xml
index a65cbe7c..7b8b66b8 100644
--- a/modules/integration/tests-common/pom.xml
+++ b/modules/integration/tests-common/pom.xml
@@ -19,17 +19,17 @@
 <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.dc</groupId>
-        <artifactId>wso2dc-integration</artifactId>
+        <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>
-    <groupId>org.wso2.dc</groupId>
+    <groupId>org.wso2.iot</groupId>
     <artifactId>tests-common</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 DC 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 6cd90357..44f49cdc 100644
--- a/modules/integration/tests-common/ui-pages/pom.xml
+++ b/modules/integration/tests-common/ui-pages/pom.xml
@@ -22,15 +22,15 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-        <groupId>org.wso2.dc</groupId>
+        <groupId>org.wso2.iot</groupId>
         <artifactId>tests-common</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.dc</groupId>
-    <artifactId>org.wso2.carbon.dc.integration.ui.pages</artifactId>
+    <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>
 
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index c150907f..b2afc246 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -19,17 +19,17 @@
 <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.dc</groupId>
-        <artifactId>wso2dc-integration</artifactId>
+        <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>
-    <groupId>org.wso2.dc</groupId>
+    <groupId>org.wso2.iot</groupId>
     <artifactId>tests-integration</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 MDM Backend Integration Tests</name>
+    <name>WSO2 IoT Server Integration Tests</name>
 
     <modules>
     </modules>
diff --git a/modules/integration/tests-platform/pom.xml b/modules/integration/tests-platform/pom.xml
index f3f21958..0b9b59d4 100644
--- a/modules/integration/tests-platform/pom.xml
+++ b/modules/integration/tests-platform/pom.xml
@@ -19,17 +19,17 @@
 <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.dc</groupId>
-        <artifactId>wso2dc-integration</artifactId>
+        <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>
-    <groupId>org.wso2.dc</groupId>
+    <groupId>org.wso2.iot</groupId>
     <artifactId>tests-platform</artifactId>
     <packaging>pom</packaging>
-    <name>WSO2 DC Platform Integration Tests</name>
+    <name>WSO2 IoT Server Integration Tests</name>
 
     <modules>
     </modules>
diff --git a/modules/integration/tests-ui-integration/pom.xml b/modules/integration/tests-ui-integration/pom.xml
index 1e6ef5a7..8a1532a2 100644
--- a/modules/integration/tests-ui-integration/pom.xml
+++ b/modules/integration/tests-ui-integration/pom.xml
@@ -20,15 +20,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.wso2.dc</groupId>
-        <artifactId>wso2dc-integration</artifactId>
+        <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>
-    <name>WSO2 DC - Integration Test UI Module</name>
-    <artifactId>org.wso2.carbon.dc.integration.test.ui.integration</artifactId>
+    <name>WSO2 IoT Server - Integration Test UI Module</name>
+    <artifactId>org.wso2.carbon.iot.integration.test.ui.integration</artifactId>
     <packaging>jar</packaging>
 
     <build>
@@ -62,7 +62,7 @@
                         <property>
                             <name>carbon.zip</name>
                             <value>
-                                ${basedir}/../../distribution/target/wso2dc-${project.version}.zip
+                                ${basedir}/../../distribution/target/wso2iot-${project.version}.zip
                             </value>
                         </property>
                         <property>
@@ -130,8 +130,8 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.wso2.dc</groupId>
-                                    <artifactId>wso2dc</artifactId>
+                                    <groupId>org.wso2.iot</groupId>
+                                    <artifactId>wso2iot</artifactId>
                                     <version>${project.version}</version>
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
@@ -192,7 +192,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2dc-${project.version}/repository/resources/security/
+                                        ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/resources/security/
                                     </directory>
                                     <includes>
                                         <include>**/*.jks</include>
@@ -213,7 +213,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2dc-${project.version}/repository/conf/axis2/
+                                        ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/conf/axis2/
                                     </directory>
                                     <includes>
                                         <include>**/*.xml</include>
@@ -234,7 +234,7 @@
                             <resources>
                                 <resource>
                                     <directory>
-                                        ${basedir}/target/tobeCopied/wso2dc-${project.version}/repository/deployment/client/modules
+                                        ${basedir}/target/tobeCopied/wso2iot-${project.version}/repository/deployment/client/modules
                                     </directory>
                                     <includes>
                                         <include>**/*.mar</include>
@@ -250,8 +250,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.wso2.dc</groupId>
-            <artifactId>org.wso2.carbon.dc.integration.ui.pages</artifactId>
+            <groupId>org.wso2.iot</groupId>
+            <artifactId>org.wso2.carbon.iot.integration.ui.pages</artifactId>
         </dependency>
         <dependency>
             <groupId>org.wso2.carbon.automation</groupId>
diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
index ba4725ca..c99c7bc9 100644
--- a/modules/p2-profile-gen/pom.xml
+++ b/modules/p2-profile-gen/pom.xml
@@ -20,15 +20,15 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <groupId>org.wso2.dc</groupId>
-        <artifactId>wso2dc-parent</artifactId>
+        <groupId>org.wso2.iot</groupId>
+        <artifactId>wso2iot-parent</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>wso2dc-profile-gen</artifactId>
-    <name>WSO2 Device Cloud (DC) - P2 Profile Gen</name>
+    <artifactId>wso2iot-profile-gen</artifactId>
+    <name>WSO2 IoT Server - P2 Profile Gen</name>
     <packaging>pom</packaging>
 
     <build>
diff --git a/pom.xml b/pom.xml
index 8318625a..e38c4e03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,13 +21,13 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.wso2.dc</groupId>
-    <artifactId>wso2dc-parent</artifactId>
+    <groupId>org.wso2.iot</groupId>
+    <artifactId>wso2iot-parent</artifactId>
     <packaging>pom</packaging>
     <version>1.0.0-SNAPSHOT</version>
-    <name>WSO2 DC - Parent</name>
+    <name>WSO2 IoT - Parent</name>
     <url>http://wso2.org</url>
-    <description>WSO2 Device Cloud</description>
+    <description>WSO2 IoT Server</description>
 
     <parent>
         <groupId>org.wso2</groupId>
@@ -158,12 +158,7 @@
                     </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.dc</groupId>
-                <artifactId>org.wso2.carbon.dc.integration.ui.pages</artifactId>
-                <version>${mdm.version}</version>
-                <scope>test</scope>
-            </dependency>
+
 
             <!--Carbon Kernel Dependencies-->
             <dependency>