diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml
index 54cff03dc6..d9a77d577b 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml
@@ -27,7 +27,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.iot.androidsense.analytics</artifactId>
-    <name>WSO2 Carbon - IoT Server Android Sense Analytics capp</name>
+    <name>WSO2 Carbon - IoT Server Android Sense Analytics Carbon App</name>
     <packaging>pom</packaging>
 
     <build>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/bar-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/bar-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/bar-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/bar-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/batch-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/batch-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/batch-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/batch-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/Android_Active_Stack_Chart/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/Android_Active_Stack_Chart/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_stack_chart_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_stack_chart_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/batch-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/batch-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/batch-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/batch-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/line-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/line-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/line-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/js/core/line-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/Android_Active_Time_Chart/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/Android_Active_Time_Chart/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_active_time_chart_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_active_time_chart_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/js/core/batch-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/js/core/batch-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/js/core/batch-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/js/core/batch-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/js/core/donut-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/js/core/donut-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/js/core/donut-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/js/core/donut-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/Android_Activity_Chart/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/Android_Activity_Chart/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_chart_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_chart_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_script/AndroidActivityScript.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_script/AndroidActivityScript.xml
similarity index 96%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_script/AndroidActivityScript.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_script/AndroidActivityScript.xml
index a8e82e1f17..b20721054a 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_script/AndroidActivityScript.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_script/AndroidActivityScript.xml
@@ -26,5 +26,7 @@
             FROM AndroidActivityData WHERE action = 'RUNNING' OR action = 'WALKING' OR action = 'CYCLING'
             GROUP BY year, month, day, meta_deviceId, action, meta_owner ORDER BY timestamp ASC;             
 
-            INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_ACTIVITY_STATS;                            </Script>
+            INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_ACTIVITY_STATS;
+    </Script>
+    <CronExpression>0 0/5 * * * ?</CronExpression>
 </Analytics>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_script/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_script/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_script/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_script/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_stats_event_sink/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_event_sink/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_stats_event_sink/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_event_sink/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_stats_event_sink/org_wso2_iot_android_activity_stats.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_event_sink/org_wso2_iot_android_activity_stats.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_stats_event_sink/org_wso2_iot_android_activity_stats.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_event_sink/org_wso2_iot_android_activity_stats.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_stats_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_stats_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_stats_streams/org.wso2.iot.android.activity.stats_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_streams/org.wso2.iot.android.activity.stats_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_stats_streams/org.wso2.iot.android.activity.stats_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_stats_streams/org.wso2.iot.android.activity.stats_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_streams/org.wso2.iot.android.activity_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_streams/org.wso2.iot.android.activity_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_activity_streams/org.wso2.iot.android.activity_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_activity_streams/org.wso2.iot.android.activity_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_andriod_audio_filter_executionplan/Andriod-Audio-Filter-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_andriod_audio_filter_executionplan/Andriod-Audio-Filter-ExecutionPlan.siddhiql
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_andriod_audio_filter_executionplan/Andriod-Audio-Filter-ExecutionPlan.siddhiql
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_andriod_audio_filter_executionplan/Andriod-Audio-Filter-ExecutionPlan.siddhiql
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_andriod_audio_filter_executionplan/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_andriod_audio_filter_executionplan/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_andriod_audio_filter_executionplan/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_andriod_audio_filter_executionplan/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_activity_executionplan/Android-Activity-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_activity_executionplan/Android-Activity-ExecutionPlan.siddhiql
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_activity_executionplan/Android-Activity-ExecutionPlan.siddhiql
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_activity_executionplan/Android-Activity-ExecutionPlan.siddhiql
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_activity_executionplan/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_activity_executionplan/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_activity_executionplan/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_activity_executionplan/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_audio_executionplan/Android-Audio-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_audio_executionplan/Android-Audio-ExecutionPlan.siddhiql
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_audio_executionplan/Android-Audio-ExecutionPlan.siddhiql
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_audio_executionplan/Android-Audio-ExecutionPlan.siddhiql
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_audio_executionplan/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_audio_executionplan/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_audio_executionplan/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_audio_executionplan/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_call_executionplan/Android-Call-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_call_executionplan/Android-Call-ExecutionPlan.siddhiql
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_call_executionplan/Android-Call-ExecutionPlan.siddhiql
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_call_executionplan/Android-Call-ExecutionPlan.siddhiql
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_call_executionplan/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_call_executionplan/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_call_executionplan/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_call_executionplan/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_data_executionplan/Android-Data-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_data_executionplan/Android-Data-ExecutionPlan.siddhiql
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_data_executionplan/Android-Data-ExecutionPlan.siddhiql
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_data_executionplan/Android-Data-ExecutionPlan.siddhiql
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_data_executionplan/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_data_executionplan/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_data_executionplan/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_data_executionplan/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_location_executionplan/Android-Location-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_location_executionplan/Android-Location-ExecutionPlan.siddhiql
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_location_executionplan/Android-Location-ExecutionPlan.siddhiql
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_location_executionplan/Android-Location-ExecutionPlan.siddhiql
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_location_executionplan/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_location_executionplan/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_location_executionplan/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_location_executionplan/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_screen_executionplan/Android-Screen-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_screen_executionplan/Android-Screen-ExecutionPlan.siddhiql
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_screen_executionplan/Android-Screen-ExecutionPlan.siddhiql
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_screen_executionplan/Android-Screen-ExecutionPlan.siddhiql
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_screen_executionplan/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_screen_executionplan/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_screen_executionplan/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_screen_executionplan/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_sense_executionplan/Android-Sense-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sense_executionplan/Android-Sense-ExecutionPlan.siddhiql
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_sense_executionplan/Android-Sense-ExecutionPlan.siddhiql
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sense_executionplan/Android-Sense-ExecutionPlan.siddhiql
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_sense_executionplan/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sense_executionplan/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_sense_executionplan/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sense_executionplan/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_sms_executionplan/Android-SMS-ExecutionPlan.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sms_executionplan/Android-SMS-ExecutionPlan.siddhiql
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_sms_executionplan/Android-SMS-ExecutionPlan.siddhiql
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sms_executionplan/Android-SMS-ExecutionPlan.siddhiql
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_sms_executionplan/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sms_executionplan/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_android_sms_executionplan/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_android_sms_executionplan/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_audio_script/AndroidAudioScript.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_audio_script/AndroidAudioScript.xml
similarity index 94%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_audio_script/AndroidAudioScript.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_audio_script/AndroidAudioScript.xml
index 6f1038493c..aa90f5fd96 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_audio_script/AndroidAudioScript.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_audio_script/AndroidAudioScript.xml
@@ -15,5 +15,7 @@
             FROM AndroidHeadsetData
             GROUP BY year, month, day, meta_deviceId, meta_owner ORDER BY timestamp DESC;
 
