From 90dcc43ed1677f27d2418c10a83f6a0a27ac35d7 Mon Sep 17 00:00:00 2001
From: charithag <charitha.ws@gmail.com>
Date: Tue, 2 Feb 2016 16:02:25 +0530
Subject: [PATCH] Updated connected cup component structure

---
 .../connectedcup/component/agent/pom.xml      |  22 ++++-
 .../component/analytics/build.xml             |  43 ++++++++
 .../connectedcup/component/analytics/pom.xml  |  92 ++++++++++++++++++
 .../component/analytics/src/assembly/src.xml  |  36 +++++++
 .../EventReceiver_coffeelevel.xml             |  27 +++++
 .../artifact.xml                              |  22 +++++
 .../Eventstore_coffeelevel_1.0.0/artifact.xml |  22 +++++
 .../org_wso2_iot_devices_coffeelevel.xml      |  18 ++++
 .../artifact.xml                              |  23 +++++
 ...rg.wso2.iot.devices.coffeelevel_1.0.0.json |   0
 .../CoffeeLevel_Sensor_Script.xml             |  18 ++++
 .../Sparkscripts_1.0.0/artifact.xml           |  22 +++++
 .../CoffeeLevel_Sensor/artifacts.xml          |  30 ++++++
 .../EventReceiver_temperature.xml             |  26 +++++
 .../artifact.xml                              |  22 +++++
 .../Eventstore_temperature_1.0.0/artifact.xml |  22 +++++
 .../org_wso2_iot_devices_temperature.xml      |  18 ++++
 .../artifact.xml                              |  23 +++++
 ...rg.wso2.iot.devices.temperature_1.0.0.json |   0
 .../Temperature_Sensor_Script.xml             |  18 ++++
 .../Sparkscripts_1.0.0/artifact.xml           |  22 +++++
 .../Temperature_Sensor/artifacts.xml          |  29 ++++++
 .../connectedcup/component/controller/pom.xml |   6 +-
 .../connectedcup/component/manager/pom.xml    |   6 +-
 .../samples/connectedcup/component/pom.xml    |  17 ++--
 .../samples/connectedcup/component/ui/pom.xml |  62 ++++++++++++
 .../component/ui/src/assembly/src.xml         |  36 +++++++
 .../device-view.hbs                           |   0
 .../device-view.js                            |   4 +-
 .../device-view.json                          |   0
 .../public/images/thumb.png                   | Bin
 .../policy-edit.hbs                           |   1 +
 .../policy-edit.json}                         |   0
 .../policy-view.hbs                           |   1 +
 .../policy-view.json                          |   3 +
 .../policy-wizard.hbs                         |   1 +
 .../policy-wizard.json                        |   3 +
 .../public/images/coffee_stats.png            | Bin
 .../public/images/coffeecup.png               | Bin
 .../public/images/thumb.png                   | Bin
 .../public/js/download.js                     |   0
 .../public/js/jquery.validate.js              |  21 ++--
 .../type-view.hbs                             |   0
 .../type-view.json                            |   3 +
 .../EventReceiver_coffeelevel.xml             |   9 --
 .../artifact.xml                              |   4 -
 .../Eventstore_coffeelevel_1.0.0/artifact.xml |   4 -
 .../artifact.xml                              |   5 -
 .../Sparkscripts_1.0.0/artifact.xml           |   4 -
 .../CoffeeLevel_Sensor/artifacts.xml          |  12 ---
 .../EventReceiver_temperature.xml             |   8 --
 .../artifact.xml                              |   4 -
 .../Eventstore_temperature_1.0.0/artifact.xml |   4 -
 .../artifact.xml                              |   5 -
 .../Sparkscripts_1.0.0/artifact.xml           |   4 -
 .../Temperature_Sensor/artifacts.xml          |  11 ---
 .../connectedcup/feature/analytics/build.xml  |  25 -----
 .../connectedcup/feature/analytics/pom.xml    |  72 --------------
 .../feature/connectedcup-feature/pom.xml      |  82 +++++++++-------
 .../carbonapps/CoffeeLevel_Sensor.car         | Bin 4158 -> 0 bytes
 .../carbonapps/Temperature_Sensor.car         | Bin 4138 -> 0 bytes
 .../database/ConnectedCupDM_DB.h2.db          | Bin 20480 -> 0 bytes
 modules/samples/connectedcup/feature/pom.xml  |   5 +-
 modules/samples/connectedcup/pom.xml          |   4 +-
 64 files changed, 746 insertions(+), 235 deletions(-)
 create mode 100644 modules/samples/connectedcup/component/analytics/build.xml
 create mode 100644 modules/samples/connectedcup/component/analytics/pom.xml
 create mode 100644 modules/samples/connectedcup/component/analytics/src/assembly/src.xml
 create mode 100644 modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/EventReceiver_coffeelevel.xml
 create mode 100644 modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/artifact.xml
 create mode 100644 modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/artifact.xml
 rename modules/samples/connectedcup/{feature/analytics => component/analytics/src/main/resources/carbonapps}/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/org_wso2_iot_devices_coffeelevel.xml (65%)
 create mode 100644 modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/artifact.xml
 rename modules/samples/connectedcup/{feature/analytics => component/analytics/src/main/resources/carbonapps}/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/org.wso2.iot.devices.coffeelevel_1.0.0.json (100%)
 rename modules/samples/connectedcup/{feature/analytics => component/analytics/src/main/resources/carbonapps}/CoffeeLevel_Sensor/Sparkscripts_1.0.0/CoffeeLevel_Sensor_Script.xml (58%)
 create mode 100644 modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/artifact.xml
 create mode 100644 modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/artifacts.xml
 create mode 100644 modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
 create mode 100644 modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
 create mode 100644 modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
 rename modules/samples/connectedcup/{feature/analytics => component/analytics/src/main/resources/carbonapps}/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml (65%)
 create mode 100644 modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
 rename modules/samples/connectedcup/{feature/analytics => component/analytics/src/main/resources/carbonapps}/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json (100%)
 rename modules/samples/connectedcup/{feature/analytics => component/analytics/src/main/resources/carbonapps}/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml (57%)
 create mode 100644 modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
 create mode 100644 modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/artifacts.xml
 create mode 100644 modules/samples/connectedcup/component/ui/pom.xml
 create mode 100644 modules/samples/connectedcup/component/ui/src/assembly/src.xml
 rename modules/samples/connectedcup/{feature/connectedcup-feature => component/ui}/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs (100%)
 rename modules/samples/connectedcup/{feature/connectedcup-feature => component/ui}/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js (91%)
 rename modules/samples/connectedcup/{feature/connectedcup-feature => component/ui}/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.json (100%)
 rename modules/samples/connectedcup/{feature/connectedcup-feature => component/ui}/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/public/images/thumb.png (100%)
 create mode 100644 modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-edit/policy-edit.hbs
 rename modules/samples/connectedcup/{feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json => component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-edit/policy-edit.json} (100%)
 create mode 100644 modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-view/policy-view.hbs
 create mode 100644 modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-view/policy-view.json
 create mode 100644 modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-wizard/policy-wizard.hbs
 create mode 100644 modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-wizard/policy-wizard.json
 rename modules/samples/connectedcup/{feature/connectedcup-feature => component/ui}/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffee_stats.png (100%)
 rename modules/samples/connectedcup/{feature/connectedcup-feature => component/ui}/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffeecup.png (100%)
 rename modules/samples/connectedcup/{feature/connectedcup-feature => component/ui}/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/thumb.png (100%)
 rename modules/samples/connectedcup/{feature/connectedcup-feature => component/ui}/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/download.js (100%)
 rename modules/samples/connectedcup/{feature/connectedcup-feature => component/ui}/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/jquery.validate.js (98%)
 rename modules/samples/connectedcup/{feature/connectedcup-feature => component/ui}/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.hbs (100%)
 create mode 100644 modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json
 delete mode 100644 modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/EventReceiver_coffeelevel.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/artifact.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/artifact.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/artifact.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Sparkscripts_1.0.0/artifact.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/artifacts.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/Temperature_Sensor/artifacts.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/build.xml
 delete mode 100644 modules/samples/connectedcup/feature/analytics/pom.xml
 delete mode 100644 modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/carbonapps/CoffeeLevel_Sensor.car
 delete mode 100644 modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/carbonapps/Temperature_Sensor.car
 delete mode 100644 modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/database/ConnectedCupDM_DB.h2.db

