From c6876695fc48305fd1587ecbc9c99b3ce5ca733a Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Fri, 23 Jun 2017 12:54:23 +0530
Subject: [PATCH] Seperating the connected cup feature into backend, api, ui
 features as recommended feature structure.

---
 .../analytics/samples/connected-cup/pom.xml   | 165 +++++++++++++++
 .../samples/{ => device-plugins}/pom.xml      |   2 +-
 .../eventsimulatorfiles/activity_data.csv     |   0
 .../activity_data_streamConfiguration.xml     |   0
 .../eventsimulatorfiles/audio_data.csv        |   0
 .../audio_data_streamConfiguration.xml        |   0
 .../eventsimulatorfiles/battery_data.csv      |   0
 .../battery_data_streamConfiguration.xml      |   0
 .../eventsimulatorfiles/call_data.csv         |   0
 .../call_data_streamConfiguration.xml         |   0
 .../eventsimulatorfiles/location_data.csv     |   0
 .../location_data_streamConfiguration.xml     |   0
 .../eventsimulatorfiles/network_data.csv      |   0
 .../network_data_streamConfiguration.xml      |   0
 .../eventsimulatorfiles/screen_data.csv       |   0
 .../screen_data_streamConfiguration.xml       |   0
 .../eventsimulatorfiles/sms_data.csv          |   0
 .../sms_data_streamConfiguration.xml          |   0
 .../samples/connectedcup-samples-deployer.xml |  78 ++++---
 .../feature/analytics-feature/pom.xml         | 123 ++++++++++++
 .../src/main/resources/build.properties       |   0
 .../src/main/resources/p2.inf                 |   7 +
 .../pom.xml                                   |  43 +---
 .../src/main/resources/build.properties       |   1 +
 .../main/resources/configs/connectedcup.xml   |   0
 .../datasources/connectedcup-datasources.xml  |   0
 .../src/main/resources/dbscripts/h2.sql       |   0
 .../src/main/resources/dbscripts/mysql.sql    |   0
 .../backend-feature/src/main/resources/p2.inf |  19 ++
 .../resources/agent/deviceConfig.properties   |  29 ---
 .../main/resources/agent/sketch.properties    |   2 -
 .../src/main/resources/agent/start-device.sh  | 190 ------------------
 .../src/main/resources/p2.inf                 |  27 ---
 .../core/samples/connectedcup/feature/pom.xml |   4 +-
 .../connectedcup/feature/ui-feature/pom.xml   | 171 ++++++++++++++++
 .../src/main/resources/build.properties       |   1 +
 .../main/resources/configs/connectedcup.xml   |  25 +++
 .../datasources/connectedcup-datasources.xml  |  46 +++++
 .../src/main/resources/dbscripts/h2.sql       |  11 +
 .../src/main/resources/dbscripts/mysql.sql    |  12 ++
 .../ui-feature/src/main/resources/p2.inf      |  20 ++
 .../core/samples/device-plugins-deployer.xml  |   2 +-
 42 files changed, 661 insertions(+), 317 deletions(-)
 create mode 100644 modules/distribution/src/analytics/samples/connected-cup/pom.xml
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/pom.xml (99%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/activity_data.csv (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/audio_data.csv (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/battery_data.csv (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/call_data.csv (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/call_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/location_data.csv (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/location_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/network_data.csv (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/network_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/screen_data.csv (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/sms_data.csv (100%)
 rename modules/distribution/src/analytics/samples/{ => device-plugins}/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml (100%)
 create mode 100644 modules/distribution/src/core/samples/connectedcup/feature/analytics-feature/pom.xml
 rename modules/distribution/src/core/samples/connectedcup/feature/{connectedcup-feature => analytics-feature}/src/main/resources/build.properties (100%)
 create mode 100644 modules/distribution/src/core/samples/connectedcup/feature/analytics-feature/src/main/resources/p2.inf
 rename modules/distribution/src/core/samples/connectedcup/feature/{connectedcup-feature => backend-feature}/pom.xml (74%)
 create mode 100644 modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/build.properties
 rename modules/distribution/src/core/samples/connectedcup/feature/{connectedcup-feature => backend-feature}/src/main/resources/configs/connectedcup.xml (100%)
 rename modules/distribution/src/core/samples/connectedcup/feature/{connectedcup-feature => backend-feature}/src/main/resources/datasources/connectedcup-datasources.xml (100%)
 rename modules/distribution/src/core/samples/connectedcup/feature/{connectedcup-feature => backend-feature}/src/main/resources/dbscripts/h2.sql (100%)
 rename modules/distribution/src/core/samples/connectedcup/feature/{connectedcup-feature => backend-feature}/src/main/resources/dbscripts/mysql.sql (100%)
 create mode 100644 modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/p2.inf
 delete mode 100644 modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/deviceConfig.properties
 delete mode 100644 modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/sketch.properties
 delete mode 100755 modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/start-device.sh
 delete mode 100644 modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf
 create mode 100644 modules/distribution/src/core/samples/connectedcup/feature/ui-feature/pom.xml
 create mode 100644 modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/build.properties
 create mode 100644 modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/configs/connectedcup.xml
 create mode 100644 modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/datasources/connectedcup-datasources.xml
 create mode 100644 modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/h2.sql
 create mode 100644 modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/mysql.sql
 create mode 100644 modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/p2.inf

diff --git a/modules/distribution/src/analytics/samples/connected-cup/pom.xml b/modules/distribution/src/analytics/samples/connected-cup/pom.xml
new file mode 100644
index 00000000..4e6e89ef
--- /dev/null
+++ b/modules/distribution/src/analytics/samples/connected-cup/pom.xml
@@ -0,0 +1,165 @@
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.wso2</groupId>
+        <artifactId>wso2</artifactId>
+        <version>1</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.wso2.iot.devicemgt-plugins</groupId>
+    <artifactId>iot-devicetype-analytics-samples</artifactId>
+    <version>1.0.0</version>
+    <packaging>pom</packaging>
+    <name>Installing Connected Cup Device Types - Analytics</name>
+    <url>http://wso2.org</url>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>1.5.4</version>
+                <executions>
+                    <execution>
+                        <id>2-p2-repo-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-repo-gen</goal>
+                        </goals>
+                        <configuration>
+                            <metadataRepository>file:\${project.basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${project.basedir}/target/p2-repo</artifactRepository>
+                            <publishArtifacts>true</publishArtifacts>
+                            <publishArtifactRepository>true</publishArtifactRepository>
+                            <featureArtifacts>
+                                <featureArtifactDef>
+                                    org.coffeeking:org.coffeeking.connectedcup.analytics.feature:\${org.coffeeking.version}
+                                </featureArtifactDef>
+                            </featureArtifacts>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>default-feature-install</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-profile-gen</goal>
+                        </goals>
+                        <configuration>
+                            <profile>analytics-default</profile>
+                            <metadataRepository>file:\${project.basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${project.basedir}/target/p2-repo</artifactRepository>
+                            <destination>\${project.basedir}/../../../components</destination>
+                            <deleteOldProfileFiles>false</deleteOldProfileFiles>
+                            <features>
+                                <!-- Connected Cup Features -->
+                                <feature>
+                                    <id>org.coffeeking.connectedcup.analytics.feature.group</id>
+                                    <version>\${org.coffeeking.version}</version>
+                                </feature>
+                            </features>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </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>
+    <properties>
+        <carbon.device.mgt.plugin.version>@carbon-device-mgt-plugin-version@</carbon.device.mgt.plugin.version>
+        <org.coffeeking.version>1.0.0</org.coffeeking.version>
+    </properties>
+</project>
\ No newline at end of file
diff --git a/modules/distribution/src/analytics/samples/pom.xml b/modules/distribution/src/analytics/samples/device-plugins/pom.xml
similarity index 99%
rename from modules/distribution/src/analytics/samples/pom.xml
rename to modules/distribution/src/analytics/samples/device-plugins/pom.xml
index 509f552e..6ae63c0e 100644
--- a/modules/distribution/src/analytics/samples/pom.xml
+++ b/modules/distribution/src/analytics/samples/device-plugins/pom.xml
@@ -79,7 +79,7 @@
                             <profile>analytics-default</profile>
                             <metadataRepository>file:\${project.basedir}/target/p2-repo</metadataRepository>
                             <artifactRepository>file:\${project.basedir}/target/p2-repo</artifactRepository>
-                            <destination>\${project.basedir}/../../components</destination>
+                            <destination>\${project.basedir}/../../../components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
                                 <feature>
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data.csv b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/activity_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data.csv
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/activity_data.csv
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/activity_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data.csv b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/audio_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data.csv
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/audio_data.csv
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/audio_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data.csv b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/battery_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data.csv
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/battery_data.csv
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/battery_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data.csv b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/call_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data.csv
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/call_data.csv
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/call_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/call_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/call_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data.csv b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/location_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data.csv
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/location_data.csv
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/location_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/location_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/location_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data.csv b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/network_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data.csv
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/network_data.csv
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/network_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/network_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/network_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data.csv b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/screen_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data.csv
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/screen_data.csv
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/screen_data_streamConfiguration.xml
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data.csv b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/sms_data.csv
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data.csv
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/sms_data.csv
diff --git a/modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml b/modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml
similarity index 100%
rename from modules/distribution/src/analytics/samples/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml
rename to modules/distribution/src/analytics/samples/device-plugins/resources/eventsimulatorfiles/sms_data_streamConfiguration.xml
diff --git a/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
index 83b3dce8..b17b154f 100644
--- a/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
+++ b/modules/distribution/src/core/samples/connectedcup-samples-deployer.xml
@@ -26,6 +26,7 @@
 
     <modules>
         <module>connectedcup</module>
+        <module>../wso2/analytics/samples/connected-cup</module>
     </modules>
 
     <modelVersion>4.0.0</modelVersion>
@@ -33,7 +34,7 @@
     <artifactId>iot-devicetype-samples</artifactId>
     <version>1.0.0</version>
     <packaging>pom</packaging>
-    <name>Creating custom distribution</name>
+    <name>Installing Connected Cup Device Types - IoT Core</name>
     <url>http://wso2.org</url>
 
     <build>
@@ -50,13 +51,16 @@
                             <goal>p2-repo-gen</goal>
                         </goals>
                         <configuration>
-                            <metadataRepository>file:\${basedir}/p2-repo</metadataRepository>
-                            <artifactRepository>file:\${basedir}/p2-repo</artifactRepository>
+                            <metadataRepository>file:\${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${basedir}/target/p2-repo</artifactRepository>
                             <publishArtifacts>true</publishArtifacts>
                             <publishArtifactRepository>true</publishArtifactRepository>
                             <featureArtifacts>
                                 <featureArtifactDef>
-                                    org.coffeeking:org.coffeeking.connectedcup.feature:\${org.coffeeking.version}
+                                    org.coffeeking:org.coffeeking.connectedcup.backend.feature:\${org.coffeeking.version}
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    org.coffeeking:org.coffeeking.connectedcup.ui.feature:\${org.coffeeking.version}
                                 </featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
@@ -69,44 +73,64 @@
                         </goals>
                         <configuration>
                             <profile>default</profile>
-                            <metadataRepository>file:\${basedir}/p2-repo</metadataRepository>
-                            <artifactRepository>file:\${basedir}/p2-repo</artifactRepository>
+                            <metadataRepository>file:\${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${basedir}/target/p2-repo</artifactRepository>
                             <destination>\${basedir}/../wso2/components</destination>
                             <deleteOldProfileFiles>false</deleteOldProfileFiles>
                             <features>
+                                <!-- Connected Cup Features -->
+                                <feature>
+                                    <id>org.coffeeking.connectedcup.ui.feature.group</id>
+                                    <version>\${org.coffeeking.version}</version>
+                                </feature>
                                 <feature>
-                                    <id>org.coffeeking.connectedcup.feature.group</id>
+                                    <id>org.coffeeking.connectedcup.backend.feature.group</id>
                                     <version>\${org.coffeeking.version}</version>
                                 </feature>
                             </features>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
                     <execution>
-                        <id>default-feature-install</id>
+                        <id>manager-feature-install</id>
                         <phase>package</phase>
+                        <goals>
+                            <goal>p2-profile-gen</goal>
+                        </goals>
                         <configuration>
-                            <tasks>
-                                <replace token="false" value="true"
-                                         dir="../wso2/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
-                                    <include name="**/bundles.info"/>
-                                </replace>
-                                <copy todir="../wso2/analytics/repository/deployment/server/carbonapps">
-                                    <fileset dir="../repository/deployment/server/carbonapps">
-                                        <include name="*.car"/>
-                                    </fileset>
-                                </copy>
-                            </tasks>
+                            <profile>device-manager</profile>
+                            <metadataRepository>file:\${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${basedir}/target/p2-repo</artifactRepository>
+                            <destination>\${basedir}/../wso2/components</destination>
+                            <deleteOldProfileFiles>false</deleteOldProfileFiles>
+                            <features>
+                                <!-- Connected Cup UI Features -->
+                                <feature>
+                                    <id>org.coffeeking.connectedcup.ui.feature.group</id>
+                                    <version>\${org.coffeeking.version}</version>
+                                </feature>
+                            </features>
                         </configuration>
+                    </execution>
+                    <execution>
+                        <id>backend-feature-install</id>
+                        <phase>package</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>p2-profile-gen</goal>
                         </goals>
+                        <configuration>
+                            <profile>device-backend</profile>
+                            <metadataRepository>file:\${basedir}/target/p2-repo</metadataRepository>
+                            <artifactRepository>file:\${basedir}/target/p2-repo</artifactRepository>
+                            <destination>\${basedir}/../wso2/components</destination>
+                            <deleteOldProfileFiles>false</deleteOldProfileFiles>
+                            <features>
+                                <!-- Connected Cup BE Features -->
+                                <feature>
+                                    <id>org.coffeeking.connectedcup.backend.feature.group</id>
+                                    <version>\${org.coffeeking.version}</version>
+                                </feature>
+                            </features>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/analytics-feature/pom.xml b/modules/distribution/src/core/samples/connectedcup/feature/analytics-feature/pom.xml
new file mode 100644
index 00000000..8f440816
--- /dev/null
+++ b/modules/distribution/src/core/samples/connectedcup/feature/analytics-feature/pom.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<parent>
+		<groupId>org.coffeeking</groupId>
+		<artifactId>connected-cup-feature-parent</artifactId>
+		<version>1.0.0</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.coffeeking.connectedcup.analytics.feature</artifactId>
+	<packaging>pom</packaging>
+	<version>1.0.0</version>
+	<name>WSO2 IoTS(Device Types) - Connected Cup Analytics Feature</name>
+	<description>WSO2 IoTS(Device Types) - Connected Cup Feature</description>
+	<url>http://wso2.org</url>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>../analytics-feature/src/main/resources</outputDirectory>
+							<resources>
+								<resource>
+									<directory>resources</directory>
+									<includes>
+										<include>build.properties</include>
+										<include>p2.inf</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.coffeeking</groupId>
+                                    <artifactId>org.coffeeking.connectedcup.analytics
+                                    </artifactId>
+                                    <version>${org.coffeeking.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>
+                                        ${project.build.directory}/maven-shared-archive-resources/carbonapps
+                                    </outputDirectory>
+                                    <includes>**/*</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.wso2.maven</groupId>
+				<artifactId>carbon-p2-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>p2-feature-generation</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-feature-gen</goal>
+						</goals>
+						<configuration>
+							<id>org.coffeeking.connectedcup.analytics</id>
+							<propertiesFile>../../../features/etc/feature.properties</propertiesFile>
+							<adviceFile>
+								<properties>
+									<propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+									<propertyDef>org.eclipse.equinox.p2.type.group:true</propertyDef>
+								</properties>
+							</adviceFile>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/build.properties b/modules/distribution/src/core/samples/connectedcup/feature/analytics-feature/src/main/resources/build.properties
similarity index 100%
rename from modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/build.properties
rename to modules/distribution/src/core/samples/connectedcup/feature/analytics-feature/src/main/resources/build.properties
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/analytics-feature/src/main/resources/p2.inf b/modules/distribution/src/core/samples/connectedcup/feature/analytics-feature/src/main/resources/p2.inf
new file mode 100644
index 00000000..647a15da
--- /dev/null
+++ b/modules/distribution/src/core/samples/connectedcup/feature/analytics-feature/src/main/resources/p2.inf
@@ -0,0 +1,7 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../analytics/repository/deployment/server/carbonapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.analytics_${feature.version}/carbonapps/,target:${installFolder}/../../analytics/repository/deployment/server/carbonapps/,overwrite:true);\
+
+instructions.unconfigure = \
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../analytics/repository/deployment/server/carbonapps/coffee_level.car);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../analytics/repository/deployment/server/carbonapps/connected_cup.car);\
\ No newline at end of file
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/pom.xml b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/pom.xml
similarity index 74%
rename from modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/pom.xml
rename to modules/distribution/src/core/samples/connectedcup/feature/backend-feature/pom.xml
index 9829ece0..8c901ad4 100644
--- a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/pom.xml
+++ b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/pom.xml
@@ -30,11 +30,11 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.coffeeking.connectedcup.feature</artifactId>
+	<artifactId>org.coffeeking.connectedcup.backend.feature</artifactId>
 	<packaging>pom</packaging>
 	<version>1.0.0</version>
 	<name>WSO2 IoTS(Device Types) - Connected Cup Feature</name>
-	<description>WSO2 IoTS(Device Types) - Connected Cup Feature</description>
+	<description>WSO2 IoTS(Device Types) - Connected Cup Backend Feature</description>
 	<url>http://wso2.org</url>
 
 	<dependencies>
@@ -74,7 +74,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>src/main/resources</outputDirectory>
+							<outputDirectory>../backend-feature/src/main/resources</outputDirectory>
 							<resources>
 								<resource>
 									<directory>resources</directory>
@@ -93,41 +93,6 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-dependency-plugin</artifactId>
 				<executions>
-                    <execution>
-                        <id>unpack</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.coffeeking</groupId>
-                                    <artifactId>org.coffeeking.connectedcup.analytics
-                                    </artifactId>
-                                    <version>${org.coffeeking.version}</version>
-                                    <type>zip</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>
-                                        ${project.build.directory}/maven-shared-archive-resources/carbonapps
-                                    </outputDirectory>
-                                    <includes>**/*</includes>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.coffeeking</groupId>
-                                    <artifactId>org.coffeeking.connectedcup.ui
-                                    </artifactId>
-                                    <version>${org.coffeeking.version}</version>
-                                    <type>zip</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>
-                                        ${project.build.directory}/maven-shared-archive-resources/jaggeryapps/devicemgt
-                                    </outputDirectory>
-                                    <includes>**/*</includes>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
 					<execution>
 						<id>copy-jaxrs-war</id>
 						<phase>package</phase>
@@ -209,7 +174,7 @@
 							<goal>p2-feature-gen</goal>
 						</goals>
 						<configuration>
-							<id>org.coffeeking.connectedcup</id>
+							<id>org.coffeeking.connectedcup.backend</id>
 							<propertiesFile>../../../features/etc/feature.properties</propertiesFile>
 							<adviceFile>
 								<properties>
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/build.properties b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/build.properties
new file mode 100644
index 00000000..9c86577d
--- /dev/null
+++ b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/build.properties
@@ -0,0 +1 @@
+custom = true
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/configs/connectedcup.xml b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/configs/connectedcup.xml
similarity index 100%
rename from modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/configs/connectedcup.xml
rename to modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/configs/connectedcup.xml
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/datasources/connectedcup-datasources.xml b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/datasources/connectedcup-datasources.xml
similarity index 100%
rename from modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/datasources/connectedcup-datasources.xml
rename to modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/datasources/connectedcup-datasources.xml
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/dbscripts/h2.sql b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/dbscripts/h2.sql
similarity index 100%
rename from modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/dbscripts/h2.sql
rename to modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/dbscripts/h2.sql
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/dbscripts/mysql.sql b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/dbscripts/mysql.sql
similarity index 100%
rename from modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/dbscripts/mysql.sql
rename to modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/dbscripts/mysql.sql
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/p2.inf b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/p2.inf
new file mode 100644
index 00000000..d23ed547
--- /dev/null
+++ b/modules/distribution/src/core/samples/connectedcup/feature/backend-feature/src/main/resources/p2.inf
@@ -0,0 +1,19 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../conf/device-types/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/configs/,target:${installFolder}/../../../conf/device-types/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/webapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/webapps/,target:${installFolder}/../../../repository/deployment/server/webapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/datasources/,target:${installFolder}/../../../conf/datasources/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/database/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.backend_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
+
+instructions.unconfigure = \
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/device-types/connectedcup.xml);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connectedcup.war);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connected-cup-agent.war);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connectedcup);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connected-cup-agent);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/datasources/connectedcup-datasources.xml);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/database/ConnectedCupDM_DB.h2.db);\
\ No newline at end of file
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/deviceConfig.properties b/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/deviceConfig.properties
deleted file mode 100644
index a189416d..00000000
--- a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/deviceConfig.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-#
-# Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-#
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-#
-#
-
-#[Device-Configurations]
-owner=${DEVICE_OWNER}
-deviceId=${DEVICE_ID}
-device-name=${DEVICE_NAME}
-controller-context=/digital_display/controller
-mqtt-ep=${MQTT_EP}
-auth-method=token
-auth-token=${DEVICE_TOKEN}
-refresh-token=${DEVICE_REFRESH_TOKEN}
-push-interval=15
-
-
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/sketch.properties b/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/sketch.properties
deleted file mode 100644
index e794c194..00000000
--- a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/sketch.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-templates=deviceConfig.properties
-zipfilename=DigitalDisplayAgent.zip
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/start-device.sh b/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/start-device.sh
deleted file mode 100755
index e9dd87c4..00000000
--- a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/agent/start-device.sh
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/bin/bash
-
-echo "----------------------------------------------------------------"
-echo "|		WSO2 IOT Sample				"
-echo "|	   Virtual RaspiAlarm			"
-echo "|	       ----------------				"
-echo "|    ....initializing startup-script	"
-echo "----------------------------------------------------------------"
-
-#while true; do
-#    read -p "What is the network-interface of your device that the Agent should use (find from ifconfig. ex: wlan0,en0,eth0..) > " interface
-#
-#    echo "Setting the network-interface to " $interface
-#    sed s/^network-interface=.*/network-interface=$interface/ deviceConfig.properties > myTmp
-#    mv -f myTmp deviceConfig.properties
-#    break;
-#done
-#
-#while true; do
-#    read -p "Whats the time-interval (in seconds) between successive Data-Pushes to the WSO2-IoT-Server (ex: '60' indicates 1 minute) > " interval
-#
-#    if [ $interval -eq $interval 2>/dev/null ]
-#    then
-#        echo "Setting data-push interval to " $interval " seconds."
-#        sed s/^push-interval=.*/push-interval=$interval/ deviceConfig.properties > myTmp
-#        mv -f myTmp deviceConfig.properties
-#        break;
-#    else
-#        echo "Input needs to be an integer indicating the number seconds between successive data-pushes."
-#    fi
-#done
-
-
-#java -jar wso2-firealarm-virtual-agent-advanced.jar
-
-#while true; do
-#    read -p "Do you wish to run 'apt-get update' and continue? [Yes/No] " yn
-#    case $yn in
-#        [Yy]* ) sudo apt-get update;
-#				break;;
-#        [Nn]* ) echo "Continuing without apt-get update...";
-#				break;;
-#        * ) echo "Please answer yes or no.";
-#    esac
-#done
-#
-#if [ $? -ne 0 ]; then
-#    echo "apt-get update failed.... Some dependencies may not get installed"
-#    echo "If an already installed version of the package exists, try running:"
-#    echo "----------------------------------------------------------------"
-#    echo "sudo -i"
-#    echo "cd /var/lib/dpkg/info"
-#    echo "rm -rf wso2-raspi-alarm*"
-#    echo "dpkg --remove --force-remove-reinstreq wso2-raspi-alarm"
-#    echo "exit"
-#    echo "----------------------------------------------------------------"
-#    echo "Retry Installation...."
-#    break;
-#fi
-#
-#echo "Installing 'gdebi' package..."
-#sudo apt-get install gdebi			# installation of gdebi
-#
-#
-#if [ $? -ne 0 ]; then
-#	echo "gdebi installation failed.... dependencies will not be installed without gdebi"
-#	read -p "Do you wish to continue without gdebi? [Yes/No] " yn
-#    case $yn in
-#        [Yy]* ) echo "Continueing without gdebi.....";;
-#        [Nn]* ) echo "Try to resolve errors and re-run the script.";
-#				exit;;
-#        * ) exit;;
-#    esac
-#fi
-#
-#
-#for f in ./wso2-raspi-alarm_1.0_armhf.deb; do
-#    ## Check if the glob gets expanded to existing files.
-#    ## If not, f here will be exactly the pattern above
-#    ## and the exists test will evaluate to false.
-#    # [ -e "$f" ] && echo "'wso2-raspi-alarm_1.0_armhf.deb' file found and installing" || echo "'wso2-raspi-alarm_1.0_armhf.deb' file does not exist in current path"; exit;
-#    if [ -e "$f" ]; then
-#    	echo "'wso2-raspi-alarm_1.0_armhf.deb' file found and installing now...."
-#    else
-#    	echo "'wso2-raspi-alarm_1.0_armhf.deb' file does not exist in current path. \nExiting installation...";
-#    	exit;
-#    fi
-#    ## This is all we needed to know, so we can break after the first iteration
-#    break
-#done
-#
-#echo "Installing the 'wso2-raspi-alarm deb package'"
-#sudo gdebi wso2-raspi-alarm_1.0_armhf.deb
-#
-#if [ $? -ne 0 ]; then
-#	echo "Installation Failed...."
-#	exit;
-#fi
-
-#sudo killall -9 python
-#
-#for f in ./RaspberryAgent.zip; do
-#    ## Check if the glob gets expanded to existing files.
-#    ## If not, f here will be exactly the pattern above
-#    ## and the exists test will evaluate to false.
-#    # [ -e "$f" ] && echo "'wso2-raspi-alarm_1.0_armhf.deb' file found and installing" || echo "'wso2-raspi-alarm_1.0_armhf.deb' file does not exist in current path"; exit;
-#    if [ -e "$f" ]; then
-#    	echo "Agent files found......"
-#	sudo rm -rf /usr/local/src/RaspberryAgent
-#	sudo unzip RaspberryAgent.zip -d /usr/local/src/
-#    else
-#    	echo "'RaspberryAgent.zip' file does not exist in current path. \nInstalling without upgrading agent...";
-#     fi
-#    ## This is all we needed to know, so we can break after the first iteration
-#    break
-#done
-#
-#for f in /usr/local/src/RaspberryAgent/rc.local; do
-#    ## Check if the glob gets expanded to existing files.
-#    ## If not, f here will be exactly the pattern above
-#    ## and the exists test will evaluate to false.
-#    if [ -e "$f" ]; then
-#    	echo "Copying boot script"
-#	sudo mv /usr/local/src/RaspberryAgent/rc.local /etc/rc.local
-#	sudo chmod +x /etc/rc.local
-#    else
-#    	echo "Unable to set agent statup on boot";
-#    fi
-#    ## This is all we needed to know, so we can break after the first iteration
-#    break
-#done
-#
-#for f in ./deviceConfigs.cfg; do
-#    ## Check if the glob gets expanded to existing files.
-#    ## If not, f here will be exactly the pattern above
-#    ## and the exists test will evaluate to false.
-#    if [ -e "$f" ]; then
-#    	echo "Configuration file found......"
-#    else
-#    	echo "'deviceConfigs.cfg' file does not exist in current path. \nExiting installation...";
-#    	exit;
-#    fi
-#    ## This is all we needed to know, so we can break after the first iteration
-#    break
-#done
-#
-#echo "Altering Configuration file"
-#sed -i 's|[/,]||g' deviceConfigs.cfg
-#
-#echo "Copying configurations file to /usr/local/src/RaspberryAgent"
-#sudo cp ./deviceConfigs.cfg /usr/local/src/RaspberryAgent/
-#
-#if [ $? -ne 0 ]; then
-#	echo "Copying configuration file failed...."
-#	exit;
-#fi
-#
-#while true; do
-#    read -p "Whats the time-interval (in seconds) between successive Data-Pushes to the WSO2-DC (ex: '60' indicates 1 minute) > " input
-#
-#    if [ $input -eq $input 2>/dev/null ]
-#    then
-#        echo "Setting data-push interval to $input seconds."
-#        echo $input > /usr/local/src/RaspberryAgent/time-interval
-#        break;
-#    else
-#        echo "Input needs to be an integer indicating the number seconds between successive data-pushes."
-#    fi
-#done
-#
-#cd /usr/local/src/RaspberryAgent/
-#sudo chmod +x RaspberryStats.py
-#sudo nohup ./RaspberryStats.py -i $input </dev/null &
-#
-#if [ $? -ne 0 ]; then
-#	echo "Could not start the service..."
-#	exit;
-#else
-#	echo "Running the RaspberryAgent service...."
-#fi
-#
-#echo "--------------------------------------------------------------------------"
-#echo "|			Successfully Started		"
-#echo "|		   --------------------------		"
-#echo "|  cd to /usr/local/src/RaspberryAgent"
-#echo "|	 run 'sudo nohup ./RaspberryStats.py -i time  </dev/null &'to start service manually."
-#echo "|  Relapce time with the time-interval (in seconds) between successive Data-Pushes to the WSO2-DC (ex: '60' indicates 1 minute)"
-#echo "|	 Find logs at: /usr/local/src/RaspberryAgent/logs/RaspberryStats.log"
-#echo "---------------------------------------------------------------------------"
-
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf b/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf
deleted file mode 100644
index 91e01d56..00000000
--- a/modules/distribution/src/core/samples/connectedcup/feature/connectedcup-feature/src/main/resources/p2.inf
+++ /dev/null
@@ -1,27 +0,0 @@
-instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../conf/device-types/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/configs/,target:${installFolder}/../../../conf/device-types/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/webapps/,target:${installFolder}/../../../repository/deployment/server/webapps/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/carbonapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/carbonapps/,target:${installFolder}/../../../repository/deployment/server/carbonapps/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/datasources/,target:${installFolder}/../../../conf/datasources/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/jaggeryapps/,target:${installFolder}/../../../repository/deployment/server/jaggeryapps/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/database/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
-
-instructions.unconfigure = \
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/device-types/connectedcup.xml);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connectedcup.war);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connected-cup-agent.war);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connectedcup);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/webapps/connected-cup-agent);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/datasources/connectedcup-datasources.xml);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/database/ConnectedCupDM_DB.h2.db);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view);\
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view);\
\ No newline at end of file
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/pom.xml b/modules/distribution/src/core/samples/connectedcup/feature/pom.xml
index 886d3a05..729639c6 100644
--- a/modules/distribution/src/core/samples/connectedcup/feature/pom.xml
+++ b/modules/distribution/src/core/samples/connectedcup/feature/pom.xml
@@ -36,7 +36,9 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <module>connectedcup-feature</module>
+        <module>backend-feature</module>
+        <module>ui-feature</module>
+        <module>analytics-feature</module>
     </modules>
 
 </project>
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/pom.xml b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/pom.xml
new file mode 100644
index 00000000..f2dc1e12
--- /dev/null
+++ b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/pom.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+	<parent>
+		<groupId>org.coffeeking</groupId>
+		<artifactId>connected-cup-feature-parent</artifactId>
+		<version>1.0.0</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.coffeeking.connectedcup.ui.feature</artifactId>
+	<packaging>pom</packaging>
+	<version>1.0.0</version>
+	<name>WSO2 IoTS(Device Types) - Connected Cup UI Feature</name>
+	<description>WSO2 IoTS(Device Types) - Connected Cup UI Feature</description>
+	<url>http://wso2.org</url>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.h2database.wso2</groupId>
+			<artifactId>h2-database-engine</artifactId>
+			<version>1.2.140.wso2v3</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-resources</id>
+						<phase>generate-resources</phase>
+						<goals>
+							<goal>copy-resources</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>../ui-feature/src/main/resources</outputDirectory>
+							<resources>
+								<resource>
+									<directory>resources</directory>
+									<includes>
+										<include>build.properties</include>
+										<include>p2.inf</include>
+									</includes>
+								</resource>
+							</resources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+                    <execution>
+                        <id>unpack</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.coffeeking</groupId>
+                                    <artifactId>org.coffeeking.connectedcup.ui
+                                    </artifactId>
+                                    <version>${org.coffeeking.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>
+                                        ${project.build.directory}/maven-shared-archive-resources/jaggeryapps/devicemgt
+                                    </outputDirectory>
+                                    <includes>**/*</includes>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-antrun-plugin</artifactId>
+				<executions>
+					<execution>
+						<!-- Creating Connected Cup Plugin Management schema -->
+						<id>create-connected-cup-plugin-mgt-schema</id>
+						<phase>package</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<echo
+										message="########### Create Connected Cup plugin Management H2 Schema ###########"/>
+								<property name="db.dir"
+										  value="target/maven-shared-archive-resources/database"/>
+								<property name="userid" value="wso2carbon"/>
+								<property name="password" value="wso2carbon"/>
+								<property name="dbURL"
+										  value="jdbc:h2:file:${basedir}/${db.dir}/ConnectedCupDM_DB;DB_CLOSE_ON_EXIT=FALSE"/>
+
+								<mkdir dir="${basedir}/${db.dir}"/>
+
+								<sql driver="org.h2.Driver" url="${dbURL}" userid="${userid}"
+									 password="${password}"
+									 autocommit="true" onerror="continue">
+									<classpath refid="maven.dependency.classpath"/>
+									<classpath refid="maven.compile.classpath"/>
+									<classpath refid="maven.runtime.classpath"/>
+
+									<fileset file="${basedir}/src/main/resources/dbscripts/h2.sql"/>
+								</sql>
+								<echo message="##################### END ####################"/>
+							</tasks>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>org.wso2.maven</groupId>
+				<artifactId>carbon-p2-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>p2-feature-generation</id>
+						<phase>package</phase>
+						<goals>
+							<goal>p2-feature-gen</goal>
+						</goals>
+						<configuration>
+							<id>org.coffeeking.connectedcup.ui</id>
+							<propertiesFile>../../../features/etc/feature.properties</propertiesFile>
+							<adviceFile>
+								<properties>
+									<propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+									<propertyDef>org.eclipse.equinox.p2.type.group:true</propertyDef>
+								</properties>
+							</adviceFile>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/build.properties b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/build.properties
new file mode 100644
index 00000000..9c86577d
--- /dev/null
+++ b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/build.properties
@@ -0,0 +1 @@
+custom = true
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/configs/connectedcup.xml b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/configs/connectedcup.xml
new file mode 100644
index 00000000..8d70e4d0
--- /dev/null
+++ b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/configs/connectedcup.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2015, 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.
+  -->
+
+<DeviceTypeConfigurations>
+  <DeviceTypeConfig type="connectedcup">
+    <DatasourceName>jdbc/ConnectedCupDM_DB</DatasourceName>
+    <!--ApiApplicationName>firealarm</ApiApplicationName-->
+  </DeviceTypeConfig>
+</DeviceTypeConfigurations>
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/datasources/connectedcup-datasources.xml b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/datasources/connectedcup-datasources.xml
new file mode 100644
index 00000000..893a91c0
--- /dev/null
+++ b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/datasources/connectedcup-datasources.xml
@@ -0,0 +1,46 @@
+<!--
+  ~ Copyright (c) 2015, 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.
+  -->
+
+<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
+    <providers>
+        <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
+    </providers>
+    <datasources>
+        <datasource>
+            <name>ConnectedCupDM_DB</name>
+            <description>The datasource used for the Connected Cup database</description>
+            <jndiConfig>
+                <name>jdbc/ConnectedCupDM_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/ConnectedCupDM_DB;DB_CLOSE_ON_EXIT=FALSE
+                    </url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
+    </datasources>
+</datasources-configuration>
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/h2.sql b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/h2.sql
new file mode 100644
index 00000000..afa2ad8a
--- /dev/null
+++ b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/h2.sql
@@ -0,0 +1,11 @@
+
+-- -----------------------------------------------------
+-- Table `CONNECTED_CUP_DEVICE`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `CONNECTED_CUP_DEVICE` (
+  `CONNECTED_CUP_DEVICE_ID` VARCHAR(45) NOT NULL ,
+  `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (`CONNECTED_CUP_DEVICE_ID`) );
+
+
+
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/mysql.sql b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/mysql.sql
new file mode 100644
index 00000000..64560fc3
--- /dev/null
+++ b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/dbscripts/mysql.sql
@@ -0,0 +1,12 @@
+-- -----------------------------------------------------
+-- Table `CONNECTED_CUP_DEVICE`
+-- -----------------------------------------------------
+CREATE TABLE IF NOT EXISTS `CONNECTED_CUP_DEVICE` (
+  `CONNECTED_CUP_DEVICE_ID` VARCHAR(45) NOT NULL ,
+  `DEVICE_NAME` VARCHAR(100) NULL DEFAULT NULL,
+  PRIMARY KEY (`CONNECTED_CUP_DEVICE_ID`) )
+ENGINE = InnoDB;
+
+
+
+
diff --git a/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/p2.inf b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/p2.inf
new file mode 100644
index 00000000..27366c97
--- /dev/null
+++ b/modules/distribution/src/core/samples/connectedcup/feature/ui-feature/src/main/resources/p2.inf
@@ -0,0 +1,20 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../conf/device-types/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.ui_${feature.version}/configs/,target:${installFolder}/../../../conf/device-types/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.ui_${feature.version}/jaggeryapps/,target:${installFolder}/../../../repository/deployment/server/jaggeryapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.ui_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.ui_${feature.version}/datasources/,target:${installFolder}/../../../conf/datasources/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../../repository/database/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.coffeeking.connectedcup.ui_${feature.version}/database/,target:${installFolder}/../../../repository/database/,overwrite:true);\
+
+
+instructions.unconfigure = \
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/device-types/connectedcup.xml);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../dbscripts/cdm/plugins/connectedcup);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../conf/datasources/connectedcup-datasources.xml);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/database/ConnectedCupDM_DB.h2.db);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.analytics-view);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../../repository/deployment/server/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.realtime.analytics-view);\
\ No newline at end of file
diff --git a/modules/distribution/src/core/samples/device-plugins-deployer.xml b/modules/distribution/src/core/samples/device-plugins-deployer.xml
index 23b5509a..7aa00660 100644
--- a/modules/distribution/src/core/samples/device-plugins-deployer.xml
+++ b/modules/distribution/src/core/samples/device-plugins-deployer.xml
@@ -33,7 +33,7 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <module>../wso2/analytics/samples</module>
+        <module>../wso2/analytics/samples/device-plugins</module>
     </modules>
 
     <build>