-            INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_HEADSET_STATS;                 </Script>
+            INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_HEADSET_STATS;
+    </Script>
+    <CronExpression>0 0/5 * * * ?</CronExpression>
 </Analytics>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_audio_script/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_audio_script/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_audio_script/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_audio_script/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_audio_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_audio_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_audio_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_audio_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_audio_streams/org.wso2.iot.android.audio_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_audio_streams/org.wso2.iot.android.audio_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_audio_streams/org.wso2.iot.android.audio_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_audio_streams/org.wso2.iot.android.audio_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/area-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/area-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/area-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/area-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/provider-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/provider-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/provider-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/realtime-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/realtime-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/core/realtime-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/provider-libs/ws-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/provider-libs/ws-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/js/provider-libs/ws-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/Android_Battery_Level_Chart/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/Android_Battery_Level_Chart/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_level_chart_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_level_chart_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/donut-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/donut-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/donut-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/donut-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/provider-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/provider-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/provider-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/realtime-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/realtime-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/core/realtime-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/provider-libs/ws-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/provider-libs/ws-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/js/provider-libs/ws-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/Android_Battery_Percentage_Chart/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_percentage_chart_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_percentage_chart_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_streams/org.wso2.iot.android.battery_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_streams/org.wso2.iot.android.battery_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_streams/org.wso2.iot.android.battery_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_streams/org.wso2.iot.android.battery_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_ui_event_publisher/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_ui_event_publisher/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_ui_event_publisher/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_ui_event_publisher/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_ui_event_publisher/org.wso2.iot.android.battery.ui.publisher.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_ui_event_publisher/org.wso2.iot.android.battery.ui.publisher.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_battery_ui_event_publisher/org.wso2.iot.android.battery.ui.publisher.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_battery_ui_event_publisher/org.wso2.iot.android.battery.ui.publisher.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_script/AndriodCallScript.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_script/AndriodCallScript.xml
similarity index 94%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_script/AndriodCallScript.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_script/AndriodCallScript.xml
index 7f26e785bd..7503381b01 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_script/AndriodCallScript.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_script/AndriodCallScript.xml
@@ -15,5 +15,7 @@
         FROM AndroidCallData
         GROUP BY year, month, day, meta_deviceId, meta_owner, type ORDER BY timestamp DESC;
         
-        INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_CALL_STATS;                            </Script>
+        INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_CALL_STATS;
+    </Script>
+    <CronExpression>0 0/5 * * * ?</CronExpression>
 </Analytics>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_script/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_script/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_script/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_script/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_event_sink/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_event_sink/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_event_sink/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_event_sink/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_event_sink/org_wso2_iot_android_call_stats.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_event_sink/org_wso2_iot_android_call_stats.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_event_sink/org_wso2_iot_android_call_stats.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_event_sink/org_wso2_iot_android_call_stats.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_streams/org.wso2.iot.android.call.stats_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_streams/org.wso2.iot.android.call.stats_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_streams/org.wso2.iot.android.call.stats_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_streams/org.wso2.iot.android.call.stats_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_ui_event_publisher/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_ui_event_publisher/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_ui_event_publisher/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_ui_event_publisher/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_ui_event_publisher/org.wso2.iot.android.call.stats.ui.publisher.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_ui_event_publisher/org.wso2.iot.android.call.stats.ui.publisher.xml
similarity index 99%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_ui_event_publisher/org.wso2.iot.android.call.stats.ui.publisher.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_ui_event_publisher/org.wso2.iot.android.call.stats.ui.publisher.xml
index 6237873a42..6a64193c8c 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_stats_ui_event_publisher/org.wso2.iot.android.call.stats.ui.publisher.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_stats_ui_event_publisher/org.wso2.iot.android.call.stats.ui.publisher.xml
@@ -5,3 +5,5 @@
   <mapping customMapping="disable" type="wso2event"/>
   <to eventAdapterType="ui"/>
 </eventPublisher>
+
+
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_streams/org.wso2.iot.android.call_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_streams/org.wso2.iot.android.call_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_streams/org.wso2.iot.android.call_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_streams/org.wso2.iot.android.call_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/batch-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/batch-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/batch-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/batch-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/donut-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/donut-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/donut-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/donut-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/Android_Call_Time_Chart/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/Android_Call_Time_Chart/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_time_chart_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_time_chart_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_ui_event_publisher/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_ui_event_publisher/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_ui_event_publisher/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_ui_event_publisher/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_ui_event_publisher/org.wso2.iot.android.call.ui.publisher.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_ui_event_publisher/org.wso2.iot.android.call.ui.publisher.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_call_ui_event_publisher/org.wso2.iot.android.call.ui.publisher.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_call_ui_event_publisher/org.wso2.iot.android.call.ui.publisher.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/application.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/application.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/application.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/application.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/autocomplete.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/autocomplete.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/autocomplete.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/autocomplete.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/bootstrap.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/bootstrap.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/bootstrap.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/bootstrap.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/dataTables.bootstrap.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/dataTables.bootstrap.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/dataTables.bootstrap.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/dataTables.bootstrap.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/daterangepicker.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/daterangepicker.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/daterangepicker.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/daterangepicker.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/font-awesome.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/font-awesome.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/font-awesome.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/font-awesome.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/font-awesome.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/font-awesome.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/font-awesome.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/font-awesome.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/gadget.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/gadget.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/gadget.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/gadget.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/jquery.dataTables.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/jquery.dataTables.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/jquery.dataTables.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/jquery.dataTables.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/nanoscroller.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/nanoscroller.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/css/nanoscroller.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/css/nanoscroller.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/fonts/FontAwesome.otf b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/fonts/FontAwesome.otf
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/fonts/FontAwesome.otf
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/fonts/FontAwesome.otf
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/fonts/fontawesome-webfont.eot b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/fonts/fontawesome-webfont.eot
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/fonts/fontawesome-webfont.eot
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/fonts/fontawesome-webfont.eot
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/fonts/fontawesome-webfont.svg b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/fonts/fontawesome-webfont.svg
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/fonts/fontawesome-webfont.svg
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/fonts/fontawesome-webfont.svg
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/fonts/fontawesome-webfont.ttf b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/fonts/fontawesome-webfont.ttf
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/fonts/fontawesome-webfont.ttf
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/fonts/fontawesome-webfont.woff b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/fonts/fontawesome-webfont.woff
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/fonts/fontawesome-webfont.woff
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/fonts/fontawesome-webfont.woff
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/fonts/fontawesome-webfont.woff2 b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/fonts/fontawesome-webfont.woff2
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/fonts/fontawesome-webfont.woff2
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/VizGrammar.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/VizGrammar.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/VizGrammar.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/VizGrammar.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/VizGrammar.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/VizGrammar.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/VizGrammar.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/VizGrammar.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/VizGrammar2.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/VizGrammar2.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/VizGrammar2.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/VizGrammar2.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/carbon-analytics.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/carbon-analytics.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/carbon-analytics.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/carbon-analytics.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/d3.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/d3.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/d3.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/d3.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/dagre-d3.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/dagre-d3.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/dagre-d3.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/dagre-d3.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/dataTables.bootstrap.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/dataTables.bootstrap.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/dataTables.bootstrap.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/dataTables.bootstrap.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/daterangepicker.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/daterangepicker.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/daterangepicker.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/daterangepicker.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/gadget-utils.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/gadget-utils.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/gadget-utils.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/gadget-utils.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/jquery-1.10.2.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/jquery-1.10.2.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/jquery-1.10.2.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/jquery-1.10.2.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/jquery.autocomplete.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/jquery.autocomplete.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/jquery.autocomplete.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/jquery.autocomplete.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/jquery.dataTables.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/jquery.dataTables.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/jquery.dataTables.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/jquery.dataTables.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/jquery.nanoscroller.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/jquery.nanoscroller.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/jquery.nanoscroller.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/jquery.nanoscroller.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/moment.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/moment.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/moment.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/moment.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/topojson.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/topojson.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/topojson.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/topojson.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/typeahead.bundle.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/typeahead.bundle.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/typeahead.bundle.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/typeahead.bundle.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/utils.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/utils.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/utils.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/utils.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/vega.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/vega.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_commons_gadget/commons/js/vega.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_commons_gadget/commons/js/vega.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_script/AndriodDataScript.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_script/AndriodDataScript.xml
similarity index 94%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_script/AndriodDataScript.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_script/AndriodDataScript.xml
index 5d7e35e176..181eb2f8d2 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_script/AndriodDataScript.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_script/AndriodDataScript.xml
@@ -15,5 +15,7 @@
         FROM AndroidDataData
         GROUP BY year, month, day, meta_deviceId, meta_owner, type ORDER BY timestamp DESC;
 