diff --git a/modules/samples/connectedcup/component/agent/pom.xml b/modules/samples/connectedcup/component/agent/pom.xml
index 035dff03..b30f6967 100644
--- a/modules/samples/connectedcup/component/agent/pom.xml
+++ b/modules/samples/connectedcup/component/agent/pom.xml
@@ -1,3 +1,21 @@
+<!--
+  ~ 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>
@@ -7,10 +25,10 @@
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.coffeeking.agent</artifactId>
+  <artifactId>org.coffeeking.connectedcup.agent</artifactId>
   <packaging>war</packaging>
   <version>1.9.2-SNAPSHOT</version>
-  <name>connected-cup-agent Maven Webapp</name>
+  <name>WSO2 IoTS(Device Types) - Connected Cup Agent Web app</name>
   <url>http://maven.apache.org</url>
 
   <dependencies>
diff --git a/modules/samples/connectedcup/component/analytics/build.xml b/modules/samples/connectedcup/component/analytics/build.xml
new file mode 100644
index 00000000..15ff3ff0
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/build.xml
@@ -0,0 +1,43 @@
+<?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 name="create-sample-sensor-capps" default="zip" basedir=".">
+
+    <property name="project-name" value="${ant.project.name}"/>
+    <property name="target-dir" value="target/carbonapps"/>
+    <property name="src-dir" value="src/main/resources/carbonapps"/>
+
+    <property name="Temperature_Sensor_dir" value="Temperature_Sensor"/>
+    <property name="CoffeeLevel_Sensor_dir" value="CoffeeLevel_Sensor"/>
+
+    <target name="clean">
+        <delete dir="${target-dir}" />
+    </target>
+
+    <target name="zip" depends="clean">
+        <mkdir dir="${target-dir}"/>
+        <zip destfile="${target-dir}/${Temperature_Sensor_dir}.car">
+            <zipfileset dir="${src-dir}/${Temperature_Sensor_dir}"/>
+        </zip>
+        <zip destfile="${target-dir}/${CoffeeLevel_Sensor_dir}.car">
+            <zipfileset dir="${src-dir}/${CoffeeLevel_Sensor_dir}"/>
+        </zip>
+    </target>
+
+</project>
diff --git a/modules/samples/connectedcup/component/analytics/pom.xml b/modules/samples/connectedcup/component/analytics/pom.xml
new file mode 100644
index 00000000..8526b568
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/pom.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+        <artifactId>device-mgt-iot-connectedcup</artifactId>
+        <version>1.9.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.coffeeking.connectedcup.analytics</artifactId>
+    <name>WSO2 IoTS(Device Types) - Connected Cup Analytics capp</name>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <version>2.4.1</version>
+                <executions>
+                    <execution>
+                        <id>auto-clean</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <target>
+                                <ant antfile="build.xml" target="zip"/>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5.5</version>
+                <configuration>
+                    <finalName>${project.artifactId}-${carbon.device.mgt.version}</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>src/assembly/src.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>create-archive</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/modules/samples/connectedcup/component/analytics/src/assembly/src.xml b/modules/samples/connectedcup/component/analytics/src/assembly/src.xml
new file mode 100644
index 00000000..a5a37501
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/assembly/src.xml
@@ -0,0 +1,36 @@
+<!--
+  ~ 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.
+  -->
+
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>src</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <baseDirectory>${basedir}/src</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}/target/carbonapps</directory>
+            <outputDirectory>/</outputDirectory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/EventReceiver_coffeelevel.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/EventReceiver_coffeelevel.xml
new file mode 100644
index 00000000..f61865c5
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/EventReceiver_coffeelevel.xml
@@ -0,0 +1,27 @@
+<?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.
+  -->
+
+<eventReceiver name="EventReceiver_coffeelevel" statistics="disable" trace="disable"
+               xmlns="http://wso2.org/carbon/eventreceiver">
+    <from eventAdapterType="wso2event">
+        <property name="events.duplicated.in.cluster">false</property>
+    </from>
+    <mapping customMapping="disable" type="wso2event"/>
+    <to streamName="org.wso2.iot.devices.coffeelevel" version="1.0.0"/>
+</eventReceiver>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/artifact.xml
new file mode 100644
index 00000000..ab46c07d
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/artifact.xml
@@ -0,0 +1,22 @@
+<?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.
+  -->
+
+<artifact name="Eventreceiver_coffeelevel" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
+    <file>EventReceiver_coffeelevel.xml</file>
+</artifact>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/artifact.xml
new file mode 100644
index 00000000..74bd1698
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/artifact.xml
@@ -0,0 +1,22 @@
+<?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.
+  -->
+
+<artifact name="Eventstore_coffeelevel" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
+    <file>org_wso2_iot_devices_coffeelevel.xml</file>
+</artifact>
diff --git a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/org_wso2_iot_devices_coffeelevel.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/org_wso2_iot_devices_coffeelevel.xml
similarity index 65%
rename from modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/org_wso2_iot_devices_coffeelevel.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/org_wso2_iot_devices_coffeelevel.xml
index 580b17a3..1253864f 100644
--- a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/org_wso2_iot_devices_coffeelevel.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/org_wso2_iot_devices_coffeelevel.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ 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.
+  -->
+
 <EventStoreConfiguration>
     <Source>
         <StreamId>org.wso2.iot.devices.coffeelevel:1.0.0</StreamId>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/artifact.xml
