diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_receiver/accelerometer_receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_receiver/accelerometer_receiver.xml
deleted file mode 100644
index 58169198b..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_receiver/accelerometer_receiver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- false
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_receiver/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_receiver/artifact.xml
deleted file mode 100644
index 92e3ca24c..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_receiver/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- accelerometer_receiver.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_script/accelerometer_script.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_script/accelerometer_script.xml
deleted file mode 100644
index e408138ed..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_script/accelerometer_script.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- accelerometer_script
-
- 0 0/5 * * * ?
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_store/org_wso2_iot_devices_accelerometer.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_store/org_wso2_iot_devices_accelerometer.xml
deleted file mode 100644
index 91a06e8a6..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_store/org_wso2_iot_devices_accelerometer.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- x
- false
- false
- false
- FLOAT
-
-
- y
- false
- false
- false
- FLOAT
-
-
- z
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_stream/artifact.xml
deleted file mode 100644
index 585c13ab5..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.accelerometer_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_stream/org.wso2.iot.devices.accelerometer_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_stream/org.wso2.iot.devices.accelerometer_1.0.0.json
deleted file mode 100644
index aeb32cf43..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/accelerometer_stream/org.wso2.iot.devices.accelerometer_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.accelerometer",
- "version": "1.0.0",
- "nickName": "accelerometer",
- "description": "accelerometer data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {"name": "x","type": "FLOAT"},
- {"name": "y","type": "FLOAT"},
- {"name": "z","type": "FLOAT"}
- ]
-}
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/artifacts.xml
deleted file mode 100644
index 5dbad9b90..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/accelerometer_sensor/artifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/artifacts.xml
deleted file mode 100644
index 180abe266..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/artifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_receiver/battery_receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_receiver/battery_receiver.xml
deleted file mode 100644
index 6c604ae66..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_receiver/battery_receiver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- false
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_script/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_script/artifact.xml
deleted file mode 100644
index 45a0eb05e..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_script/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- battery_script.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_script/battery_script.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_script/battery_script.xml
deleted file mode 100644
index 5e52e7b0e..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_script/battery_script.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- battery_script
-
- 0 0/5 * * * ?
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_store/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_store/artifact.xml
deleted file mode 100644
index 849375c42..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_store/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- org_wso2_iot_devices_battery.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_store/org_wso2_iot_devices_battery.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_store/org_wso2_iot_devices_battery.xml
deleted file mode 100644
index 2625d1153..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_store/org_wso2_iot_devices_battery.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- level
- false
- false
- false
- INTEGER
-
-
-
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_stream/artifact.xml
deleted file mode 100644
index d28485d2e..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.battery_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_stream/org.wso2.iot.devices.battery_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_stream/org.wso2.iot.devices.battery_1.0.0.json
deleted file mode 100644
index fca65ea11..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/battery_sensor/battery_stream/org.wso2.iot.devices.battery_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.battery",
- "version": "1.0.0",
- "nickName": "battery",
- "description": "battery data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "level","type": "INT"
- }
- ]
-}
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/artifacts.xml
deleted file mode 100644
index 16258879e..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/artifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_receiver/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_receiver/artifact.xml
deleted file mode 100644
index a3ac8431a..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_receiver/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- gps_receiver.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_receiver/gps_receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_receiver/gps_receiver.xml
deleted file mode 100644
index 10ba69dfc..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_receiver/gps_receiver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- false
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_script/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_script/artifact.xml
deleted file mode 100644
index 85c2f2f23..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_script/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- gps_script.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_script/gps_script.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_script/gps_script.xml
deleted file mode 100644
index 828ef8fbf..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_script/gps_script.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- gps_script
-
- 0 0/5 * * * ?
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_store/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_store/artifact.xml
deleted file mode 100644
index f01ee5cf7..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_store/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- org_wso2_iot_devices_gps.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_store/org_wso2_iot_devices_gps.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_store/org_wso2_iot_devices_gps.xml
deleted file mode 100644
index 7d2fef25e..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_store/org_wso2_iot_devices_gps.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- latitude
- false
- false
- false
- DOUBLE
-
-
- longitude
- false
- false
- false
- DOUBLE
-
-
-
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_stream/artifact.xml
deleted file mode 100644
index 497eaa78c..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.gps_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_stream/org.wso2.iot.devices.gps_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_stream/org.wso2.iot.devices.gps_1.0.0.json
deleted file mode 100644
index fcdca5cd6..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gps_sensor/gps_stream/org.wso2.iot.devices.gps_1.0.0.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "org.wso2.iot.devices.gps",
- "version": "1.0.0",
- "nickName": "GPS Data",
- "description": "GPS data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {"name": "latitude","type": "DOUBLE"},
- {"name": "longitude","type": "DOUBLE"}
- ]
-}
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/artifacts.xml
deleted file mode 100644
index 7e7e45a45..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/artifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_receiver/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_receiver/artifact.xml
deleted file mode 100644
index d47e501ed..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_receiver/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- gravity_receiver.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_receiver/gravity_receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_receiver/gravity_receiver.xml
deleted file mode 100644
index b076a6c96..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_receiver/gravity_receiver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- false
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_script/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_script/artifact.xml
deleted file mode 100644
index 3ef3f8746..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_script/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- gravity_script.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_script/gravity_script.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_script/gravity_script.xml
deleted file mode 100644
index c2fffe8d6..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_script/gravity_script.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- gravity_script
-
- 0 0/5 * * * ?
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_store/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_store/artifact.xml
deleted file mode 100644
index fec70f100..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_store/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- org_wso2_iot_devices_gravity.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_store/org_wso2_iot_devices_gravity.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_store/org_wso2_iot_devices_gravity.xml
deleted file mode 100644
index a1d6ddbea..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_store/org_wso2_iot_devices_gravity.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- x
- false
- false
- false
- FLOAT
-
-
- y
- false
- false
- false
- FLOAT
-
-
- z
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_stream/artifact.xml
deleted file mode 100644
index d2a122c34..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.gravity_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_stream/org.wso2.iot.devices.gravity_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_stream/org.wso2.iot.devices.gravity_1.0.0.json
deleted file mode 100644
index f6104fea0..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gravity_sensor/gravity_stream/org.wso2.iot.devices.gravity_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.gravity",
- "version": "1.0.0",
- "nickName": "Gravity Data",
- "description": "Gravity data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {"name": "x","type": "FLOAT"},
- {"name": "y","type": "FLOAT"},
- {"name": "z","type": "FLOAT"}
- ]
-}
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/artifacts.xml
deleted file mode 100644
index 5dd927f14..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/artifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_receiver/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_receiver/artifact.xml
deleted file mode 100644
index cd74b7183..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_receiver/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- gyroscope_receiver.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_receiver/gyroscope_receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_receiver/gyroscope_receiver.xml
deleted file mode 100644
index a6ebdaa42..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_receiver/gyroscope_receiver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- false
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_script/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_script/artifact.xml
deleted file mode 100644
index 48d925cc4..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_script/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- gyroscope_script.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_script/gyroscope_script.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_script/gyroscope_script.xml
deleted file mode 100644
index fddde9c3c..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_script/gyroscope_script.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- gyroscope_script
-
- 0 0/5 * * * ?
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_store/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_store/artifact.xml
deleted file mode 100644
index c4cb07cae..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_store/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- org_wso2_iot_devices_gyroscope.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_store/org_wso2_iot_devices_gyroscope.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_store/org_wso2_iot_devices_gyroscope.xml
deleted file mode 100644
index f91bf8db8..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_store/org_wso2_iot_devices_gyroscope.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- x
- false
- false
- false
- FLOAT
-
-
- y
- false
- false
- false
- FLOAT
-
-
- z
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_stream/artifact.xml
deleted file mode 100644
index 138949793..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.gyroscope_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_stream/org.wso2.iot.devices.gyroscope_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_stream/org.wso2.iot.devices.gyroscope_1.0.0.json
deleted file mode 100644
index 0f9e8bd88..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/gyroscope_sensor/gyroscope_stream/org.wso2.iot.devices.gyroscope_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.gyroscope",
- "version": "1.0.0",
- "nickName": "Gyroscope Data",
- "description": "Gyroscope data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {"name": "x","type": "FLOAT"},
- {"name": "y","type": "FLOAT"},
- {"name": "z","type": "FLOAT"}
- ]
-}
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/artifacts.xml
deleted file mode 100644
index 22d5b8ec9..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/artifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_receiver/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_receiver/artifact.xml
deleted file mode 100644
index 55861b658..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_receiver/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- light_receiver.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_receiver/light_receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_receiver/light_receiver.xml
deleted file mode 100644
index 0d4f5b3cc..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_receiver/light_receiver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- false
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_script/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_script/artifact.xml
deleted file mode 100644
index b2a7aa656..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_script/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- light_script.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_script/light_script.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_script/light_script.xml
deleted file mode 100644
index 236fbcbd1..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_script/light_script.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- light_script
-
- 0 0/5 * * * ?
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_store/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_store/artifact.xml
deleted file mode 100644
index 4c9957d95..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_store/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- org_wso2_iot_devices_light.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_store/org_wso2_iot_devices_light.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_store/org_wso2_iot_devices_light.xml
deleted file mode 100644
index d7051c715..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_store/org_wso2_iot_devices_light.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- light
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_stream/artifact.xml
deleted file mode 100644
index 61cfc6f65..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.light_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_stream/org.wso2.iot.devices.light_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_stream/org.wso2.iot.devices.light_1.0.0.json
deleted file mode 100644
index 5fd6308bb..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/light_sensor/light_stream/org.wso2.iot.devices.light_1.0.0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "name": "org.wso2.iot.devices.light",
- "version": "1.0.0",
- "nickName": "light Data",
- "description": "light data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {"name": "light","type": "FLOAT"}
- ]
-}
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/artifacts.xml
deleted file mode 100644
index 8762137df..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/artifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_receiver/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_receiver/artifact.xml
deleted file mode 100644
index 33f1d8b42..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_receiver/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- magnetic_receiver.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_script/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_script/artifact.xml
deleted file mode 100644
index 67c49b4ec..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_script/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- magnetic_script.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_script/magnetic_script.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_script/magnetic_script.xml
deleted file mode 100644
index bbbb6c4f0..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_script/magnetic_script.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- magnetic_script
-
- 0 0/5 * * * ?
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_store/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_store/artifact.xml
deleted file mode 100644
index 95951aeb5..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_store/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- org_wso2_iot_devices_magnetic.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_store/org_wso2_iot_devices_magnetic.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_store/org_wso2_iot_devices_magnetic.xml
deleted file mode 100644
index 200e88b2b..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_store/org_wso2_iot_devices_magnetic.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- x
- false
- false
- false
- FLOAT
-
-
- y
- false
- false
- false
- FLOAT
-
-
- z
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_stream/artifact.xml
deleted file mode 100644
index e222004ce..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.magnetic_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_stream/org.wso2.iot.devices.magnetic_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_stream/org.wso2.iot.devices.magnetic_1.0.0.json
deleted file mode 100644
index f757bde77..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/magnetic_sensor/magnetic_stream/org.wso2.iot.devices.magnetic_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.magnetic",
- "version": "1.0.0",
- "nickName": "magnetic Data",
- "description": "magnetic data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {"name": "x","type": "FLOAT"},
- {"name": "y","type": "FLOAT"},
- {"name": "z","type": "FLOAT"}
- ]
-}
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/artifacts.xml
deleted file mode 100644
index a4e4b8c43..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/artifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_receiver/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_receiver/artifact.xml
deleted file mode 100644
index 0c4d43ffa..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_receiver/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- pressure_receiver.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_receiver/pressure_receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_receiver/pressure_receiver.xml
deleted file mode 100644
index 045909671..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_receiver/pressure_receiver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- false
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_script/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_script/artifact.xml
deleted file mode 100644
index ef22d8d1f..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_script/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- pressure_script.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_script/pressure_script.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_script/pressure_script.xml
deleted file mode 100644
index add6b2909..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_script/pressure_script.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- pressure_script
-
- 0 0/5 * * * ?
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_store/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_store/artifact.xml
deleted file mode 100644
index f65697483..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_store/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- org_wso2_iot_devices_pressure.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_store/org_wso2_iot_devices_pressure.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_store/org_wso2_iot_devices_pressure.xml
deleted file mode 100644
index 5e2f91f34..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_store/org_wso2_iot_devices_pressure.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- pressure
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_stream/artifact.xml
deleted file mode 100644
index 6d7e87c4c..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.pressure_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_stream/org.wso2.iot.devices.pressure_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_stream/org.wso2.iot.devices.pressure_1.0.0.json
deleted file mode 100644
index 912dd110a..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/pressure_sensor/pressure_stream/org.wso2.iot.devices.pressure_1.0.0.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "name": "org.wso2.iot.devices.pressure",
- "version": "1.0.0",
- "nickName": "Pressure Data",
- "description": "Pressure data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {"name": "pressure","type": "FLOAT"}
- ]
-}
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/artifacts.xml
deleted file mode 100644
index 2c471e846..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/artifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_receiver/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_receiver/artifact.xml
deleted file mode 100644
index 057dc5e3b..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_receiver/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- proximity_receiver.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_receiver/proximity_receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_receiver/proximity_receiver.xml
deleted file mode 100644
index a349b435b..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_receiver/proximity_receiver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- false
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_script/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_script/artifact.xml
deleted file mode 100644
index e5bed9d73..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_script/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- proximity_script.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_script/proximity_script.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_script/proximity_script.xml
deleted file mode 100644
index 4c75d72b7..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_script/proximity_script.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- proximity_script
-
- 0 0/5 * * * ?
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_store/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_store/artifact.xml
deleted file mode 100644
index c0057aec5..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_store/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- org_wso2_iot_devices_proximity.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_store/org_wso2_iot_devices_proximity.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_store/org_wso2_iot_devices_proximity.xml
deleted file mode 100644
index ef4819322..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_store/org_wso2_iot_devices_proximity.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- proximity
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_stream/artifact.xml
deleted file mode 100644
index 5352a37f7..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.proximity_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_stream/org.wso2.iot.devices.proximity_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_stream/org.wso2.iot.devices.proximity_1.0.0.json
deleted file mode 100644
index 88fb90089..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/proximity_sensor/proximity_stream/org.wso2.iot.devices.proximity_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.proximity",
- "version": "1.0.0",
- "nickName": "Proximity Data",
- "description": "Proximity data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "proximity","type": "FLOAT"
- }
- ]
-}
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/artifacts.xml
deleted file mode 100644
index 015f7f9f9..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/artifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_receiver/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_receiver/artifact.xml
deleted file mode 100644
index 7cd17daf9..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_receiver/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- rotation_receiver.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_receiver/rotation_receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_receiver/rotation_receiver.xml
deleted file mode 100644
index 435316fca..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_receiver/rotation_receiver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- false
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_script/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_script/artifact.xml
deleted file mode 100644
index 6e49ea677..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_script/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- rotation_script.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_script/rotation_script.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_script/rotation_script.xml
deleted file mode 100644
index b56944aee..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_script/rotation_script.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- rotation_script
-
- 0 0/5 * * * ?
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_store/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_store/artifact.xml
deleted file mode 100644
index 0dd5ae69b..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_store/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- org_wso2_iot_devices_rotation.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_store/org_wso2_iot_devices_rotation.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_store/org_wso2_iot_devices_rotation.xml
deleted file mode 100644
index 102f05a02..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_store/org_wso2_iot_devices_rotation.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- x
- false
- false
- false
- FLOAT
-
-
- y
- false
- false
- false
- FLOAT
-
-
- z
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_stream/artifact.xml
deleted file mode 100644
index 9e6d15239..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.rotation_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_stream/org.wso2.iot.devices.rotation_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_stream/org.wso2.iot.devices.rotation_1.0.0.json
deleted file mode 100644
index d44b455f4..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/rotation_sensor/rotation_stream/org.wso2.iot.devices.rotation_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.rotation",
- "version": "1.0.0",
- "nickName": "Rotation Data",
- "description": "Rotation data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {"name": "x","type": "FLOAT"},
- {"name": "y","type": "FLOAT"},
- {"name": "z","type": "FLOAT"}
- ]
-}
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/artifacts.xml
deleted file mode 100644
index 78a81e7b6..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/artifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_publisher/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_publisher/artifact.xml
deleted file mode 100644
index 66bd7c891..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_publisher/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- speed_publisher.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_publisher/speed_publisher.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_publisher/speed_publisher.xml
deleted file mode 100644
index 5e4d07ad3..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_publisher/speed_publisher.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- Email Alerts Speed
- pacificcontrolsapps@gmail.com
- text/html
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_receiver/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_receiver/artifact.xml
deleted file mode 100644
index f92a96656..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_receiver/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- speed_receiver.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_receiver/speed_receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_receiver/speed_receiver.xml
deleted file mode 100644
index ce6c90eee..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_receiver/speed_receiver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- false
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_store/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_store/artifact.xml
deleted file mode 100644
index aa7e5c69f..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_store/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- org_wso2_iot_devices_speed.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_store/org_wso2_iot_devices_speed.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_store/org_wso2_iot_devices_speed.xml
deleted file mode 100644
index e9ebd7669..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_store/org_wso2_iot_devices_speed.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- limit
- false
- false
- false
- LONG
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_stream/artifact.xml
deleted file mode 100644
index ff22e4804..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.speed_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_stream/org.wso2.iot.devices.speed_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_stream/org.wso2.iot.devices.speed_1.0.0.json
deleted file mode 100644
index 0d2b60898..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/speed_sensor/speed_stream/org.wso2.iot.devices.speed_1.0.0.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "name": "org.wso2.iot.devices.speed",
- "version": "1.0.0",
- "nickName": "speed",
- "description": "speed data received from the Device",
- "metaData": [
- {
- "name": "owner",
- "type": "STRING"
- },
- {
- "name": "deviceType",
- "type": "STRING"
- },
- {
- "name": "deviceId",
- "type": "STRING"
- },
- {
- "name": "time",
- "type": "LONG"
- }
- ],
- "payloadData": [
- {
- "name": "limit",
- "type": "FLOAT"
- }
- ]
-}
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/artifacts.xml
deleted file mode 100644
index fb4685ebd..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/artifacts.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/artifact.xml
deleted file mode 100644
index 752cb8c41..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- temperature_publisher.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/temperature_publisher.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/temperature_publisher.xml
deleted file mode 100644
index 94aa0c49f..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_publisher/temperature_publisher.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/artifact.xml
deleted file mode 100644
index f858a2efa..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- temperature_receiver.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/temperature_receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/temperature_receiver.xml
deleted file mode 100644
index 771c545df..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_receiver/temperature_receiver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- false
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/artifact.xml
deleted file mode 100644
index 5d7cdee19..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- temperature_script.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/temperature_script.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/temperature_script.xml
deleted file mode 100644
index 7175df39b..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_script/temperature_script.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- temperature_script
-
- 0 0/5 * * * ?
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/artifact.xml
deleted file mode 100644
index 4863a47e9..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- org_wso2_iot_devices_temperature.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/org_wso2_iot_devices_temperature.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/org_wso2_iot_devices_temperature.xml
deleted file mode 100644
index d06f73b14..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_store/org_wso2_iot_devices_temperature.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- temperature
- false
- false
- false
- FLOAT
-
-
-
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/artifact.xml
deleted file mode 100644
index cc733b792..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.temperature_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/org.wso2.iot.devices.temperature_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/org.wso2.iot.devices.temperature_1.0.0.json
deleted file mode 100644
index 5d94b9821..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/temperature_sensor/temperature_stream/org.wso2.iot.devices.temperature_1.0.0.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "org.wso2.iot.devices.temperature",
- "version": "1.0.0",
- "nickName": "Temperature Data",
- "description": "Temperature data received from the Device",
- "metaData": [
- {"name":"owner","type":"STRING"},
- {"name":"deviceType","type":"STRING"},
- {"name":"deviceId","type":"STRING"},
- {"name":"time","type":"LONG"}
- ],
- "payloadData": [
- {
- "name": "temperature","type": "FLOAT"
- }
- ]
-}
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/artifacts.xml
deleted file mode 100644
index 23dcb9ff1..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/artifacts.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_publisher/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_publisher/artifact.xml
deleted file mode 100644
index f4ab5fa59..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_publisher/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- turn_publisher.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_publisher/turn_publisher.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_publisher/turn_publisher.xml
deleted file mode 100644
index d04a6f041..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_publisher/turn_publisher.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- Email Alerts Turn
- pacificcontrolsapps@gmail.com
- text/html
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_receiver/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_receiver/artifact.xml
deleted file mode 100644
index 7b9f14cf0..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_receiver/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- turn_receiver.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_receiver/turn_receiver.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_receiver/turn_receiver.xml
deleted file mode 100644
index c94db7500..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_receiver/turn_receiver.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
- false
-
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_store/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_store/artifact.xml
deleted file mode 100644
index e6c987339..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_store/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
- org_wso2_iot_devices_turn.xml
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_store/org_wso2_iot_devices_turn.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_store/org_wso2_iot_devices_turn.xml
deleted file mode 100644
index a8ab51da7..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_store/org_wso2_iot_devices_turn.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-
-
-
-
-
- EVENT_STORE
-
-
- meta_owner
- true
- true
- false
- STRING
-
-
- meta_deviceType
- true
- true
- false
- STRING
-
-
- meta_deviceId
- true
- true
- false
- STRING
-
-
- meta_time
- true
- true
- false
- LONG
-
-
- turn
- false
- false
- false
- STRING
-
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_stream/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_stream/artifact.xml
deleted file mode 100644
index 5579b0595..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
- org.wso2.iot.devices.turn_1.0.0.json
-
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_stream/org.wso2.iot.devices.turn_1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_stream/org.wso2.iot.devices.turn_1.0.0.json
deleted file mode 100644
index beec77a55..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/turn_sensor/turn_stream/org.wso2.iot.devices.turn_1.0.0.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
- "name": "org.wso2.iot.devices.turn",
- "version": "1.0.0",
- "nickName": "turn",
- "description": "turn data received from the Device",
- "metaData": [
- {
- "name": "owner",
- "type": "STRING"
- },
- {
- "name": "deviceType",
- "type": "STRING"
- },
- {
- "name": "deviceId",
- "type": "STRING"
- },
- {
- "name": "time",
- "type": "LONG"
- }
- ],
- "payloadData": [
- {
- "name": "turn",
- "type": "STRING"
- }
- ]
-}