-        INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_DATA_STATS;                            </Script>
+        INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_DATA_STATS;
+    </Script>
+    <CronExpression>0 0/5 * * * ?</CronExpression>
 </Analytics>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_script/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_script/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_script/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_script/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_stats_event_sink/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_stats_event_sink/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_stats_event_sink/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_stats_event_sink/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_stats_event_sink/org_wso2_iot_android_data_stats.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_stats_event_sink/org_wso2_iot_android_data_stats.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_stats_event_sink/org_wso2_iot_android_data_stats.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_stats_event_sink/org_wso2_iot_android_data_stats.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_stats_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_stats_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_stats_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_stats_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_stats_streams/org.wso2.iot.android.data.stats_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_stats_streams/org.wso2.iot.android.data.stats_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_stats_streams/org.wso2.iot.android.data.stats_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_stats_streams/org.wso2.iot.android.data.stats_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_streams/org.wso2.iot.android.data_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_streams/org.wso2.iot.android.data_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_streams/org.wso2.iot.android.data_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_streams/org.wso2.iot.android.data_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_ui_event_publisher/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_ui_event_publisher/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_ui_event_publisher/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_ui_event_publisher/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_ui_event_publisher/org.wso2.iot.android.data.ui.publisher.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_ui_event_publisher/org.wso2.iot.android.data.ui.publisher.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_ui_event_publisher/org.wso2.iot.android.data.ui.publisher.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_ui_event_publisher/org.wso2.iot.android.data.ui.publisher.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/batch-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/batch-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/batch-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/batch-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/donut-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/donut-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/donut-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/donut-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/Android_Data_Usage_Chart/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/Android_Data_Usage_Chart/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_data_usage_chart_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_data_usage_chart_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/css/bootstrap-datepicker.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/css/bootstrap-datepicker.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/css/bootstrap-datepicker.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/css/bootstrap-datepicker.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/css/jquery-ui.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/css/jquery-ui.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/css/jquery-ui.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/css/jquery-ui.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/index.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/index.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/index.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/index.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/index.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/index.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/index.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/index.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/js/bootstrap-datepicker.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/js/bootstrap-datepicker.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/js/bootstrap-datepicker.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/js/bootstrap-datepicker.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/js/jquery-ui.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/js/jquery-ui.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_gadget/date-picker/js/jquery-ui.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_gadget/date-picker/js/jquery-ui.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_widget_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_widget_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_widget_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_widget_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_widget_gadget/date-picker-widget/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_widget_gadget/date-picker-widget/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_widget_gadget/date-picker-widget/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_widget_gadget/date-picker-widget/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_widget_gadget/date-picker-widget/index.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_widget_gadget/date-picker-widget/index.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_widget_gadget/date-picker-widget/index.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_widget_gadget/date-picker-widget/index.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_widget_gadget/date-picker-widget/index.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_widget_gadget/date-picker-widget/index.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_picker_widget_gadget/date-picker-widget/index.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_picker_widget_gadget/date-picker-widget/index.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/css/bootstrap-datepicker.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/css/bootstrap-datepicker.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/css/bootstrap-datepicker.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/css/bootstrap-datepicker.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/css/daterangepicker-bs3.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/css/daterangepicker-bs3.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/css/daterangepicker-bs3.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/css/daterangepicker-bs3.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/css/jquery-ui.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/css/jquery-ui.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/css/jquery-ui.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/css/jquery-ui.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/index.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/index.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/index.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/index.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/index.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/index.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/index.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/index.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/js/bootstrap-datepicker.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/js/bootstrap-datepicker.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/js/bootstrap-datepicker.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/js/bootstrap-datepicker.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/js/daterangepicker.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/js/daterangepicker.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/js/daterangepicker.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/js/daterangepicker.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/js/jquery-ui.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/js/jquery-ui.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/js/jquery-ui.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/js/jquery-ui.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/js/moment.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/js/moment.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_date_range_picker_gadget/date-range-picker/js/moment.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_date_range_picker_gadget/date-range-picker/js/moment.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/css/devicetable.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/css/devicetable.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/css/devicetable.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/css/devicetable.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/js/core/batch-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/js/core/batch-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/js/core/batch-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/js/core/batch-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/Android_Details/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/Android_Details/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_details_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_details_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_details_event_sink/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_event_sink/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_details_event_sink/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_event_sink/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_details_event_sink/org_wso2_iot_andriod_device_details.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_event_sink/org_wso2_iot_andriod_device_details.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_details_event_sink/org_wso2_iot_andriod_device_details.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_event_sink/org_wso2_iot_andriod_device_details.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_details_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_details_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_details_streams/org.wso2.iot.andriod.device.details_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_streams/org.wso2.iot.andriod.device.details_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_details_streams/org.wso2.iot.andriod.device.details_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_details_streams/org.wso2.iot.andriod.device.details_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/css/bootstrap.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/css/bootstrap.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/css/bootstrap.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/css/bootstrap.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/css/style.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/css/style.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/css/style.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/css/style.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/img/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/img/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/img/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/img/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/index.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/index.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/index.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/index.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/VizGrammar.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/VizGrammar.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/VizGrammar.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/VizGrammar.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/VizGrammarSettings.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/VizGrammarSettings.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/VizGrammarSettings.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/VizGrammarSettings.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/analyticsUtils.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/analyticsUtils.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/analyticsUtils.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/analyticsUtils.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/d3.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/d3.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/d3.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/d3.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/gadgetconf.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/gadgetconf.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/gadgetconf.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/gadgetconf.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/jquery.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/jquery.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/jquery.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/jquery.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/main.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/main.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/main.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/main.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/topojson.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/topojson.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/topojson.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/topojson.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/vega.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/vega.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_grouping_gadget/device-grouping/js/vega.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_grouping_gadget/device-grouping/js/vega.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/css/autocomplete.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/css/autocomplete.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/css/autocomplete.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/css/autocomplete.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/index.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/index.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/index.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/index.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/js/gadget-utils.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/js/gadget-utils.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/js/gadget-utils.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/js/gadget-utils.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/js/gadgetconf.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/js/gadgetconf.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/js/gadgetconf.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/js/gadgetconf.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/js/main.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/js/main.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/js/main.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/js/main.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/js/typeahead.bundle.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/js/typeahead.bundle.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/Android_Device_SearchBox/js/typeahead.bundle.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/Android_Device_SearchBox/js/typeahead.bundle.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_device_searchbox_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_device_searchbox_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_audio_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_audio_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_audio_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_audio_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_audio_streams/org.wso2.iot.andriod.filtered.audio_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_audio_streams/org.wso2.iot.andriod.filtered.audio_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_audio_streams/org.wso2.iot.andriod.filtered.audio_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_audio_streams/org.wso2.iot.andriod.filtered.audio_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_audio_ui_event_publisher/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_audio_ui_event_publisher/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_audio_ui_event_publisher/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_audio_ui_event_publisher/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_audio_ui_event_publisher/org.wso2.iot.android.filtered.audio.ui.publisher.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_audio_ui_event_publisher/org.wso2.iot.android.filtered.audio.ui.publisher.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_audio_ui_event_publisher/org.wso2.iot.android.filtered.audio.ui.publisher.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_audio_ui_event_publisher/org.wso2.iot.android.filtered.audio.ui.publisher.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/css/bootstrap.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/css/bootstrap.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/css/bootstrap.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/css/bootstrap.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/css/font-wso2.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/css/font-wso2.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/css/font-wso2.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/css/font-wso2.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/css/style.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/css/style.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/css/style.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/css/style.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/fonts/font-wso2.eot b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/fonts/font-wso2.eot
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/fonts/font-wso2.eot
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/fonts/font-wso2.eot
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/fonts/font-wso2.svg b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/fonts/font-wso2.svg
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/fonts/font-wso2.svg
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/fonts/font-wso2.svg
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/fonts/font-wso2.ttf b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/fonts/font-wso2.ttf
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/fonts/font-wso2.ttf
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/fonts/font-wso2.ttf
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/fonts/font-wso2.woff b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/fonts/font-wso2.woff
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/fonts/font-wso2.woff
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/fonts/font-wso2.woff
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/fonts/font-wso2.woff2 b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/fonts/font-wso2.woff2
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/fonts/font-wso2.woff2
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/fonts/font-wso2.woff2
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/img/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/img/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/img/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/img/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/index.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/index.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/index.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/index.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/VizGrammar.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/VizGrammar.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/VizGrammar.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/VizGrammar.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/VizGrammarSettings.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/VizGrammarSettings.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/VizGrammarSettings.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/VizGrammarSettings.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/analyticsUtils.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/analyticsUtils.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/analyticsUtils.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/analyticsUtils.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/d3.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/d3.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/d3.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/d3.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/gadgetconf.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/gadgetconf.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/gadgetconf.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/gadgetconf.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/jquery.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/jquery.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/jquery.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/jquery.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/main.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/main.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/main.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/main.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/mustache.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/mustache.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/mustache.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/mustache.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/topojson.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/topojson.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/topojson.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/topojson.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/vega.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/vega.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_filtered_by_gadget/filtered-by/js/vega.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_filtered_by_gadget/filtered-by/js/vega.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/css/dataTables.bootstrap.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/css/dataTables.bootstrap.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/css/dataTables.bootstrap.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/css/dataTables.bootstrap.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/batch-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/batch-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/batch-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/batch-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/table-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/table-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/table-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/core/table-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/jquery.dataTables.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/jquery.dataTables.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/jquery.dataTables.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/js/jquery.dataTables.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/Android_Frequent_Contacts_List/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequent_contacts_list_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequent_contacts_list_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequentcontacts_script/AndriodFrequentContactsScript.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequentcontacts_script/AndriodFrequentContactsScript.xml
similarity index 97%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequentcontacts_script/AndriodFrequentContactsScript.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequentcontacts_script/AndriodFrequentContactsScript.xml
index 91976371d0..9cab7c60ba 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequentcontacts_script/AndriodFrequentContactsScript.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequentcontacts_script/AndriodFrequentContactsScript.xml
@@ -49,5 +49,7 @@
         SELECT owner, deviceId, number, sum(callCount) as callCount, sum(smsCount) as smsCount, sum(total) as total, year
         FROM Android_Frequent_Contacts_Per_Month
         GROUP BY deviceId, owner, number, year