new file mode 100644
index 00000000..5af619c1
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/artifact.xml
@@ -0,0 +1,23 @@
+<?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.
+  -->
+
+<artifact name="Eventstream_coffeelevel" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
+	<file>org.wso2.iot.devices.coffeelevel_1.0.0.json</file>
+</artifact>
+
diff --git a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/org.wso2.iot.devices.coffeelevel_1.0.0.json b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/org.wso2.iot.devices.coffeelevel_1.0.0.json
similarity index 100%
rename from modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/org.wso2.iot.devices.coffeelevel_1.0.0.json
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/org.wso2.iot.devices.coffeelevel_1.0.0.json
diff --git a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Sparkscripts_1.0.0/CoffeeLevel_Sensor_Script.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/CoffeeLevel_Sensor_Script.xml
similarity index 58%
rename from modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Sparkscripts_1.0.0/CoffeeLevel_Sensor_Script.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/CoffeeLevel_Sensor_Script.xml
index 992d0b6d..3b2eebf9 100644
--- a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Sparkscripts_1.0.0/CoffeeLevel_Sensor_Script.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/CoffeeLevel_Sensor_Script.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ 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.
+  -->
+
 <Analytics>
     <Name>CoffeeLevel_Sensor_Script</Name>
     <Script>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/artifact.xml
new file mode 100644
index 00000000..0ed651a9
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/Sparkscripts_1.0.0/artifact.xml
@@ -0,0 +1,22 @@
+<?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.
+  -->
+
+<artifact name="Sparkscripts" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
+    <file>CoffeeLevel_Sensor_Script.xml</file>
+</artifact>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/artifacts.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/artifacts.xml
new file mode 100644
index 00000000..0269500e
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/CoffeeLevel_Sensor/artifacts.xml
@@ -0,0 +1,30 @@
+<?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.
+  -->
+
+<artifacts>
+    <artifact name="CoffeeLevel_CAPP" version="1.0.0" type="carbon/application">
+
+		<dependency artifact="Eventstream_coffeelevel" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="Eventstore_coffeelevel" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="Eventreceiver_coffeelevel" version="1.0.0" include="true"
+					serverRole="DataAnalyticsServer"/>
+
+		<dependency artifact="Sparkscripts" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+    </artifact>
+</artifacts>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
new file mode 100644
index 00000000..28b710c2
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
@@ -0,0 +1,26 @@
+<?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.
+  -->
+
+<eventReceiver name="EventReceiver_temperature" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
+    <from eventAdapterType="wso2event">
+        <property name="events.duplicated.in.cluster">false</property>
+    </from>
+    <mapping customMapping="disable" type="wso2event"/>
+    <to streamName="org.wso2.iot.devices.temperature" version="1.0.0"/>
+</eventReceiver>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
new file mode 100644
index 00000000..25df5673
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
@@ -0,0 +1,22 @@
+<?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.
+  -->
+
+<artifact name="Eventreceiver_temperature" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
+    <file>EventReceiver_temperature.xml</file>
+</artifact>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
new file mode 100644
index 00000000..ccfb3b31
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
@@ -0,0 +1,22 @@
+<?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.
+  -->
+
+<artifact name="Eventstore_temperature" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
+    <file>org_wso2_iot_devices_temperature.xml</file>
+</artifact>
diff --git a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
similarity index 65%
rename from modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
index 13a625bd..d06f73b1 100644
--- a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstore_temperature_1.0.0/org_wso2_iot_devices_temperature.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ 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.
+  -->
+
 <EventStoreConfiguration>
     <Source>
         <StreamId>org.wso2.iot.devices.temperature:1.0.0</StreamId>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
new file mode 100644
index 00000000..27ec6970
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
@@ -0,0 +1,23 @@
+<?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.
+  -->
+
+<artifact name="Eventstream_temperature" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
+	<file>org.wso2.iot.devices.temperature_1.0.0.json</file>	
+</artifact>
+
diff --git a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json
similarity index 100%
rename from modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Eventstream_temperature_1.0.0/org.wso2.iot.devices.temperature_1.0.0.json
diff --git a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
similarity index 57%
rename from modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
rename to modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
index 7e9c9084..f94f38d4 100644
--- a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/Temperature_Sensor_Script.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ 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.
+  -->
+
 <Analytics>
     <Name>Temperature_Sensor_Script</Name>
     <Script>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
new file mode 100644
index 00000000..9b4228e3
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
@@ -0,0 +1,22 @@
+<?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.
+  -->
+
+<artifact name="Sparkscripts" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
+    <file>Temperature_Sensor_Script.xml</file>
+</artifact>
diff --git a/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/artifacts.xml b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/artifacts.xml
new file mode 100644
index 00000000..2bfe42dd
--- /dev/null
+++ b/modules/samples/connectedcup/component/analytics/src/main/resources/carbonapps/Temperature_Sensor/artifacts.xml
@@ -0,0 +1,29 @@
+<?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.
+  -->
+
+<artifacts>
+    <artifact name="IoTServer_Sensors_CAPP" version="1.0.0" type="carbon/application">        
+
+		<dependency artifact="Eventstream_temperature" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="Eventstore_temperature" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+		<dependency artifact="Eventreceiver_temperature" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+
+		<dependency artifact="Sparkscripts" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+    </artifact>
+</artifacts>
diff --git a/modules/samples/connectedcup/component/controller/pom.xml b/modules/samples/connectedcup/component/controller/pom.xml
index d90e621f..f5f813e3 100644
--- a/modules/samples/connectedcup/component/controller/pom.xml
+++ b/modules/samples/connectedcup/component/controller/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ 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
@@ -12,7 +12,7 @@
   ~ 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
+  ~ KIND, either express or implied. See the License for the
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
@@ -29,7 +29,7 @@
 
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.coffeeking.controller.service</artifactId>
+    <artifactId>org.coffeeking.connectedcup.controller.service</artifactId>
     <version>1.9.2-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>WSO2 IoTS(Device Types) - Connected Cup Controller Service</name>