-        ORDER BY total DESC;                            </Script>
+        ORDER BY total DESC;
+    </Script>
+    <CronExpression>0 0/5 * * * ?</CronExpression>
 </Analytics>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequentcontacts_script/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequentcontacts_script/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_frequentcontacts_script/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_frequentcontacts_script/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_stats_event_sink/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_stats_event_sink/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_stats_event_sink/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_stats_event_sink/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_stats_event_sink/org_wso2_iot_android_headset_stats.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_stats_event_sink/org_wso2_iot_android_headset_stats.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_stats_event_sink/org_wso2_iot_android_headset_stats.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_stats_event_sink/org_wso2_iot_android_headset_stats.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_stats_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_stats_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_stats_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_stats_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_stats_streams/org.wso2.iot.android.headset.stats_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_stats_streams/org.wso2.iot.android.headset.stats_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_stats_streams/org.wso2.iot.android.headset.stats_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_stats_streams/org.wso2.iot.android.headset.stats_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/batch-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/batch-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/batch-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/batch-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/donut-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/donut-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/donut-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/donut-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/Android_Headset_Usage_Chart/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_headset_usage_chart_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_headset_usage_chart_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_event_sink/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_event_sink/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_event_sink/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_event_sink/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_event_sink/org_wso2_iot_android_location.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_event_sink/org_wso2_iot_android_location.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_event_sink/org_wso2_iot_android_location.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_event_sink/org_wso2_iot_android_location.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/css/map-style.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/css/map-style.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/css/map-style.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/css/map-style.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/css/number-chart.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/css/number-chart.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/css/number-chart.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/css/number-chart.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/data/demo-tracks.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/data/demo-tracks.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/data/demo-tracks.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/data/demo-tracks.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/img/marker/marker-icon-2x.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/img/marker/marker-icon-2x.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/img/marker/marker-icon-2x.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/img/marker/marker-icon-2x.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/img/marker/marker-icon.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/img/marker/marker-icon.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/img/marker/marker-icon.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/img/marker/marker-icon.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/img/marker/marker-shadow.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/img/marker/marker-shadow.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/img/marker/marker-shadow.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/img/marker/marker-shadow.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/LeafletPlayback.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/LeafletPlayback.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/LeafletPlayback.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/LeafletPlayback.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/android-geo.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/android-geo.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/android-geo.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/android-geo.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/angular-leaflet-directive.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/angular-leaflet-directive.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/angular-leaflet-directive.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/angular-leaflet-directive.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/core/_number-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/core/_number-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/core/_number-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/core/_number-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/core/batch-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/core/batch-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/core/batch-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/core/batch-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/core/provider-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/core/provider-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/core/provider-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/core/realtime-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/core/realtime-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/core/realtime-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/leaflet-heat.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/leaflet-heat.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/leaflet-heat.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/leaflet-heat.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/provider-libs/ws-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/js/provider-libs/ws-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/js/provider-libs/ws-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/Android_Location_Map/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/Android_Location_Map/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_map_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_map_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_script/LocationScript.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_script/LocationScript.xml
similarity index 97%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_script/LocationScript.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_script/LocationScript.xml
index cc86a06a03..12ae3132ea 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_script/LocationScript.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_script/LocationScript.xml
@@ -39,5 +39,7 @@
         INSERT INTO TABLE Android_Location_Stats_Per_Year
         SELECT owner, deviceId, latitude, longitude, streetName, sum(noOfVisits) as noOfVisits, year
         FROM Android_Location_Stats_Per_Month
-        GROUP BY deviceId, owner, year, streetName, latitude, longitude;                            </Script>
+        GROUP BY deviceId, owner, year, streetName, latitude, longitude;
+    </Script>
+    <CronExpression>0 0/5 * * * ?</CronExpression>
 </Analytics>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_script/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_script/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_script/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_script/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_stats_event_sink/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_stats_event_sink/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_stats_event_sink/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_stats_event_sink/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_stats_event_sink/org_wso2_iot_android_location_stats.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_stats_event_sink/org_wso2_iot_android_location_stats.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_stats_event_sink/org_wso2_iot_android_location_stats.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_stats_event_sink/org_wso2_iot_android_location_stats.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_stats_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_stats_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_stats_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_stats_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_stats_streams/org.wso2.iot.android.location.stats_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_stats_streams/org.wso2.iot.android.location.stats_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_stats_streams/org.wso2.iot.android.location.stats_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_stats_streams/org.wso2.iot.android.location.stats_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_streams/org.wso2.iot.android.location_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_streams/org.wso2.iot.android.location_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_streams/org.wso2.iot.android.location_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_streams/org.wso2.iot.android.location_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_ui_event_publisher/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_ui_event_publisher/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_ui_event_publisher/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_ui_event_publisher/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_ui_event_publisher/org.wso2.iot.android.location.ui.publisher.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_ui_event_publisher/org.wso2.iot.android.location.ui.publisher.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_location_ui_event_publisher/org.wso2.iot.android.location.ui.publisher.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_location_ui_event_publisher/org.wso2.iot.android.location.ui.publisher.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/css/bootstrap.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/css/bootstrap.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/css/bootstrap.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/css/bootstrap.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/css/style.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/css/style.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/css/style.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/css/style.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/img/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/img/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/img/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/img/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/index.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/index.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/index.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/index.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/VizGrammar.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/VizGrammar.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/VizGrammar.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/VizGrammar.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/VizGrammarSettings.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/VizGrammarSettings.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/VizGrammarSettings.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/VizGrammarSettings.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/analyticsUtils.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/analyticsUtils.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/analyticsUtils.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/analyticsUtils.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/bootstrap-paginator.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/bootstrap-paginator.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/bootstrap-paginator.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/bootstrap-paginator.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/d3.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/d3.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/d3.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/d3.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/gadgetconf.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/gadgetconf.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/gadgetconf.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/gadgetconf.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/jquery.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/jquery.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/jquery.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/jquery.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/main.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/main.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/main.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/main.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/topojson.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/topojson.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/topojson.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/topojson.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/vega.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/vega.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_non_compliant_features_gadget/non-compliant-features/js/vega.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_non_compliant_features_gadget/non-compliant-features/js/vega.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/css/dataTables.bootstrap.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/css/dataTables.bootstrap.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/css/dataTables.bootstrap.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/css/dataTables.bootstrap.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/provider-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/provider-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/provider-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/realtime-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/realtime-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/realtime-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/table-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/table-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/table-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/core/table-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/jquery.dataTables.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/jquery.dataTables.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/jquery.dataTables.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/jquery.dataTables.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/provider-libs/ws-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/js/provider-libs/ws-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/js/provider-libs/ws-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/Android_Realtime_Audio/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/Android_Realtime_Audio/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_audio_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_audio_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/css/dataTables.bootstrap.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/css/dataTables.bootstrap.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/css/dataTables.bootstrap.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/css/dataTables.bootstrap.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/provider-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/provider-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/provider-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/realtime-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/realtime-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/realtime-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/table-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/table-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/table-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/core/table-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/jquery.dataTables.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/jquery.dataTables.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/jquery.dataTables.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/jquery.dataTables.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/provider-libs/ws-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/js/provider-libs/ws-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/js/provider-libs/ws-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/Android_Realtime_Battery/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/Android_Realtime_Battery/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_battery_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_battery_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/css/dataTables.bootstrap.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/css/dataTables.bootstrap.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/css/dataTables.bootstrap.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/css/dataTables.bootstrap.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/core/provider-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/core/provider-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/core/provider-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/core/realtime-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/core/realtime-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/core/realtime-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/core/table-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/core/table-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/core/table-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/core/table-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/jquery.dataTables.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/jquery.dataTables.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/jquery.dataTables.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/jquery.dataTables.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/provider-libs/ws-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/js/provider-libs/ws-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/js/provider-libs/ws-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/Android_Realtime_Call/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/Android_Realtime_Call/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_call_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_call_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/css/dataTables.bootstrap.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/css/dataTables.bootstrap.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/css/dataTables.bootstrap.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/css/dataTables.bootstrap.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/core/provider-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/core/provider-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/core/provider-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/core/realtime-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/core/realtime-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/core/realtime-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/core/table-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/core/table-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/core/table-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/core/table-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/jquery.dataTables.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/jquery.dataTables.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/jquery.dataTables.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/jquery.dataTables.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/provider-libs/ws-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/js/provider-libs/ws-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/js/provider-libs/ws-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/Android_Realtime_Data/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/Android_Realtime_Data/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_data_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_data_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/css/dataTables.bootstrap.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/css/dataTables.bootstrap.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/css/dataTables.bootstrap.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/css/dataTables.bootstrap.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/provider-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/provider-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/provider-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/realtime-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/realtime-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/realtime-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/table-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/table-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/table-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/core/table-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/jquery.dataTables.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/jquery.dataTables.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/jquery.dataTables.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/jquery.dataTables.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/provider-libs/ws-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/js/provider-libs/ws-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/js/provider-libs/ws-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/Android_Realtime_Screen/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/Android_Realtime_Screen/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_screen_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_screen_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/css/dataTables.bootstrap.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/css/dataTables.bootstrap.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/css/dataTables.bootstrap.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/css/dataTables.bootstrap.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/provider-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/provider-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/provider-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/provider-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/realtime-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/realtime-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/realtime-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/realtime-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/table-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/table-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/table-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/core/table-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/jquery.dataTables.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/jquery.dataTables.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/jquery.dataTables.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/jquery.dataTables.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/provider-libs/ws-client.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/provider-libs/ws-client.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/js/provider-libs/ws-client.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/js/provider-libs/ws-client.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/Android_Realtime_SMS/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/Android_Realtime_SMS/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_realtime_sms_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_realtime_sms_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/js/core/batch-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/batch-provider-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/js/core/batch-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/batch-provider-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/donut-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/donut-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/donut-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/donut-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/gadget-core.js