diff --git a/modules/samples/connectedcup/component/manager/pom.xml b/modules/samples/connectedcup/component/manager/pom.xml
index e3668bad..100e7512 100644
--- a/modules/samples/connectedcup/component/manager/pom.xml
+++ b/modules/samples/connectedcup/component/manager/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ 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
@@ -12,7 +12,7 @@
   ~ 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
+  ~ KIND, either express or implied. See the License for the
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
@@ -28,7 +28,7 @@
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.coffeeking.manager.service</artifactId>
+	<artifactId>org.coffeeking.connectedcup.manager.service</artifactId>
 	<version>1.9.2-SNAPSHOT</version>
 	<packaging>war</packaging>
 	<name>WSO2 IoTS(Device Types) - Connected Cup Manager Service</name>
diff --git a/modules/samples/connectedcup/component/pom.xml b/modules/samples/connectedcup/component/pom.xml
index 0ac9752f..f8a5e71b 100644
--- a/modules/samples/connectedcup/component/pom.xml
+++ b/modules/samples/connectedcup/component/pom.xml
@@ -37,11 +37,12 @@
 	<url>http://wso2.org</url>
 
 	<modules>
+        <module>analytics</module>
 		<module>plugin</module>
 		<module>controller</module>
 		<module>manager</module>
         <module>agent</module>
-
+        <module>ui</module>
 	</modules>
 
 	<build>
@@ -80,7 +81,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.apimgt.webapp.publisher_0.9.2.SNAPSHOT.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.apimgt.webapp.publisher_${carbon.device.mgt.jar.version}.jar
                 </systemPath>
             </dependency>
 