similarity index 86%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/gadget-core.js
index 580aa797fa..893d71637b 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/gadget-core.js
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/gadget-core.js
@@ -60,19 +60,20 @@ $(function() {
                 contentType: "application/json",
                 async: false,
                 success: function(data) {
-                    var duration = data[0].duration / 60000; // Convert to minutes
-                    var newData = [{
+                    if(typeof data[0].duration == 'undefined'){
+                        console.log("Currently data can't be retrieved...");
+                        console.log(JSON.stringify(data));
+                    }else{
+                        var duration = data[0].duration / 60000; // Convert to minutes
+                        var newData = [{
                             "duration": duration,
                             "owner": "YES"
                         }, {
                             "duration": (1440 - duration),
                             "owner": "NO"
                         }
-                    ];
-                // data.forEach(function(entry) {
-                //     entry.duration = entry.duration / 60000 % 100; // Convert to minutes
-                // });
-                // providerData = data;
+                        ];
+                    }
                 providerData = newData;
             }
         });
@@ -81,18 +82,15 @@ $(function() {
 
 
 var drawGadget = function() {
-
     draw('#canvas', conf[CHART_CONF], schema, providerData);
     setInterval(function() {
         draw('#canvas', conf[CHART_CONF], schema, getProviderData());
     }, pref.getInt(REFRESH_INTERVAL));
-
 };
 
 getGadgetLocation(function(gadget_Location) {
     gadgetLocation = gadget_Location;
     init();
     drawGadget();
-
 });
 });
\ No newline at end of file
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/Android_Screen_On_Chart/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_on_chart_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_script/AndriodScreenScript.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_script/AndriodScreenScript.xml
similarity index 94%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_script/AndriodScreenScript.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_script/AndriodScreenScript.xml
index 0d7e59ac4c..f6b0e4fb7c 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_script/AndriodScreenScript.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_script/AndriodScreenScript.xml
@@ -15,5 +15,7 @@
         FROM AndroidScreenData
         GROUP BY year, month, day, meta_deviceId, meta_owner ORDER BY timestamp DESC;
         
-        INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_SCREEN_STATS;                            </Script>
+        INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_SCREEN_STATS;
+    </Script>
+    <CronExpression>0 0/5 * * * ?</CronExpression>
 </Analytics>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_script/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_script/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_script/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_script/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_stats_event_sink/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_stats_event_sink/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_stats_event_sink/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_stats_event_sink/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_stats_event_sink/org_wso2_iot_android_screen_stats.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_stats_event_sink/org_wso2_iot_android_screen_stats.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_stats_event_sink/org_wso2_iot_android_screen_stats.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_stats_event_sink/org_wso2_iot_android_screen_stats.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_stats_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_stats_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_stats_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_stats_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_stats_streams/org.wso2.iot.android.screen.stats_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_stats_streams/org.wso2.iot.android.screen.stats_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_stats_streams/org.wso2.iot.android.screen.stats_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_stats_streams/org.wso2.iot.android.screen.stats_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_streams/org.wso2.iot.android.screen_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_streams/org.wso2.iot.android.screen_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_streams/org.wso2.iot.android.screen_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_streams/org.wso2.iot.android.screen_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_ui_event_publisher/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_ui_event_publisher/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_ui_event_publisher/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_ui_event_publisher/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_ui_event_publisher/org.wso2.iot.android.screen.ui.publisher.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_ui_event_publisher/org.wso2.iot.android.screen.ui.publisher.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_ui_event_publisher/org.wso2.iot.android.screen.ui.publisher.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_screen_ui_event_publisher/org.wso2.iot.android.screen.ui.publisher.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_dashboard/android-iot.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_dashboard/android-iot.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/android-iot.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_dashboard/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_dashboard/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_dashboard/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_execution/android_sense_execution.siddhiql b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_execution/android_sense_execution.siddhiql
deleted file mode 100644
index 9a6b1e907a..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_execution/android_sense_execution.siddhiql
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Enter a unique ExecutionPlan */
-@Plan:name('android_sense_execution')
-
-/* Enter a unique description for ExecutionPlan */
--- @Plan:description('android_sense_execution')
-
-/* define streams/tables and write queries here ... */
-
-@Export('org.wso2.iot.devices.wordcount:1.0.0')
-define stream words (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, sessionId string, word string, status string);
-
-@Export('org.wso2.iot.devices.rotation:1.0.0')
-define stream rotation (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, x float, y float, z float);
-
-@Export('org.wso2.iot.devices.proximity:1.0.0')
-define stream proximity (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, proximity float);
-
-@Export('org.wso2.iot.devices.pressure:1.0.0')
-define stream pressure (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, pressure float);
-
-@Export('org.wso2.iot.devices.magnetic:1.0.0')
-define stream magnetic (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, x float, y float, z float);
-
-@Export('org.wso2.iot.devices.light:1.0.0')
-define stream light (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, light float);
-
-@Export('org.wso2.iot.devices.gyroscope:1.0.0')
-define stream gyroscope (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, x float, y float, z float);
-
-@Export('org.wso2.iot.devices.gravity:1.0.0')
-define stream gravity (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, x float, y float, z float);
-
-@Export('org.wso2.iot.devices.gps:1.0.0')
-define stream gps (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, latitude double, longitude double);
-
-@Export('org.wso2.iot.devices.battery:1.0.0')
-define stream battery (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, level int);
-
-@Export('org.wso2.iot.devices.accelerometer:1.0.0')
-define stream accelerometer (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, x float, y float, z float);
-
-@Export("org.wso2.iot.devices.speed:1.0.0")
-define stream speed (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, limit float);
-
-@Export("org.wso2.iot.devices.turn:1.0.0")
-define stream turn (meta_owner string, meta_deviceType string, meta_deviceId string, meta_time long, turn string);
-
-@Import('org.wso2.iot.android.sense:1.0.0')
-define stream androidsense (meta_owner string, meta_deviceId string, meta_type string, meta_timestamp long, battery int, gps_lat double, gps_long double, accelerometer_x float, accelerometer_y float, accelerometer_z float,speed_limit float,turn_way string, magnetic_x float, magnetic_y float, magnetic_z float, gyroscope_x float, gyroscope_y float, gyroscope_z float, light float, pressure float, proximity float, gravity_x float, gravity_y float, gravity_z float, rotation_x float, rotation_y float, rotation_z float, word string, word_sessionId string, word_status string);
-
-from androidsense[meta_type == 'speed' and speed_limit > 25]
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, speed_limit as limit
-insert into speed;
-
-from androidsense[meta_type == 'turn']
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, turn_way as turn
-insert into turn;
-
-from androidsense[meta_type == 'accelerometer']
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, accelerometer_x as x, accelerometer_y as y, accelerometer_z as z
-insert into accelerometer;
-
-from androidsense[meta_type == 'battery']
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, battery as level
-insert into battery;
-
-from androidsense[meta_type == 'gps']
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, gps_lat as latitude, gps_long as longitude
-insert into gps;
-
-from androidsense[meta_type == 'gravity']
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, gravity_x as x, gravity_y as y, gravity_z as z
-insert into gravity;
-
-from androidsense[meta_type == 'gyroscope']
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, gyroscope_x as x, gyroscope_y as y, gyroscope_z as z
-insert into gyroscope;
-
-from androidsense[meta_type == 'light']
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, light
-insert into light;
-
-from androidsense[meta_type == 'magnetic']
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, magnetic_x as x, magnetic_y as y, magnetic_z as z
-insert into magnetic;
-
-from androidsense[meta_type == 'pressure']
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, pressure
-insert into pressure;
-
-from androidsense[meta_type == 'proximity']
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, proximity
-insert into proximity;
-
-from androidsense[meta_type == 'rotation']
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, rotation_x as x, rotation_y as y, rotation_z as z
-insert into rotation;
-
-from androidsense[meta_type == 'word']
-select meta_owner, 'android_sense' as meta_deviceType, meta_deviceId, meta_timestamp as meta_time, word_sessionId as sessionId, word as word, word_status as status
-insert into words;
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_execution/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_execution/artifact.xml
deleted file mode 100644
index f2a5be12eb..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_execution/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="android_sense_execution" version="1.0.0" type="event/execution-plan" serverRole="DataAnalyticsServer">
-	<file>android_sense_execution.siddhiql</file>
-</artifact>
-
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_script/Android_Sense_Script.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_script/Android_Sense_Script.xml
similarity index 92%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_script/Android_Sense_Script.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_script/Android_Sense_Script.xml
index 2b903946cc..80ed0fcde8 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_script/Android_Sense_Script.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_script/Android_Sense_Script.xml
@@ -15,6 +15,7 @@
             FROM AndroidHeadsetData
             GROUP BY year, month, day, meta_deviceId, meta_owner ORDER BY timestamp DESC;
 
-            INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_HEADSET_STATS;             
-                                                        </Script>
+            INCREMENTAL_TABLE_COMMIT ORG_WSO2_IOT_ANDROID_HEADSET_STATS;
+    </Script>
+    <CronExpression>0 0/5 * * * ?</CronExpression>
 </Analytics>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_script/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_script/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_script/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_script/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_stream/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_stream/artifact.xml
deleted file mode 100644
index efc77622fb..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_stream/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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="android_sense_stream" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-	<file>org.wso2.iot.android.sense_1.0.0.json</file>
-</artifact>
-
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_stream/org.wso2.iot.android.sense_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_stream/org.wso2.iot.android.sense_1.0.0.json
deleted file mode 100644
index a42d308c46..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_stream/org.wso2.iot.android.sense_1.0.0.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "name": "org.wso2.iot.android.sense",
-  "version": "1.0.0",
-  "nickName": "android_sense_stream",
-  "description": "This hold the device type stream of android sense",
-  "metaData": [
-    {"name": "owner", "type": "STRING"},
-    {"name": "deviceId", "type": "STRING"},
-    {"name": "type", "type": "STRING"},
-    {"name": "timestamp", "type": "LONG"}
-  ],
-  "payloadData": [
-    {"name": "battery", "type": "INT"},
-    {"name": "gps_lat", "type": "DOUBLE"},
-    {"name": "gps_long", "type": "DOUBLE"},
-    {"name": "accelerometer_x", "type": "FLOAT"},
-    {"name": "accelerometer_y", "type": "FLOAT"},
-    {"name": "accelerometer_z", "type": "FLOAT"},
-    {"name": "speed_limit", "type": "FLOAT"},
-    {"name": "turn_way", "type": "STRING"},
-    {"name": "magnetic_x", "type": "FLOAT"},
-    {"name": "magnetic_y", "type": "FLOAT"},
-    {"name": "magnetic_z", "type": "FLOAT"},
-    {"name": "gyroscope_x", "type": "FLOAT"},
-    {"name": "gyroscope_y", "type": "FLOAT"},
-    {"name": "gyroscope_z", "type": "FLOAT"},
-    {"name": "light", "type": "FLOAT"},
-    {"name": "pressure", "type": "FLOAT"},
-    {"name": "proximity", "type": "FLOAT"},
-    {"name": "gravity_x", "type": "FLOAT"},
-    {"name": "gravity_y", "type": "FLOAT"},
-    {"name": "gravity_z", "type": "FLOAT"},
-    {"name": "rotation_x", "type": "FLOAT"},
-    {"name": "rotation_y", "type": "FLOAT"},
-    {"name": "rotation_z", "type": "FLOAT"},
-    {"name": "word", "type": "STRING"},
-    {"name": "word_sessionId", "type": "STRING"},
-    {"name": "word_status", "type": "STRING"}
-  ]
-}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_streams/org.wso2.iot.android.sense_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_streams/org.wso2.iot.android.sense_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sense_streams/org.wso2.iot.android.sense_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sense_streams/org.wso2.iot.android.sense_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/conf.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/conf.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/conf.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/conf.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/gadget-controller.jag b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/gadget-controller.jag
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/gadget-controller.jag
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/gadget-controller.jag
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/gadget.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/gadget.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/gadget.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/gadget.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/batch-provider-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/js/core/batch-provider-api.js
similarity index 99%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/batch-provider-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/js/core/batch-provider-api.js
index d726b7d51c..30c96902a5 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_screen_on_chart_gadget/Android_Screen_On_Chart/js/core/batch-provider-api.js
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/js/core/batch-provider-api.js
@@ -178,7 +178,6 @@ var getConfig, validate, getMode, getSchema, getData, registerCallBackforPush;
             result = connector.getRecordsByRange(loggedInUser, tableName, from, to, 0, limit, null).getMessage();
 
         }
-        log.info(result);
         result = JSON.parse(result);
         var data = [];
         for (var i = 0; i < result.length; i++) {
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/js/core/donut-chart-api.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/js/core/donut-chart-api.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/js/core/donut-chart-api.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/js/core/donut-chart-api.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/js/core/gadget-core.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/js/core/gadget-core.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/js/core/gadget-core.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/js/core/gadget-core.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/js/core/gadget-util.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/js/core/gadget-util.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/js/core/gadget-util.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/js/core/gadget-util.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/Android_SMS_Chart/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/Android_SMS_Chart/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_chart_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_chart_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_script/AndriodSmsScript.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_script/AndriodSmsScript.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_script/AndriodSmsScript.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_script/AndriodSmsScript.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_script/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_script/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_script/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_script/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_stats_event_sink/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_event_sink/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_stats_event_sink/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_event_sink/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_stats_event_sink/org_wso2_iot_android_sms_stats.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_event_sink/org_wso2_iot_android_sms_stats.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_stats_event_sink/org_wso2_iot_android_sms_stats.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_event_sink/org_wso2_iot_android_sms_stats.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_stats_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_stats_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_stats_streams/org.wso2.iot.android.sms.stats_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_streams/org.wso2.iot.android.sms.stats_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_stats_streams/org.wso2.iot.android.sms.stats_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_stats_streams/org.wso2.iot.android.sms.stats_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_streams/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_streams/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_streams/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_streams/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_streams/org.wso2.iot.android.sms_1.0.0.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_streams/org.wso2.iot.android.sms_1.0.0.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_streams/org.wso2.iot.android.sms_1.0.0.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_streams/org.wso2.iot.android.sms_1.0.0.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_ui_event_publisher/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_ui_event_publisher/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_ui_event_publisher/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_ui_event_publisher/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_ui_event_publisher/org.wso2.iot.android.sms.ui.publisher.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_ui_event_publisher/org.wso2.iot.android.sms.ui.publisher.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_sms_ui_event_publisher/org.wso2.iot.android.sms.ui.publisher.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_sms_ui_event_publisher/org.wso2.iot.android.sms.ui.publisher.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/artifact.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/artifact.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/artifact.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/artifact.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/css/bootstrap.min.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/css/bootstrap.min.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/css/bootstrap.min.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/css/bootstrap.min.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/css/style.css b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/css/style.css
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/css/style.css
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/css/style.css
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/gadget.json b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/gadget.json
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/gadget.json
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/gadget.json
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/img/phone.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/img/phone.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/img/phone.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/img/phone.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/img/thumbnail.png b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/img/thumbnail.png
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/img/thumbnail.png
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/img/thumbnail.png
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/index.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/index.xml
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/index.xml
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/index.xml
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/VizGrammar.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/VizGrammar.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/VizGrammar.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/VizGrammar.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/VizGrammarSettings.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/VizGrammarSettings.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/VizGrammarSettings.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/VizGrammarSettings.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/analyticsUtils.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/analyticsUtils.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/analyticsUtils.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/analyticsUtils.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/bootstrap-paginator.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/bootstrap-paginator.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/bootstrap-paginator.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/bootstrap-paginator.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/d3.min.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/d3.min.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/d3.min.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/d3.min.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/gadgetconf.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/gadgetconf.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/gadgetconf.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/gadgetconf.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/jquery.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/jquery.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/jquery.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/jquery.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/main.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/main.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/main.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/main.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/topojson.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/topojson.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/topojson.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/topojson.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/vega.js b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/vega.js
similarity index 100%
rename from components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/android_un_secured_devices_gadget/un-secured-devices/js/vega.js
rename to components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/android_un_secured_devices_gadget/un-secured-devices/js/vega.js
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/artifacts.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/artifacts.xml
index a03fa2c2de..67abcb7a06 100644
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/artifacts.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/src/main/resources/carbonapps/androidsense/artifacts.xml
@@ -18,10 +18,154 @@
   -->
 
 <artifacts>
-    <artifact name="android_sense" version="1.0.0" type="carbon/application">
-        <dependency artifact="android_sense_stream" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+    <artifact name="android_analytics" version="1.0.0" type="carbon/application">
+        <dependency artifact="android_active_stack_chart_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_active_time_chart_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_activity_chart_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_activity_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_activity_stats_event_sink" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_activity_stats_streams" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_activity_streams" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_andriod_audio_filter_executionplan" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_android_activity_executionplan" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_android_audio_executionplan" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_android_call_executionplan" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_android_data_executionplan" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_android_location_executionplan" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_android_screen_executionplan" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_android_sense_executionplan" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_android_sms_executionplan" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_audio_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_audio_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_battery_level_chart_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_battery_percentage_chart_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_battery_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_battery_ui_event_publisher" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_call_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_call_stats_event_sink" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_call_stats_streams" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_call_stats_ui_event_publisher" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_call_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_call_time_chart_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_call_ui_event_publisher" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_commons_gadget" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_data_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_data_stats_event_sink" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_data_stats_streams" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_data_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_data_ui_event_publisher" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_data_usage_chart_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_date_picker_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_date_picker_widget_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_date_range_picker_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_details_gadget" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_device_details_event_sink" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_device_details_streams" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_device_grouping_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_device_searchbox_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_filtered_audio_streams" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_filtered_audio_ui_event_publisher" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_filtered_by_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_frequent_contacts_list_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_frequentcontacts_script" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_headset_stats_event_sink" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_headset_stats_streams" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_headset_usage_chart_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_location_event_sink" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_location_map_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_location_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_location_stats_event_sink" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_location_stats_streams" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_location_streams" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_location_ui_event_publisher" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_non_compliant_features_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_realtime_audio_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_realtime_battery_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_realtime_call_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_realtime_data_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_realtime_screen_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_realtime_sms_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_screen_on_chart_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_screen_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_screen_stats_event_sink" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_screen_stats_streams" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_screen_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_screen_ui_event_publisher" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_sense_dashboard" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_sense_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_sense_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_sms_chart_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_sms_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_sms_stats_event_sink" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_sms_stats_streams" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_sms_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_sms_ui_event_publisher" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
+        <dependency artifact="android_un_secured_devices_gadget" version="1.0.0" include="true"
+                    serverRole="DataAnalyticsServer"/>
         <dependency artifact="android_sense_receiver" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
         <dependency artifact="android_sense_publisher" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_sense_execution" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
     </artifact>
 </artifacts>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/build.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/build.xml
deleted file mode 100644
index a0a04fe973..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/build.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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-android-sense-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="Android_Sense_dir" value="android_analytics"/>
-
-    <target name="clean">
-        <delete dir="${target-dir}" />
-    </target>
-
-    <target name="zip" depends="clean">
-        <mkdir dir="${target-dir}"/>
-        <zip destfile="${target-dir}/${Android_Sense_dir}.car">
-            <zipfileset dir="${src-dir}/${Android_Sense_dir}"/>
-        </zip>
-    </target>
-</project>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/pom.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/pom.xml
deleted file mode 100644
index 54cff03dc6..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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>
-        <artifactId>androidsense-plugin</artifactId>
-        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>3.0.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.iot.androidsense.analytics</artifactId>
-    <name>WSO2 Carbon - IoT Server Android Sense Analytics capp</name>
-    <packaging>pom</packaging>
-
-    <build>
-        <plugins>
-            <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.devicemgt.plugins.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/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/assembly/src.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/assembly/src.xml
deleted file mode 100644
index a5a375010e..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/assembly/src.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  ~ 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/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/artifacts.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/artifacts.xml
deleted file mode 100644
index f04a301dd6..0000000000
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics2/src/main/resources/carbonapps/android_analytics/artifacts.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<?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="android_analytics" version="1.0.0" type="carbon/application">
-        <dependency artifact="android_active_stack_chart_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_active_time_chart_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_activity_chart_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_activity_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_activity_stats_event_sink" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_activity_stats_streams" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_activity_streams" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_andriod_audio_filter_executionplan" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_android_activity_executionplan" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_android_audio_executionplan" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_android_call_executionplan" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_android_data_executionplan" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_android_location_executionplan" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_android_screen_executionplan" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_android_sense_executionplan" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_android_sms_executionplan" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_audio_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_audio_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_battery_level_chart_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_battery_percentage_chart_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_battery_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_battery_ui_event_publisher" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_call_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_call_stats_event_sink" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_call_stats_streams" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_call_stats_ui_event_publisher" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_call_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_call_time_chart_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_call_ui_event_publisher" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_commons_gadget" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_data_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_data_stats_event_sink" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_data_stats_streams" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_data_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_data_ui_event_publisher" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_data_usage_chart_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_date_picker_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_date_picker_widget_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_date_range_picker_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_details_gadget" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_device_details_event_sink" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_device_details_streams" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_device_grouping_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_device_searchbox_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_filtered_audio_streams" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_filtered_audio_ui_event_publisher" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_filtered_by_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_frequent_contacts_list_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_frequentcontacts_script" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_headset_stats_event_sink" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_headset_stats_streams" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_headset_usage_chart_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_location_event_sink" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_location_map_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_location_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_location_stats_event_sink" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_location_stats_streams" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_location_streams" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_location_ui_event_publisher" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_non_compliant_features_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_realtime_audio_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_realtime_battery_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_realtime_call_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_realtime_data_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_realtime_screen_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_realtime_sms_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_screen_on_chart_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_screen_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_screen_stats_event_sink" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_screen_stats_streams" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_screen_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_screen_ui_event_publisher" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_sense_dashboard" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_sense_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_sense_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_sms_chart_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_sms_script" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_sms_stats_event_sink" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_sms_stats_streams" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_sms_streams" version="1.0.0" include="true" serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_sms_ui_event_publisher" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="android_un_secured_devices_gadget" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-    </artifact>
-</artifacts>