@@ -99,7 +100,7 @@
                 <version>${carbon.iot.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.iot_1.9.2.SNAPSHOT.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.iot_${carbon.iot.device.mgt.jar.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -108,7 +109,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.core_0.9.2.SNAPSHOT.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.core_${carbon.device.mgt.jar.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -117,7 +118,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.common_0.9.2.SNAPSHOT.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.common_${carbon.device.mgt.jar.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -126,7 +127,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.certificate.mgt.core_0.9.2.SNAPSHOT.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.certificate.mgt.core_${carbon.device.mgt.jar.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -135,7 +136,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.apimgt.annotations_0.9.2.SNAPSHOT.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.apimgt.annotations_${carbon.device.mgt.jar.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -144,7 +145,7 @@
                 <version>${carbon.device.mgt.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.analytics_0.9.2.SNAPSHOT.jar
+                    ${basedir}/../../../../repository/components/plugins/org.wso2.carbon.device.mgt.analytics_${carbon.device.mgt.jar.version}.jar
                 </systemPath>
             </dependency>
             <dependency>
diff --git a/modules/samples/connectedcup/component/ui/pom.xml b/modules/samples/connectedcup/component/ui/pom.xml
new file mode 100644
index 00000000..6077708f
--- /dev/null
+++ b/modules/samples/connectedcup/component/ui/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+        <artifactId>device-mgt-iot-connectedcup</artifactId>
+        <version>1.9.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.coffeeking.connectedcup.ui</artifactId>
+    <name>WSO2 IoTS(Device Types) - Connected Cup UI</name>
+    <packaging>pom</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.5.5</version>
+                <configuration>
+                    <finalName>${project.artifactId}-${carbon.device.mgt.version}</finalName>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>src/assembly/src.xml</descriptor>
+                    </descriptors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>create-archive</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
\ No newline at end of file
diff --git a/modules/samples/connectedcup/component/ui/src/assembly/src.xml b/modules/samples/connectedcup/component/ui/src/assembly/src.xml
new file mode 100644
index 00000000..2797034e
--- /dev/null
+++ b/modules/samples/connectedcup/component/ui/src/assembly/src.xml
@@ -0,0 +1,36 @@
+<!--
+  ~ 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.
+  -->
+
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>src</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <baseDirectory>${basedir}/src</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}/src/main/resources/jaggeryapps/devicemgt</directory>
+            <outputDirectory>/</outputDirectory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
similarity index 100%
rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
rename to modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js
similarity index 91%
rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js
rename to modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js
index 530e0710..7094a844 100644
--- a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js
+++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * 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
@@ -11,7 +11,7 @@
  * 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
+ * KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations
  * under the License.
  */
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.json b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.json
similarity index 100%
rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.json
rename to modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.json
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/public/images/thumb.png b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/public/images/thumb.png
similarity index 100%
rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/public/images/thumb.png
rename to modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/public/images/thumb.png
diff --git a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-edit/policy-edit.hbs b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-edit/policy-edit.hbs
new file mode 100644
index 00000000..63835834
--- /dev/null
+++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-edit/policy-edit.hbs
@@ -0,0 +1 @@
+{{unit "iot.unit.policy.edit"}}
\ No newline at end of file
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-edit/policy-edit.json
similarity index 100%
rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json
rename to modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-edit/policy-edit.json
diff --git a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-view/policy-view.hbs b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-view/policy-view.hbs
new file mode 100644
index 00000000..00e27f7c
--- /dev/null
+++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-view/policy-view.hbs
@@ -0,0 +1 @@
+{{unit "iot.unit.policy.view"}}
\ No newline at end of file
diff --git a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-view/policy-view.json b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-view/policy-view.json
new file mode 100644
index 00000000..9eecd8f5
--- /dev/null
+++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-view/policy-view.json
@@ -0,0 +1,3 @@
+{
+    "version": "1.0.0"
+}
\ No newline at end of file
diff --git a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-wizard/policy-wizard.hbs b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-wizard/policy-wizard.hbs
new file mode 100644
index 00000000..3a0c0687
--- /dev/null
+++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-wizard/policy-wizard.hbs
@@ -0,0 +1 @@
+{{unit "iot.unit.policy.wizard"}}
\ No newline at end of file
diff --git a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-wizard/policy-wizard.json b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-wizard/policy-wizard.json
new file mode 100644
index 00000000..9eecd8f5
--- /dev/null
+++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.policy-wizard/policy-wizard.json
@@ -0,0 +1,3 @@
+{
+    "version": "1.0.0"
+}
\ No newline at end of file
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffee_stats.png b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffee_stats.png
similarity index 100%
rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffee_stats.png
rename to modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffee_stats.png
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffeecup.png b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffeecup.png
similarity index 100%
rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffeecup.png
rename to modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/coffeecup.png
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/thumb.png b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/thumb.png
similarity index 100%
rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/thumb.png
rename to modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/images/thumb.png
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/download.js b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/download.js
similarity index 100%
rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/download.js
rename to modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/download.js
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/jquery.validate.js b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/jquery.validate.js
similarity index 98%
rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/jquery.validate.js
rename to modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/jquery.validate.js
index 3c1ebb04..fe7ecf07 100644
--- a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/jquery.validate.js
+++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/public/js/jquery.validate.js
@@ -1,12 +1,19 @@
-/**
- * jQuery Validation Plugin 1.11.0pre
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
- * http://bassistance.de/jquery-plugins/jquery-plugin-validation/
- * http://docs.jquery.com/Plugins/Validation
+ * 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
  *
- * Copyright 2013 Jörn Zaefferer
- * Released under the MIT license:
- *   http://www.opensource.org/licenses/mit-license.php
+ * 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.
  */
 
 (function($) {
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.hbs b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.hbs
similarity index 100%
rename from modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.hbs
rename to modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.hbs
diff --git a/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json
new file mode 100644
index 00000000..9eecd8f5
--- /dev/null
+++ b/modules/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.type-view/type-view.json
@@ -0,0 +1,3 @@
+{
+    "version": "1.0.0"
+}
\ No newline at end of file
diff --git a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/EventReceiver_coffeelevel.xml b/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/EventReceiver_coffeelevel.xml
deleted file mode 100644
index 8e4a875a..00000000
--- a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/EventReceiver_coffeelevel.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventReceiver name="EventReceiver_coffeelevel" statistics="disable" trace="disable"
-               xmlns="http://wso2.org/carbon/eventreceiver">
-    <from eventAdapterType="wso2event">
-        <property name="events.duplicated.in.cluster">false</property>
-    </from>
-    <mapping customMapping="disable" type="wso2event"/>
-    <to streamName="org.wso2.iot.devices.coffeelevel" version="1.0.0"/>
-</eventReceiver>
diff --git a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/artifact.xml b/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/artifact.xml
deleted file mode 100644
index 68eb6cbf..00000000
--- a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventreceiver_coffeelevel_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<artifact name="Eventreceiver_coffeelevel" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
-    <file>EventReceiver_coffeelevel.xml</file>
-</artifact>
diff --git a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/artifact.xml b/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/artifact.xml
deleted file mode 100644
index 7d5beecd..00000000
--- a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstore_coffeelevel_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<artifact name="Eventstore_coffeelevel" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
-    <file>org_wso2_iot_devices_coffeelevel.xml</file>
-</artifact>
diff --git a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/artifact.xml b/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/artifact.xml
deleted file mode 100644
index 6cd0244f..00000000
--- a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Eventstream_coffeelevel_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<artifact name="Eventstream_coffeelevel" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-	<file>org.wso2.iot.devices.coffeelevel_1.0.0.json</file>
-</artifact>
-
diff --git a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Sparkscripts_1.0.0/artifact.xml b/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index 2ed05598..00000000
--- a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<artifact name="Sparkscripts" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
-    <file>CoffeeLevel_Sensor_Script.xml</file>
-</artifact>
diff --git a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/artifacts.xml b/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/artifacts.xml
deleted file mode 100644
index 08a03ac0..00000000
--- a/modules/samples/connectedcup/feature/analytics/CoffeeLevel_Sensor/artifacts.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<artifacts>
-    <artifact name="CoffeeLevel_CAPP" version="1.0.0" type="carbon/application">
-
-		<dependency artifact="Eventstream_coffeelevel" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-		<dependency artifact="Eventstore_coffeelevel" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-		<dependency artifact="Eventreceiver_coffeelevel" version="1.0.0" include="true"
-					serverRole="DataAnalyticsServer"/>
-
-		<dependency artifact="Sparkscripts" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-    </artifact>
-</artifacts>
diff --git a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml b/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
deleted file mode 100644
index 6786696c..00000000
--- a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/EventReceiver_temperature.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<eventReceiver name="EventReceiver_temperature" statistics="disable" trace="disable" xmlns="http://wso2.org/carbon/eventreceiver">
-    <from eventAdapterType="wso2event">
-        <property name="events.duplicated.in.cluster">false</property>
-    </from>
-    <mapping customMapping="disable" type="wso2event"/>
-    <to streamName="org.wso2.iot.devices.temperature" version="1.0.0"/>
-</eventReceiver>
diff --git a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml b/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
deleted file mode 100644
index b72e1ff7..00000000
--- a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventreceiver_temperature_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<artifact name="Eventreceiver_temperature" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
-    <file>EventReceiver_temperature.xml</file>
-</artifact>
diff --git a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml b/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
deleted file mode 100644
index 90b14c11..00000000
--- a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstore_temperature_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<artifact name="Eventstore_temperature" version="1.0.0" type="analytics/eventstore" serverRole="DataAnalyticsServer">
-    <file>org_wso2_iot_devices_temperature.xml</file>
-</artifact>
diff --git a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml b/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
deleted file mode 100644
index 61e7903b..00000000
--- a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Eventstream_temperature_1.0.0/artifact.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<artifact name="Eventstream_temperature" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-	<file>org.wso2.iot.devices.temperature_1.0.0.json</file>	
-</artifact>
-
diff --git a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml b/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
deleted file mode 100644
index 58c2dcc1..00000000
--- a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/Sparkscripts_1.0.0/artifact.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<artifact name="Sparkscripts" version="1.0.0" type="analytics/spark" serverRole="DataAnalyticsServer">
-    <file>Temperature_Sensor_Script.xml</file>
-</artifact>
diff --git a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/artifacts.xml b/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/artifacts.xml
deleted file mode 100644
index b5350763..00000000
--- a/modules/samples/connectedcup/feature/analytics/Temperature_Sensor/artifacts.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<artifacts>
-    <artifact name="IoTServer_Sensors_CAPP" version="1.0.0" type="carbon/application">        
-
-		<dependency artifact="Eventstream_temperature" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-		<dependency artifact="Eventstore_temperature" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-		<dependency artifact="Eventreceiver_temperature" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-
-		<dependency artifact="Sparkscripts" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-    </artifact>
-</artifacts>
diff --git a/modules/samples/connectedcup/feature/analytics/build.xml b/modules/samples/connectedcup/feature/analytics/build.xml
deleted file mode 100644
index df25af53..00000000
--- a/modules/samples/connectedcup/feature/analytics/build.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="create-sample-sensor-capps" default="zip" basedir="">
-
-    <property name="project-name" value="${ant.project.name}"/>
-    <property name="target-dir"
-              value="../connectedcup-feature/src/main/resources/carbonapps"/>
-
-    <property name="Temperature_Sensor_dir" value="Temperature_Sensor"/>
-    <property name="CoffeeLevel_Sensor_dir" value="CoffeeLevel_Sensor"/>
-
-    <target name="clean">
-        <delete dir="${target-dir}" />
-    </target>
-
-    <target name="zip" depends="clean">
-        <mkdir dir="${target-dir}"/>
-        <zip destfile="${target-dir}/${Temperature_Sensor_dir}.car">
-            <zipfileset dir="${Temperature_Sensor_dir}"/>
-        </zip>
-        <zip destfile="${target-dir}/${CoffeeLevel_Sensor_dir}.car">
-            <zipfileset dir="${CoffeeLevel_Sensor_dir}"/>
-        </zip>
-    </target>
-
-</project>
diff --git a/modules/samples/connectedcup/feature/analytics/pom.xml b/modules/samples/connectedcup/feature/analytics/pom.xml
deleted file mode 100644
index b60fafe2..00000000
--- a/modules/samples/connectedcup/feature/analytics/pom.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-# 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.
-  -->
-<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.carbon.devicemgt-plugins</groupId>
-		<artifactId>connected-cup-feature-parent</artifactId>
-		<version>1.9.2-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>org.coffeeking.connectedcup.analytics</artifactId>
-	<packaging>pom</packaging>
-	<version>1.9.2-SNAPSHOT</version>
-	<name>WSO2 IoTS(Device Types) - Connected Cup Analytics</name>
-	<description>WSO2 IoTS(Device Types) - Connected Cup Analytics</description>
-	<url>http://wso2.org</url>
-
-	<build>
-		<plugins>
-			<plugin>
-				<artifactId>maven-clean-plugin</artifactId>
-				<version>2.4.1</version>
-				<executions>
-					<execution>
-						<id>auto-clean</id>
-						<phase>initialize</phase>
-						<goals>
-							<goal>clean</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-antrun-plugin</artifactId>
-				<version>1.7</version>
-				<executions>
-					<execution>
-						<phase>process-resources</phase>
-						<configuration>
-							<target>
-								<ant antfile="build.xml" target="zip"/>
-							</target>
-						</configuration>
-						<goals>
-							<goal>run</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/pom.xml b/modules/samples/connectedcup/feature/connectedcup-feature/pom.xml
index 3967bd60..9181eb7e 100644
--- a/modules/samples/connectedcup/feature/connectedcup-feature/pom.xml
+++ b/modules/samples/connectedcup/feature/connectedcup-feature/pom.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~
@@ -44,21 +45,21 @@
 
 		<dependency>
 			<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-			<artifactId>org.coffeeking.manager.service</artifactId>
+			<artifactId>org.coffeeking.connectedcup.manager.service</artifactId>
 			<version>1.9.2-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 
 		<dependency>
 			<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-			<artifactId>org.coffeeking.controller.service</artifactId>
+			<artifactId>org.coffeeking.connectedcup.controller.service</artifactId>
 			<version>1.9.2-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
 
 		<dependency>
 			<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-			<artifactId>org.coffeeking.agent</artifactId>
+			<artifactId>org.coffeeking.connectedcup.agent</artifactId>
 			<version>1.9.2-SNAPSHOT</version>
 			<type>war</type>
 		</dependency>
@@ -102,8 +103,43 @@
 				<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.wso2.carbon.devicemgt-plugins</groupId>
+                                    <artifactId>org.coffeeking.connectedcup.analytics
+                                    </artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>
+                                        ${project.build.directory}/maven-shared-archive-resources/carbonapps
+                                    </outputDirectory>
+                                    <includes>**/*</includes>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+                                    <artifactId>org.coffeeking.connectedcup.ui
+                                    </artifactId>
+                                    <version>${project.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-manager-war</id>
+						<id>copy-jaxrs-war</id>
 						<phase>package</phase>
 						<goals>
 							<goal>copy</goal>
@@ -112,50 +148,26 @@
 							<artifactItems>
 								<artifactItem>
 									<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-									<artifactId>org.coffeeking.manager.service</artifactId>
+									<artifactId>org.coffeeking.connectedcup.manager.service</artifactId>
 									<type>war</type>
 									<overWrite>true</overWrite>
-									<outputDirectory>${basedir}/src/main/resources/webapps/</outputDirectory>
+									<outputDirectory>${project.build.directory}/maven-shared-archive-resources/webapps/</outputDirectory>
 									<destFileName>connectedcup_mgt.war</destFileName>
 								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>copy-jaxrs-controller-war</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
 								<artifactItem>
 									<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-									<artifactId>org.coffeeking.controller.service</artifactId>
+									<artifactId>org.coffeeking.connectedcup.controller.service</artifactId>
 									<type>war</type>
 									<overWrite>true</overWrite>
-									<outputDirectory>${basedir}/src/main/resources/webapps/</outputDirectory>
+									<outputDirectory>${project.build.directory}/maven-shared-archive-resources/webapps/</outputDirectory>
 									<destFileName>connectedcup.war</destFileName>
 								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>copy-jaxrs-agent-war</id>
-						<phase>package</phase>
-						<goals>
-							<goal>copy</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
 								<artifactItem>
 									<groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-									<artifactId>org.coffeeking.agent</artifactId>
+									<artifactId>org.coffeeking.connectedcup.agent</artifactId>
 									<type>war</type>
 									<overWrite>true</overWrite>
-									<outputDirectory>${basedir}/src/main/resources/webapps/</outputDirectory>
+									<outputDirectory>${project.build.directory}/maven-shared-archive-resources/webapps/</outputDirectory>
 									<destFileName>connected-cup-agent.war</destFileName>
 								</artifactItem>
 							</artifactItems>
@@ -183,7 +195,7 @@
 								<echo
 										message="########### Create Connected Cup plugin Management H2 Schema ###########"/>
 								<property name="db.dir"
-										  value="src/main/resources/database"/>
+										  value="target/maven-shared-archive-resources/database"/>
 								<property name="userid" value="wso2carbon"/>
 								<property name="password" value="wso2carbon"/>
 								<property name="dbURL"
diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/carbonapps/CoffeeLevel_Sensor.car b/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/carbonapps/CoffeeLevel_Sensor.car
deleted file mode 100644
index b6521f086f75e5490f1a5268c30072c542e1ed0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4158
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

diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/carbonapps/Temperature_Sensor.car b/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/carbonapps/Temperature_Sensor.car
deleted file mode 100644
index 31eda7ba1d28d258792b58b503ad4a860a0cc251..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4138
zcmb7H2{_bSA0GQImr<4?Yh=k%lr3C7+hDRUGsaxTmLX=0rI00;A!IGPY}q1iB-ug@
zWhrE5M3%Be-&I84f4bKrK6LMSp7YF^=b7`K^ZtJC`TgF3>QPYAgFv((P+gX|Ht2_O
z5?E{EP;OXHlpV?$hw?;VQRpiuPbAjM6NQkLl#-M>13hr}iS6AOtUK`Yf3uZmXR9X)
ziT+o6*?_&qSCF2UF?OELSFo5p_oV&KGXCv}h%dkotH?kg<?X``Vfj4@M*BoT(g*Dd
zzf^0`BE>Sl%AR!9HA`KjErMJ@r2CRUW}UaAXn<24-N<;Q^ncnX+BZ_}q%U}nBUu@2
zKZ-K17>w$Yy%L_8bdKfSNKU1x;jZO58vcp-sL~qViJWo8H+4ghmb1G%>ZB&$ul2Fj
zsMyY9nA_)doWxy!bBKmrWP7Jo+MxT`oX&8FODXrBn1CGi0xlR4*aFrlRk{#QcO|fm
zv8MBl>xbexPBw<SddAitG;1yxj&YF}Tr<I?FqAH9$+FM>cN~(_BZk<ZiI+{~7dOmZ
zUgt(vZxm=$U(lVW4yJQArFOsfzDVVkXSol9Cfv7LnL0DX!_Ob}ZD13$o%_FH8hiV7
zbOI2|K46OfgP0;cvCa-iJ1i-L=;$W;r&25$OJDHi-qv-#+D4QgXiSt}uvW8b$H(1o
z-KulWqG_s|M^1M{xu}FB%jUJUW=%jB)QrkM&OOy@-oy=_$d*<|{??y^;=FQ_X#o<%
zX6ec4FU2GvH090zxy`D_hf`Kn4C+ovh%nlMf3j2*m=w)I3=Ga$QA(*#8`rJc>sqcA
zl(Y|<!j;tfhBXB0ceCSOWlhTfSd9Zyber8l%Knj>X;%kxuoNTB@<zsQb8x63&$FnA
zbx=TBvIDq+Qm(=@q1rpn_K*Ipb@$>w%j)9=TBm}`Y>i9Q;;OT8^`*oB#WGxZzdF*s
zKMOVYpn%>$z}Mh7KWBbGR`}O&%0RVDk&LjCS9bCbDhqR$juSMbSM_Eq&ht+qFZI`u
zSrK4G9w+8ltXCn(%P?Exo>}p{@ea)`^+Z|rB3N|aTc+J46O-(q2EdbWqymA|en!&W
z(-Gl~ahE|jyJHddD4eq$3iIPjCFONALCx@~6!?1AvRKmSXm`AHUJFqwl9IOAMhDJ2
zV2{=rCfiuUiSdQZD$O>PTO-Cd*6Zc2I$>Ef%PG*0;+mJ`xI)PYFlkBo=H*0)+hTL0
z#c587gixeK5S`Yen79+#sg`-jlBpDTUH#Hui2+2FghHbk;xQH5bI@BdC7*<cxV?^f
zpaiHDGeRQ7!zIqE7EUxhWMP6{JH6caNMA#bkm%4cCwm%n%DpYBL`DW7EK)!6Nhq}b
zSnNCAlOl_2eoiHLBf=>QOq>6t@-Z|$rNv{Tt8`qg8Blkj3gO(irlwJ*s>hUI1Z8SV
zulU(xCgx|LCwe;7C9I|uZcz1^5YI`xq#MA?59SV$cM@dMm2)0h_R@beXTFI4qFBb)
ze>u70GPV--wM;&>GtjYbeL?X_=lU#*;`C<3puIw%;HXQ0c=}ED-@iJX4j|v1ELgek
z*j*q=W57JUldJ;@<}OJ_zW^i&*69Bvma-`EzFjlu_B~#roxWT9jowdcLt^dY3><9m
zt~;_hMah-d8gE0EZwwF~5@)@fqL%1AYBS6fFC{|M1bc#o7n_iL(G-5V;9p?+vwl&k
zG2w5!&el53pE~ZS^ldr#R1_PI8K=vvTE1qhC8GdOQcVyyE`4ATHqhosZ|zLpMop6=
z-IiJ7$9ZcF{G>hkKhI3I>a1k`q~6U`XzuM>63bCQnmRva3g}Xjq)SOamy&<$Qu6=0
zkE9F6-R)*<6CNl#VO<@@j2KBZWj{81O%|#JeWg$bShHJ7Tr~SH<D-HSu8}-A=Ah7}
zZ=Yq4kX=u#2*s$*G`uVIkaa$;r(Y^scneY`T=w}r-Kuu=6!&Bi$L;orG;CR-Xkb-c
z!RN?EqX+M4_4ViUJN$99bD*GtIEWrs=a?l?kC0CfA7U+@N@<oJA>;8!W2^B>(}Xnz
zn<K3Ob?^z<7?!A4i-ww%<6jJCtpdR@m*jB7;dy>=xbb^<@kW`kA51wtq%{UN5(#RM
ztJMsO&{z2gzQbb4@%g#^9UrpYL0oZ(d|wCzFrNYhk^+LbPmeVDp}QNS+%WE*2;=Wf
zl=PGn<D1-afLJa0;%^zE6D9vB&=rbsQWxkIG$GEr7!vp@;d-_L!_F^;%a{gRivB2l
zbG&i2`Rh32q|={cy~}uAjHvL`w6!)!Q)mtL1VTtsu^IoRJ1j!EIIodz4jMm*1-AzG
zrB5VgL^s}dYUWDIk2`wLwW>ljJFm_ZUoA}U=jG!;%fwwh?aSIj=~NNWxpMv+-Pr&O
zq4Gv^8@|?j&DNJ{6TzI+!~CP-$j)8^JR6yP*Vzua)*HxLu5|WTaYWKZ{CpKe)=DyN
zX--L0cjnfV^yoBQ%@f{Dd36sbuKdSkI*nSKBmS!u1NZyi{2rxd-tYja`f`wp$J`R~
zyqtHw_Gori4W@QFFlTNorcFMm{RoHKO>@fzfk`uu-#0_ksXaUWI=x;>UF-Lr?&Xp^
zdz#|)R*!rulR9Exru3DC9jZ~xnURUh%#U4~NhRXc@N0v+zkbNeR_DGLYz9e<wDBM`
z>2rh`_-iN6h1m=h)KfGhxNb>npV8&98t}?A3Lvgn)~i3_4O3n&P)-pOjaxIz#ucEs
zp7woA(QKkYgQ>>oHYj$d9X|AkH4#X68!&nIPy4RY(AmWN^duuSQPEJ%&$}m;CQMpd
z<@(Fj*S3z~jM{3GV>VUxG*>qpsu~phPo25gGT7SPlsy=dYdhI|!;xlf>#^cf9fljQ
zk?<<Qbv7?s))g^pT%rAEYXoz`1=A3+O;}n7+U6_)0(&R1&Sg_h^rdiMQf08zy4e}O
z=&ajfF$M|AjuklK;NRa{Uj)AiT`<#&<lW8axcETY1i%DC4gxU&pWD~RkW^Y1r?1zn
zN_x>{7SlF4@<()ZKT<qlH||1?Ku{jCwJ#0uU)Dz7REhB0;4!I3#%54H#jVeY9Z7;U
zjps&S@DRSLZ11mT%`etH0vICm??HRf-7YTl@gGLGp9Q)2(0@o0e1VnlppSc8`_6@G
zJap}~LhCj3B^!!ljvVi!=Xh1^qD{e-mVL&8i<L2LX{zUxTqDjEvM{H=X3>FaWoNQH
ze-q<BeJ{#4o%vZtNLTz-6PV1pPP%?(bhhi3I(2rS5WS`6hNBI~y4b^;B1>)f$P`I3
z1&v&#xtY%ih?PnpyJX~Gii7<+5D;LnfEGyo`yaUXgV9L-{jWhnQvsIWUGPDk=dg?M
zY$JWYnC}kM0nO?#ERw(fYmlz>5LoV0$#wwt_xsxrxk1yw@@M~X4t4)~kJ@X4caBm3
z1pBk2w#7`+@?PY<7IX)h1E}eTCg(8Ny{2ymcJpVj|HK0BWwF<`>>O7FxX!;>9H5KC
zXzVo!JGcqdKg0bOmSHcQy=`^p*g=|orFm$R-HX1rdheij)9s6XScLW#&K<D3Kt0*s
Z`Mr!n^{9ZLk?JcG$bk|By3auR_CIn9CHw#Y

diff --git a/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/database/ConnectedCupDM_DB.h2.db b/modules/samples/connectedcup/feature/connectedcup-feature/src/main/resources/database/ConnectedCupDM_DB.h2.db
deleted file mode 100644
index 3f7f3a4eacd974b92b922746398272c64f4e40e4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20480
zcmeI$y>8P`6ae6qCUKiKR1p<)U^p#pY!jzk$9B_>j(yu$ah%|vwn0c%nxBCYF)$#I
z7&~-e;~C%yU}Rz92|!E?m0;ir;3iE<E7H(PRBD?ODT8m$JwE3<wj(*4g<=lKvUaZk
z*(@a3cj$2>G7%XckKhLdPyhu`00mIs5({X%Ki(gdzxeSIw}GXj01BW03ZMWAoIwEp
z|IdJhp(ua?D1ZVea76^-vBeixq!nxf1yBG5Pyhu`;FJQXCqFxpzu0Fc9*K={-zT}x
z3GUN0_b$o3J!KLMLje>(0Te(16gW2lX+9&AD(mYKkt9kokP-VwB_hdEPEy2qVX41H
zi2y>nf3(3O0D$iw_jk;uo_6Y;Jh!4TF$$mn3ZMWApumL_NZo38YMQuq;VQ#|Pyhu`
z00mG01<p$#^=+@4IvPoiabL%|4>9fy$Gx89UQTh3lJWhS`2AFD|3)mBjXu5^y*@Yo
z{Jbi`yeKeg0$Er}?vClUPhIf!f=!_s6l}{_HY$!o4WF8!5mZByZdwKf-86yy;Q6j@
zIsTE*-b$!K)wRmHTZ0m<34?NkmMMbem~^|py|*J|J3>{0`DAFgRQFjWe^L#Mg^JT(
zA9SV@PoDuuei`eX#L$f*HUHhakYFz_JI(*4!a9OY-8G83E2x?XPQ?c&ux+Wk<3KKS
z^fEn+k_i#Pr0aTM9}U$FgL+=*S4z}5jMZ4^@r*8Acd1t#5|<F~va#+B8mnn-SiWwD
zrsY*_y>{xs9-D?RILq+SQjv|eak|mcBcmOBt|27|Y`m|AjrW9%2jd#(^B+c>5P4Wg
zKI`=#c<g@L@+vt)cMI$?_ShW=yq1&Kn(CTN@{Oh@uM!@Lx>p2#wV|kTJD;n!8`?@s
zZsh7pt4$i3qG+;AnhIOhR+?>Xr=_-<^|iX1*YcXOv)WP=xtVLWcy{BKEhi1>ZIAkJ
zP(xS<EZYQGB}<Ur>a1_MmQUFg!LAF?2w8-*+YPq^uk(1|`8)jtoqHzqtOpe26=hXj
zfb_#oWbcv=yAP7kuT?3Kc}Ulf{$^K<Qs`S{S_yo}5kh8fci;a{kJ^(L`$Yj1Kmim$
dfl(Gn&2``ZPen%=0eeRQ6hHwKK!Fhx_zl`5XpaB@

diff --git a/modules/samples/connectedcup/feature/pom.xml b/modules/samples/connectedcup/feature/pom.xml
index 77d8aa76..0f8767b1 100644
--- a/modules/samples/connectedcup/feature/pom.xml
+++ b/modules/samples/connectedcup/feature/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~ 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
@@ -12,7 +12,7 @@
   ~ 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
+  ~ KIND, either express or implied. See the License for the
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
@@ -36,7 +36,6 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <module>analytics</module>
         <module>connectedcup-feature</module>
     </modules>
 
diff --git a/modules/samples/connectedcup/pom.xml b/modules/samples/connectedcup/pom.xml
index fa467447..09a31b4e 100644
--- a/modules/samples/connectedcup/pom.xml
+++ b/modules/samples/connectedcup/pom.xml
@@ -224,11 +224,13 @@
 
     <properties>
 	<carbon.kernel.version>4.4.3</carbon.kernel.version>
-	<carbon.device.mgt.version>0.9.2-SNAPSHOT</carbon.device.mgt.version>
+	<carbon.device.mgt.version>1.1.0-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.jar.version>1.1.0.SNAPSHOT</carbon.device.mgt.jar.version>
 	<paho.mqtt.version>1.0.2</paho.mqtt.version>
 	<commons-json.version>3.0.0.wso2v1</commons-json.version>
 	<eclipse.osgi.version>3.8.1.v20120830-144521</eclipse.osgi.version>
 	<carbon.iot.device.mgt.version>1.9.2-SNAPSHOT</carbon.iot.device.mgt.version>
+        <carbon.iot.device.mgt.jar.version>1.9.2.SNAPSHOT</carbon.iot.device.mgt.jar.version>
 	<javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
 	<!--XMPP/MQTT Version-->