From aeb7e08d64a28dda599facb2cf0e8247348c8b29 Mon Sep 17 00:00:00 2001
From: Chatura Dilan <dilan@dilan.me>
Date: Thu, 1 Dec 2016 14:17:04 +0530
Subject: [PATCH 1/5] Added COSU policy edit

---
 .../public/templates/android-policy-edit.hbs         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
index 69b165900..d1854284c 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
@@ -85,7 +85,7 @@
             <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
-        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)" class="hide">
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
             <span class="wr-hidden-operation-icon fw-stack">
                 <i class="fw fw-import fw-stack-2x"></i>
             </span>
@@ -96,7 +96,7 @@
                     class="fw fw-ok"></i></span>
             <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
-        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)" class="hide">
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)" >
             <span class="wr-hidden-operations-icon fw-stack">
                 <i class="fw fw-register fw-stack-2x"></i>
             </span>
@@ -1203,7 +1203,7 @@
             </div>
         </div>
         <!-- cosu-system-update-policy -->
-        <div class="wr-hidden-operation hidden hide" data-operation="cosu-system-update-policy">
+        <div class="wr-hidden-operation" data-operation="cosu-system-update-policy">
             <div class="panel panel-default operation-data" data-operation="cosu-system-update-policy-body"
                  data-operation-code="SYSTEM_UPDATE_POLICY">
                 <div id="cosu-system-update-policy-heading" class="panel-heading" role="tab">
@@ -1222,7 +1222,7 @@
                         to modify these settings on their devices.
                     </div>
                 </div>
-                <div id="cosu-system-update-policy-body hidden" class="panel-collapse panel-body collapse"
+                <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse"
                      role="tabpanel"
                      aria-labelledby="cosu-system-update-policy-body">
                     <hr/>
@@ -1273,7 +1273,7 @@
                             </span>
                         </label>
                     </div>
-                    <div id="cosu-system-update-policy-window-select" class="hidden">
+                    <div id="cosu-system-update-policy-window-select">
                         <div>
                             <ul class="message message-info">
                                 <i class="icon fw fw-info"></i>
@@ -1360,7 +1360,7 @@
             </div>
         </div>
         <!-- cosu-whitelist-applications -->
-        <div class="wr-hidden-operation hidden hide" data-operation="cosu-whitelisted-applications">
+        <div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications">
             <div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
                  data-operation-code="KIOSK_APPS">
                 <div id="cosu-whitelisted-applications-heading" class="panel-heading" role="tab">

From 3249079965916635942d46d3bec6b376c9b3405a Mon Sep 17 00:00:00 2001
From: madhawap <madhawa.818@gmail.com>
Date: Thu, 1 Dec 2016 15:41:07 +0530
Subject: [PATCH 2/5] Seperate out task operations

---
 .../public/js/device-detail.js                |  6 +-
 .../impl/AndroidDeviceManagementService.java  | 20 ++++++
 .../config/MobileDeviceManagementConfig.java  | 12 ++++
 .../impl/config/task/TaskConfiguration.java   | 62 +++++++++++++++++++
 .../impl/WindowsDeviceManagementService.java  | 10 +--
 .../main/resources/devicetypes/android.xml    | 17 ++++-
 6 files changed, 120 insertions(+), 7 deletions(-)
 create mode 100644 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/task/TaskConfiguration.java

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
index a90864968..89fe38224 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
@@ -22,6 +22,7 @@ var InitiateViewOption = null;
     var deviceId = $(".device-id");
     var deviceIdentifier = deviceId.data("deviceid");
     var deviceType = deviceId.data("type");
+    var ownership = deviceId.data("ownership");
     var payload = [deviceIdentifier];
     var operationTable;
     var serviceUrl;
@@ -134,6 +135,7 @@ var InitiateViewOption = null;
     });
 
     function loadOperationsLog(update) {
+        var owner = $("#device-owner").data("owner");
         var operationsLogTable = "#operations-log-table";
         if (update) {
             operationTable = $(operationsLogTable).DataTable();
@@ -148,8 +150,8 @@ var InitiateViewOption = null;
             pageLength : 10,
             order: [],
             ajax: {
-                url: "/emm/api/operation/paginate",
-                data: {deviceId : deviceIdentifier, deviceType: deviceType},
+                url: "/devicemgt/api/operation/paginate",
+                data: {deviceId : deviceIdentifier, deviceType: deviceType, owner:owner},
                 dataSrc: function (json) {
                     $("#operations-spinner").addClass("hidden");
                     $("#operations-log-container").empty();
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
index bed25a980..7f9913b01 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
@@ -23,6 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
+import org.wso2.carbon.device.mgt.common.TaskOperation;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
@@ -52,6 +53,25 @@ public class AndroidDeviceManagementService implements DeviceManagementService {
         return AndroidDeviceManagementService.DEVICE_TYPE_ANDROID;
     }
 
+//    This method is not in use
+    @Override
+    public List<TaskOperation> getTasksForPlatform() {
+//            List<String> operationsForPlatform = new ArrayList<>();
+//            TaskConfiguration taskConfiguration =
+//                    MobileDeviceConfigurationManager.getInstance().getMobileDeviceManagementConfig()
+//                            .getTaskConfiguration();
+//
+//            List<TaskConfiguration.Operation> ops = taskConfiguration.getOperations();
+//            List<TaskOperation> taskOperations = new ArrayList<>();
+//            for (TaskConfiguration.Operation op : ops) {
+//                TaskOperation taskOperation = new TaskOperation();
+//                taskOperation.setTaskName(op.getOperationName());
+//                taskOperation.setRecurrentTimes(op.getRecurrency());
+//                taskOperations.add(taskOperation);
+//            }
+            return null;
+    }
+
     @Override
     public void init() throws DeviceManagementException {
         this.deviceManager = new AndroidDeviceManager();
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java
index 2c65375c7..dd873b444 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java
@@ -18,6 +18,8 @@
 
 package org.wso2.carbon.device.mgt.mobile.android.impl.config;
 
+
+
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -28,6 +30,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 public final class MobileDeviceManagementConfig {
 
     private MobileDeviceManagementRepository mobileDeviceMgtRepository;
+//    private TaskConfiguration taskConfiguration;
 
     @XmlElement(name = "ManagementRepository", nillable = false)
     public MobileDeviceManagementRepository getMobileDeviceMgtRepository() {
@@ -39,4 +42,13 @@ public final class MobileDeviceManagementConfig {
         this.mobileDeviceMgtRepository = mobileDeviceMgtRepository;
     }
 
+//    @XmlElement(name = "TaskConfiguration", required = true)
+//    public TaskConfiguration getTaskConfiguration() {
+//        return taskConfiguration;
+//    }
+//
+//    public void setTaskConfiguration(TaskConfiguration taskConfiguration) {
+//        this.taskConfiguration = taskConfiguration;
+//    }
+
 }
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/task/TaskConfiguration.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/task/TaskConfiguration.java
new file mode 100644
index 000000000..06eb83956
--- /dev/null
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/task/TaskConfiguration.java
@@ -0,0 +1,62 @@
+package org.wso2.carbon.device.mgt.mobile.android.impl.config.task;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.List;
+
+/**
+ *
+ */
+@XmlRootElement(name = "TaskConfiguration")
+public class TaskConfiguration {
+
+
+    private boolean enabled;
+    private List<Operation> operations;
+
+    @XmlElement(name = "Enable", required = true)
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    @XmlElementWrapper(name="Operations")
+    @XmlElement(name = "Operation", required = true)
+    public List<Operation> getOperations() {
+        return operations;
+    }
+
+    public void setOperations(List<Operation> operations) {
+        this.operations = operations;
+    }
+
+    @XmlRootElement(name = "Operation")
+    public static class Operation {
+
+        private String operationName;
+        private int recurrency;
+
+        @XmlElement(name = "Name", required = true)
+        public String getOperationName() {
+            return operationName;
+        }
+
+        public void setOperationName(String operationName) {
+            this.operationName = operationName;
+        }
+
+        @XmlElement(name = "RecurrentTimes", required = true)
+        public int getRecurrency() {
+            return recurrency;
+        }
+
+        public void setRecurrency(int recurrency) {
+            this.recurrency = recurrency;
+        }
+
+    }
+}
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java
index 965823707..5a21c0539 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManagementService.java
@@ -18,14 +18,11 @@
 
 package org.wso2.carbon.device.mgt.mobile.windows.impl;
 
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
 import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
-import org.wso2.carbon.device.mgt.common.app.mgt.Application;
-import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
+import org.wso2.carbon.device.mgt.common.TaskOperation;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
-import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 
@@ -45,6 +42,11 @@ public class WindowsDeviceManagementService implements DeviceManagementService {
         return WindowsDeviceManagementService.DEVICE_TYPE_WINDOWS;
     }
 
+    @Override
+    public List<TaskOperation> getTasksForPlatform() {
+        return null;
+    }
+
     @Override
     public void init() throws DeviceManagementException {
         this.deviceManager = new WindowsDeviceManager();
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
index 5ee31efff..3da1f798b 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
@@ -401,5 +401,20 @@
             </Operation>
         </Feature>
     </Features>
-
+    <TaskConfiguration>
+        <Operations>
+            <Operation>
+                <Name>DEVICE_INFO</Name>
+                <RecurrentTimes>1</RecurrentTimes>
+            </Operation>
+            <Operation>
+                <Name>APPLICATION_LIST</Name>
+                <RecurrentTimes>5</RecurrentTimes>
+            </Operation>
+            <Operation>
+                <Name>DEVICE_LOCATION</Name>
+                <RecurrentTimes>1</RecurrentTimes>
+            </Operation>
+        </Operations>
+    </TaskConfiguration>
 </DeviceTypeConfiguration>
\ No newline at end of file

From 429b52f037a6d43964260115f34a933570474031 Mon Sep 17 00:00:00 2001
From: madhawap <madhawa.818@gmail.com>
Date: Thu, 1 Dec 2016 16:04:43 +0530
Subject: [PATCH 3/5] resolve conflicts

---
 .../build.xml                                 |    7 +-
 .../org.wso2.carbon.iot.geo.dashboard/pom.xml |   77 +
 .../src/assembly/src.xml                      |   36 +
 .../carbonapps}/Dashboard_1.0.0/artifact.xml  |    0
 .../Dashboard_1.0.0/geo-dashboard.json        |    0
 .../GadgetGeoDashboard_1.0.0/artifact.xml     |    0
 ...Geo-ExecutionPlan-Proximity_alert.siddhiql |    0
 .../Geo-ExecutionPlan-Speed_alert.siddhiql    |    0
 ...eo-ExecutionPlan-Stationery_alert.siddhiql |    0
 .../Geo-ExecutionPlan-Traffic_alert.siddhiql  |    0
 .../Geo-ExecutionPlan-Within_alert.siddhiql   |    0
 .../geo-dashboard/conf/cep_info.json          |    0
 .../geo-dashboard/conf/database.json          |    0
 .../geo-dashboard/controllers/get_alerts.jag  |    0
 .../controllers/get_alerts_history.jag        |    0
 .../controllers/get_server_info.jag           |    0
 .../controllers/modals/proximity_alert.jag    |    0
 .../controllers/modals/speed_alert.jag        |    0
 .../controllers/modals/stationery_alert.jag   |    0
 .../controllers/modals/traffic_point.jag      |    0
 .../controllers/modals/within_alert.jag       |    0
 .../controllers/remove_alerts.jag             |    0
 .../geo-dashboard/controllers/set_alerts.jag  |    0
 .../controllers/tile_servers.jag              |    0
 .../controllers/wms_endpoints.jag             |    0
 .../geo-dashboard/css/L.Control.Locate.css    |    0
 .../geo-dashboard/css/L.Control.Locate.ie.css |    0
 .../css/MarkerCluster.Default.css             |    0
 .../geo-dashboard/css/MarkerCluster.css       |    0
 .../geo-dashboard/css/app.css                 |    0
 .../css/bootstrap-wizard-lib/LICENSE          |    0
 .../bootstrap-wizard-lib/bootstrap-wizard.css |    0
 .../geo-dashboard/css/bootstrap.min.css       |    0
 .../geo-dashboard/css/css/animation.css       |    0
 .../geo-dashboard/css/css/locate-fa-codes.css |    0
 .../css/css/locate-fa-embedded.css            |    0
 .../css/css/locate-fa-ie7-codes.css           |    0
 .../geo-dashboard/css/css/locate-fa-ie7.css   |    0
 .../geo-dashboard/css/css/locate-fa.css       |    0
 .../geo-dashboard/css/d3/c3.css               |    0
 .../geo-dashboard/css/font-awesome.min.css    |    0
 .../geo-dashboard/css/font/LICENSE.txt        |    0
 .../geo-dashboard/css/font/README.txt         |    0
 .../geo-dashboard/css/font/config.json        |    0
 .../geo-dashboard/css/font/locate-fa.eot      |  Bin
 .../geo-dashboard/css/font/locate-fa.svg      |    0
 .../geo-dashboard/css/font/locate-fa.ttf      |  Bin
 .../geo-dashboard/css/font/locate-fa.woff     |  Bin
 .../geo-dashboard/css/fonts/FontAwesome.otf   |  Bin
 .../css/fonts/fontawesome-webfont.eot         |  Bin
 .../css/fonts/fontawesome-webfont.svg         |    0
 .../css/fonts/fontawesome-webfont.ttf         |  Bin
 .../css/fonts/fontawesome-webfont.woff        |  Bin
 ...O.Move_this_images_to_assets_images_folder |    0
 .../geo-dashboard/css/images/layers-2x.png    |  Bin
 .../geo-dashboard/css/images/layers.png       |  Bin
 .../css/images/marker-icon-2x.png             |  Bin
 .../geo-dashboard/css/images/marker-icon.png  |  Bin
 .../css/images/marker-shadow.png              |  Bin
 .../geo-dashboard/css/jquery-ui.min.css       |    0
 .../geo-dashboard/css/jquery-ui.theme.min.css |    0
 .../geo-dashboard/css/leaflet.css             |    0
 .../geo-dashboard/css/leaflet/L.Grid.css      |    0
 .../css/leaflet/images/spritesheet-2x.png     |  Bin
 .../css/leaflet/images/spritesheet.png        |  Bin
 .../css/leaflet/leaflet.draw.css              |    0
 .../css/leaflet_fullscreen/fullscreen.png     |  Bin
 .../css/leaflet_fullscreen/fullscreen@2x.png  |  Bin
 .../leaflet_fullscreen/leaflet.fullscreen.css |    0
 .../geo-dashboard/css/login.css               |    0
 .../geo-dashboard/css/main.css                |    0
 .../geo-dashboard/css/map.css                 |    0
 .../geo-dashboard/css/style.css               |    0
 .../geo-dashboard/css/uikit/LICENSES          |    0
 .../css/uikit/addons/uikit.addons.css         |    0
 .../css/uikit/addons/uikit.addons.min.css     |    0
 .../uikit/addons/uikit.almost-flat.addons.css |    0
 .../addons/uikit.almost-flat.addons.min.css   |    0
 .../uikit/addons/uikit.gradient.addons.css    |    0
 .../addons/uikit.gradient.addons.min.css      |    0
 .../geo-dashboard/css/uikit/uikit.min.css     |    0
 .../geo-dashboard/gadget.json                 |    0
 .../geo-dashboard/img/fav/wso2_fav.png        |  Bin
 .../geo-dashboard/img/favicon-120.png         |  Bin
 .../geo-dashboard/img/favicon-152.png         |  Bin
 .../geo-dashboard/img/favicon-196.png         |  Bin
 .../geo-dashboard/img/favicon-76.png          |  Bin
 .../geo-dashboard/img/favicon.ico             |  Bin
 .../geo-dashboard/img/layers-2x.png           |  Bin
 .../geo-dashboard/img/layers.png              |  Bin
 .../geo-dashboard/img/marker-icon-2x.png      |  Bin
 .../geo-dashboard/img/marker-icon.png         |  Bin
 .../geo-dashboard/img/marker-shadow.png       |  Bin
 .../geo-dashboard/img/markers/STOP.png        |  Bin
 .../geo-dashboard/img/markers/VEHICLE.png     |  Bin
 .../img/markers/arrow_alerted.png             |  Bin
 .../img/markers/arrow_normal.png              |  Bin
 .../img/markers/arrow_offline.png             |  Bin
 .../img/markers/arrow_warning.png             |  Bin
 .../geo-dashboard/img/markers/danger.png      |  Bin
 .../img/markers/default_icons/greenMarker.png |  Bin
 .../img/markers/default_icons/marker-icon.png |  Bin
 .../markers/default_icons/marker-shadow.png   |  Bin
 .../img/markers/default_icons/pinkMarker.png  |  Bin
 .../img/markers/default_icons/redMarker.png   |  Bin
 .../geo-dashboard/img/markers/info.png        |  Bin
 .../img/markers/moving/device-alerted.png     |  Bin
 .../img/markers/moving/device-normal.png      |  Bin
 .../img/markers/moving/device-offline.png     |  Bin
 .../img/markers/moving/device-warning.png     |  Bin
 .../img/markers/non_moving/device-alerted.png |  Bin
 .../img/markers/non_moving/device-normal.png  |  Bin
 .../img/markers/non_moving/device-offline.png |  Bin
 .../img/markers/non_moving/device-warning.png |  Bin
 .../markers/non_moving/stationary-alerted.png |  Bin
 .../markers/non_moving/stationary-normal.png  |  Bin
 .../markers/non_moving/stationary-normal2.png |  Bin
 .../markers/non_moving/stationary-offline.png |  Bin
 .../markers/non_moving/stationary-warning.png |  Bin
 .../object-types/default/moving/alerted.png   |  Bin
 .../object-types/default/moving/normal.png    |  Bin
 .../object-types/default/moving/offline.png   |  Bin
 .../object-types/default/moving/warning.png   |  Bin
 .../default/non-moving/alerted.png            |  Bin
 .../default/non-moving/normal.png             |  Bin
 .../default/non-moving/offline.png            |  Bin
 .../default/non-moving/warning.png            |  Bin
 .../stationary/non-moving/alerted.png         |  Bin
 .../stationary/non-moving/normal.png          |  Bin
 .../stationary/non-moving/normal2.png         |  Bin
 .../stationary/non-moving/offline.png         |  Bin
 .../stationary/non-moving/warning.png         |  Bin
 .../object-types/stop/non-moving/alerted.png  |  Bin
 .../object-types/stop/non-moving/normal.png   |  Bin
 .../object-types/stop/non-moving/normal2.png  |  Bin
 .../object-types/stop/non-moving/offline.png  |  Bin
 .../object-types/stop/non-moving/warning.png  |  Bin
 .../object-types/vehicle/moving/alerted.png   |  Bin
 .../object-types/vehicle/moving/normal.png    |  Bin
 .../object-types/vehicle/moving/offline.png   |  Bin
 .../object-types/vehicle/moving/warning.png   |  Bin
 .../vehicle/non-moving/alerted.png            |  Bin
 .../vehicle/non-moving/normal.png             |  Bin
 .../vehicle/non-moving/offline.png            |  Bin
 .../vehicle/non-moving/warning.png            |  Bin
 .../geo-dashboard/img/markers/offline.png     |  Bin
 .../geo-dashboard/img/markers/resize.png      |  Bin
 .../geo-dashboard/img/markers/resize_2.png    |  Bin
 .../geo-dashboard/img/markers/stopIcon.png    |  Bin
 .../geo-dashboard/img/markers/warn.png        |  Bin
 .../geo-dashboard/img/thumbnail.png           |  Bin
 .../geo-dashboard/img/wso2-logo.png           |  Bin
 .../geo-dashboard/include/commons.jag         |    0
 .../geo-dashboard/include/database.jag        |    0
 .../geo-dashboard/include/store_alerts.jag    |    0
 .../geo-dashboard/index.xml                   |    0
 .../geo-dashboard/js/app.js                   |    0
 .../geo-dashboard/js/application_options.js   |    0
 .../js/bootstrap-wizard-lib/LICENSE           |    0
 .../bootstrap-wizard-lib/bootstrap-wizard.js  |    0
 .../bootstrap-wizard.min.js                   |    0
 .../js/bootstrap/BOOTSTRAP_LICENSE            |    0
 .../js/bootstrap/bootstrap.min.js             |    0
 .../geo-dashboard/js/d3/C3_LICENSE            |    0
 .../geo-dashboard/js/d3/D3_LICENSE            |    0
 .../geo-dashboard/js/d3/c3.min.js             |    0
 .../geo-dashboard/js/d3/d3.min.js             |    0
 .../geo-dashboard/js/geo_fencing.js           |    0
 .../geo-dashboard/js/geo_proximity.js         |    0
 .../geo-dashboard/js/geo_remote.js            |    0
 .../js/jquery/jquery-2.1.1.min.js             |    0
 .../geo-dashboard/js/jquery/jquery-ui.min.js  |    0
 .../js/leaflet/L.CircleEditor.js              |    0
 .../js/leaflet/L.Control.Locate.js            |    0
 .../geo-dashboard/js/leaflet/L.Grid.js        |    0
 .../js/leaflet/L.MeasuringTool.js             |    0
 .../js/leaflet/L.PolySideLabel.js             |    0
 .../js/leaflet/LICENSE_RaphaelLayer           |    0
 .../js/leaflet/Leaflet.fullscreen.min.js      |    0
 .../geo-dashboard/js/leaflet/MIT-LICENSE.txt  |    0
 .../geo-dashboard/js/leaflet/Marker.Rotate.js |    0
 .../js/leaflet/images/marker-icon.png         |  Bin
 .../js/leaflet/images/marker-shadow.png       |  Bin
 .../geo-dashboard/js/leaflet/leaflet.draw.js  |    0
 .../js/leaflet/leaflet.groupedlayercontrol.js |    0
 .../geo-dashboard/js/leaflet/leaflet.js       |    0
 .../js/leaflet/leaflet.markercluster.js       |    0
 .../geo-dashboard/js/leaflet/raphael-min.js   |    0
 .../geo-dashboard/js/leaflet/rlayer.js        |    0
 .../geo-dashboard/js/show_alert_in_map.js     |    0
 .../geo-dashboard/js/typeahead.bundle.min.js  |    0
 .../geo-dashboard/js/uikit/LICENSES           |    0
 .../js/uikit/addons/autocomplete.js           |    0
 .../js/uikit/addons/autocomplete.min.js       |    0
 .../js/uikit/addons/datepicker.js             |    0
 .../js/uikit/addons/datepicker.min.js         |    0
 .../js/uikit/addons/form-password.js          |    0
 .../js/uikit/addons/form-password.min.js      |    0
 .../js/uikit/addons/form-select.js            |    0
 .../js/uikit/addons/form-select.min.js        |    0
 .../js/uikit/addons/htmleditor.js             |    0
 .../js/uikit/addons/htmleditor.min.js         |    0
 .../geo-dashboard/js/uikit/addons/nestable.js |    0
 .../js/uikit/addons/nestable.min.js           |    0
 .../geo-dashboard/js/uikit/addons/notify.js   |    0
 .../js/uikit/addons/notify.min.js             |    0
 .../js/uikit/addons/pagination.js             |    0
 .../js/uikit/addons/pagination.min.js         |    0
 .../geo-dashboard/js/uikit/addons/search.js   |    0
 .../js/uikit/addons/search.min.js             |    0
 .../geo-dashboard/js/uikit/addons/sortable.js |    0
 .../js/uikit/addons/sortable.min.js           |    0
 .../geo-dashboard/js/uikit/addons/sticky.js   |    0
 .../js/uikit/addons/sticky.min.js             |    0
 .../js/uikit/addons/timepicker.js             |    0
 .../js/uikit/addons/timepicker.min.js         |    0
 .../geo-dashboard/js/uikit/addons/upload.js   |    0
 .../js/uikit/addons/upload.min.js             |    0
 .../geo-dashboard/js/uikit/uikit.min.js       |    0
 .../geo-dashboard/js/websocket.js             |    0
 .../Geo-Receiver-HTTP-LocationStream.xml      |    0
 .../artifact.xml                              |    0
 ...FusionGenerateNotifications-1.0.0.siddhiql |    0
 .../artifact.xml                              |    0
 ...utionPlan-InputStandardizer-1.0.0.siddhiql |    0
 .../artifact.xml                              |    0
 ...-ExecutionPlan-Pass_through-1.0.0.siddhiql |    0
 .../artifact.xml                              |    0
 ...sher-RDBMS-GeoAlertNotifications-1.0.0.xml |    0
 .../artifact.xml                              |    0
 ...WebSocketLocal-FusedSpacialEvent-1.0.0.xml |    0
 .../artifact.xml                              |    0
 ...ocketLocal-GeoAlertNotifications-1.0.0.xml |    0
 .../artifact.xml                              |    0
 .../ThemeGeoDashboard_1.0.0/artifact.xml      |    0
 .../geo-dashboard/css/dashboard.css           |    0
 .../main/resources/carbonapps}/artifacts.xml  |    0
 .../artifact.xml                              |    0
 ...rg.wso2.geo.AlertsNotifications-1.0.0.json |    0
 .../artifact.xml                              |    0
 .../org.wso2.geo.FusedSpatialEvent-1.0.0.json |    0
 .../artifact.xml                              |    0
 .../org.wso2.geo.LocationStream-1.0.0.json    |    0
 .../artifact.xml                              |    0
 ...wso2.geo.ProcessedSpatialEvents-1.0.0.json |    0
 .../artifact.xml                              |    0
 ....wso2.geo.StandardSpatialEvents-1.0.0.json |    0
 components/analytics/iot-analytics/pom.xml    |    1 +
 .../app/build.gradle                          |    1 +
 .../app/src/main/AndroidManifest.xml          |   18 +-
 .../data/publisher/DataPublisherService.java  |  106 +-
 .../android/sense/data/publisher/Event.java   |  212 ++-
 .../iot/android/sense/event/SenseService.java |   21 +-
 .../event/streams/SenseDataCollector.java     |    6 +-
 .../event/streams/activity/ActivityData.java  |   67 +
 .../streams/activity/ActivityReceiver.java    |   54 +
 .../streams/application/ApplicationData.java  |   61 +
 .../application/ApplicationDataReceiver.java  |   45 +
 .../sense/event/streams/audio/AudioData.java  |   58 +
 .../event/streams/audio/AudioDataReader.java  |   50 +
 .../event/streams/battery/BatteryData.java    |   18 +
 .../streams/battery/BatteryDataReceiver.java  |    8 +-
 .../sense/event/streams/call/CallData.java    |   70 +
 .../event/streams/call/CallDataReceiver.java  |   87 +
 .../event/streams/screen/ScreenData.java      |   55 +
 .../streams/screen/ScreenDataReceiver.java    |   32 +
 .../sense/event/streams/sms/SmsData.java      |   58 +
 .../event/streams/sms/SmsDataReceiver.java    |   49 +
 .../sensorlisting/SupportedSensors.java       |    3 +
 .../android/sense/util/SenseDataHolder.java   |  111 +-
 .../sense/util/SenseDataReceiverManager.java  |  175 ++
 .../analytics-view.js                         |   26 +-
 .../analytics-view.js                         |   26 +-
 .../device-view.hbs                           |  120 +-
 .../policy-wizard.hbs                         |    2 +-
 .../analytics-view.js                         |   26 +-
 .../endpoint/HttpSessionConfigurator.java     |   36 +
 .../SuperTenantSubscriptionEndpoint.java      |   14 +-
 .../endpoint/TenantSubscriptionEndpoint.java  |   21 +-
 .../endpoint/constants/Constants.java         |   25 +
 .../authentication/Authenticator.java         |    7 +-
 .../authentication/OAuthAuthenticator.java    |    9 +-
 .../oauth/OAuthTokenValdiator.java            |   48 +-
 .../device-view.hbs                           |  781 ++++-----
 .../device-view.js                            |   11 +-
 .../public/js/device-detail.js                |   10 +-
 .../public/templates/operations-log.hbs       |   24 -
 .../public/templates/policy-compliance.hbs    |    3 +-
 .../operation-bar.hbs                         |   32 +
 .../operation-bar.js                          |  106 ++
 .../operation-bar.json                        |    3 +
 .../public/js/operation-bar.js                |  248 +++
 .../templates/hidden-operations-android.hbs   |    0
 .../templates/hidden-operations-ios.hbs       |    0
 .../public/templates/operations.hbs           |    0
 .../operation-bar.hbs                         |  113 +-
 .../operation-bar.js                          |  129 +-
 .../public/js/operation-bar.js                |  326 ++--
 .../policy-edit.hbs                           |   19 +-
 .../public/js/android-policy-edit.js          |  855 ++++++++++
 .../public/templates/android-policy-edit.hbs  | 1464 +++++++++++++++++
 .../policy-wizard.hbs                         |   47 +-
 .../public/js/android-policy-operations.js    |  842 ++++++++++
 .../templates/android-policy-operations.hbs   | 1464 +++++++++++++++++
 .../private/config.json                       |   39 +-
 .../qr-modal.hbs                              |   64 +
 .../qr-modal.js                               |   23 +
 .../qr-modal.json                             |    3 +
 .../type-view.hbs                             |   88 +-
 .../pom.xml                                   |    2 +-
 .../pom.xml                                   |   37 +-
 .../main/resources/devicetypes/android.xml    |  209 +--
 312 files changed, 7568 insertions(+), 1220 deletions(-)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard}/build.xml (84%)
 create mode 100644 components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
 create mode 100644 components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/assembly/src.xml
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Dashboard_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Dashboard_1.0.0/geo-dashboard.json (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Proximity_alert.siddhiql (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Speed_alert.siddhiql (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Stationery_alert.siddhiql (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Traffic_alert.siddhiql (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Within_alert.siddhiql (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/cep_info.json (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/database.json (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_alerts.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_alerts_history.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_server_info.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/proximity_alert.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/speed_alert.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/stationery_alert.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/traffic_point.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/within_alert.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/remove_alerts.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/set_alerts.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/tile_servers.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/wms_endpoints.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/L.Control.Locate.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/L.Control.Locate.ie.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/MarkerCluster.Default.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/MarkerCluster.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/app.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap-wizard-lib/LICENSE (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap-wizard-lib/bootstrap-wizard.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap.min.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/animation.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-codes.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-embedded.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-ie7-codes.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-ie7.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/d3/c3.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font-awesome.min.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/LICENSE.txt (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/README.txt (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/config.json (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.eot (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.svg (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.ttf (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.woff (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/FontAwesome.otf (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.eot (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.svg (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.ttf (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.woff (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/TODO.Move_this_images_to_assets_images_folder (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/layers-2x.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/layers.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-icon-2x.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-icon.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-shadow.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui.min.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui.theme.min.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/L.Grid.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/images/spritesheet-2x.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/images/spritesheet.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/leaflet.draw.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/fullscreen.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/fullscreen@2x.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/leaflet.fullscreen.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/login.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/main.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/map.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/style.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/LICENSES (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.addons.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.addons.min.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.almost-flat.addons.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.almost-flat.addons.min.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.gradient.addons.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.gradient.addons.min.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/uikit.min.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/gadget.json (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/fav/wso2_fav.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-120.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-152.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-196.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-76.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon.ico (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/layers-2x.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/layers.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-icon-2x.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-icon.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-shadow.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/STOP.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/VEHICLE.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_alerted.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_normal.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_offline.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_warning.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/danger.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/greenMarker.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/marker-icon.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/marker-shadow.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/pinkMarker.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/redMarker.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/info.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-alerted.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-normal.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-offline.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-warning.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-alerted.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-normal.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-offline.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-warning.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-alerted.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-normal.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-normal2.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-offline.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-warning.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/alerted.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/normal.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/offline.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/warning.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/alerted.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/normal.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/offline.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/warning.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/alerted.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/normal.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/normal2.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/offline.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/warning.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/alerted.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/normal.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/normal2.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/offline.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/warning.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/alerted.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/normal.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/offline.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/warning.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/alerted.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/normal.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/offline.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/warning.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/offline.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/resize.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/resize_2.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/stopIcon.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/warn.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/thumbnail.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/img/wso2-logo.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/include/commons.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/include/database.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/include/store_alerts.jag (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/application_options.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/LICENSE (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/bootstrap-wizard.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/bootstrap-wizard.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap/BOOTSTRAP_LICENSE (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap/bootstrap.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/C3_LICENSE (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/D3_LICENSE (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/c3.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/d3.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_fencing.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_proximity.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_remote.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/jquery/jquery-2.1.1.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/jquery/jquery-ui.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.CircleEditor.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.Control.Locate.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.Grid.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.MeasuringTool.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.PolySideLabel.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/LICENSE_RaphaelLayer (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/Leaflet.fullscreen.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/MIT-LICENSE.txt (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/Marker.Rotate.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/images/marker-icon.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/images/marker-shadow.png (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.draw.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.groupedlayercontrol.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.markercluster.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/raphael-min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/rlayer.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/show_alert_in_map.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/typeahead.bundle.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/LICENSES (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/autocomplete.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/autocomplete.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/datepicker.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/datepicker.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-password.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-password.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-select.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-select.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/htmleditor.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/htmleditor.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/nestable.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/nestable.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/notify.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/notify.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/pagination.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/pagination.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/search.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/search.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sortable.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sortable.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sticky.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sticky.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/timepicker.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/timepicker.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/upload.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/upload.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/uikit.min.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-Dashboard-Http-Receiver_1.0.0/Geo-Receiver-HTTP-LocationStream.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-Dashboard-Http-Receiver_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-ExecutionPlan-EventsFusionGenerateNotifications_1.0.0/Geo-ExecutionPlan-EventsFusionGenerateNotifications-1.0.0.siddhiql (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-ExecutionPlan-EventsFusionGenerateNotifications_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-ExecutionPlan-InputStandardizer_1.0.0/Geo-ExecutionPlan-InputStandardizer-1.0.0.siddhiql (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-ExecutionPlan-InputStandardizer_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-ExecutionPlan-Pass_through_1.0.0/Geo-ExecutionPlan-Pass_through-1.0.0.siddhiql (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-ExecutionPlan-Pass_through_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-Publisher-RDBMS-GeoAlertNotifications_1.0.0/Geo-Publisher-RDBMS-GeoAlertNotifications-1.0.0.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-Publisher-RDBMS-GeoAlertNotifications_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-Publisher-WebSocketLocal-FusedSpacialEvent_1.0.0/Geo-Publisher-WebSocketLocal-FusedSpacialEvent-1.0.0.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-Publisher-WebSocketLocal-FusedSpacialEvent_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-Publisher-WebSocketLocal-GeoAlertNotifications_1.0.0/Geo-Publisher-WebSocketLocal-GeoAlertNotifications-1.0.0.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/Geo-Publisher-WebSocketLocal-GeoAlertNotifications_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/ThemeGeoDashboard_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/ThemeGeoDashboard_1.0.0/geo-dashboard/css/dashboard.css (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/artifacts.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/org.wso2.geo.AlertsNotifications_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/org.wso2.geo.AlertsNotifications_1.0.0/org.wso2.geo.AlertsNotifications-1.0.0.json (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/org.wso2.geo.FusedSpatialEvent_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/org.wso2.geo.FusedSpatialEvent_1.0.0/org.wso2.geo.FusedSpatialEvent-1.0.0.json (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/org.wso2.geo.LocationStream_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/org.wso2.geo.LocationStream_1.0.0/org.wso2.geo.LocationStream-1.0.0.json (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/org.wso2.geo.ProcessedSpatialEvents_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/org.wso2.geo.ProcessedSpatialEvents_1.0.0/org.wso2.geo.ProcessedSpatialEvents-1.0.0.json (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/org.wso2.geo.StandardSpatialEvents_1.0.0/artifact.xml (100%)
 rename {features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp => components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps}/org.wso2.geo.StandardSpatialEvents_1.0.0/org.wso2.geo.StandardSpatialEvents-1.0.0.json (100%)
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/activity/ActivityData.java
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/activity/ActivityReceiver.java
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/application/ApplicationData.java
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/application/ApplicationDataReceiver.java
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/audio/AudioData.java
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/audio/AudioDataReader.java
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/call/CallData.java
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/call/CallDataReceiver.java
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/screen/ScreenData.java
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/screen/ScreenDataReceiver.java
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/sms/SmsData.java
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/sms/SmsDataReceiver.java
 create mode 100644 components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataReceiverManager.java
 create mode 100644 components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/HttpSessionConfigurator.java
 create mode 100644 components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/constants/Constants.java
 delete mode 100755 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/operations-log.hbs
 create mode 100644 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/operation-bar.hbs
 create mode 100644 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/operation-bar.js
 create mode 100644 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/operation-bar.json
 create mode 100644 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/public/js/operation-bar.js
 rename components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/{cdmf.unit.device.type.android.operation-bar => cdmf.unit.device.type.android.old.operation-bar}/public/templates/hidden-operations-android.hbs (100%)
 rename components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/{cdmf.unit.device.type.android.operation-bar => cdmf.unit.device.type.android.old.operation-bar}/public/templates/hidden-operations-ios.hbs (100%)
 rename components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/{cdmf.unit.device.type.android.operation-bar => cdmf.unit.device.type.android.old.operation-bar}/public/templates/operations.hbs (100%)
 create mode 100644 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/js/android-policy-edit.js
 create mode 100644 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
 create mode 100644 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/js/android-policy-operations.js
 create mode 100644 components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
 create mode 100644 components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.hbs
 create mode 100644 components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.js
 create mode 100644 components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.json

diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/build.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/build.xml
similarity index 84%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/build.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/build.xml
index 5d2b4dea5..1fee6c82c 100644
--- a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/build.xml
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/build.xml
@@ -20,9 +20,8 @@
 <project name="create-geo-fence-capps" default="zip" basedir=".">
 
     <property name="project-name" value="${ant.project.name}"/>
-    <property name="res-dir" value="src/main/resources"/>
-    <property name="target-dir" value="target/"/>
-    <property name="src-dir" value="src/main/capp"/>
+    <property name="target-dir" value="target/carbonapps"/>
+    <property name="src-dir" value="src/main/resources/carbonapps"/>
 
     <property name="GeoDashboard" value="org_wso2_carbon_iot_geo_dashboard-1.0.0"/>
 
@@ -31,7 +30,7 @@
     </target>
 
     <target name="zip" depends="clean">
-        <zip destfile="${res-dir}/${GeoDashboard}.car">
+        <zip destfile="${target-dir}/${GeoDashboard}.car">
             <zipfileset dir="${src-dir}"/>
         </zip>
     </target>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
new file mode 100644
index 000000000..0e8d3b1f4
--- /dev/null
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+        <artifactId>iot-analytics</artifactId>
+        <version>3.0.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.iot.geo.dashboard</artifactId>
+    <name>WSO2 Carbon - IoT Geo Dashboard C-APP</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the IoT geo dashboard gadget</description>
+    <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/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/assembly/src.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/assembly/src.xml
new file mode 100644
index 000000000..a5a375010
--- /dev/null
+++ b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/assembly/src.xml
@@ -0,0 +1,36 @@
+<!--
+  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<assembly
+        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+    <id>src</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>false</includeBaseDirectory>
+    <baseDirectory>${basedir}/src</baseDirectory>
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}/target/carbonapps</directory>
+            <outputDirectory>/</outputDirectory>
+            <useDefaultExcludes>true</useDefaultExcludes>
+        </fileSet>
+    </fileSets>
+</assembly>
\ No newline at end of file
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Dashboard_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Dashboard_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Dashboard_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Dashboard_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Dashboard_1.0.0/geo-dashboard.json b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Dashboard_1.0.0/geo-dashboard.json
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Dashboard_1.0.0/geo-dashboard.json
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Dashboard_1.0.0/geo-dashboard.json
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Proximity_alert.siddhiql b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Proximity_alert.siddhiql
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Proximity_alert.siddhiql
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Proximity_alert.siddhiql
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Speed_alert.siddhiql b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Speed_alert.siddhiql
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Speed_alert.siddhiql
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Speed_alert.siddhiql
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Stationery_alert.siddhiql b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Stationery_alert.siddhiql
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Stationery_alert.siddhiql
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Stationery_alert.siddhiql
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Traffic_alert.siddhiql b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Traffic_alert.siddhiql
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Traffic_alert.siddhiql
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Traffic_alert.siddhiql
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Within_alert.siddhiql b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Within_alert.siddhiql
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Within_alert.siddhiql
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/alerts/Geo-ExecutionPlan-Within_alert.siddhiql
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/cep_info.json b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/cep_info.json
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/cep_info.json
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/cep_info.json
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/database.json b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/database.json
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/database.json
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/conf/database.json
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_alerts.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_alerts.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_alerts.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_alerts.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_alerts_history.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_alerts_history.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_alerts_history.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_alerts_history.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_server_info.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_server_info.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_server_info.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/get_server_info.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/proximity_alert.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/proximity_alert.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/proximity_alert.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/proximity_alert.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/speed_alert.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/speed_alert.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/speed_alert.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/speed_alert.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/stationery_alert.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/stationery_alert.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/stationery_alert.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/stationery_alert.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/traffic_point.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/traffic_point.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/traffic_point.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/traffic_point.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/within_alert.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/within_alert.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/within_alert.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/modals/within_alert.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/remove_alerts.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/remove_alerts.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/remove_alerts.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/remove_alerts.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/set_alerts.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/set_alerts.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/set_alerts.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/set_alerts.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/tile_servers.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/tile_servers.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/tile_servers.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/tile_servers.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/wms_endpoints.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/wms_endpoints.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/wms_endpoints.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/controllers/wms_endpoints.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/L.Control.Locate.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/L.Control.Locate.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/L.Control.Locate.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/L.Control.Locate.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/L.Control.Locate.ie.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/L.Control.Locate.ie.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/L.Control.Locate.ie.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/L.Control.Locate.ie.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/MarkerCluster.Default.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/MarkerCluster.Default.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/MarkerCluster.Default.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/MarkerCluster.Default.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/MarkerCluster.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/MarkerCluster.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/MarkerCluster.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/MarkerCluster.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/app.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/app.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/app.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/app.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap-wizard-lib/LICENSE b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap-wizard-lib/LICENSE
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap-wizard-lib/LICENSE
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap-wizard-lib/LICENSE
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap-wizard-lib/bootstrap-wizard.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap-wizard-lib/bootstrap-wizard.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap-wizard-lib/bootstrap-wizard.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap-wizard-lib/bootstrap-wizard.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap.min.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap.min.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap.min.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/bootstrap.min.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/animation.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/animation.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/animation.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/animation.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-codes.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-codes.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-codes.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-codes.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-embedded.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-embedded.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-embedded.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-embedded.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-ie7-codes.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-ie7-codes.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-ie7-codes.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-ie7-codes.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-ie7.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-ie7.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-ie7.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa-ie7.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/css/locate-fa.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/d3/c3.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/d3/c3.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/d3/c3.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/d3/c3.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font-awesome.min.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font-awesome.min.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font-awesome.min.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font-awesome.min.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/LICENSE.txt b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/LICENSE.txt
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/LICENSE.txt
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/LICENSE.txt
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/README.txt b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/README.txt
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/README.txt
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/README.txt
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/config.json b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/config.json
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/config.json
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/config.json
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.eot b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.eot
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.eot
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.eot
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.svg b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.svg
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.svg
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.svg
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.ttf b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.ttf
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.ttf
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.ttf
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.woff b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.woff
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.woff
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/font/locate-fa.woff
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/FontAwesome.otf b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/FontAwesome.otf
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/FontAwesome.otf
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/FontAwesome.otf
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.eot b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.eot
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.eot
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.eot
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.svg b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.svg
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.svg
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.svg
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.ttf b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.ttf
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.ttf
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.woff b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.woff
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.woff
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/fonts/fontawesome-webfont.woff
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/TODO.Move_this_images_to_assets_images_folder b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/TODO.Move_this_images_to_assets_images_folder
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/TODO.Move_this_images_to_assets_images_folder
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/TODO.Move_this_images_to_assets_images_folder
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/layers-2x.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/layers-2x.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/layers-2x.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/layers-2x.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/layers.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/layers.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/layers.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/layers.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-icon-2x.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-icon-2x.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-icon-2x.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-icon-2x.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-icon.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-icon.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-icon.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-icon.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-shadow.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-shadow.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-shadow.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/images/marker-shadow.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui.min.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui.min.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui.min.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui.min.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui.theme.min.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui.theme.min.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui.theme.min.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/jquery-ui.theme.min.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/L.Grid.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/L.Grid.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/L.Grid.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/L.Grid.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/images/spritesheet-2x.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/images/spritesheet-2x.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/images/spritesheet-2x.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/images/spritesheet-2x.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/images/spritesheet.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/images/spritesheet.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/images/spritesheet.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/images/spritesheet.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/leaflet.draw.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/leaflet.draw.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/leaflet.draw.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet/leaflet.draw.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/fullscreen.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/fullscreen.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/fullscreen.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/fullscreen.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/fullscreen@2x.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/fullscreen@2x.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/fullscreen@2x.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/fullscreen@2x.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/leaflet.fullscreen.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/leaflet.fullscreen.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/leaflet.fullscreen.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/leaflet_fullscreen/leaflet.fullscreen.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/login.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/login.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/login.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/login.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/main.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/main.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/main.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/main.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/map.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/map.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/map.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/map.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/style.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/style.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/style.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/style.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/LICENSES b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/LICENSES
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/LICENSES
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/LICENSES
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.addons.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.addons.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.addons.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.addons.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.addons.min.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.addons.min.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.addons.min.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.addons.min.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.almost-flat.addons.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.almost-flat.addons.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.almost-flat.addons.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.almost-flat.addons.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.almost-flat.addons.min.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.almost-flat.addons.min.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.almost-flat.addons.min.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.almost-flat.addons.min.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.gradient.addons.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.gradient.addons.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.gradient.addons.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.gradient.addons.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.gradient.addons.min.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.gradient.addons.min.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.gradient.addons.min.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/addons/uikit.gradient.addons.min.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/uikit.min.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/uikit.min.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/uikit.min.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/css/uikit/uikit.min.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/gadget.json b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/gadget.json
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/gadget.json
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/gadget.json
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/fav/wso2_fav.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/fav/wso2_fav.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/fav/wso2_fav.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/fav/wso2_fav.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-120.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-120.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-120.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-120.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-152.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-152.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-152.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-152.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-196.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-196.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-196.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-196.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-76.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-76.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-76.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon-76.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon.ico b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon.ico
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon.ico
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/favicon.ico
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/layers-2x.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/layers-2x.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/layers-2x.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/layers-2x.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/layers.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/layers.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/layers.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/layers.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-icon-2x.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-icon-2x.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-icon-2x.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-icon-2x.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-icon.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-icon.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-icon.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-icon.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-shadow.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-shadow.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-shadow.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/marker-shadow.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/STOP.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/STOP.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/STOP.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/STOP.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/VEHICLE.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/VEHICLE.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/VEHICLE.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/VEHICLE.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_alerted.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_alerted.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_alerted.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_alerted.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_normal.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_normal.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_normal.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_normal.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_offline.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_offline.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_offline.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_offline.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_warning.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_warning.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_warning.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/arrow_warning.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/danger.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/danger.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/danger.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/danger.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/greenMarker.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/greenMarker.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/greenMarker.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/greenMarker.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/marker-icon.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/marker-icon.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/marker-icon.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/marker-icon.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/marker-shadow.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/marker-shadow.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/marker-shadow.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/marker-shadow.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/pinkMarker.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/pinkMarker.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/pinkMarker.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/pinkMarker.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/redMarker.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/redMarker.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/redMarker.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/default_icons/redMarker.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/info.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/info.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/info.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/info.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-alerted.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-alerted.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-alerted.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-alerted.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-normal.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-normal.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-normal.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-normal.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-offline.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-offline.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-offline.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-offline.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-warning.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-warning.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-warning.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/moving/device-warning.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-alerted.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-alerted.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-alerted.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-alerted.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-normal.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-normal.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-normal.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-normal.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-offline.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-offline.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-offline.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-offline.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-warning.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-warning.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-warning.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/device-warning.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-alerted.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-alerted.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-alerted.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-alerted.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-normal.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-normal.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-normal.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-normal.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-normal2.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-normal2.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-normal2.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-normal2.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-offline.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-offline.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-offline.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-offline.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-warning.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-warning.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-warning.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/non_moving/stationary-warning.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/alerted.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/alerted.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/alerted.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/alerted.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/normal.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/normal.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/normal.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/normal.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/offline.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/offline.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/offline.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/offline.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/warning.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/warning.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/warning.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/moving/warning.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/alerted.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/alerted.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/alerted.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/alerted.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/normal.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/normal.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/normal.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/normal.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/offline.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/offline.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/offline.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/offline.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/warning.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/warning.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/warning.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/default/non-moving/warning.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/alerted.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/alerted.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/alerted.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/alerted.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/normal.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/normal.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/normal.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/normal.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/normal2.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/normal2.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/normal2.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/normal2.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/offline.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/offline.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/offline.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/offline.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/warning.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/warning.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/warning.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stationary/non-moving/warning.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/alerted.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/alerted.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/alerted.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/alerted.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/normal.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/normal.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/normal.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/normal.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/normal2.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/normal2.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/normal2.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/normal2.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/offline.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/offline.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/offline.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/offline.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/warning.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/warning.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/warning.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/stop/non-moving/warning.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/alerted.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/alerted.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/alerted.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/alerted.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/normal.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/normal.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/normal.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/normal.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/offline.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/offline.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/offline.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/offline.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/warning.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/warning.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/warning.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/moving/warning.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/alerted.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/alerted.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/alerted.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/alerted.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/normal.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/normal.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/normal.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/normal.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/offline.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/offline.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/offline.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/offline.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/warning.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/warning.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/warning.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/object-types/vehicle/non-moving/warning.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/offline.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/offline.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/offline.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/offline.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/resize.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/resize.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/resize.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/resize.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/resize_2.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/resize_2.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/resize_2.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/resize_2.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/stopIcon.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/stopIcon.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/stopIcon.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/stopIcon.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/warn.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/warn.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/warn.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/markers/warn.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/thumbnail.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/thumbnail.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/thumbnail.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/thumbnail.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/wso2-logo.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/wso2-logo.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/img/wso2-logo.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/img/wso2-logo.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/include/commons.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/include/commons.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/include/commons.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/include/commons.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/include/database.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/include/database.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/include/database.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/include/database.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/include/store_alerts.jag b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/include/store_alerts.jag
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/include/store_alerts.jag
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/include/store_alerts.jag
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/index.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/app.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/application_options.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/application_options.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/application_options.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/application_options.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/LICENSE b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/LICENSE
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/LICENSE
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/LICENSE
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/bootstrap-wizard.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/bootstrap-wizard.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/bootstrap-wizard.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/bootstrap-wizard.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/bootstrap-wizard.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/bootstrap-wizard.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/bootstrap-wizard.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap-wizard-lib/bootstrap-wizard.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap/BOOTSTRAP_LICENSE b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap/BOOTSTRAP_LICENSE
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap/BOOTSTRAP_LICENSE
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap/BOOTSTRAP_LICENSE
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap/bootstrap.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap/bootstrap.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap/bootstrap.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/bootstrap/bootstrap.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/C3_LICENSE b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/C3_LICENSE
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/C3_LICENSE
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/C3_LICENSE
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/D3_LICENSE b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/D3_LICENSE
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/D3_LICENSE
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/D3_LICENSE
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/c3.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/c3.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/c3.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/c3.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/d3.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/d3.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/d3.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/d3/d3.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_fencing.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_fencing.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_fencing.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_fencing.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_proximity.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_proximity.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_proximity.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_proximity.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_remote.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_remote.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_remote.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/geo_remote.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/jquery/jquery-2.1.1.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/jquery/jquery-2.1.1.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/jquery/jquery-2.1.1.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/jquery/jquery-2.1.1.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/jquery/jquery-ui.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/jquery/jquery-ui.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/jquery/jquery-ui.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/jquery/jquery-ui.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.CircleEditor.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.CircleEditor.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.CircleEditor.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.CircleEditor.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.Control.Locate.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.Control.Locate.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.Control.Locate.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.Control.Locate.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.Grid.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.Grid.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.Grid.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.Grid.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.MeasuringTool.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.MeasuringTool.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.MeasuringTool.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.MeasuringTool.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.PolySideLabel.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.PolySideLabel.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.PolySideLabel.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/L.PolySideLabel.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/LICENSE_RaphaelLayer b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/LICENSE_RaphaelLayer
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/LICENSE_RaphaelLayer
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/LICENSE_RaphaelLayer
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/Leaflet.fullscreen.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/Leaflet.fullscreen.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/Leaflet.fullscreen.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/Leaflet.fullscreen.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/MIT-LICENSE.txt b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/MIT-LICENSE.txt
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/MIT-LICENSE.txt
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/MIT-LICENSE.txt
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/Marker.Rotate.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/Marker.Rotate.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/Marker.Rotate.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/Marker.Rotate.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/images/marker-icon.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/images/marker-icon.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/images/marker-icon.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/images/marker-icon.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/images/marker-shadow.png b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/images/marker-shadow.png
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/images/marker-shadow.png
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/images/marker-shadow.png
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.draw.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.draw.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.draw.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.draw.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.groupedlayercontrol.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.groupedlayercontrol.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.groupedlayercontrol.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.groupedlayercontrol.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.markercluster.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.markercluster.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.markercluster.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/leaflet.markercluster.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/raphael-min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/raphael-min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/raphael-min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/raphael-min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/rlayer.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/rlayer.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/rlayer.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/leaflet/rlayer.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/show_alert_in_map.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/show_alert_in_map.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/show_alert_in_map.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/show_alert_in_map.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/typeahead.bundle.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/typeahead.bundle.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/typeahead.bundle.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/typeahead.bundle.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/LICENSES b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/LICENSES
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/LICENSES
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/LICENSES
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/autocomplete.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/autocomplete.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/autocomplete.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/autocomplete.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/autocomplete.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/autocomplete.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/autocomplete.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/autocomplete.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/datepicker.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/datepicker.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/datepicker.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/datepicker.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/datepicker.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/datepicker.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/datepicker.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/datepicker.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-password.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-password.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-password.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-password.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-password.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-password.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-password.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-password.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-select.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-select.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-select.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-select.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-select.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-select.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-select.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/form-select.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/htmleditor.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/htmleditor.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/htmleditor.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/htmleditor.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/htmleditor.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/htmleditor.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/htmleditor.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/htmleditor.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/nestable.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/nestable.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/nestable.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/nestable.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/nestable.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/nestable.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/nestable.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/nestable.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/notify.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/notify.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/notify.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/notify.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/notify.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/notify.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/notify.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/notify.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/pagination.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/pagination.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/pagination.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/pagination.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/pagination.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/pagination.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/pagination.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/pagination.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/search.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/search.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/search.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/search.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/search.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/search.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/search.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/search.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sortable.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sortable.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sortable.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sortable.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sortable.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sortable.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sortable.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sortable.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sticky.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sticky.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sticky.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sticky.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sticky.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sticky.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sticky.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/sticky.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/timepicker.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/timepicker.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/timepicker.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/timepicker.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/timepicker.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/timepicker.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/timepicker.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/timepicker.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/upload.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/upload.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/upload.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/upload.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/upload.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/upload.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/upload.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/addons/upload.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/uikit.min.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/uikit.min.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/uikit.min.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/uikit/uikit.min.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/GadgetGeoDashboard_1.0.0/geo-dashboard/js/websocket.js
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Dashboard-Http-Receiver_1.0.0/Geo-Receiver-HTTP-LocationStream.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Dashboard-Http-Receiver_1.0.0/Geo-Receiver-HTTP-LocationStream.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Dashboard-Http-Receiver_1.0.0/Geo-Receiver-HTTP-LocationStream.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Dashboard-Http-Receiver_1.0.0/Geo-Receiver-HTTP-LocationStream.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Dashboard-Http-Receiver_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Dashboard-Http-Receiver_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Dashboard-Http-Receiver_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Dashboard-Http-Receiver_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-ExecutionPlan-EventsFusionGenerateNotifications_1.0.0/Geo-ExecutionPlan-EventsFusionGenerateNotifications-1.0.0.siddhiql b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-ExecutionPlan-EventsFusionGenerateNotifications_1.0.0/Geo-ExecutionPlan-EventsFusionGenerateNotifications-1.0.0.siddhiql
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-ExecutionPlan-EventsFusionGenerateNotifications_1.0.0/Geo-ExecutionPlan-EventsFusionGenerateNotifications-1.0.0.siddhiql
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-ExecutionPlan-EventsFusionGenerateNotifications_1.0.0/Geo-ExecutionPlan-EventsFusionGenerateNotifications-1.0.0.siddhiql
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-ExecutionPlan-EventsFusionGenerateNotifications_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-ExecutionPlan-EventsFusionGenerateNotifications_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-ExecutionPlan-EventsFusionGenerateNotifications_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-ExecutionPlan-EventsFusionGenerateNotifications_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-ExecutionPlan-InputStandardizer_1.0.0/Geo-ExecutionPlan-InputStandardizer-1.0.0.siddhiql b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-ExecutionPlan-InputStandardizer_1.0.0/Geo-ExecutionPlan-InputStandardizer-1.0.0.siddhiql
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-ExecutionPlan-InputStandardizer_1.0.0/Geo-ExecutionPlan-InputStandardizer-1.0.0.siddhiql
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-ExecutionPlan-InputStandardizer_1.0.0/Geo-ExecutionPlan-InputStandardizer-1.0.0.siddhiql
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-ExecutionPlan-InputStandardizer_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-ExecutionPlan-InputStandardizer_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-ExecutionPlan-InputStandardizer_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-ExecutionPlan-InputStandardizer_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-ExecutionPlan-Pass_through_1.0.0/Geo-ExecutionPlan-Pass_through-1.0.0.siddhiql b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-ExecutionPlan-Pass_through_1.0.0/Geo-ExecutionPlan-Pass_through-1.0.0.siddhiql
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-ExecutionPlan-Pass_through_1.0.0/Geo-ExecutionPlan-Pass_through-1.0.0.siddhiql
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-ExecutionPlan-Pass_through_1.0.0/Geo-ExecutionPlan-Pass_through-1.0.0.siddhiql
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-ExecutionPlan-Pass_through_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-ExecutionPlan-Pass_through_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-ExecutionPlan-Pass_through_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-ExecutionPlan-Pass_through_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Publisher-RDBMS-GeoAlertNotifications_1.0.0/Geo-Publisher-RDBMS-GeoAlertNotifications-1.0.0.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Publisher-RDBMS-GeoAlertNotifications_1.0.0/Geo-Publisher-RDBMS-GeoAlertNotifications-1.0.0.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Publisher-RDBMS-GeoAlertNotifications_1.0.0/Geo-Publisher-RDBMS-GeoAlertNotifications-1.0.0.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Publisher-RDBMS-GeoAlertNotifications_1.0.0/Geo-Publisher-RDBMS-GeoAlertNotifications-1.0.0.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Publisher-RDBMS-GeoAlertNotifications_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Publisher-RDBMS-GeoAlertNotifications_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Publisher-RDBMS-GeoAlertNotifications_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Publisher-RDBMS-GeoAlertNotifications_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Publisher-WebSocketLocal-FusedSpacialEvent_1.0.0/Geo-Publisher-WebSocketLocal-FusedSpacialEvent-1.0.0.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Publisher-WebSocketLocal-FusedSpacialEvent_1.0.0/Geo-Publisher-WebSocketLocal-FusedSpacialEvent-1.0.0.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Publisher-WebSocketLocal-FusedSpacialEvent_1.0.0/Geo-Publisher-WebSocketLocal-FusedSpacialEvent-1.0.0.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Publisher-WebSocketLocal-FusedSpacialEvent_1.0.0/Geo-Publisher-WebSocketLocal-FusedSpacialEvent-1.0.0.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Publisher-WebSocketLocal-FusedSpacialEvent_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Publisher-WebSocketLocal-FusedSpacialEvent_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Publisher-WebSocketLocal-FusedSpacialEvent_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Publisher-WebSocketLocal-FusedSpacialEvent_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Publisher-WebSocketLocal-GeoAlertNotifications_1.0.0/Geo-Publisher-WebSocketLocal-GeoAlertNotifications-1.0.0.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Publisher-WebSocketLocal-GeoAlertNotifications_1.0.0/Geo-Publisher-WebSocketLocal-GeoAlertNotifications-1.0.0.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Publisher-WebSocketLocal-GeoAlertNotifications_1.0.0/Geo-Publisher-WebSocketLocal-GeoAlertNotifications-1.0.0.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Publisher-WebSocketLocal-GeoAlertNotifications_1.0.0/Geo-Publisher-WebSocketLocal-GeoAlertNotifications-1.0.0.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Publisher-WebSocketLocal-GeoAlertNotifications_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Publisher-WebSocketLocal-GeoAlertNotifications_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/Geo-Publisher-WebSocketLocal-GeoAlertNotifications_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/Geo-Publisher-WebSocketLocal-GeoAlertNotifications_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/ThemeGeoDashboard_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/ThemeGeoDashboard_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/ThemeGeoDashboard_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/ThemeGeoDashboard_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/ThemeGeoDashboard_1.0.0/geo-dashboard/css/dashboard.css b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/ThemeGeoDashboard_1.0.0/geo-dashboard/css/dashboard.css
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/ThemeGeoDashboard_1.0.0/geo-dashboard/css/dashboard.css
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/ThemeGeoDashboard_1.0.0/geo-dashboard/css/dashboard.css
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/artifacts.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/artifacts.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/artifacts.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.AlertsNotifications_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.AlertsNotifications_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.AlertsNotifications_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.AlertsNotifications_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.AlertsNotifications_1.0.0/org.wso2.geo.AlertsNotifications-1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.AlertsNotifications_1.0.0/org.wso2.geo.AlertsNotifications-1.0.0.json
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.AlertsNotifications_1.0.0/org.wso2.geo.AlertsNotifications-1.0.0.json
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.AlertsNotifications_1.0.0/org.wso2.geo.AlertsNotifications-1.0.0.json
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.FusedSpatialEvent_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.FusedSpatialEvent_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.FusedSpatialEvent_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.FusedSpatialEvent_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.FusedSpatialEvent_1.0.0/org.wso2.geo.FusedSpatialEvent-1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.FusedSpatialEvent_1.0.0/org.wso2.geo.FusedSpatialEvent-1.0.0.json
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.FusedSpatialEvent_1.0.0/org.wso2.geo.FusedSpatialEvent-1.0.0.json
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.FusedSpatialEvent_1.0.0/org.wso2.geo.FusedSpatialEvent-1.0.0.json
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.LocationStream_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.LocationStream_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.LocationStream_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.LocationStream_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.LocationStream_1.0.0/org.wso2.geo.LocationStream-1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.LocationStream_1.0.0/org.wso2.geo.LocationStream-1.0.0.json
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.LocationStream_1.0.0/org.wso2.geo.LocationStream-1.0.0.json
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.LocationStream_1.0.0/org.wso2.geo.LocationStream-1.0.0.json
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.ProcessedSpatialEvents_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.ProcessedSpatialEvents_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.ProcessedSpatialEvents_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.ProcessedSpatialEvents_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.ProcessedSpatialEvents_1.0.0/org.wso2.geo.ProcessedSpatialEvents-1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.ProcessedSpatialEvents_1.0.0/org.wso2.geo.ProcessedSpatialEvents-1.0.0.json
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.ProcessedSpatialEvents_1.0.0/org.wso2.geo.ProcessedSpatialEvents-1.0.0.json
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.ProcessedSpatialEvents_1.0.0/org.wso2.geo.ProcessedSpatialEvents-1.0.0.json
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.StandardSpatialEvents_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.StandardSpatialEvents_1.0.0/artifact.xml
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.StandardSpatialEvents_1.0.0/artifact.xml
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.StandardSpatialEvents_1.0.0/artifact.xml
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.StandardSpatialEvents_1.0.0/org.wso2.geo.StandardSpatialEvents-1.0.0.json b/components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.StandardSpatialEvents_1.0.0/org.wso2.geo.StandardSpatialEvents-1.0.0.json
similarity index 100%
rename from features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/capp/org.wso2.geo.StandardSpatialEvents_1.0.0/org.wso2.geo.StandardSpatialEvents-1.0.0.json
rename to components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/src/main/resources/carbonapps/org.wso2.geo.StandardSpatialEvents_1.0.0/org.wso2.geo.StandardSpatialEvents-1.0.0.json
diff --git a/components/analytics/iot-analytics/pom.xml b/components/analytics/iot-analytics/pom.xml
index 80a0adeec..0b7968a0e 100644
--- a/components/analytics/iot-analytics/pom.xml
+++ b/components/analytics/iot-analytics/pom.xml
@@ -34,6 +34,7 @@
 
     <modules>
         <module>org.wso2.carbon.device.mgt.iot.analytics</module>
+        <module>org.wso2.carbon.iot.geo.dashboard</module>
     </modules>
 
 </project>
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/build.gradle b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/build.gradle
index 0c360c9b1..9f6b11adf 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/build.gradle
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/build.gradle
@@ -61,4 +61,5 @@ dependencies {
     compile 'org.altbeacon:android-beacon-library:2.8.1'
     compile 'uk.co.alt236:easycursor-android:1.0.0'
     compile 'uk.co.alt236:bluetooth-le-library-android:1.0.0'
+    compile 'com.google.android.gms:play-services-location:9.4.0'
 }
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/AndroidManifest.xml b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/AndroidManifest.xml
index 7ba9b334c..2b0f926da 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/AndroidManifest.xml
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/AndroidManifest.xml
@@ -11,11 +11,16 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.BATTERY_STATS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-sdk android:minSdkVersion="19" />
-
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="com.google.android.gms.permission.ACTIVITY_RECOGNITION" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS"/>
+    <uses-permission android:name="android.permission.READ_SMS" />
+
+    <uses-sdk android:minSdkVersion="19" />
 
     <application
         android:allowBackup="true"
@@ -45,6 +50,8 @@
             android:label="@string/app_name" >
         </service>
 
+        <service android:name="org.wso2.carbon.iot.android.sense.event.streams.activity.ActivityReceiver"/>
+
         <receiver android:name="org.wso2.carbon.iot.android.sense.event.SenseScheduleReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
@@ -53,13 +60,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </receiver>
-        <receiver
-            android:name="org.wso2.carbon.iot.android.sense.event.streams.battery.BatteryDataReceiver"
-            android:exported="true" >
-            <intent-filter>
-                <action android:name="android.intent.action.BATTERY_CHANGED" />
-            </intent-filter>
-        </receiver>
 
         <activity
             android:name="org.wso2.carbon.iot.android.sense.realtimeviewer.ActivitySelectSensor"
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/DataPublisherService.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/DataPublisherService.java
index f3b6e06de..28b515e98 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/DataPublisherService.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/DataPublisherService.java
@@ -25,20 +25,24 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.wso2.carbon.iot.android.sense.beacon.BeaconScanedData;
+import org.wso2.carbon.iot.android.sense.constants.SenseConstants;
 import org.wso2.carbon.iot.android.sense.data.publisher.mqtt.AndroidSenseMQTTHandler;
 import org.wso2.carbon.iot.android.sense.data.publisher.mqtt.transport.MQTTTransportHandler;
 import org.wso2.carbon.iot.android.sense.data.publisher.mqtt.transport.TransportHandlerException;
-import org.wso2.carbon.iot.android.sense.constants.SenseConstants;
 import org.wso2.carbon.iot.android.sense.event.streams.Location.LocationData;
-import org.wso2.carbon.iot.android.sense.event.streams.Location.LocationDataReader;
-import org.wso2.carbon.iot.android.sense.event.streams.Speed.SpeedData;
 import org.wso2.carbon.iot.android.sense.event.streams.Sensor.SensorData;
+import org.wso2.carbon.iot.android.sense.event.streams.Speed.SpeedData;
+import org.wso2.carbon.iot.android.sense.event.streams.activity.ActivityData;
+import org.wso2.carbon.iot.android.sense.event.streams.application.ApplicationData;
+import org.wso2.carbon.iot.android.sense.event.streams.audio.AudioData;
 import org.wso2.carbon.iot.android.sense.event.streams.battery.BatteryData;
+import org.wso2.carbon.iot.android.sense.event.streams.call.CallData;
+import org.wso2.carbon.iot.android.sense.event.streams.screen.ScreenData;
+import org.wso2.carbon.iot.android.sense.event.streams.sms.SmsData;
 import org.wso2.carbon.iot.android.sense.speech.detector.util.ProcessWords;
 import org.wso2.carbon.iot.android.sense.speech.detector.util.WordData;
-import org.wso2.carbon.iot.android.sense.util.SenseDataHolder;
 import org.wso2.carbon.iot.android.sense.util.LocalRegistry;
-//import org.wso2.carbon.iot.android.sense.util.SenseClient;
+import org.wso2.carbon.iot.android.sense.util.SenseDataHolder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -111,17 +115,21 @@ public class DataPublisherService extends Service {
                     }
                     SenseDataHolder.resetSensorDataHolder();
 
-                    //retrieve batter data.
+                    //retrieve battery data.
                     List<BatteryData> batteryDataMap = SenseDataHolder.getBatteryDataHolder();
                     if (!batteryDataMap.isEmpty()) {
                         for (BatteryData batteryData : batteryDataMap) {
                             Event event = new Event();
                             event.setTimestamp(batteryData.getTimestamp());
                             event.setBattery(batteryData.getLevel());
+                            event.setBatteryTemperature(batteryData.getTemperature());
+                            event.setBatteryStatus(batteryData.getStatus());
+                            event.setBatteryState(batteryData.getState().toString());
                             events.add(event);
                         }
                     }
                     SenseDataHolder.resetBatteryDataHolder();
+
                     //retrieve location data.
                     List<LocationData> locationDataMap = SenseDataHolder.getLocationDataHolder();
 
@@ -132,7 +140,7 @@ public class DataPublisherService extends Service {
                             event.setGps(new double[]{locationData.getLatitude(), locationData.getLongitude()});
                             events.add(event);
                         }
-                     }
+                    }
                     SenseDataHolder.resetLocationDataHolder();
 
                     //retrieve speed data.
@@ -186,6 +194,90 @@ public class DataPublisherService extends Service {
                         }
                     }
                     SenseDataHolder.resetWordDataHolder();
+
+                    // retrieve call data.
+                    List<CallData> callDataList = SenseDataHolder.getCallDataHolder();
+                    if (!callDataList.isEmpty()) {
+                        for (CallData callData : callDataList) {
+                            Event event = new Event();
+                            event.setCallNumber(callData.getPhoneNumber());
+                            event.setCallType(callData.getType().toString().toLowerCase());
+                            event.setCallStartTime(callData.getStartTime());
+                            event.setCallEndTime(callData.getEndTime());
+                            event.setTimestamp(callData.getStartTime());
+
+                            events.add(event);
+                        }
+                    }
+                    SenseDataHolder.resetCallDataHolder();
+
+                    // retrieve screen data.
+                    List<ScreenData> screenDataList = SenseDataHolder.getScreenDataHolder();
+                    if (!screenDataList.isEmpty()) {
+                        for (ScreenData screenData : screenDataList) {
+                            Event event = new Event();
+                            event.setScreenState(screenData.getAction());
+                            event.setTimestamp(screenData.getTimestamp());
+
+                            events.add(event);
+                        }
+                    }
+                    SenseDataHolder.resetScreenDataHolder();
+
+                    // retrieve audio data.
+                    List<AudioData> audioDataList = SenseDataHolder.getAudioDataHolder();
+                    if (!audioDataList.isEmpty()) {
+                        for (AudioData audioData : audioDataList) {
+                            Event event = new Event();
+                            event.setTimestamp(audioData.getTimestamp());
+                            event.setAudioPlaying(audioData.isPlaying());
+                            event.setHeadsetOn(audioData.isHeadsetOn());
+                            event.setMusicVolume(audioData.getMusicVolume());
+                            events.add(event);
+                        }
+                    }
+                    SenseDataHolder.resetAudioDataHolder();
+
+                    // retrieve activity data.
+                    List<ActivityData> activityDataList = SenseDataHolder.getActivityDataHolder();
+                    if (!activityDataList.isEmpty()) {
+                        for (ActivityData activityData : activityDataList) {
+                            Event event = new Event();
+                            event.setTimestamp(activityData.getTimestamp());
+                            event.setActivityType(activityData.getActivity());
+                            event.setConfidence(activityData.getConfidence());
+                            events.add(event);
+                        }
+                    }
+                    SenseDataHolder.resetActivityDataHolder();
+
+                    // retrieve sms data.
+                    List<SmsData> smsDataList = SenseDataHolder.getSmsDataHolder();
+                    if (!smsDataList.isEmpty()) {
+                        for (SmsData smsData : smsDataList) {
+                            Event event = new Event();
+                            event.setTimestamp(smsData.getTimestamp());
+                            event.setSmsNumber(smsData.getPhoneNumber());
+                            events.add(event);
+                        }
+                    }
+                    SenseDataHolder.resetSmsDataHolder();
+
+
+                    // retrieve application data.
+                    List<ApplicationData> appDataList = SenseDataHolder.getApplicationDataHolder();
+                    if (!appDataList.isEmpty()) {
+                        for (ApplicationData appData : appDataList) {
+                            Event event = new Event();
+                            event.setTimestamp(appData.getTimestamp());
+                            event.setPackageName(appData.getPackageName());
+                            event.setAction(appData.getAction().toString());
+                            events.add(event);
+                        }
+                    }
+                    SenseDataHolder.resetApplicationDataHolder();
+
+
                     //publish the data
                     if (events.size() > 0 && LocalRegistry.isEnrolled(context)) {
                         String user = LocalRegistry.getUsername(context);
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/Event.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/Event.java
index 5b5446d70..1bc91c3a3 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/Event.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/data/publisher/Event.java
@@ -16,6 +16,12 @@ public class Event {
     private float accelerometer[] = new float[]{0, 0, 0}; //x,y,z
     private float magnetic[] = new float[]{0, 0, 0};; //x,y,z
     private float gyroscope[] = new float[]{0, 0, 0};; //x,y,z
+    private int batteryTemperature;
+    private int batteryStatus;
+    /**
+     * LOW or OK
+     */
+    private String batteryState;
     private float light;
     private float pressure;
     private float proximity;
@@ -32,8 +38,28 @@ public class Event {
     private int beaconMinor;
     private int beaconUuid;
     private String beaconProximity;
-
-
+    private String callNumber;
+    private String callType;
+    private long callStartTime;
+    private long callEndTime;
+
+    /**
+     * State of the phone display.
+     * Possible values are:
+     * on
+     * off
+     * unknown
+     */
+    private String screenState;
+
+    private boolean audioPlaying;
+    private boolean headsetOn;
+    private int musicVolume;
+    private int activityType;
+    private int confidence;
+    private String smsNumber;
+    private String packageName;
+    private String action;
 
     private int getBattery() {
         return battery;
@@ -44,6 +70,33 @@ public class Event {
         this.battery = battery;
     }
 
+    public int getBatteryTemperature() {
+        return batteryTemperature;
+    }
+
+    public void setBatteryTemperature(int batteryTemperature) {
+        this.type = "battery";  // Type is battery
+        this.batteryTemperature = batteryTemperature;
+    }
+
+    public int getBatteryStatus() {
+        return batteryStatus;
+    }
+
+    public void setBatteryStatus(int batteryStatus) {
+        this.type = "battery";  // Type is battery
+        this.batteryStatus = batteryStatus;
+    }
+
+    public String getBatteryState() {
+        return batteryState != null ? batteryState : "";
+    }
+
+    public void setBatteryState(String batteryState) {
+        this.type = "battery";  // Type is battery
+        this.batteryState = batteryState;
+    }
+
     private double[] getGps() {
         return gps;
     }
@@ -125,6 +178,15 @@ public class Event {
         this.rotation = rotation;
     }
 
+    public void setSmsNumber(String smsNumber) {
+        this.type = "sms";
+        this.smsNumber = smsNumber;
+    }
+
+    public String getSmsNumber() {
+        return smsNumber;
+    }
+
     private String getWordSessionId() {
         return wordSessionId != null ? wordSessionId : "";
     }
@@ -142,6 +204,24 @@ public class Event {
         this.word = word;
     }
 
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.type = "application";
+        this.packageName = packageName;
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.type = "application";
+        this.action = action;
+    }
+
     private long getTimestamp() {
         return timestamp;
     }
@@ -181,6 +261,9 @@ public class Event {
 
     public float getSpeed() {
         this.type = "speed";
+        if (Float.isInfinite(speed) || Float.isNaN(speed)) {
+            return -1.0f;
+        }
         return speed;
     }
 
@@ -192,7 +275,7 @@ public class Event {
 
     public String getTurns() {
 
-        if (turn == null || turn.isEmpty() || turn.equals("null")){
+        if (turn == null || turn.isEmpty() || turn.equals("null")) {
             turn = "No Turns";
         }
         return turn;
@@ -234,8 +317,98 @@ public class Event {
     }
 
     public String getBeaconProximity() {
-        this.type = "beaconProximity";
-        return beaconProximity;
+        return beaconProximity != null ? beaconProximity : "";
+    }
+
+    public String getCallNumber() {
+        return callNumber != null ? callNumber : "";
+    }
+
+    public void setCallNumber(String callNumber) {
+        this.type = "call";
+        this.callNumber = callNumber;
+    }
+
+    public String getCallType() {
+        return callType != null ? callType : "";
+    }
+
+    public void setCallType(String callType) {
+        this.type = "call";
+        this.callType = callType;
+    }
+
+    public long getCallStartTime() {
+        return callStartTime;
+    }
+
+    public void setCallStartTime(long callStartTime) {
+        this.type = "call";
+        this.callStartTime = callStartTime;
+    }
+
+    public long getCallEndTime() {
+        return callEndTime;
+    }
+
+    public void setCallEndTime(long callEndTime) {
+        this.type = "call";
+        this.callEndTime = callEndTime;
+    }
+
+    public String getScreenState() {
+        return screenState != null ? screenState : "";
+    }
+
+    public void setScreenState(String screenState) {
+        this.type = "screen";
+        this.screenState = screenState;
+    }
+
+    public boolean isAudioPlaying() {
+        return audioPlaying;
+    }
+
+    public void setAudioPlaying(boolean audioPlaying) {
+        this.type = "audio";
+        this.audioPlaying = audioPlaying;
+    }
+
+    public boolean isHeadsetOn() {
+        return headsetOn;
+    }
+
+    public void setHeadsetOn(boolean headsetOn) {
+        this.type = "audio";
+        this.headsetOn = headsetOn;
+    }
+
+    public int getMusicVolume() {
+        return musicVolume;
+    }
+
+    public void setMusicVolume(int musicVolume) {
+        this.type = "audio";
+        this.musicVolume = musicVolume;
+    }
+
+    public int getActivityType() {
+        return activityType;
+    }
+
+    public void setActivityType(int activityType) {
+        this.type = "activity";
+        this.activityType = activityType;
+    }
+
+    public int getConfidence() {
+        return confidence;
+    }
+
+    public void setConfidence(int confidence) {
+        // Do not set type here since it can be used for various types.
+        // However, now it is being used by activity only
+        this.confidence = confidence;
     }
 
     public JSONObject getEvent() throws JSONException {
@@ -248,7 +421,13 @@ public class Event {
         jsonEvent.put("metaData", jsonMetaData);
 
         JSONObject jsonPayloadData = new JSONObject();
+        // battery
         jsonPayloadData.put("battery", getBattery());
+        jsonPayloadData.put("battery_state", getBatteryState());
+        jsonPayloadData.put("battery_status", getBatteryStatus());
+        jsonPayloadData.put("battery_temperature", getBatteryTemperature());
+
+
         //gps
         double gpsEvents[] = getGps();
         jsonPayloadData.put("gps_lat", gpsEvents[0]);
@@ -301,6 +480,29 @@ public class Event {
         jsonPayloadData.put("word_sessionId", getWordSessionId());
         jsonPayloadData.put("word_status", getWordStatus());
 
+        // call
+        jsonPayloadData.put("call_number", getCallNumber());
+        jsonPayloadData.put("call_type", getCallType());
+        jsonPayloadData.put("call_start_time", getCallStartTime());
+        jsonPayloadData.put("call_end_time", getCallEndTime());
+
+        // screen
+        jsonPayloadData.put("screen_state", getScreenState());
+
+        // headset
+        jsonPayloadData.put("audio_playing", isAudioPlaying());
+        jsonPayloadData.put("headset_on", isHeadsetOn());
+        jsonPayloadData.put("music_volume", getMusicVolume());
+
+        jsonPayloadData.put("activity_type", getActivityType());
+        jsonPayloadData.put("confidence", getConfidence());
+
+        jsonPayloadData.put("sms_number", getSmsNumber());
+
+        jsonPayloadData.put("application_name", getPackageName());
+        jsonPayloadData.put("action", getAction());
+
+
         jsonEvent.put("payloadData", jsonPayloadData);
 
         return jsonEvent;
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/SenseService.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/SenseService.java
index 0aac98076..37e3356c6 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/SenseService.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/SenseService.java
@@ -16,11 +16,11 @@ package org.wso2.carbon.iot.android.sense.event;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.os.IBinder;
+
 import org.wso2.carbon.iot.android.sense.event.streams.SenseDataCollector;
-import org.wso2.carbon.iot.android.sense.event.streams.battery.BatteryDataReceiver;
 import org.wso2.carbon.iot.android.sense.util.LocalRegistry;
+import org.wso2.carbon.iot.android.sense.util.SenseDataReceiverManager;
 import org.wso2.carbon.iot.android.sense.util.SenseWakeLock;
 
 /**
@@ -48,10 +48,14 @@ public class SenseService extends Service {
         //Below triggers the data collection for sensors,location and battery.
         SenseDataCollector Sensor = new SenseDataCollector(this, SenseDataCollector.DataType.SENSOR);
         SenseDataCollector Location = new SenseDataCollector(this, SenseDataCollector.DataType.LOCATION);
-        registerReceiver(new BatteryDataReceiver(), new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
         SenseDataCollector speed = new SenseDataCollector(this, SenseDataCollector.DataType.SPEED);
-
-
+        SenseDataCollector audio = new SenseDataCollector(this, SenseDataCollector.DataType.AUDIO);
+        SenseDataReceiverManager.registerBatteryDataReceiver(this);
+        SenseDataReceiverManager.registerScreenDataReceiver(this);
+        SenseDataReceiverManager.registerCallDataReceiver(this);
+        SenseDataReceiverManager.registerActivityDataReceiver(this);
+        SenseDataReceiverManager.registerSmsDataReceiver(this);
+        SenseDataReceiverManager.registerAppDataReceiver(this);
         //service will not be stopped until we manually stop the service
         return Service.START_NOT_STICKY;
 
@@ -59,6 +63,13 @@ public class SenseService extends Service {
 
     @Override
     public void onDestroy() {
+        SenseDataReceiverManager.unregisterBatteryDataReceiver(this);
+        SenseDataReceiverManager.unregisterScreenDataReceiver(this);
+        SenseDataReceiverManager.unregisterCallDataReceiver(this);
+        SenseDataReceiverManager.unregisterActivityDataReceiver(this);
+        SenseDataReceiverManager.unregisterSmsDataReceiver(this);
+        SenseDataReceiverManager.unregisterAppDataReceiver(this);
+
         SenseWakeLock.releaseCPUWakeLock();
         super.onDestroy();
     }
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/SenseDataCollector.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/SenseDataCollector.java
index 4899b29b8..726e55fd4 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/SenseDataCollector.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/SenseDataCollector.java
@@ -19,13 +19,14 @@ import org.wso2.carbon.iot.android.sense.event.streams.Location.LocationDataRead
 import org.wso2.carbon.iot.android.sense.event.streams.Sensor.SensorDataReader;
 import org.wso2.carbon.iot.android.sense.event.streams.Speed.SpeedDataReader;
 import org.wso2.carbon.iot.android.sense.beacon.MonitoringActivity;
+import org.wso2.carbon.iot.android.sense.event.streams.audio.AudioDataReader;
 
 /**
  * This class triggered by service to collect the sensor data.
  */
 public class SenseDataCollector {
     public enum DataType {
-        SENSOR, LOCATION,SPEED
+        SENSOR, LOCATION,SPEED, AUDIO
     }
 
     public SenseDataCollector(Context ctx, DataType dt) {
@@ -40,6 +41,9 @@ public class SenseDataCollector {
             case SPEED:
                 dr = new SpeedDataReader(ctx);
                 break;
+            case AUDIO:
+                dr = new AudioDataReader(ctx);
+                break;
 
         }
         if (dr != null) {
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/activity/ActivityData.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/activity/ActivityData.java
new file mode 100644
index 000000000..772351c5b
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/activity/ActivityData.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.event.streams.activity;
+
+import java.util.Date;
+
+public class ActivityData {
+    /**
+     * 0 - In vehicle
+     * 1 - Bicycle
+     * 2 - Foot
+     * 3 - Still
+     * 4 - Unknown
+     * 5 - Tilting
+     * 7 - Walking
+     * 8 - Running
+     */
+    private int activity;
+    private int confidence;
+    private long timestamp;
+
+    ActivityData(int activity, int confidence) {
+        this.activity = activity;
+        this.confidence = confidence;
+        this.timestamp = new Date().getTime();
+    }
+
+    public int getActivity() {
+        return activity;
+    }
+
+    public void setActivity(int activity) {
+        this.activity = activity;
+    }
+
+    public int getConfidence() {
+        return confidence;
+    }
+
+    public void setConfidence(int confidence) {
+        this.confidence = confidence;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/activity/ActivityReceiver.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/activity/ActivityReceiver.java
new file mode 100644
index 000000000..322049198
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/activity/ActivityReceiver.java
@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.event.streams.activity;
+
+import android.app.IntentService;
+import android.content.Intent;
+
+import com.google.android.gms.location.ActivityRecognitionResult;
+import com.google.android.gms.location.DetectedActivity;
+
+import org.wso2.carbon.iot.android.sense.util.SenseDataHolder;
+
+public class ActivityReceiver extends IntentService {
+    public static final int MINIMUM_CONFIDENCE = 75;
+
+    /**
+     * Retrieve the information for every 10 seconds.
+     */
+    public static final long UPDATE_INTERVAL = 10000;
+
+    public ActivityReceiver() {
+        super(ActivityReceiver.class.getName());
+    }
+
+    @Override
+    protected void onHandleIntent(Intent intent) {
+        if (ActivityRecognitionResult.hasResult(intent)) {
+            ActivityRecognitionResult result = ActivityRecognitionResult.extractResult(intent);
+
+            for (DetectedActivity activity : result.getProbableActivities()) {
+                if (activity.getConfidence() >= MINIMUM_CONFIDENCE) {
+                    ActivityData data = new ActivityData(activity.getType(), activity.getConfidence());
+                    SenseDataHolder.getActivityDataHolder().add(data);
+                }
+            }
+        }
+    }
+}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/application/ApplicationData.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/application/ApplicationData.java
new file mode 100644
index 000000000..1443e36b9
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/application/ApplicationData.java
@@ -0,0 +1,61 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.event.streams.application;
+
+import java.util.Date;
+
+public class ApplicationData {
+    public enum Action {
+        INSTALL, REMOVE
+    }
+
+    private long timestamp;
+    private String packageName;
+    private Action action;
+
+    ApplicationData(String packageName, Action action) {
+        this.packageName = packageName;
+        this.action = action;
+        this.timestamp = new Date().getTime();
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getPackageName() {
+        return packageName;
+    }
+
+    public void setPackageName(String packageName) {
+        this.packageName = packageName;
+    }
+
+    public Action getAction() {
+        return action;
+    }
+
+    public void setAction(Action action) {
+        this.action = action;
+    }
+}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/application/ApplicationDataReceiver.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/application/ApplicationDataReceiver.java
new file mode 100644
index 000000000..8cb52550f
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/application/ApplicationDataReceiver.java
@@ -0,0 +1,45 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.event.streams.application;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import org.wso2.carbon.iot.android.sense.util.SenseDataHolder;
+
+/**
+ * Currently interested on package add and remove only. Can be extended for modification.
+ */
+public class ApplicationDataReceiver extends BroadcastReceiver {
+
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        String packageName = intent.getData().toString().substring(8);
+        ApplicationData appData;
+        if (Intent.ACTION_PACKAGE_ADDED.equals(intent.getAction())) {
+            appData = new ApplicationData(packageName, ApplicationData.Action.INSTALL);
+        } else {
+            // Removed
+            appData = new ApplicationData(packageName, ApplicationData.Action.REMOVE);
+        }
+        SenseDataHolder.getApplicationDataHolder().add(appData);
+    }
+}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/audio/AudioData.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/audio/AudioData.java
new file mode 100644
index 000000000..0449d3291
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/audio/AudioData.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.event.streams.audio;
+
+public class AudioData {
+    private long timestamp;
+    private boolean headsetOn;
+    private int musicVolume;
+    private boolean playing;
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public boolean isHeadsetOn() {
+        return headsetOn;
+    }
+
+    public void setHeadsetOn(boolean headsetOn) {
+        this.headsetOn = headsetOn;
+    }
+
+    public int getMusicVolume() {
+        return musicVolume;
+    }
+
+    public void setMusicVolume(int musicVolume) {
+        this.musicVolume = musicVolume;
+    }
+
+    public boolean isPlaying() {
+        return playing;
+    }
+
+    public void setPlaying(boolean playing) {
+        this.playing = playing;
+    }
+}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/audio/AudioDataReader.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/audio/AudioDataReader.java
new file mode 100644
index 000000000..1a5f85c09
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/audio/AudioDataReader.java
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.event.streams.audio;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.util.Log;
+
+import org.wso2.carbon.iot.android.sense.event.streams.DataReader;
+import org.wso2.carbon.iot.android.sense.util.SenseDataHolder;
+
+import java.util.Date;
+
+public class AudioDataReader extends DataReader {
+
+    private static final String TAG = AudioDataReader.class.getName();
+    private Context context;
+
+    public AudioDataReader(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public void run() {
+        Log.d(TAG, "Running AudioDataReader");
+        AudioManager manager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+        AudioData audioData = new AudioData();
+        audioData.setTimestamp(new Date().getTime());
+        audioData.setPlaying(manager.isMusicActive());
+        audioData.setHeadsetOn(manager.isWiredHeadsetOn());
+        audioData.setMusicVolume(manager.getStreamVolume(AudioManager.STREAM_MUSIC));
+        SenseDataHolder.getAudioDataHolder().add(audioData);
+    }
+}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/battery/BatteryData.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/battery/BatteryData.java
index 666e02a85..7a4d7413a 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/battery/BatteryData.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/battery/BatteryData.java
@@ -25,6 +25,10 @@ import java.util.Date;
  */
 public class BatteryData {
 
+    public enum State {
+        LOW, OK
+    }
+
     private int health;
     private int level;
     private int plugged;
@@ -34,6 +38,7 @@ public class BatteryData {
     private int temperature;
     private int voltage;
     private long timestamp;
+    private State state;
 
     BatteryData(Intent intent) {
         timestamp = new Date().getTime();
@@ -46,7 +51,12 @@ public class BatteryData {
         String technology = intent.getExtras().getString(BatteryManager.EXTRA_TECHNOLOGY);
         temperature = intent.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, 0);
         voltage = intent.getIntExtra(BatteryManager.EXTRA_VOLTAGE, 0);
+        state = State.OK;
+    }
 
+    BatteryData(State state) {
+        this.timestamp = new Date().getTime();
+        this.state = state;
     }
 
     public int getHealth() {
@@ -121,4 +131,12 @@ public class BatteryData {
     public void setTimestamp(long timestamp) {
         this.timestamp = timestamp;
     }
+
+    public State getState() {
+        return state;
+    }
+
+    public void setState(State state) {
+        this.state = state;
+    }
 }
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/battery/BatteryDataReceiver.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/battery/BatteryDataReceiver.java
index 9fffa1c15..794f69b3d 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/battery/BatteryDataReceiver.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/battery/BatteryDataReceiver.java
@@ -32,7 +32,13 @@ public class BatteryDataReceiver extends BroadcastReceiver {
      */
     @Override
     public void onReceive(Context context, Intent intent) {
-        SenseDataHolder.getBatteryDataHolder().add(new BatteryData(intent));
+        if (Intent.ACTION_BATTERY_OKAY.equals(intent.getAction())) {
+            SenseDataHolder.getBatteryDataHolder().add(new BatteryData(BatteryData.State.OK));
+        } else if (Intent.ACTION_BATTERY_LOW.equals(intent.getAction())) {
+            SenseDataHolder.getBatteryDataHolder().add(new BatteryData(BatteryData.State.LOW));
+        } else {
+            SenseDataHolder.getBatteryDataHolder().add(new BatteryData(intent));
+        }
     }
 
 }
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/call/CallData.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/call/CallData.java
new file mode 100644
index 000000000..9f617cdb1
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/call/CallData.java
@@ -0,0 +1,70 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.event.streams.call;
+
+public class CallData {
+
+    public enum Type {
+        INCOMING, OUTGOING, MISSED;
+    }
+
+    private Type type;
+    private String phoneNumber;
+    private long startTime;
+    private long endTime;
+
+    public CallData(Type type, String phoneNumber, long startTime, long endTime) {
+        this.type = type;
+        this.phoneNumber = phoneNumber;
+        this.startTime = startTime;
+        this.endTime = endTime;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public long getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(long startTime) {
+        this.startTime = startTime;
+    }
+
+    public long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(long endTime) {
+        this.endTime = endTime;
+    }
+}
\ No newline at end of file
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/call/CallDataReceiver.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/call/CallDataReceiver.java
new file mode 100644
index 000000000..1988914e8
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/call/CallDataReceiver.java
@@ -0,0 +1,87 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.event.streams.call;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.telephony.TelephonyManager;
+
+import org.wso2.carbon.iot.android.sense.util.SenseDataHolder;
+
+public class CallDataReceiver extends BroadcastReceiver {
+    private static int lastState = TelephonyManager.CALL_STATE_IDLE;
+    private static long startTime;
+    private static boolean isIncoming;
+    private static String lastNotifiedNumber;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (intent.getAction().equals(Intent.ACTION_NEW_OUTGOING_CALL)) {
+            lastNotifiedNumber = intent.getExtras().getString(Intent.EXTRA_PHONE_NUMBER);
+        } else {
+            String extraState = intent.getExtras().getString(TelephonyManager.EXTRA_STATE);
+            int state = 0;
+            if (extraState.equals(TelephonyManager.EXTRA_STATE_IDLE)) {
+                state = TelephonyManager.CALL_STATE_IDLE;
+            } else if (extraState.equals(TelephonyManager.EXTRA_STATE_OFFHOOK)) {
+                state = TelephonyManager.CALL_STATE_OFFHOOK;
+            } else if (extraState.equals(TelephonyManager.EXTRA_STATE_RINGING)) {
+                state = TelephonyManager.CALL_STATE_RINGING;
+            }
+
+            if (lastState == state) {
+                return; // Nothing has been changed
+            }
+            switch (state) {
+                case TelephonyManager.CALL_STATE_RINGING:
+                    // Receiving a call
+                    isIncoming = true;
+                    startTime = System.currentTimeMillis();
+                    // If incoming call, get the incoming number
+                    lastNotifiedNumber = intent.getExtras().getString(TelephonyManager.EXTRA_INCOMING_NUMBER);
+                    break;
+                case TelephonyManager.CALL_STATE_OFFHOOK:
+                    if (lastState == TelephonyManager.CALL_STATE_RINGING) {
+                        // RINGING -> OFFHOOK = ANSWERED
+                        isIncoming = true;
+                        startTime = System.currentTimeMillis();
+                    } else {
+                        // NOT RINGING -> OFFHOOK = OUTGOING
+                        isIncoming = false;
+                        startTime = System.currentTimeMillis();
+                    }
+                    break;
+                case TelephonyManager.CALL_STATE_IDLE:
+                    if (lastState == TelephonyManager.CALL_STATE_RINGING) {
+                        // RINGING -> IDLE = MISSED
+                        SenseDataHolder.getCallDataHolder().add(new CallData(CallData.Type.MISSED, lastNotifiedNumber, startTime, System.currentTimeMillis()));
+                    } else if (isIncoming) {
+                        // Incoming (OFFHOOK) -> IDLE = INCOMING CALL ENDED
+                        SenseDataHolder.getCallDataHolder().add(new CallData(CallData.Type.INCOMING, lastNotifiedNumber, startTime, System.currentTimeMillis()));
+                    } else {
+                        // Not Incoming -> IDLE = OUTGOING CALL ENDED
+                        SenseDataHolder.getCallDataHolder().add(new CallData(CallData.Type.OUTGOING, lastNotifiedNumber, startTime, System.currentTimeMillis()));
+                    }
+                    break;
+            }
+            lastState = state;
+        }
+    }
+}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/screen/ScreenData.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/screen/ScreenData.java
new file mode 100644
index 000000000..0c124611f
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/screen/ScreenData.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.event.streams.screen;
+
+import android.content.Intent;
+
+import java.util.Date;
+
+public class ScreenData {
+    private String action;
+    private long timestamp;
+
+    ScreenData(Intent intent) {
+        if (Intent.ACTION_SCREEN_ON.equals(intent.getAction())) {
+            this.action = "on";
+        } else if (Intent.ACTION_SCREEN_OFF.equals(intent.getAction())) {
+            this.action = "off";
+        } else {
+            this.action = "unknown";
+        }
+        this.timestamp = new Date().getTime();
+    }
+
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/screen/ScreenDataReceiver.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/screen/ScreenDataReceiver.java
new file mode 100644
index 000000000..ace9d98fa
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/screen/ScreenDataReceiver.java
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.event.streams.screen;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import org.wso2.carbon.iot.android.sense.util.SenseDataHolder;
+
+public class ScreenDataReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        SenseDataHolder.getScreenDataHolder().add(new ScreenData(intent));
+    }
+}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/sms/SmsData.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/sms/SmsData.java
new file mode 100644
index 000000000..607ca2a85
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/sms/SmsData.java
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.event.streams.sms;
+
+import java.util.Date;
+
+public class SmsData {
+
+    private String phoneNumber;
+    private long timestamp;
+    private String message;
+
+    SmsData(String phoneNumber, String message) {
+        this.phoneNumber = phoneNumber;
+        this.message = message;
+        this.timestamp = new Date().getTime();
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(long timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/sms/SmsDataReceiver.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/sms/SmsDataReceiver.java
new file mode 100644
index 000000000..2ada981fb
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/event/streams/sms/SmsDataReceiver.java
@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.event.streams.sms;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.telephony.SmsMessage;
+
+import org.wso2.carbon.iot.android.sense.util.SenseDataHolder;
+
+public class SmsDataReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final Bundle bundle = intent.getExtras();
+
+        if (bundle != null) {
+
+            final Object[] pdusObj = (Object[]) bundle.get("pdus");
+
+            for (int i = 0; i < pdusObj.length; i++) {
+                SmsMessage currentMessage = SmsMessage.createFromPdu((byte[]) pdusObj[i]);
+                String phoneNumber = currentMessage.getDisplayOriginatingAddress();
+                String message = currentMessage.getDisplayMessageBody();
+
+                SmsData smsData = new SmsData(phoneNumber, message);
+                SenseDataHolder.getSmsDataHolder().add(smsData);
+            }
+        }
+    }
+}
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/realtimeviewer/sensorlisting/SupportedSensors.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/realtimeviewer/sensorlisting/SupportedSensors.java
index 6d57e6d70..2b0f5351b 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/realtimeviewer/sensorlisting/SupportedSensors.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/realtimeviewer/sensorlisting/SupportedSensors.java
@@ -60,6 +60,7 @@ public class SupportedSensors {
         sensorList.add("Light");
         sensorList.add("Gyroscope");
         sensorList.add("Proximity");
+        sensorList.add("Pedometer");
     }
 
     /**
@@ -74,6 +75,7 @@ public class SupportedSensors {
         sensorTypeMap.put("gyroscope", Sensor.TYPE_GYROSCOPE);
         sensorTypeMap.put("light", Sensor.TYPE_LIGHT);
         sensorTypeMap.put("proximity", Sensor.TYPE_PROXIMITY);
+        sensorTypeMap.put("pedometer", Sensor.TYPE_STEP_COUNTER);
     }
 
     /**
@@ -88,6 +90,7 @@ public class SupportedSensors {
         typeSensorMap.put(Sensor.TYPE_GYROSCOPE, "gyroscope");
         typeSensorMap.put(Sensor.TYPE_LIGHT, "light");
         typeSensorMap.put(Sensor.TYPE_PROXIMITY, "proximity");
+        typeSensorMap.put(Sensor.TYPE_STEP_COUNTER, "pedometer");
     }
 
     /**
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataHolder.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataHolder.java
index 1d33225b9..c3d12cafb 100755
--- a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataHolder.java
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataHolder.java
@@ -17,11 +17,17 @@ import org.wso2.carbon.iot.android.sense.beacon.BeaconScanedData;
 import org.wso2.carbon.iot.android.sense.event.streams.Location.LocationData;
 import org.wso2.carbon.iot.android.sense.event.streams.Sensor.SensorData;
 import org.wso2.carbon.iot.android.sense.event.streams.Speed.SpeedData;
+import org.wso2.carbon.iot.android.sense.event.streams.activity.ActivityData;
+import org.wso2.carbon.iot.android.sense.event.streams.application.ApplicationData;
+import org.wso2.carbon.iot.android.sense.event.streams.audio.AudioData;
 import org.wso2.carbon.iot.android.sense.event.streams.battery.BatteryData;
+import org.wso2.carbon.iot.android.sense.event.streams.call.CallData;
+import org.wso2.carbon.iot.android.sense.event.streams.screen.ScreenData;
+import org.wso2.carbon.iot.android.sense.event.streams.sms.SmsData;
 import org.wso2.carbon.iot.android.sense.speech.detector.util.WordData;
+
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-import android.util.Log;
 
 
 /**
@@ -31,72 +37,123 @@ public class SenseDataHolder {
 
     private static List<SensorData> sensorDataHolder;
     private static List<BatteryData> batteryDataHolder;
+    private static List<CallData> callDataHolder;
     private static List<LocationData> locationDataHolder;
     private static List<WordData> wordDataHolder;
     private static List<SpeedData> speedDataHolder;
     private static List<BeaconScanedData> beaconScanedDataHolder;
-
+    private static List<ScreenData> screenDataHolder;
+    private static List<AudioData> audioDataHolder;
+    private static List<ActivityData> activityDataHolder;
+    private static List<SmsData> smsDataHolder;
+    private static List<ApplicationData> applicationDataHolder;
     //LocationData gps;
 
 
     private static final String TAG = SenseDataHolder.class.getName();
 
 
-    public static List<SensorData> getSensorDataHolder(){
-        if(sensorDataHolder == null){
+    public static List<SensorData> getSensorDataHolder() {
+        if (sensorDataHolder == null) {
             sensorDataHolder = new CopyOnWriteArrayList<>();
         }
         return sensorDataHolder;
     }
 
-    public static List<BatteryData> getBatteryDataHolder(){
-        if(batteryDataHolder == null){
+    public static List<BatteryData> getBatteryDataHolder() {
+        if (batteryDataHolder == null) {
             batteryDataHolder = new CopyOnWriteArrayList<>();
         }
         return batteryDataHolder;
     }
 
-    public static List<LocationData> getLocationDataHolder(){
+    public static List<CallData> getCallDataHolder() {
+        if (callDataHolder == null) {
+            callDataHolder = new CopyOnWriteArrayList<>();
+        }
+        return callDataHolder;
+    }
+
+    public static List<LocationData> getLocationDataHolder() {
 
 
-        if(locationDataHolder == null){
+        if (locationDataHolder == null) {
 
             locationDataHolder = new CopyOnWriteArrayList<>();
         }
-            return locationDataHolder;
+        return locationDataHolder;
 
     }
 
-    public static List<WordData> getWordDataHolder(){
-        if(wordDataHolder == null){
+    public static List<WordData> getWordDataHolder() {
+        if (wordDataHolder == null) {
             wordDataHolder = new CopyOnWriteArrayList<>();
         }
         return wordDataHolder;
     }
 
-    public static List<SpeedData> getSpeedDataHolder(){
-        if(speedDataHolder == null){
+    public static List<SpeedData> getSpeedDataHolder() {
+        if (speedDataHolder == null) {
             speedDataHolder = new CopyOnWriteArrayList<>();
         }
         return speedDataHolder;
     }
 
-    public static List<BeaconScanedData> getBeaconScanedDataHolder(){
-        if(beaconScanedDataHolder == null){
+    public static List<BeaconScanedData> getBeaconScanedDataHolder() {
+        if (beaconScanedDataHolder == null) {
             beaconScanedDataHolder = new CopyOnWriteArrayList<>();
         }
         return beaconScanedDataHolder;
     }
 
-    public static void resetSensorDataHolder(){
+    public static List<ScreenData> getScreenDataHolder() {
+        if (screenDataHolder == null) {
+            screenDataHolder = new CopyOnWriteArrayList<>();
+        }
+        return screenDataHolder;
+    }
+
+    public static List<AudioData> getAudioDataHolder() {
+        if (audioDataHolder == null) {
+            audioDataHolder = new CopyOnWriteArrayList<>();
+        }
+        return audioDataHolder;
+    }
+
+    public static List<ActivityData> getActivityDataHolder() {
+        if (activityDataHolder == null) {
+            activityDataHolder = new CopyOnWriteArrayList<>();
+        }
+        return activityDataHolder;
+    }
+
+    public static List<SmsData> getSmsDataHolder() {
+        if (smsDataHolder == null) {
+            smsDataHolder = new CopyOnWriteArrayList<>();
+        }
+        return smsDataHolder;
+    }
+
+    public static List<ApplicationData> getApplicationDataHolder() {
+        if (applicationDataHolder == null) {
+            applicationDataHolder = new CopyOnWriteArrayList<>();
+        }
+        return applicationDataHolder;
+    }
+
+    public static void resetSensorDataHolder() {
         sensorDataHolder = null;
     }
 
-    public static void resetBatteryDataHolder(){
+    public static void resetBatteryDataHolder() {
         batteryDataHolder = null;
     }
 
-    public static void resetLocationDataHolder(){
+    public static void resetCallDataHolder() {
+        callDataHolder = null;
+    }
+
+    public static void resetLocationDataHolder() {
         locationDataHolder = null;
     }
 
@@ -112,5 +169,23 @@ public class SenseDataHolder {
         beaconScanedDataHolder = null;
     }
 
+    public static void resetScreenDataHolder() {
+        screenDataHolder = null;
+    }
 
+    public static void resetAudioDataHolder() {
+        audioDataHolder = null;
+    }
+
+    public static void resetActivityDataHolder() {
+        activityDataHolder = null;
+    }
+
+    public static void resetSmsDataHolder() {
+        smsDataHolder = null;
+    }
+
+    public static void resetApplicationDataHolder() {
+        applicationDataHolder = null;
+    }
 }
diff --git a/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataReceiverManager.java b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataReceiverManager.java
new file mode 100644
index 000000000..a72532464
--- /dev/null
+++ b/components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.agent/app/src/main/java/org/wso2/carbon/iot/android/sense/util/SenseDataReceiverManager.java
@@ -0,0 +1,175 @@
+/*
+ * 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.
+ */
+
+package org.wso2.carbon.iot.android.sense.util;
+
+import android.app.PendingIntent;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Bundle;
+import android.provider.Telephony;
+import android.support.annotation.Nullable;
+import android.telephony.TelephonyManager;
+
+import com.google.android.gms.common.api.GoogleApiClient;
+import com.google.android.gms.location.ActivityRecognition;
+
+import org.wso2.carbon.iot.android.sense.event.streams.activity.ActivityReceiver;
+import org.wso2.carbon.iot.android.sense.event.streams.application.ApplicationDataReceiver;
+import org.wso2.carbon.iot.android.sense.event.streams.battery.BatteryDataReceiver;
+import org.wso2.carbon.iot.android.sense.event.streams.call.CallDataReceiver;
+import org.wso2.carbon.iot.android.sense.event.streams.screen.ScreenDataReceiver;
+import org.wso2.carbon.iot.android.sense.event.streams.sms.SmsDataReceiver;
+
+public class SenseDataReceiverManager {
+    private static BroadcastReceiver batteryDataReceiver;
+
+    private static BroadcastReceiver screenDataReceiver;
+
+    private static BroadcastReceiver callDataReceiver;
+
+    private static GoogleApiClient apiClient;
+
+    private static SmsDataReceiver smsDataReceiver;
+
+    private static ApplicationDataReceiver appDataReceiver;
+
+    private SenseDataReceiverManager() {
+
+    }
+
+    public static void registerBatteryDataReceiver(Context context) {
+        if (batteryDataReceiver == null) {
+            batteryDataReceiver = new BatteryDataReceiver();
+            IntentFilter intentFilter = new IntentFilter();
+            intentFilter.addAction(Intent.ACTION_BATTERY_LOW);
+            intentFilter.addAction(Intent.ACTION_BATTERY_OKAY);
+            intentFilter.addAction(Intent.ACTION_BATTERY_CHANGED);
+
+            context.registerReceiver(batteryDataReceiver, intentFilter);
+        }
+    }
+
+    public static void unregisterBatteryDataReceiver(Context context) {
+        if (batteryDataReceiver != null) {
+            context.unregisterReceiver(batteryDataReceiver);
+            batteryDataReceiver = null;
+        }
+    }
+
+    public static void registerScreenDataReceiver(Context context) {
+        if (screenDataReceiver == null) {
+            screenDataReceiver = new ScreenDataReceiver();
+            IntentFilter intentFilter = new IntentFilter();
+            intentFilter.addAction(Intent.ACTION_SCREEN_ON);
+            intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
+
+            context.registerReceiver(screenDataReceiver, intentFilter);
+        }
+    }
+
+    public static void unregisterScreenDataReceiver(Context context) {
+        if (screenDataReceiver != null) {
+            context.unregisterReceiver(screenDataReceiver);
+            screenDataReceiver = null;
+        }
+    }
+
+    public static void registerCallDataReceiver(Context context) {
+        if (callDataReceiver == null) {
+            callDataReceiver = new CallDataReceiver();
+            IntentFilter intentFilter = new IntentFilter();
+            intentFilter.addAction(TelephonyManager.ACTION_PHONE_STATE_CHANGED);
+            intentFilter.addAction(Intent.ACTION_NEW_OUTGOING_CALL);
+
+            context.registerReceiver(callDataReceiver, intentFilter);
+        }
+    }
+
+    public static void unregisterCallDataReceiver(Context context) {
+        if (callDataReceiver != null) {
+            context.unregisterReceiver(callDataReceiver);
+            callDataReceiver = null;
+        }
+    }
+
+    public static void registerActivityDataReceiver(Context context) {
+        if (apiClient == null) {
+            Intent intent = new Intent(context, ActivityReceiver.class);
+            final PendingIntent pendingIntent = PendingIntent.getService(context, 888971, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+            apiClient = new GoogleApiClient.Builder(context)
+                    .addApi(ActivityRecognition.API)
+                    .addConnectionCallbacks(new GoogleApiClient.ConnectionCallbacks() {
+                        @Override
+                        public void onConnected(@Nullable Bundle bundle) {
+                            ActivityRecognition.ActivityRecognitionApi.requestActivityUpdates(apiClient, ActivityReceiver.UPDATE_INTERVAL, pendingIntent);
+                        }
+
+                        @Override
+                        public void onConnectionSuspended(int i) {
+                            ActivityRecognition.ActivityRecognitionApi.removeActivityUpdates(apiClient, pendingIntent);
+                        }
+                    })
+                    .build();
+
+            apiClient.connect();
+        }
+    }
+
+    public static void unregisterActivityDataReceiver(Context context) {
+        if (apiClient != null) {
+            apiClient.disconnect();
+            apiClient = null;
+        }
+    }
+
+    public static void registerSmsDataReceiver(Context context) {
+        if (smsDataReceiver == null) {
+            smsDataReceiver = new SmsDataReceiver();
+            IntentFilter intentFilter = new IntentFilter();
+            intentFilter.addAction(Telephony.Sms.Intents.SMS_RECEIVED_ACTION);
+            context.registerReceiver(smsDataReceiver, intentFilter);
+        }
+    }
+
+    public static void unregisterSmsDataReceiver(Context context) {
+        if (smsDataReceiver != null) {
+            context.unregisterReceiver(smsDataReceiver);
+            smsDataReceiver = null;
+        }
+    }
+
+    public static void registerAppDataReceiver(Context context) {
+        if (appDataReceiver == null) {
+            appDataReceiver = new ApplicationDataReceiver();
+            IntentFilter intentFilter = new IntentFilter();
+            intentFilter.addAction(Intent.ACTION_PACKAGE_ADDED);
+            intentFilter.addAction(Intent.ACTION_PACKAGE_REMOVED);
+            context.registerReceiver(appDataReceiver, intentFilter);
+        }
+    }
+
+    public static void unregisterAppDataReceiver(Context context) {
+        if (appDataReceiver != null) {
+            context.unregisterReceiver(appDataReceiver);
+            appDataReceiver = null;
+        }
+    }
+}
diff --git a/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.realtime.analytics-view/analytics-view.js b/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.realtime.analytics-view/analytics-view.js
index 1c2d56a56..e54cef4ec 100644
--- a/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.realtime.analytics-view/analytics-view.js
+++ b/components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.realtime.analytics-view/analytics-view.js
@@ -18,17 +18,27 @@
 
 function onRequest(context) {
     var log = new Log("stats.js");
+    var carbonServer = require("carbon").server;
     var device = context.unit.params.device;
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var constants = require("/app/modules/constants.js");
-
     var websocketEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
-	var tokenPair = session.get(constants["TOKEN_PAIR"]);
-	if (tokenPair) {
-		var token = parse(tokenPair)["accessToken"];
-		websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?" +
-			"token="+ token +"&deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type;
-	}
-
+    var jwtService = carbonServer.osgiService(
+        'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService');
+    var jwtClient = jwtService.getJWTClient();
+    var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
+    var token = "";
+    if (encodedClientKeys) {
+        var tokenUtil = require("/app/modules/oauth/token-handler-utils.js")["utils"];
+        var resp = tokenUtil.decode(encodedClientKeys).split(":");
+        var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username,"default", {});
+        if (tokenPair) {
+            token = tokenPair.accessToken;
+        }
+        websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?"
+            + "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type;
+        var websocketToken= {'name':'websocket-token','value': token, 'path':'/', "maxAge":18000};
+        response.addCookie(websocketToken);
+    }
     return {"device": device, "websocketEndpoint": websocketEndpoint};
 }
\ No newline at end of file
diff --git a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js
index 1c2d56a56..e54cef4ec 100644
--- a/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js
+++ b/components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.realtime.analytics-view/analytics-view.js
@@ -18,17 +18,27 @@
 
 function onRequest(context) {
     var log = new Log("stats.js");
+    var carbonServer = require("carbon").server;
     var device = context.unit.params.device;
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var constants = require("/app/modules/constants.js");
-
     var websocketEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
-	var tokenPair = session.get(constants["TOKEN_PAIR"]);
-	if (tokenPair) {
-		var token = parse(tokenPair)["accessToken"];
-		websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?" +
-			"token="+ token +"&deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type;
-	}
-
+    var jwtService = carbonServer.osgiService(
+        'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService');
+    var jwtClient = jwtService.getJWTClient();
+    var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
+    var token = "";
+    if (encodedClientKeys) {
+        var tokenUtil = require("/app/modules/oauth/token-handler-utils.js")["utils"];
+        var resp = tokenUtil.decode(encodedClientKeys).split(":");
+        var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username,"default", {});
+        if (tokenPair) {
+            token = tokenPair.accessToken;
+        }
+        websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?"
+            + "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type;
+        var websocketToken= {'name':'websocket-token','value': token, 'path':'/', "maxAge":18000};
+        response.addCookie(websocketToken);
+    }
     return {"device": device, "websocketEndpoint": websocketEndpoint};
 }
\ No newline at end of file
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
index 7d345c2ab..9cd2ca642 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/device-view.hbs
@@ -37,81 +37,75 @@
     </div>
 {{/zone}}
 
-{{#zone "device-detail-properties"}}
-    <div class="media">
-        <div class="media-left col-xs-12 col-sm-2 col-md-2 col-lg-2">
-            <ul class="list-group" role="tablist">
-                <li class="active"><a class="list-group-item" href="#device_statistics" role="tab"
-                                      data-toggle="tab" aria-controls="device_statistics">Device
-                                                                                       Statistics</a>
-                </li>
-                <li><a class="list-group-item" href="#policies" role="tab"
-                       data-toggle="tab" aria-controls="policies">Policies</a>
-                </li>
-                <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
-                       aria-controls="event_log">Operations Log</a></li>
-            </ul>
-        </div>
-        <div class="media-body add-padding-left-5x remove-padding-xs tab-content">
-            <div class="panel-group tab-content">
+{{#zone "device-view-tabs"}}
+    <li class="active"><a class="list-group-item" href="#device_statistics" role="tab"
+                          data-toggle="tab" aria-controls="device_statistics">Device
+                                                                              Statistics</a>
+    </li>
+    <li><a class="list-group-item" href="#policies" role="tab"
+           data-toggle="tab" aria-controls="policies">Policies</a>
+    </li>
+    <li><a class="list-group-item" href="#event_log" role="tab" data-toggle="tab"
+           aria-controls="event_log">Operations Log</a></li>
+{{/zone}}
 
-                <div class="panel panel-default tab-pane active"
-                     id="device_statistics" role="tabpanel" aria-labelledby="device_statistics">
-                    <div class="panel-heading">Device Statistics</div>
-                    {{unit "cdmf.unit.device.type.virtual_firealarm.realtime.analytics-view" device=device}}
-                </div>
+{{#zone "device-view-tab-contents"}}
 
-                <div class="panel panel-default tab-pane" id="policies" role="tabpanel"
-                     aria-labelledby="policies">
-                    <div class="panel-heading">Policies</div>
-                    <div class="panel-body">
-                        <div id="policy-spinner" class="wr-advance-operations-init hidden">
-                            <br>
+    <div class="panel panel-default tab-pane active"
+         id="device_statistics" role="tabpanel" aria-labelledby="device_statistics">
+        <div class="panel-heading">Device Statistics</div>
+        {{unit "cdmf.unit.device.type.virtual_firealarm.realtime.analytics-view" device=device}}
+    </div>
 
-                            <i class="fw fw-settings fw-spin fw-2x"></i>
+    <div class="panel panel-default tab-pane" id="policies" role="tabpanel"
+         aria-labelledby="policies">
+        <div class="panel-heading">Policies</div>
+        <div class="panel-body">
+            <div id="policy-spinner" class="wr-advance-operations-init hidden">
+                <br>
 
-                            Loading Policies . . .
-                            <br>
-                            <br>
-                        </div>
-                        <div id="policy-list-container">
-                            <div class="panel-body">
-                                No policies found
-                            </div>
-                            <br class="c-both"/>
-                        </div>
-                    </div>
-                    <a class="padding-left"
-                       href="{{@app.context}}/policy/add/{{device.type}}?deviceId={{device.deviceIdentifier}}">
+                <i class="fw fw-settings fw-spin fw-2x"></i>
+
+                Loading Policies . . .
+                <br>
+                <br>
+            </div>
+            <div id="policy-list-container">
+                <div class="panel-body">
+                    No policies found
+                </div>
+                <br class="c-both"/>
+            </div>
+        </div>
+        <a class="padding-left"
+           href="{{@app.context}}/policy/add/{{device.type}}?deviceId={{device.deviceIdentifier}}">
                                         <span class="fw-stack">
                                             <i class="fw fw-ring fw-stack-2x"></i>
                                             <i class="fw fw-policy fw-stack-1x"></i>
                                         </span> Add device specific policy</a>
-                </div>
-                <div class="panel panel-default tab-pane" id="event_log" role="tabpanel"
-                     aria-labelledby="event_log">
-                    <div class="panel-heading">Operations Log <span><a href="#"
-                                                                       id="refresh-operations"><i
-                            class="fw fw-refresh"></i></a></span></div>
-                    <div class="panel-body">
-                        <div id="operations-spinner" class="wr-advance-operations-init hidden">
-                            <br>
+    </div>
+    <div class="panel panel-default tab-pane" id="event_log" role="tabpanel"
+         aria-labelledby="event_log">
+        <div class="panel-heading">Operations Log <span><a href="#"
+                                                           id="refresh-operations"><i
+                class="fw fw-refresh"></i></a></span></div>
+        <div class="panel-body">
+            <div id="operations-spinner" class="wr-advance-operations-init hidden">
+                <br>
 
-                            <i class="fw fw-settings fw-spin fw-2x"></i>
+                <i class="fw fw-settings fw-spin fw-2x"></i>
 
-                            Loading Operations Log . . .
-                            <br>
-                            <br>
-                        </div>
-                        <div id="operations-log-container">
-                            <div class="panel-body">
-                                Not available yet
-                            </div>
-                            <br class="c-both"/>
-                        </div>
-                    </div>
+                Loading Operations Log . . .
+                <br>
+                <br>
+            </div>
+            <div id="operations-log-container">
+                <div class="panel-body">
+                    Not available yet
                 </div>
+                <br class="c-both"/>
             </div>
         </div>
     </div>
 {{/zone}}
+
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.policy-wizard/policy-wizard.hbs b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.policy-wizard/policy-wizard.hbs
index 2ddd9c1d1..fbd9fb6d0 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.policy-wizard/policy-wizard.hbs
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.policy-wizard/policy-wizard.hbs
@@ -15,4 +15,4 @@
   specific language governing permissions and limitations
   under the License.
 }}
-{{unit "cdmf.unit.policy.wizard"}}
\ No newline at end of file
+{{unit "cdmf.unit.policy.create"}}
\ No newline at end of file
diff --git a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.realtime.analytics-view/analytics-view.js b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.realtime.analytics-view/analytics-view.js
index fa9e138d0..e54cef4ec 100644
--- a/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.realtime.analytics-view/analytics-view.js
+++ b/components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.realtime.analytics-view/analytics-view.js
@@ -22,15 +22,23 @@ function onRequest(context) {
     var device = context.unit.params.device;
     var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
     var constants = require("/app/modules/constants.js");
-
     var websocketEndpoint = devicemgtProps["wssURL"].replace("https", "wss");
-
-	var tokenPair = session.get(constants["TOKEN_PAIR"]);
-	if (tokenPair) {
-		var token = parse(tokenPair)["accessToken"];
-		websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?" +
-			"token=" + token + "&deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type;
-	}
-
+    var jwtService = carbonServer.osgiService(
+        'org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService');
+    var jwtClient = jwtService.getJWTClient();
+    var encodedClientKeys = session.get(constants["ENCODED_TENANT_BASED_WEB_SOCKET_CLIENT_CREDENTIALS"]);
+    var token = "";
+    if (encodedClientKeys) {
+        var tokenUtil = require("/app/modules/oauth/token-handler-utils.js")["utils"];
+        var resp = tokenUtil.decode(encodedClientKeys).split(":");
+        var tokenPair = jwtClient.getAccessToken(resp[0], resp[1], context.user.username,"default", {});
+        if (tokenPair) {
+            token = tokenPair.accessToken;
+        }
+        websocketEndpoint = websocketEndpoint + "/secured-websocket/org.wso2.iot.devices.temperature/1.0.0?"
+            + "deviceId=" + device.deviceIdentifier + "&deviceType=" + device.type;
+        var websocketToken= {'name':'websocket-token','value': token, 'path':'/', "maxAge":18000};
+        response.addCookie(websocketToken);
+    }
     return {"device": device, "websocketEndpoint": websocketEndpoint};
 }
\ No newline at end of file
diff --git a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/HttpSessionConfigurator.java b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/HttpSessionConfigurator.java
new file mode 100644
index 000000000..a38a5e635
--- /dev/null
+++ b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/HttpSessionConfigurator.java
@@ -0,0 +1,36 @@
+/*
+ *
+ *  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  WSO2 Inc. licenses this file to you under the Apache License,
+ *  Version 2.0 (the "License"); you may not use this file except
+ *  in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ *
+ */
+
+package org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint;
+
+import org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.constants.Constants;
+
+import javax.websocket.HandshakeResponse;
+import javax.websocket.server.HandshakeRequest;
+import javax.websocket.server.ServerEndpointConfig;
+import java.util.List;
+import java.util.Map;
+
+public class HttpSessionConfigurator extends ServerEndpointConfig.Configurator {
+    public void modifyHandshake(ServerEndpointConfig config, HandshakeRequest request, HandshakeResponse response) {
+        Map<String, List<String>> httpHeaders = request.getHeaders();
+        config.getUserProperties().put(Constants.HTTP_HEADERS, httpHeaders);
+    }
+}
diff --git a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/SuperTenantSubscriptionEndpoint.java b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/SuperTenantSubscriptionEndpoint.java
index 53b40d1ba..5eac9280e 100644
--- a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/SuperTenantSubscriptionEndpoint.java
+++ b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/SuperTenantSubscriptionEndpoint.java
@@ -24,24 +24,28 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.AuthenticationInfo;
 import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.Authenticator;
 import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.Authorizer;
+import org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.constants.Constants;
 import org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.util.ServiceHolder;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 
 import javax.websocket.CloseReason;
+import javax.websocket.EndpointConfig;
+import javax.websocket.Session;
 import javax.websocket.OnClose;
 import javax.websocket.OnError;
 import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
-import javax.websocket.Session;
 import javax.websocket.server.PathParam;
 import javax.websocket.server.ServerEndpoint;
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Connect to web socket with Super tenant
  */
 
-@ServerEndpoint(value = "/{streamname}/{version}")
+@ServerEndpoint(value = "/{streamname}/{version}", configurator = HttpSessionConfigurator.class)
 public class SuperTenantSubscriptionEndpoint extends SubscriptionEndpoint {
 
 	private static final Log log = LogFactory.getLog(SuperTenantSubscriptionEndpoint.class);
@@ -54,13 +58,15 @@ public class SuperTenantSubscriptionEndpoint extends SubscriptionEndpoint {
 	 * @param version    -  Version extracted from the ws url.
 	 */
 	@OnOpen
-	public void onOpen(Session session, @PathParam("streamname") String streamName,
+	public void onOpen(Session session, EndpointConfig config, @PathParam("streamname") String streamName,
 					   @PathParam("version") String version) {
 		if (log.isDebugEnabled()) {
 			log.debug("WebSocket opened, for Session id: " + session.getId() + ", for the Stream:" + streamName);
 		}
+		Map<String, List<String>> httpHeaders;
+		httpHeaders = (Map<String, List<String>>) config.getUserProperties().get(Constants.HTTP_HEADERS);
 		Authenticator authenticator = ServiceHolder.getWebsocketValidationService().getAuthenticator();
-		AuthenticationInfo authenticationInfo = authenticator.isAutenticated(session);
+		AuthenticationInfo authenticationInfo = authenticator.isAuthenticated(httpHeaders);
 		if (authenticationInfo != null && authenticationInfo.isAuthenticated()) {
 			Authorizer authorizer = ServiceHolder.getWebsocketValidationService().getAuthorizer();
 			boolean isAuthorized = authorizer.isAuthorized(authenticationInfo, session, streamName);
diff --git a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/TenantSubscriptionEndpoint.java b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/TenantSubscriptionEndpoint.java
index 553cdcbea..9243498a1 100644
--- a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/TenantSubscriptionEndpoint.java
+++ b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/TenantSubscriptionEndpoint.java
@@ -24,23 +24,27 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.AuthenticationInfo;
 import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.Authenticator;
 import org.wso2.carbon.device.mgt.output.adapter.websocket.authorization.Authorizer;
+import org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.constants.Constants;
 import org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.util.ServiceHolder;
 
 import javax.websocket.CloseReason;
+import javax.websocket.EndpointConfig;
+import javax.websocket.Session;
 import javax.websocket.OnClose;
 import javax.websocket.OnError;
 import javax.websocket.OnMessage;
 import javax.websocket.OnOpen;
-import javax.websocket.Session;
 import javax.websocket.server.PathParam;
 import javax.websocket.server.ServerEndpoint;
 import java.io.IOException;
+import java.util.List;
+import java.util.Map;
 
 /**
  * Connect to web socket with a tenant
  */
 
-@ServerEndpoint(value = "/t/{tdomain}/{streamname}/{version}")
+@ServerEndpoint(value = "/t/{tdomain}/{streamname}/{version}", configurator = HttpSessionConfigurator.class)
 public class TenantSubscriptionEndpoint extends SubscriptionEndpoint {
 
     private static final Log log = LogFactory.getLog(TenantSubscriptionEndpoint.class);
@@ -54,13 +58,15 @@ public class TenantSubscriptionEndpoint extends SubscriptionEndpoint {
      * @param tdomain - Tenant domain extracted from ws url.
      */
     @OnOpen
-    public void onOpen (Session session, @PathParam("streamname") String streamName ,
-            @PathParam("version") String version, @PathParam("tdomain") String tdomain) {
+    public void onOpen (Session session, EndpointConfig config, @PathParam("streamname") String streamName ,
+                        @PathParam("version") String version, @PathParam("tdomain") String tdomain) {
         if (log.isDebugEnabled()) {
             log.debug("WebSocket opened, for Session id: "+session.getId()+", for the Stream:"+streamName);
         }
+        Map<String, List<String>> httpHeaders;
+        httpHeaders = (Map<String, List<String>>) config.getUserProperties().get(Constants.HTTP_HEADERS);
         Authenticator authenticator = ServiceHolder.getWebsocketValidationService().getAuthenticator();
-        AuthenticationInfo authenticationInfo = authenticator.isAutenticated(session);
+        AuthenticationInfo authenticationInfo = authenticator.isAuthenticated(httpHeaders);
         if (authenticationInfo != null && authenticationInfo.isAuthenticated()) {
             Authorizer authorizer = ServiceHolder.getWebsocketValidationService().getAuthorizer();
             boolean isAuthorized = authorizer.isAuthorized(authenticationInfo, session, streamName);
@@ -68,9 +74,8 @@ public class TenantSubscriptionEndpoint extends SubscriptionEndpoint {
                 try {
                     PrivilegedCarbonContext.startTenantFlow();
                     PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tdomain, true);
-                    ServiceHolder.getInstance().getUiOutputCallbackControllerService().subscribeWebsocket(streamName,
-                                                                                                          version,
-                                                                                                          session);
+                    ServiceHolder.getInstance().getUiOutputCallbackControllerService().subscribeWebsocket(streamName
+                            , version, session);
                 } finally {
                     PrivilegedCarbonContext.endTenantFlow();
                 }
diff --git a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/constants/Constants.java b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/constants/Constants.java
new file mode 100644
index 000000000..14b4e968c
--- /dev/null
+++ b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/endpoint/constants/Constants.java
@@ -0,0 +1,25 @@
+/*
+ *
+ *  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.
+ *
+ */
+
+package org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint.constants;
+
+public class Constants {
+    public static final String HTTP_HEADERS = "HttpHeaders";
+}
diff --git a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authentication/Authenticator.java b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authentication/Authenticator.java
index a9a5dc07b..d1d06cc5c 100644
--- a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authentication/Authenticator.java
+++ b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authentication/Authenticator.java
@@ -14,7 +14,8 @@
 
 package org.wso2.carbon.device.mgt.output.adapter.websocket.authentication;
 
-import javax.websocket.Session;
+import java.util.List;
+import java.util.Map;
 
 /**
  * This interface is used to authenticate a websocket session
@@ -24,7 +25,7 @@ public interface Authenticator {
     /**
      * Check whether the client is authenticated to connect.
      * @param session user object.
-     * @return AuthenicationInfo which contains authentication client information.
+     * @return AuthenticationInfo which contains authentication client information.
      */
-    AuthenticationInfo isAutenticated(Session session);
+    AuthenticationInfo isAuthenticated(Map<String, List<String>> webSocketConnectionProperties);
 }
diff --git a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authentication/OAuthAuthenticator.java b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authentication/OAuthAuthenticator.java
index 7eaab2b5b..698f4f826 100644
--- a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authentication/OAuthAuthenticator.java
+++ b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authentication/OAuthAuthenticator.java
@@ -15,12 +15,13 @@
 package org.wso2.carbon.device.mgt.output.adapter.websocket.authentication;
 
 import org.wso2.carbon.device.mgt.output.adapter.websocket.authentication.oauth.OAuthTokenValdiator;
-import javax.websocket.Session;
+
+import java.util.List;
+import java.util.Map;
 
 public class OAuthAuthenticator implements Authenticator {
 
-    @Override
-    public AuthenticationInfo isAutenticated(Session session) {
-        return OAuthTokenValdiator.getInstance().validateToken(session);
+    public AuthenticationInfo isAuthenticated(Map<String, List<String>> webSocketConnectionProperties) {
+        return OAuthTokenValdiator.getInstance().validateToken(webSocketConnectionProperties);
     }
 }
diff --git a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authentication/oauth/OAuthTokenValdiator.java b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authentication/oauth/OAuthTokenValdiator.java
index 5c55a5c21..b92f08ae0 100644
--- a/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authentication/oauth/OAuthTokenValdiator.java
+++ b/components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/src/main/java/org/wso2/carbon/device/mgt/output/adapter/websocket/authentication/oauth/OAuthTokenValdiator.java
@@ -31,7 +31,6 @@ import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.utils.CarbonUtils;
 import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
-import javax.websocket.Session;
 import java.io.File;
 import java.io.IOException;
 import java.rmi.RemoteException;
@@ -50,10 +49,11 @@ public class OAuthTokenValdiator {
 	private static Log log = LogFactory.getLog(OAuthTokenValdiator.class);
 	private static final String WEBSOCKET_CONFIG_LOCATION =
 			CarbonUtils.getEtcCarbonConfigDirPath() + File.separator + "websocket-validation.properties";
-	private static final String QUERY_STRING_SEPERATOR = "&";
-	private static final String QUERY_KEY_VALUE_SEPERATOR = "=";
+	private static final String COOKIE_KEY_VALUE_SEPERATOR = "=";
+	private static final String COOKIE_KEYPAIR_SEPERATOR = ";";
+	private static final String COOKIE = "cookie";
 	private static final String TOKEN_TYPE = "bearer";
-	private static final String TOKEN_IDENTIFIER = "token";
+	private static final String TOKEN_IDENTIFIER = "websocket-token";
 	private static OAuthTokenValdiator oAuthTokenValdiator;
 
 	public static OAuthTokenValdiator getInstance() {
@@ -79,12 +79,11 @@ public class OAuthTokenValdiator {
 
 	/**
 	 * This method gets a string accessToken and validates it
-	 *
-	 * @param session which need to be validated.
+	 * @param webSocketConnectionProperties WebSocket connection information including http headers
 	 * @return AuthenticationInfo with the validated results.
 	 */
-	public AuthenticationInfo validateToken(Session session) {
-		String token = getTokenFromSession(session);
+	public AuthenticationInfo validateToken(Map<String, List<String>> webSocketConnectionProperties) {
+		String token = getToken(webSocketConnectionProperties);
 		if (token == null) {
 			AuthenticationInfo authenticationInfo = new AuthenticationInfo();
 			authenticationInfo.setAuthenticated(false);
@@ -189,26 +188,21 @@ public class OAuthTokenValdiator {
 	}
 
 	/**
-	 * @param session of the user.
-	 * @return retreive the token from the query string
+	 * Retrieving the token from the http header
+	 * @param webSocketConnectionProperties WebSocket connection information including http headers
+	 * @return retrieved token
 	 */
-	private String getTokenFromSession(Session session) {
-		String queryString = session.getQueryString();
-		if (queryString != null) {
-			String[] allQueryParamPairs = queryString.split(QUERY_STRING_SEPERATOR);
-
-			for (String keyValuePair : allQueryParamPairs) {
-				String[] queryParamPair = keyValuePair.split(QUERY_KEY_VALUE_SEPERATOR);
-
-				if (queryParamPair.length != 2) {
-					log.warn("Invalid query string [" + queryString + "] passed in.");
-					break;
-				}
-				if (queryParamPair[0].equals(TOKEN_IDENTIFIER)) {
-					return queryParamPair[1];
-				}
-			}
-		}
+	private String getToken(Map<String, List<String>> webSocketConnectionProperties) {
+		String cookieString = webSocketConnectionProperties.get(COOKIE).get(0);
+ 		String[] properties = cookieString.split(COOKIE_KEYPAIR_SEPERATOR);
+ 		String token;
+		for (String keyValuePair: properties) {
+            if(TOKEN_IDENTIFIER.equals((keyValuePair.split(COOKIE_KEY_VALUE_SEPERATOR)[0]).trim())){
+                token = (keyValuePair.split(COOKIE_KEY_VALUE_SEPERATOR)[1]).trim();
+				return token;
+            }
+        }
+		log.error("WebSocket token should be specified in cookie");
 		return null;
 	}
 }
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
index 0f613ddc8..3842be730 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
@@ -1,485 +1,406 @@
 {{unit "cdmf.unit.device.type.android.leaflet"}}
 {{unit "cdmf.unit.lib.qrcode"}}
 {{unit "cdmf.unit.device.type.android.qr-modal"}}
-{{unit "cdmf.unit.device.type.android.operation-bar"}}
 
 {{#if deviceFound}}
     {{#if isAuthorized}}
 
         {{#zone "device-details-header"}}
-        <h1 class="page-sub-title device-id device-select"
-            data-deviceid="{{deviceView.deviceIdentifier}}" data-type="{{deviceView.type}}"
-            data-ownership="{{deviceView.ownership}}">
-            Device {{deviceView.name}}
-            {{#if deviceView.model}}
-                <span class="lbl-device">
-                    ( {{deviceView.vendor}} {{deviceView.model}} )
+            <h1 class="page-sub-title device-id device-select"
+                data-deviceid="{{device.deviceIdentifier}}" data-type="{{device.type}}"
+                data-ownership="{{device.ownership}}"
+                data-owner="{{device.owner}}">
+                Device {{device.name}}
+                {{#if device.model}}
+                    <span class="lbl-device">
+                    ( {{device.vendor}} {{device.model}} )
                 </span>
-            {{/if}}
-        </h1>
+                {{/if}}
+            </h1>
         {{/zone}}
 
-                {{#zone "overview-section"}}
-                    <div class="media-body asset-desc add-padding-left-5x">
-                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Device
-                                                                                                         Overview
-                        </div>
-                        <table class="table table-responsive table-striped" id="members">
-                            <tbody>
-                            {{#if deviceView.deviceIdentifier}}
-                                <tr role="row" class="odd">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Device ID</td>
-                                    <td style="padding:10px 15px;">{{deviceView.deviceIdentifier}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.name}}
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Name</td>
-                                    <td style="padding:10px 15px;">{{deviceView.name}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.vendor}}
-                                {{#if deviceView.model}}
-                                    <tr role="row" class="odd">
-                                        <td class="sorting_1" style="padding:10px 15px; width: 15%;">Model</td>
-                                        <td style="padding:10px 15px;">{{deviceView.vendor}} {{deviceView.model}}</td>
-                                    </tr>
-                                {{/if}}
-                            {{/if}}
-                            {{#if deviceView.status}}
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Status</td>
-                                    <td style="padding:10px 15px;">
-                                        {{#equal deviceView.status "ACTIVE"}}<span><i
-                                                class="fw fw-ok icon-success"></i>Active</span>{{/equal}}
-                                        {{#equal deviceView.status "INACTIVE"}}<span><i
-                                                class="fw fw-warning icon-warning"></i>Inactive</span>{{/equal}}
-                                        {{#equal deviceView.status "BLOCKED"}}<span><i
-                                                class="fw fw-remove icon-danger"></i>Blocked</span>{{/equal}}
-                                        {{#equal deviceView.status "REMOVED"}}<span><i
-                                                class="fw fw-delete icon-danger"></i>Removed</span>{{/equal}}
-                                    </td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.owner}}
-                                <tr role="row" class="odd">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Owner</td>
-                                    <td style="padding:10px 15px;">{{deviceView.owner}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.ownership}}
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Ownership</td>
-                                    <td style="padding:10px 15px;">{{deviceView.ownership}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.imei}}
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">IMEI</td>
-                                    <td style="padding:10px 15px;">{{deviceView.imei}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.udid}}
-                                <tr role="row" class="odd">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">UDID</td>
-                                    <td style="padding:10px 15px;">{{deviceView.udid}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.osBuildDate}}
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Firmware Build
-                                                                                                 Date
-                                    </td>
-                                    <td style="padding:10px 15px;">{{deviceView.osBuildDate}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.phoneNumber}}
-                                <tr role="row" class="odd">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Phone Number</td>
-                                    <td style="padding:10px 15px;">{{deviceView.phoneNumber}}</td>
-                                </tr>
-                            {{/if}}
-                            {{#if deviceView.lastUpdatedTime}}
-                                <tr role="row" class="even">
-                                    <td class="sorting_1" style="padding:10px 15px; width: 15%;">Last Update</td>
-                                    <td style="padding:10px 15px;">{{deviceView.lastUpdatedTime}}</td>
-                                </tr>
-                            {{/if}}
-                            </tbody>
-                        </table>
-                    </div>
-                {{/zone}}
-
-                {{#zone "device-opetations"}}
-                    {{#if deviceView.isNotRemoved}}
-                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-                            Operations
-                        </div>
-                        <div class="add-margin-top-4x">
-                            {{unit "cdmf.unit.device.operation-bar" device=deviceView backendApiUri=backendApiUri autoCompleteParams=autoCompleteParams}}
-                        </div>
+        {{#zone "overview-section"}}
+            <div class="media-body asset-desc add-padding-left-5x">
+                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Device
+                                                                                                 Overview
+                </div>
+                <table class="table table-responsive table-striped" id="members">
+                    <tbody>
+                    {{#if device.deviceIdentifier}}
+                        <tr role="row" class="odd">
+                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Device ID</td>
+                            <td style="padding:10px 15px;">{{device.deviceIdentifier}}</td>
+                        </tr>
                     {{/if}}
-                {{/zone}}
-
+                    {{#if device.name}}
+                        <tr role="row" class="even">
+                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Name</td>
+                            <td style="padding:10px 15px;">{{device.name}}</td>
+                        </tr>
+                    {{/if}}
+                    {{#if device.vendor}}
+                        {{#if device.model}}
+                            <tr role="row" class="odd">
+                                <td class="sorting_1" style="padding:10px 15px; width: 15%;">Model</td>
+                                <td style="padding:10px 15px;">{{device.vendor}}
+                                    {{device.model}}</td>
+                            </tr>
+                        {{/if}}
+                    {{/if}}
+                    {{#if device.status}}
+                        <tr role="row" class="even">
+                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Status</td>
+                            <td style="padding:10px 15px;">
+                                {{#equal device.status "ACTIVE"}}<span><i
+                                        class="fw fw-ok icon-success"></i>Active</span>{{/equal}}
+                                {{#equal device.status "INACTIVE"}}<span><i
+                                        class="fw fw-warning icon-warning"></i>Inactive</span>{{/equal}}
+                                {{#equal device.status "BLOCKED"}}<span><i
+                                        class="fw fw-remove icon-danger"></i>Blocked</span>{{/equal}}
+                                {{#equal device.status "REMOVED"}}<span><i
+                                        class="fw fw-delete icon-danger"></i>Removed</span>{{/equal}}
+                            </td>
+                        </tr>
+                    {{/if}}
+                    {{#if device.owner}}
+                        <tr role="row" class="odd">
+                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Owner</td>
+                            <td style="padding:10px 15px;">{{device.owner}}</td>
+                        </tr>
+                    {{/if}}
+                    {{#if device.ownership}}
+                        <tr role="row" class="even">
+                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Ownership</td>
+                            <td style="padding:10px 15px;">{{device.ownership}}</td>
+                        </tr>
+                    {{/if}}
+                    {{#if device.imei}}
+                        <tr role="row" class="even">
+                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">IMEI</td>
+                            <td style="padding:10px 15px;">{{device.imei}}</td>
+                        </tr>
+                    {{/if}}
+                    {{#if device.udid}}
+                        <tr role="row" class="odd">
+                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">UDID</td>
+                            <td style="padding:10px 15px;">{{device.udid}}</td>
+                        </tr>
+                    {{/if}}
+                    {{#if device.osBuildDate}}
+                        <tr role="row" class="even">
+                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Firmware Build
+                                                                                         Date
+                            </td>
+                            <td style="padding:10px 15px;">{{device.osBuildDate}}</td>
+                        </tr>
+                    {{/if}}
+                    {{#if device.phoneNumber}}
+                        <tr role="row" class="odd">
+                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Phone Number</td>
+                            <td style="padding:10px 15px;">{{device.phoneNumber}}</td>
+                        </tr>
+                    {{/if}}
+                    {{#if device.lastUpdatedTime}}
+                        <tr role="row" class="even">
+                            <td class="sorting_1" style="padding:10px 15px; width: 15%;">Last Update</td>
+                            <td style="padding:10px 15px;">{{device.lastUpdatedTime}}</td>
+                        </tr>
+                    {{/if}}
+                    </tbody>
+                </table>
             </div>
+        {{/zone}}
 
-            {{#zone "device-detail-properties"}}
-                <div class="media tab-responsive">
-                <div class="media-left col-xs-1 col-sm-1 col-md-2 col-lg-2 hidden-xs">
-                    <ul class="list-group nav nav-pills nav-stacked" role="tablist">
-                        {{#if deviceView.isNotWindows}}
-                            <li role="presentation" class="list-group-item active">
-                                <a href="#device_details_tab" role="tab" data-toggle="tab"
-                                   aria-controls="device_details_tab">
-                                    <i class="icon fw fw-mobile"></i><span class="hidden-sm">Device Details</span>
-                                </a>
-                            </li>
-                        {{/if}}
-                        {{#if deviceView.isNotWindows}}
-                        <li role="presentation" class="list-group-item">
-                        {{else}}
-                        <li role="presentation" class="list-group-item active">
-                        {{/if}}
-                        <li role="presentation" class="list-group-item">
-                            <a href="#policy_compliance_tab" role="tab" data-toggle="tab"
-                               aria-controls="policy_compliance_tab">
-                                <i class="icon fw fw-policy"></i><span class="hidden-sm">Policy Compliance</span>
-                            </a>
-                        </li>
-                        {{#if deviceView.isNotWindows}}
-                            <li role="presentation" class="list-group-item">
-                                <a href="#device_location_tab" role="tab" data-toggle="tab"
-                                   data-lat="{{deviceView.location.latitude}}"
-                                   data-long="{{deviceView.location.longitude}}"
-                                   aria-controls="device_location_tab">
-                                    <i class="icon fw fw-map-location"></i><span
-                                        class="hidden-sm">Device Location</span>
-                                </a>
-                            </li>
-                            <li role="presentation" class="list-group-item">
-                                <a href="#installed_applications_tab" role="tab" data-toggle="tab"
-                                   aria-controls="installed_applications_tab">
-                                    <i class="icon fw fw-application"></i><span class="hidden-sm">Installed Applications</span>
-                                </a>
-                            </li>
-                        {{/if}}
-                        {{#if deviceView.isNotRemoved}}
-                            <li role="presentation" class="list-group-item">
-                                <a href="#event_log_tab" role="tab" data-toggle="tab" aria-controls="event_log_tab">
-                                    <i class="icon fw fw-text"></i><span class="hidden-sm">Operations Log</span>
-                                </a>
-                            </li>
-                        {{/if}}
-                    </ul>
+
+        {{#zone "device-opetations"}}
+            {{#if device.isNotRemoved}}
+                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                    Operations
+                </div>
+                <div class="add-margin-top-4x">
+                    {{unit "cdmf.unit.device.type.android.operation-bar" device=device
+                    backendApiUri=backendApiUri autoCompleteParams=autoCompleteParams}}
                 </div>
-                    <div class="media-body add-padding-left-5x remove-padding-xs">
-                        <div class="panel-group tab-content remove-padding" id="tabs" role="tablist"
-                             data-status="{{deviceView.isNotRemoved}}" aria-multiselectable="true">
-                            <div class="arrow-left hidden-xs"></div>
+            {{/if}}
+        {{/zone}}
+
+        {{#zone "device-details-tab-injected"}}
+            <li role="presentation" class="list-group-item">
+                <a href="#policy_compliance_tab" role="tab" data-toggle="tab"
+                   aria-controls="policy_compliance_tab">
+                    <i class="icon fw fw-policy"></i><span class="hidden-sm">Policy Compliance</span>
+                </a>
+            </li>
+            <li role="presentation" class="list-group-item">
+                <a href="#device_location_tab" role="tab" data-toggle="tab"
+                   data-lat="{{device.location.latitude}}"
+                   data-long="{{device.location.longitude}}"
+                   aria-controls="device_location_tab">
+                    <i class="icon fw fw-map-location"></i><span
+                        class="hidden-sm">Device Location</span>
+                </a>
+            </li>
+            <li role="presentation" class="list-group-item">
+                <a href="#installed_applications_tab" role="tab" data-toggle="tab"
+                   aria-controls="installed_applications_tab">
+                    <i class="icon fw fw-application"></i><span class="hidden-sm">Installed Applications</span>
+                </a>
+            </li>
+        {{/zone}}
 
-                            {{#if deviceView.isNotWindows}}
-                                <div class="panel panel-default" role="tabpanel" id="device_details_tab">
-                                    <div class="panel-heading visible-xs collapsed" id="device_details">
-                                        <h4 class="panel-title">
-                                            <a role="button" data-toggle="collapse" data-parent="#tabs"
-                                               href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
-                                                <i class="fw fw-mobile fw-2x"></i>
-                                                Device Details
-                                                <i class="caret-updown fw fw-down"></i>
-                                            </a>
-                                        </h4>
+        {{#zone "device-details-tab-contents"}}
+            <div class="panel panel-default" role="tabpanel" id="device_details_tab">
+                <div class="panel-heading visible-xs collapsed" id="device_details">
+                    <h4 class="panel-title">
+                        <a role="button" data-toggle="collapse" data-parent="#tabs"
+                           href="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+                            <i class="fw fw-mobile fw-2x"></i>
+                            Device Details
+                            <i class="caret-updown fw fw-down"></i>
+                        </a>
+                    </h4>
+                </div>
+                <div class="panel-heading display-none-xs">Device Details</div>
+                <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel"
+                     aria-labelledby="device_details">
+                    <div class="panel-body ">
+                        <div class="device-detail-body">
+                            <!-- device summary -->
+                            {{#if device.deviceInfoAvailable}}
+                                {{#if device.BatteryLevel}}
+                                    <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
+                                        <div class="col-md-12">
+                                            <div class="wr-stats-board-tile">
+                                                <div class="tile-name">BATTERY</div>
+                                                <div>
+                                                    <div class="tile-icon"><i
+                                                            class="fw fw-battery"></i></div>
+                                                    <div class="tile-stats">
+                                                        {{device.BatteryLevel
+                                                        .value}} %
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                {{/if}}
+                                    <!--{{#if device.cpuUsage}}-->
+                            <!--<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">-->
+                            <!--<div class="col-md-12">-->
+                            <!--<div class="wr-stats-board-tile">-->
+                            <!--<div class="tile-name">CPU Usage</div>-->
+                            <!--<div>-->
+                            <!--<div class="tile-icon"><i class="fw fw-dashboard"></i></div>-->
+                            <!--<div class="tile-stats">-->
+                            <!--{{device.cpuUsage.value}} %-->
+                            <!--</div>-->
+                            <!--</div>-->
+                            <!--</div>-->
+                            <!--</div>-->
+                            <!--</div>-->
+                                    <!--{{/if}}-->
+                                {{#if device.ramUsage}}
+                                    <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
+                                        <div class="col-md-12">
+                                            <div class="wr-stats-board-tile">
+                                                <div class="tile-name">RAM Usage</div>
+                                                <div>
+                                                    <div class="tile-icon"><i
+                                                            class="fw fw-hardware"></i></div>
+                                                    <div class="tile-stats">
+                                                        {{device.ramUsage
+                                                        .value}} %
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
                                     </div>
-                                    <div class="panel-heading display-none-xs">Device Details</div>
-                                    <div id="collapseOne" class="panel-collapse collapse in" role="tabpanel"
-                                         aria-labelledby="device_details">
-                                        <div class="panel-body ">
-                                            <div class="device-detail-body">
-                                                <!-- device summary -->
-                                                {{#equal deviceView.type "windows"}}
-                                                    <div class="message message-info">
-                                                        <h4 class="remove-margin"><i class="icon fw fw-info"></i>Not
-                                                                                                                 available yet</h4>
+                                {{/if}}
+                                {{#if device.internalMemory}}
+                                    <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
+                                        <div class="col-md-12">
+                                            <div class="wr-stats-board-tile">
+                                                <div class="tile-name">Local Storage</div>
+                                                <div>
+                                                    <div class="tile-icon"><i
+                                                            class="fw fw-hdd"></i>
                                                     </div>
-                                                {{/equal}}
-                                                {{#if deviceView.deviceInfoAvailable}}
-                                                    {{#if deviceView.BatteryLevel}}
-                                                        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
-                                                            <div class="col-md-12">
-                                                                <div class="wr-stats-board-tile">
-                                                                    <div class="tile-name">BATTERY</div>
-                                                                    <div>
-                                                                        <div class="tile-icon"><i
-                                                                                class="fw fw-battery"></i></div>
-                                                                        <div class="tile-stats">
-                                                                            {{deviceView.BatteryLevel.value}} %
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    {{/if}}
-                                                        <!--{{#if deviceView.cpuUsage}}-->
-                                                <!--<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">-->
-                                                <!--<div class="col-md-12">-->
-                                                <!--<div class="wr-stats-board-tile">-->
-                                                <!--<div class="tile-name">CPU Usage</div>-->
-                                                <!--<div>-->
-                                                <!--<div class="tile-icon"><i class="fw fw-dashboard"></i></div>-->
-                                                <!--<div class="tile-stats">-->
-                                                <!--{{deviceView.cpuUsage.value}} %-->
-                                                <!--</div>-->
-                                                <!--</div>-->
-                                                <!--</div>-->
-                                                <!--</div>-->
-                                                <!--</div>-->
-                                                        <!--{{/if}}-->
-                                                    {{#if deviceView.ramUsage}}
-                                                        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
-                                                            <div class="col-md-12">
-                                                                <div class="wr-stats-board-tile">
-                                                                    <div class="tile-name">RAM Usage</div>
-                                                                    <div>
-                                                                        <div class="tile-icon"><i
-                                                                                class="fw fw-hardware"></i></div>
-                                                                        <div class="tile-stats">
-                                                                            {{deviceView.ramUsage.value}} %
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    {{/if}}
-                                                    {{#if deviceView.internalMemory}}
-                                                        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
-                                                            <div class="col-md-12">
-                                                                <div class="wr-stats-board-tile">
-                                                                    <div class="tile-name">Local Storage</div>
-                                                                    <div>
-                                                                        <div class="tile-icon"><i
-                                                                                class="fw fw-hdd"></i>
-                                                                        </div>
-                                                                        <div class="tile-stats">
-                                                                            {{deviceView.internalMemory.usage}} %
+                                                    <div class="tile-stats">
+                                                        {{device.internalMemory
+                                                        .usage}} %
                                                                                 <span class="tile-stats-free">
-                                                            TOTAL OF {{deviceView.internalMemory.total}} GB
+                                                            TOTAL OF {{device.internalMemory
+                                                                                .total}} GB
                                                         </span>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    {{/if}}
-                                                    {{#if deviceView.externalMemory}}
-                                                        <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
-                                                            <div class="col-md-12">
-                                                                <div class="wr-stats-board-tile">
-                                                                    <div class="tile-name">External Storage</div>
-                                                                    <div>
-                                                                        <div class="tile-icon"><i
-                                                                                class="fw fw-usb-drive"></i></div>
-                                                                        <div class="tile-stats">
-                                                                            {{deviceView.externalMemory.usage}} %
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                {{/if}}
+                                {{#if device.externalMemory}}
+                                    <div class="col-xs-12 col-sm-6 col-md-6 col-lg-6">
+                                        <div class="col-md-12">
+                                            <div class="wr-stats-board-tile">
+                                                <div class="tile-name">External Storage</div>
+                                                <div>
+                                                    <div class="tile-icon"><i
+                                                            class="fw fw-usb-drive"></i></div>
+                                                    <div class="tile-stats">
+                                                        {{device.externalMemory
+                                                        .usage}} %
                                                                                 <span class="tile-stats-free">
-                                                            TOTAL OF {{deviceView.externalMemory.total}} GB
+                                                            TOTAL OF {{device.externalMemory
+                                                                                .total}} GB
                                                         </span>
-                                                                        </div>
-                                                                    </div>
-                                                                </div>
-                                                            </div>
-                                                        </div>
-                                                    {{/if}}
-                                                {{else}}
-                                                    <div class="message message-info">
-                                                        <h4 class="remove-margin">
-                                                            <i class="icon fw fw-info"></i>
-                                                            Battery, RAM and Storage related information are not
-                                                            available yet.
-                                                        </h4>
                                                     </div>
-                                                {{/if}}
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
+                                {{/if}}
+                            {{else}}
+                                <div class="message message-info">
+                                    <h4 class="remove-margin">
+                                        <i class="icon fw fw-info"></i>
+                                        Battery, RAM and Storage related information are not
+                                        available yet.
+                                    </h4>
                                 </div>
                             {{/if}}
+                        </div>
+                    </div>
+                </div>
+            </div>
+        {{/zone}}
 
-                            <div class="panel panel-default visible-xs-block" role="tabpanel"
-                                 id="policy_compliance_tab">
-                                <div class="panel-heading visible-xs collapsed" id="policy_compliance">
-                                    <h4 class="panel-title">
-                                        <a role="button"
-                                           data-toggle="collapse" data-parent="#tabs" href="#collapseTwo"
-                                           aria-expanded="true" aria-controls="collapseTwo">
-                                            <i class="fw fw-policy fw-2x"></i>
-                                            Policy Compliance
-                                            <i class="caret-updown fw fw-down"></i>
-                                        </a>
-                                    </h4>
-                                </div>
-                                <div class="panel-heading display-none-xs">
-                                    Policy Compliance
+        {{#zone "device-view-tab-injected-conents"}}
+            <div class="panel panel-default visible-xs-block" role="tabpanel"
+                 id="policy_compliance_tab">
+                <div class="panel-heading visible-xs collapsed" id="policy_compliance">
+                    <h4 class="panel-title">
+                        <a role="button"
+                           data-toggle="collapse" data-parent="#tabs" href="#collapseTwo"
+                           aria-expanded="true" aria-controls="collapseTwo">
+                            <i class="fw fw-policy fw-2x"></i>
+                            Policy Compliance
+                            <i class="caret-updown fw fw-down"></i>
+                        </a>
+                    </h4>
+                </div>
+                <div class="panel-heading display-none-xs">
+                    Policy Compliance
 
                                         <span>
                             <a href="javascript:void(0);" id="refresh-policy">
                                 <i class="fw fw-refresh"></i>
                             </a>
                         </span>
-                                </div>
-                                <div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel"
-                                     aria-labelledby="policy_compliance">
-                                    <div class="panel-body ">
+                </div>
+                <div id="collapseTwo" class="panel-collapse collapse in" role="tabpanel"
+                     aria-labelledby="policy_compliance">
+                    <div class="panel-body ">
                             <span class="visible-xs add-padding-2x text-right">
                                 <a href="javascript:void(0);" id="refresh-policy">
                                     <i class="fw fw-refresh"></i>
                                 </a>
                             </span>
-                                        <div id="policy-spinner"
-                                             class="wr-advance-operations-init add-padding-bottom-2x add-padding-bottom-4x hidden">
-                                            <i class="fw fw-settings fw-spin fw-2x"></i>Loading Policy
-                                                                                        Compliance...
-                                        </div>
-                                        <div id="policy-list-container">
-                                        </div>
-                                    </div>
-                                </div>
+                        <div id="policy-spinner"
+                             class="wr-advance-operations-init add-padding-bottom-2x add-padding-bottom-4x hidden">
+                            <i class="fw fw-settings fw-spin fw-2x"></i>Loading Policy
+                                                                        Compliance...
+                        </div>
+                        <div id="policy-list-container">
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div class="panel panel-default visible-xs-block" role="tabpanel"
+                 id="device_location_tab">
+                <div class="panel-heading visible-xs collapsed" id="device_location">
+                    <h4 class="panel-title">
+                        <a role="button" data-toggle="collapse" data-parent="#tabs"
+                           href="#collapseThree" aria-expanded="true" aria-controls="collapseThree">
+                            <i class="fw fw-map-location fw-2x"></i>
+                            Device Location
+                            <i class="caret-updown fw fw-down"></i>
+                        </a>
+                    </h4>
+                </div>
+                <div class="panel-heading display-none-xs">Device Location</div>
+                <div id="collapseThree" class="panel-collapse collapse in" role="tabpanel"
+                     aria-labelledby="device_location">
+                    <div class="panel-body">
+                        {{#if device.location}}
+                            <div id="device-location"
+                                 data-lat="{{device.location.latitude}}"
+                                 data-long="{{device.location.longitude}}">
                             </div>
-                            <div class="panel panel-default visible-xs-block" role="tabpanel"
-                                 id="device_location_tab">
-                                <div class="panel-heading visible-xs collapsed" id="device_location">
-                                    <h4 class="panel-title">
-                                        <a role="button" data-toggle="collapse" data-parent="#tabs"
-                                           href="#collapseThree" aria-expanded="true" aria-controls="collapseThree">
-                                            <i class="fw fw-map-location fw-2x"></i>
-                                            Device Location
-                                            <i class="caret-updown fw fw-down"></i>
-                                        </a>
-                                    </h4>
-                                </div>
-                                <div class="panel-heading display-none-xs">Device Location</div>
-                                <div id="collapseThree" class="panel-collapse collapse in" role="tabpanel"
-                                     aria-labelledby="device_location">
-                                    <div class="panel-body">
-                                        {{#if deviceView.location}}
-                                            <div id="device-location"
-                                                 data-lat="{{deviceView.location.latitude}}"
-                                                 data-long="{{deviceView.location.longitude}}">
-                                            </div>
-                                        {{else}}
-                                            <div id="map-error" class="message message-warning">
-                                                <h4 class="remove-margin">
-                                                    <i class="icon fw fw-warning"></i>
-                                                    Device location information is not available.
-                                                </h4>
-                                            </div>
-                                            <p class="add-padding-5x"></p>
-                                            <p class="add-padding-5x"></p>
-                                            <p class="add-padding-5x"></p>
-                                        {{/if}}
-                                    </div>
-                                </div>
+                        {{else}}
+                            <div id="map-error" class="message message-warning">
+                                <h4 class="remove-margin">
+                                    <i class="icon fw fw-warning"></i>
+                                    Device location information is not available.
+                                </h4>
                             </div>
-                            <div class="panel panel-default visible-xs-block" role="tabpanel"
-                                 id="installed_applications_tab">
-                                <div class="panel-heading visible-xs collapsed" id="installed_applications">
-                                    <h4 class="panel-title">
-                                        <a role="button" data-toggle="collapse" data-parent="#tabs"
-                                           href="#collapseFour" aria-expanded="true" aria-controls="collapseFour">
-                                            <i class="fw fw-application fw-2x"></i>
-                                            Installed Applications
-                                            <i class="caret-updown fw fw-down"></i>
-                                        </a>
-                                    </h4>
-                                </div>
-                                <div class="panel-heading display-none-xs">
-                                    Installed Applications
+                            <p class="add-padding-5x"></p>
+                            <p class="add-padding-5x"></p>
+                            <p class="add-padding-5x"></p>
+                        {{/if}}
+                    </div>
+                </div>
+            </div>
+
+            <div class="panel panel-default visible-xs-block" role="tabpanel"
+                 id="installed_applications_tab">
+                <div class="panel-heading visible-xs collapsed" id="installed_applications">
+                    <h4 class="panel-title">
+                        <a role="button" data-toggle="collapse" data-parent="#tabs"
+                           href="#collapseFour" aria-expanded="true" aria-controls="collapseFour">
+                            <i class="fw fw-application fw-2x"></i>
+                            Installed Applications
+                            <i class="caret-updown fw fw-down"></i>
+                        </a>
+                    </h4>
+                </div>
+                <div class="panel-heading display-none-xs">
+                    Installed Applications
 
                                         <span>
                             <a href="javascript:void(0);" id="refresh-apps">
                                 <i class="fw fw-refresh"></i>
                             </a>
                         </span>
-                                </div>
-                                <div id="collapseFour" class="panel-collapse collapse in" role="tabpanel"
-                                     aria-labelledby="installed_applications">
-                                    <div class="panel-body">
+                </div>
+                <div id="collapseFour" class="panel-collapse collapse in" role="tabpanel"
+                     aria-labelledby="installed_applications">
+                    <div class="panel-body">
                             <span class="visible-xs add-padding-2x text-right">
                                 <a href="javascript:void(0);" id="refresh-apps">
                                     <i class="fw fw-refresh"></i>
                                 </a>
                             </span>
-                                        <div id="apps-spinner" class="wr-advance-operations-init hidden">
-                                            <i class="fw fw-settings fw-spin fw-2x"></i> Loading Applications
-                                                                                         List...
-                                        </div>
-                                        <div id="applications-list-container">
-                                            <div class="message message-info">
-                                                <h4>
-                                                    <i class="icon fw fw-info"></i>
-                                                    No applications found.
-                                                </h4>
-                                                <p>Please try refreshing in a while.</p>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="panel panel-default visible-xs-block" role="tabpanel" id="event_log_tab">
-                                <div class="panel-heading visible-xs collapsed" id="event_log">
-                                    <h4 class="panel-title">
-                                        <a role="button" data-toggle="collapse" data-parent="#tabs"
-                                           href="#collapseFive" aria-expanded="true" aria-controls="collapseFive">
-                                            <i class="fw fw-text fw-2x"></i>
-                                            Operations Log
-                                            <i class="caret-updown fw fw-down"></i>
-                                        </a>
-                                    </h4>
-                                </div>
-                                <div class="panel-heading display-none-xs">
-                                    Operations Log
-                                        <span>
-                            <a href="javascript:void(0);" id="refresh-operations">
-                                <i class="fw fw-refresh"></i>
-                            </a>
-                        </span>
-                                </div>
-                                <div id="collapseFive" class="panel-collapse collapse in" role="tabpanel"
-                                     aria-labelledby="event_log">
-                                    <div class="panel-body">
-                                            <span class="visible-xs add-padding-2x text-right">
-                                                <a href="javascript:void(0);" id="refresh-operations">
-                                                    <i class="fw fw-refresh"></i>
-                                                </a>
-                                            </span>
-                                        <div id="operations-spinner" class="wr-advance-operations-init hidden">
-                                            <i class="fw fw-settings fw-spin fw-2x"></i> Loading Operations Log...
-                                        </div>
-                                        <div id="operations-log-container">
-                                            <div class="message message-info">
-                                                <h4 class="remove-margin">
-                                                    <i class="icon fw fw-info"></i>
-                                                    There are no operations, performed yet on this device.
-                                                </h4>
-                                            </div>
-                                        </div>
-                                        <table class="table table-striped table-hover table-bordered display data-table"
-                                               id="operations-log-table">
-                                            <thead>
-                                            <tr class="sort-row">
-                                                <th>Operation Code</th>
-                                                <th>Status</th>
-                                                <th>Request created at</th>
-                                            </tr>
-                                            </thead>
-                                            <tbody>
-                                            </tbody>
-                                        </table>
-                                    </div>
-                                </div>
+                        <div id="apps-spinner" class="wr-advance-operations-init hidden">
+                            <i class="fw fw-settings fw-spin fw-2x"></i> Loading Applications
+                                                                         List...
+                        </div>
+                        <div id="applications-list-container">
+                            <div class="message message-info">
+                                <h4>
+                                    <i class="icon fw fw-info"></i>
+                                    No applications found.
+                                </h4>
+                                <p>Please try refreshing in a while.</p>
                             </div>
                         </div>
                     </div>
+                </div>
             </div>
-                {{/zone}}
+
+        {{/zone}}
+
+        </div>
         </div>
     {{else}}
         <h1 class="page-sub-title">
@@ -500,19 +421,13 @@
     {{#if isAuthorized}}
         <!--suppress HtmlUnknownTarget -->
         <script id="policy-view" src="{{@unit.publicUri}}/templates/policy-compliance.hbs"
-                data-device-id="{{deviceView.deviceIdentifier}}" data-device-type="{{deviceView
-        .type}}"
+                data-device-id="{{device.deviceIdentifier}}" data-device-type="{{device.type}}"
                 type="text/x-handlebars-template"></script>
         <!--suppress HtmlUnknownTarget -->
         <script id="applications-list" src="{{@unit.publicUri}}/templates/applications-list.hbs"
-                data-device-id="{{deviceView.deviceIdentifier}}" data-device-type="{{deviceView
-        .type}}"
+                data-device-id="{{device.deviceIdentifier}}" data-device-type="{{device.type}}"
                 type="text/x-handlebars-template"></script>
         <!--suppress HtmlUnknownTarget -->
-        <script id="operations-log" src="{{@unit.publicUri}}/templates/operations-log.hbs"
-                data-device-id="{{deviceView.deviceIdentifier}}" data-device-type="{{deviceView
-        .type}}"
-                type="text/x-handlebars-template"></script>
         {{js "js/device-detail.js"}}
         <script src="https://maps.googleapis.com/maps/api/js?v=3.exp&signed_in=true"></script>
         {{js "js/load-map.js"}}
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
index e12577afd..b7ce950c0 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.js
@@ -36,9 +36,6 @@ function onRequest(context) {
             if (filteredDeviceData["type"]) {
                 viewModel["type"] = filteredDeviceData["type"];
                 viewModel.isNotWindows = true;
-                if (viewModel["deviceType"] == "windows") {
-                    viewModel.isNotWindows = false;
-                }
             }
             if (filteredDeviceData["deviceIdentifier"]) {
                 viewModel["deviceIdentifier"] = filteredDeviceData["deviceIdentifier"];
@@ -197,7 +194,7 @@ function onRequest(context) {
                 viewModel["deviceInfoAvailable"] = false;
             }
 
-            deviceViewData["deviceView"] = viewModel;
+            deviceViewData["device"] = viewModel;
         } else if (response["status"] == "unauthorized") {
             deviceViewData["deviceFound"] = true;
             deviceViewData["isAuthorized"] = false;
@@ -207,5 +204,11 @@ function onRequest(context) {
     } else {
         deviceViewData["deviceFound"] = false;
     }
+
+    var autoCompleteParams = [
+        {"name" : "deviceId", "value" : deviceId}
+    ];
+
+    deviceViewData["autoCompleteParams"] = autoCompleteParams;
     return deviceViewData;
 }
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
index 89fe38224..c68579335 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
@@ -112,9 +112,6 @@ var InitiateViewOption = null;
     $(document).ready(function() {
         $(".device-detail-body").removeClass("hidden");
         $("#loading-content").remove();
-        console.log("##### something went wrong here!" + deviceType)
-        loadOperationBar(deviceType);
-        loadOperationsLog(false);
         loadApplicationsList();
         loadPolicyCompliance();
 
@@ -127,13 +124,8 @@ var InitiateViewOption = null;
             $("#apps-spinner").removeClass("hidden");
             loadApplicationsList();
         });
-
-        $("#refresh-operations").click(function () {
-            $("#operations-spinner").removeClass("hidden");
-            loadOperationsLog(true);
-        });
     });
-
+    
     function loadOperationsLog(update) {
         var owner = $("#device-owner").data("owner");
         var operationsLogTable = "#operations-log-table";
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/operations-log.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/operations-log.hbs
deleted file mode 100755
index cc5db5117..000000000
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/operations-log.hbs
+++ /dev/null
@@ -1,24 +0,0 @@
-<table class="table table-striped table-hover table-bordered display data-table" id="operations-log-table">
-    <thead>
-        <tr class="sort-row">
-            <th>Operation Code</th>
-            <th>Status</th>
-            <th>Request created at</th>
-        </tr>
-    </thead>
-    <tbody>
-    {{#each operations}}
-        <tr data-type="selectable" data-id="{{id}}">
-            <td data-display="{{code}}" data-grid-label="Code">{{code}}</td>
-            <td data-display="{{status}}" data-grid-label="Status">
-                {{#equal status "COMPLETED"}}<span><i class="fw fw-ok icon-success"></i> Completed</span>{{/equal}}
-                {{#equal status "PENDING"}}<span><i class="fw fw-warning icon-warning"></i> Pending</span>{{/equal}}
-                {{#equal status "ERROR"}}<span><i class="fw fw-error icon-danger"></i> Error</span>{{/equal}}
-                {{#equal status "IN_PROGRESS"}}<span><i class="fw fw-ok icon-warning"></i> In Progress</span>{{/equal}}
-            </td>
-            <td data-display="{{createdTimeStamp}}" data-grid-label="Created Timestamp">{{createdTimeStamp}}</td>
-        </tr>
-    {{/each}}
-    <br class="c-both" />
-    </tbody>
-</table>
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs
index d20ca7a9c..eac53066c 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs
@@ -45,7 +45,8 @@
         </div>
         <div class="col-lg-3">
             <span class="list-group-item-actions">
-                <a href="/emm/policies/view?id={{policy.id}}" class="cu-btn-inner policy-view-link" data-id="{{id}}">
+                <a href="/devicemgt/policies/view?id={{policy.id}}" class="cu-btn-inner
+                policy-view-link" data-id="{{id}}">
                     <span class="fw-stack">
                         <i class="fw fw-ring fw-stack-2x"></i>
                         <i class="fw fw-view fw-stack-1x"></i>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/operation-bar.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/operation-bar.hbs
new file mode 100644
index 000000000..ae9864018
--- /dev/null
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/operation-bar.hbs
@@ -0,0 +1,32 @@
+{{!
+  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.
+}}
+
+{{unit "cdmf.unit.device.type.android.date-range-picker"}}
+
+{{#zone "content"}}
+    <div id="operations-mod" data-permissions="{{permissions}}" data-device-type="{{deviceType}}" data-ownership="{{ownership}}">
+        {{unit "cdmf.unit.device.type.android.operation-mod"}}
+    </div>
+{{/zone}}
+
+{{#zone "bottomJs"}}
+    <!--suppress HtmlUnknownTarget -->
+    <script id="operations-bar" src="{{@unit.publicUri}}/templates/operations.hbs"
+            type="text/x-handlebars-template"></script>
+    {{js "js/operation-bar.js"}}
+{{/zone}}
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/operation-bar.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/operation-bar.js
new file mode 100644
index 000000000..18541e4a9
--- /dev/null
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/operation-bar.js
@@ -0,0 +1,106 @@
+/*
+ * 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.
+ */
+
+function onRequest(context) {
+    var log = new Log("cdmf.unit.device.type.android.operation-bar");
+    var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
+    var viewModel = {};
+    var permissions = {};
+
+    // adding android operations related permission checks
+    permissions["android"] = [];
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/ring")) {
+        permissions["android"].push("DEVICE_RING");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/lock")) {
+        permissions["android"].push("DEVICE_LOCK");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/unlock")) {
+        permissions["android"].push("DEVICE_UNLOCK");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/location")) {
+        permissions["android"].push("DEVICE_LOCATION");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/clear-password")) {
+        permissions["android"].push("CLEAR_PASSWORD");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/reboot")) {
+        permissions["android"].push("DEVICE_REBOOT");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/upgrade-firmware")) {
+        permissions["android"].push("UPGRADE_FIRMWARE");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/mute")) {
+        permissions["android"].push("DEVICE_MUTE");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/send-notification")) {
+        permissions["android"].push("NOTIFICATION");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/change-lock-code")) {
+        permissions["android"].push("CHANGE_LOCK_CODE");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/enterprise-wipe")) {
+        permissions["android"].push("ENTERPRISE_WIPE");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/wipe")) {
+        permissions["android"].push("WIPE_DATA");
+    }
+
+    // adding ios operations related permission checks
+    permissions["ios"] = [];
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/lock")) {
+        permissions["ios"].push("DEVICE_LOCK");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/location")) {
+        permissions["ios"].push("LOCATION");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/enterprise-wipe")) {
+        permissions["ios"].push("ENTERPRISE_WIPE");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/notification")) {
+        permissions["ios"].push("NOTIFICATION");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/ring")) {
+        permissions["ios"].push("RING");
+    }
+
+    // adding windows operations related permission checks
+    permissions["windows"] = [];
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/lock")) {
+        permissions["windows"].push("DEVICE_LOCK");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/disenroll/windows")) {
+        permissions["windows"].push("DISENROLL");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/wipe")) {
+        permissions["windows"].push("WIPE_DATA");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/ring")) {
+        permissions["windows"].push("DEVICE_RING");
+    }
+    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/lock-reset")) {
+        permissions["windows"].push("LOCK_RESET");
+    }
+
+    viewModel["permissions"] = stringify(permissions);
+
+    viewModel["deviceType"] = context.unit.params.deviceType;
+    viewModel["ownership"] = context.unit.params.ownership;
+
+    return viewModel;
+}
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/operation-bar.json b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/operation-bar.json
new file mode 100644
index 000000000..688e93980
--- /dev/null
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/operation-bar.json
@@ -0,0 +1,3 @@
+{
+  "version": "1.0.0"
+}
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/public/js/operation-bar.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/public/js/operation-bar.js
new file mode 100644
index 000000000..90ce9ce4a
--- /dev/null
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/public/js/operation-bar.js
@@ -0,0 +1,248 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Setting-up global variables.
+ */
+
+var operations = '.wr-operations',
+    modalPopup = '.modal',
+    modalPopupContent = modalPopup + ' .modal-content',
+    navHeight = $('#nav').height(),
+    headerHeight = $('header').height(),
+    offset = (headerHeight + navHeight),
+    deviceSelection = '.device-select',
+    platformTypeConstants = {
+        "ANDROID": "android",
+        "IOS": "ios",
+        "WINDOWS": "windows"
+    },
+    ownershipTypeConstants = {
+        "BYOD": "BYOD",
+        "COPE": "COPE"
+    },
+    operationBarModeConstants = {
+        "BULK": "BULK_OPERATION_MODE",
+        "SINGLE": "SINGLE_OPERATION_MODE"
+    };
+
+/*
+ * Function to get selected devices ID's
+ */
+function getSelectedDeviceIds() {
+    var deviceIdentifierList = [];
+    $(deviceSelection).each(function (index) {
+        var device = $(this);
+        var deviceId = device.data('deviceid');
+        var deviceType = device.data('type');
+        deviceIdentifierList.push({
+                                      "id": deviceId,
+                                      "type": deviceType
+                                  });
+    });
+    if (deviceIdentifierList.length == 0) {
+        var thisTable = $(".DTTT_selected").closest('.dataTables_wrapper').find('.dataTable').dataTable();
+        thisTable.api().rows().every(function () {
+            if ($(this.node()).hasClass('DTTT_selected')) {
+                var deviceId = $(thisTable.api().row(this).node()).data('deviceid');
+                var deviceType = $(thisTable.api().row(this).node()).data('devicetype');
+                deviceIdentifierList.push({
+                                              "id": deviceId,
+                                              "type": deviceType
+                                          });
+            }
+        });
+    }
+
+    return deviceIdentifierList;
+}
+
+/*
+ * On operation click function.
+ * @param selection: Selected operation
+ */
+function operationSelect(selection) {
+    var deviceIdList = getSelectedDeviceIds();
+    if (deviceIdList == 0) {
+        $(modalPopupContent).html($("#errorOperations").html());
+    } else {
+        $(modalPopupContent).addClass("operation-data");
+        $(modalPopupContent).html($(operations + " .operation[data-operation-code=" + selection + "]").html());
+        $(modalPopupContent).data("operation-code", selection);
+    }
+    showPopup();
+}
+
+function getDevicesByTypes(deviceList) {
+    var deviceTypes = {};
+    $.each(deviceList, function (index, item) {
+        if (!deviceTypes[item.type]) {
+            deviceTypes[item.type] = [];
+        }
+        if (item.type == platformTypeConstants.ANDROID ||
+            item.type == platformTypeConstants.IOS || item.type == platformTypeConstants.WINDOWS) {
+            deviceTypes[item.type].push(item.id);
+        }
+    });
+    return deviceTypes;
+}
+
+//function unloadOperationBar() {
+//    $("#showOperationsBtn").addClass("hidden");
+//    $(".wr-operations").html("");
+//}
+
+function loadOperationBar(deviceType, ownership, mode) {
+    var operationBar = $("#operations-bar");
+    var operationBarSrc = operationBar.attr("src");
+
+    $.template("operations-bar", operationBarSrc, function (template) {
+        var serviceURL = "/api/device-mgt/v1.0/devices/" + deviceType + "/*/features";
+        invokerUtil.get(
+            serviceURL,
+            // success callback
+            function (data) {
+                var permittedOperations = [];
+                var i;
+                var permissionList = $("#operations-mod").data("permissions");
+                var totalFeatures = JSON.parse(data);
+                for (i = 0; i < permissionList[deviceType].length; i++) {
+                    var j;
+                    for (j = 0; j < totalFeatures.length; j++) {
+                        if (permissionList[deviceType][i] == totalFeatures[j]["code"]) {
+                            if (deviceType == platformTypeConstants.ANDROID) {
+                                if (totalFeatures[j]["code"] == "DEVICE_UNLOCK") {
+                                    if (ownership == ownershipTypeConstants.COPE) {
+                                        permittedOperations.push(totalFeatures[j]);
+                                    }
+                                } else if (totalFeatures[j]["code"] == "WIPE_DATA") {
+                                    if (mode == operationBarModeConstants.BULK) {
+                                        if (ownership == ownershipTypeConstants.COPE) {
+                                            permittedOperations.push(totalFeatures[j]);
+                                        }
+                                    } else {
+                                        permittedOperations.push(totalFeatures[j]);
+                                    }
+                                } else {
+                                    permittedOperations.push(totalFeatures[j]);
+                                }
+                            } else {
+                                permittedOperations.push(totalFeatures[j]);
+                            }
+                        }
+                    }
+                }
+
+                var viewModel = {};
+                permittedOperations = permittedOperations.filter(function (current) {
+                    var iconName;
+                    switch (deviceType) {
+                        case platformTypeConstants.ANDROID:
+                            iconName = operationModule.getAndroidIconForFeature(current.code);
+                            break;
+                        case platformTypeConstants.WINDOWS:
+                            iconName = operationModule.getWindowsIconForFeature(current.code);
+                            break;
+                        case platformTypeConstants.IOS:
+                            iconName = operationModule.getIOSIconForFeature(current.code);
+                            break;
+                    }
+
+                    /* adding ownership in addition to device-type
+                     as it's vital in cases where UI for the same feature should change
+                     according to ownership
+                      */
+                    if (ownership) {
+                        current.ownership = ownership;
+                    }
+
+                    if (iconName) {
+                        current.icon = iconName;
+                    }
+
+                    return current;
+                });
+
+                viewModel.features = permittedOperations;
+                var content = template(viewModel);
+                $(".wr-operations").html(content);
+            },
+            // error callback
+            function (message) {
+                $(".wr-operations").html(message);
+            });
+    });
+}
+
+function runOperation(operationName) {
+    var deviceIdList = getSelectedDeviceIds();
+    var list = getDevicesByTypes(deviceIdList);
+
+    var successCallback = function (data) {
+        if (operationName == "NOTIFICATION") {
+            $(modalPopupContent).html($("#messageSuccess").html());
+        } else {
+            $(modalPopupContent).html($("#operationSuccess").html());
+        }
+        showPopup();
+    };
+    var errorCallback = function (data) {
+        $(modalPopupContent).html($("#errorOperationUnexpected").html());
+        showPopup();
+    };
+
+    var payload, serviceEndPoint;
+    if (list[platformTypeConstants.IOS]) {
+        payload =
+            operationModule.generatePayload(platformTypeConstants.IOS, operationName, list[platformTypeConstants.IOS]);
+        serviceEndPoint = operationModule.getIOSServiceEndpoint(operationName);
+    } else if (list[platformTypeConstants.ANDROID]) {
+        payload = operationModule
+            .generatePayload(platformTypeConstants.ANDROID, operationName, list[platformTypeConstants.ANDROID]);
+        serviceEndPoint = operationModule.getAndroidServiceEndpoint(operationName);
+    } else if (list[platformTypeConstants.WINDOWS]) {
+        payload = operationModule.generatePayload(platformTypeConstants.WINDOWS, operationName,
+                                                  list[platformTypeConstants.WINDOWS]);
+        serviceEndPoint = operationModule.getWindowsServiceEndpoint(operationName);
+    }
+    if (operationName == "NOTIFICATION") {
+        var errorMsgWrapper = "#notification-error-msg";
+        var errorMsg = "#notification-error-msg span";
+        var messageTitle = $("#messageTitle").val();
+        var messageText = $("#messageText").val();
+        if (!(messageTitle && messageText)) {
+            $(errorMsg).text("Enter a message. It cannot be empty.");
+            $(errorMsgWrapper).removeClass("hidden");
+        } else {
+            invokerUtil.post(serviceEndPoint, payload, successCallback, errorCallback);
+            $(modalPopupContent).removeData();
+            hidePopup();
+        }
+    } else {
+        invokerUtil.post(serviceEndPoint, payload, successCallback, errorCallback);
+        $(modalPopupContent).removeData();
+        hidePopup();
+    }
+}
+
+/*
+ * DOM ready functions.
+ */
+$(document).ready(function () {
+    $(operations).show();
+});
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/templates/hidden-operations-android.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/public/templates/hidden-operations-android.hbs
similarity index 100%
rename from components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/templates/hidden-operations-android.hbs
rename to components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/public/templates/hidden-operations-android.hbs
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/templates/hidden-operations-ios.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/public/templates/hidden-operations-ios.hbs
similarity index 100%
rename from components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/templates/hidden-operations-ios.hbs
rename to components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/public/templates/hidden-operations-ios.hbs
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/templates/operations.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/public/templates/operations.hbs
similarity index 100%
rename from components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/templates/operations.hbs
rename to components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.old.operation-bar/public/templates/operations.hbs
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.hbs
index ae9864018..2a59b7024 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.hbs
@@ -15,18 +15,113 @@
   specific language governing permissions and limitations
   under the License.
 }}
+{{#if control_operations}}
+    <div class="wr-operations" style="height: 87px; display: block;">
+        <style>
+            ::-webkit-input-placeholder {
+                color: #B8B8B8;
+            }
 
-{{unit "cdmf.unit.device.type.android.date-range-picker"}}
+            ::-moz-placeholder {
+                color: #B8B8B8;
+            }
 
-{{#zone "content"}}
-    <div id="operations-mod" data-permissions="{{permissions}}" data-device-type="{{deviceType}}" data-ownership="{{ownership}}">
-        {{unit "cdmf.unit.device.type.android.operation-mod"}}
+            :-ms-input-placeholder {
+                color: #B8B8B8;
+            }
+
+            input:-moz-placeholder {
+                color: #B8B8B8;
+            }
+        </style>
+        {{#each control_operations}}
+            <a href="javascript:operationSelect('{{operation}}')">
+                {{#if iconFont}}
+                    <i class="fw {{iconFont}}"></i>
+                {{else}}
+                    {{#if icon}}
+                        <img src="{{@app.context}}/{{icon}}" style="width: 48px;"/>
+                    {{else}}
+                        <i class="fw fw-service"></i>
+                    {{/if}}
+                {{/if}}
+                <span>{{name}}</span>
+            </a>
+
+            <div class="operation" data-operation-code="{{operation}}">
+                <div class="content">
+                    <div class="row">
+                        <div class="col-lg-5 col-md-6 col-centered">
+                            <h3>
+                        <span class="fw-stack">
+                            <i class="fw fw-ring fw-stack-2x"></i>
+                            <i class="fw fw-service fw-stack-1x"></i>
+                        </span>
+                                {{name}}
+                                <br>
+                            </h3>
+                            <h4>
+                                {{description}}
+                                <br>
+                            </h4>
+
+                            <form action="{{params.0.uri}}" method="{{params.0.method}}"
+                                  style="padding-bottom: 20px;"
+                                  data-payload="{{payload}}" id="form-{{operation}}"
+                                  data-device-id="{{../device.deviceIdentifier}}">
+                                {{#each params.0.pathParams}}
+                                    <input type="{{type}}" id="{{name}}" placeholder="{{name}}" class="form-control" data-param-type="path" value="{{value}}" />
+                                    <br />
+                                {{/each}}
+                                {{#each params.0.formParams}}
+                                    <input type="{{type}}" id="{{name}}" name="{{name}}" placeholder="{{name}}" class="form-control" data-param-type="form" value="{{value}}" />
+                                    <br />
+                                {{/each}}
+                                {{#each params.0.queryParams}}
+                                    <input type="{{type}}" id="{{name}}" placeholder="{{name}}" class="form-control" data-param-type="query" value="{{value}}" />
+                                    <br />
+                                {{/each}}
+                                <button id="btnSend" type="button" onclick="submitForm('form-{{operation}}')" class="btn btn-default">&nbsp;&nbsp;&nbsp;&nbsp;Send
+                                                       to Device&nbsp;&nbsp;&nbsp;&nbsp;</button>
+                                <label id="lblSending" class="wr-input-label hidden"><i
+                                        class="fw fw-lifecycle fw-spin fw-2x"></i> Sending..</label>
+                                <label id="lblSent" class="wr-input-label hidden"><i
+                                        class="fw fw-check fw-2x"></i> Sent</label>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        {{/each}}
     </div>
-{{/zone}}
+{{else}}
+    <div align="center">
+        <h4 style="color: #D8000C"><i class="icon fw fw-error" style="color: #D8000C"></i>
+            Operations Loading Failed!</h4>
+    </div>
+{{/if}}
+
+<div id="operation-response-template" style="display: none">
+    <div class="content">
+        <div class="row">
+            <div class="col-lg-5 col-md-6 col-centered">
+                <h3>
+                    <span class="fw-stack">
+                        <i class="fw fw-ring fw-stack-2x"></i>
+                        <i id="status-icon" class="fw fw-error fw-stack-1x"></i>
+                    </span>
+                    <br>
+                </h3>
+                <h4>
+                    <span id="title"></span>
+                    <br>
+                </h4>
+                <span id="description"></span>
+            </div>
+        </div>
+    </div>
+</div>
 
 {{#zone "bottomJs"}}
-    <!--suppress HtmlUnknownTarget -->
-    <script id="operations-bar" src="{{@unit.publicUri}}/templates/operations.hbs"
-            type="text/x-handlebars-template"></script>
     {{js "js/operation-bar.js"}}
-{{/zone}}
\ No newline at end of file
+{{/zone}}
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.js
index 18541e4a9..153b66b96 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/operation-bar.js
@@ -17,90 +17,51 @@
  */
 
 function onRequest(context) {
-    var log = new Log("cdmf.unit.device.type.android.operation-bar");
-    var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
-    var viewModel = {};
-    var permissions = {};
+    var log = new Log("operation.js");
+    var operationModule = require("/app/modules/business-controllers/operation.js")["operationModule"];
+    var device = context.unit.params.device;
+    var autoCompleteParams = context.unit.params.autoCompleteParams;
+    var encodedFeaturePayloads=context.unit.params.encodedFeaturePayloads;
+    var controlOperations = operationModule.getControlOperations(device.type);
+    var queryParams = [];
+    var formParams = [];
+    var pathParams = [];
+    for (var i = 0; i < controlOperations.length; i++) {
+        var currentParamList = controlOperations[i]["params"];
+        for (var j = 0; j < currentParamList.length; j++) {
+            var currentParam = currentParamList[j];
+            currentParamList[j]["formParams"] = processParams(currentParam["formParams"], autoCompleteParams);
+            currentParamList[j]["queryParams"] = processParams(currentParam["queryParams"], autoCompleteParams);
+            currentParamList[j]["pathParams"] = processParams(currentParam["pathParams"], autoCompleteParams);
+        }
+        controlOperations[i]["params"] = currentParamList;
+        if (encodedFeaturePayloads) {
+            controlOperations[i]["payload"] = getPayload(encodedFeaturePayloads, controlOperations[i]["operation"]);
+        }
+    }
+    return {"control_operations": controlOperations, "device": device};
+}
 
-    // adding android operations related permission checks
-    permissions["android"] = [];
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/ring")) {
-        permissions["android"].push("DEVICE_RING");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/lock")) {
-        permissions["android"].push("DEVICE_LOCK");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/unlock")) {
-        permissions["android"].push("DEVICE_UNLOCK");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/location")) {
-        permissions["android"].push("DEVICE_LOCATION");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/clear-password")) {
-        permissions["android"].push("CLEAR_PASSWORD");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/reboot")) {
-        permissions["android"].push("DEVICE_REBOOT");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/upgrade-firmware")) {
-        permissions["android"].push("UPGRADE_FIRMWARE");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/mute")) {
-        permissions["android"].push("DEVICE_MUTE");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/send-notification")) {
-        permissions["android"].push("NOTIFICATION");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/change-lock-code")) {
-        permissions["android"].push("CHANGE_LOCK_CODE");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/enterprise-wipe")) {
-        permissions["android"].push("ENTERPRISE_WIPE");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning-device/operations/android/wipe")) {
-        permissions["android"].push("WIPE_DATA");
-    }
-
-    // adding ios operations related permission checks
-    permissions["ios"] = [];
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/lock")) {
-        permissions["ios"].push("DEVICE_LOCK");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/location")) {
-        permissions["ios"].push("LOCATION");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/enterprise-wipe")) {
-        permissions["ios"].push("ENTERPRISE_WIPE");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/notification")) {
-        permissions["ios"].push("NOTIFICATION");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/ios/ring")) {
-        permissions["ios"].push("RING");
-    }
-
-    // adding windows operations related permission checks
-    permissions["windows"] = [];
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/lock")) {
-        permissions["windows"].push("DEVICE_LOCK");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/disenroll/windows")) {
-        permissions["windows"].push("DISENROLL");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/wipe")) {
-        permissions["windows"].push("WIPE_DATA");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/ring")) {
-        permissions["windows"].push("DEVICE_RING");
-    }
-    if (userModule.isAuthorized("/permission/admin/device-mgt/devices/owning/operations/windows/lock-reset")) {
-        permissions["windows"].push("LOCK_RESET");
-    }
-
-    viewModel["permissions"] = stringify(permissions);
-
-    viewModel["deviceType"] = context.unit.params.deviceType;
-    viewModel["ownership"] = context.unit.params.ownership;
+function processParams(paramsList, autoCompleteParams) {
+    var log = new Log();
+    log.info("-- Params : "+paramsList.length);
+    log.info("-- Auto Params : "+autoCompleteParams);
+    for (var i = 0; i < paramsList.length; i++) {
+        var paramName = paramsList[i];
+        var paramValue = "";
+        var paramType = "text";
+        for (var k = 0; k < autoCompleteParams.length; k++) {
+            if (paramName == autoCompleteParams[k].name) {
+                paramValue = autoCompleteParams[k].value;
+                paramType = "hidden";
+            }
+        }
+        paramsList[i] = {"name": paramName, "value": paramValue, "type": paramType};
+    }
+    return paramsList;
+}
 
-    return viewModel;
+function getPayload(featuresPayload, featureCode){
+    var featuresJSONPayloads = JSON.parse(featuresPayload);
+    return featuresJSONPayloads[featureCode];
 }
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/js/operation-bar.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/js/operation-bar.js
index 90ce9ce4a..ad893ec2e 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/js/operation-bar.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.operation-bar/public/js/operation-bar.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
  * WSO2 Inc. licenses this file to you under the Apache License,
  * Version 2.0 (the "License"); you may not use this file except
@@ -16,233 +16,131 @@
  * under the License.
  */
 
-/*
- * Setting-up global variables.
- */
-
-var operations = '.wr-operations',
-    modalPopup = '.modal',
-    modalPopupContent = modalPopup + ' .modal-content',
-    navHeight = $('#nav').height(),
-    headerHeight = $('header').height(),
-    offset = (headerHeight + navHeight),
-    deviceSelection = '.device-select',
-    platformTypeConstants = {
-        "ANDROID": "android",
-        "IOS": "ios",
-        "WINDOWS": "windows"
-    },
-    ownershipTypeConstants = {
-        "BYOD": "BYOD",
-        "COPE": "COPE"
-    },
-    operationBarModeConstants = {
-        "BULK": "BULK_OPERATION_MODE",
-        "SINGLE": "SINGLE_OPERATION_MODE"
-    };
-
-/*
- * Function to get selected devices ID's
- */
-function getSelectedDeviceIds() {
-    var deviceIdentifierList = [];
-    $(deviceSelection).each(function (index) {
-        var device = $(this);
-        var deviceId = device.data('deviceid');
-        var deviceType = device.data('type');
-        deviceIdentifierList.push({
-                                      "id": deviceId,
-                                      "type": deviceType
-                                  });
-    });
-    if (deviceIdentifierList.length == 0) {
-        var thisTable = $(".DTTT_selected").closest('.dataTables_wrapper').find('.dataTable').dataTable();
-        thisTable.api().rows().every(function () {
-            if ($(this.node()).hasClass('DTTT_selected')) {
-                var deviceId = $(thisTable.api().row(this).node()).data('deviceid');
-                var deviceType = $(thisTable.api().row(this).node()).data('devicetype');
-                deviceIdentifierList.push({
-                                              "id": deviceId,
-                                              "type": deviceType
-                                          });
-            }
-        });
-    }
-
-    return deviceIdentifierList;
-}
-
 /*
  * On operation click function.
  * @param selection: Selected operation
  */
 function operationSelect(selection) {
-    var deviceIdList = getSelectedDeviceIds();
-    if (deviceIdList == 0) {
-        $(modalPopupContent).html($("#errorOperations").html());
-    } else {
-        $(modalPopupContent).addClass("operation-data");
-        $(modalPopupContent).html($(operations + " .operation[data-operation-code=" + selection + "]").html());
-        $(modalPopupContent).data("operation-code", selection);
-    }
+    $(modalPopupContent).addClass("operation-data");
+    $(modalPopupContent).html($(" .operation[data-operation-code=" + selection + "]").html());
+    $(modalPopupContent).data("operation-code", selection);
     showPopup();
 }
 
-function getDevicesByTypes(deviceList) {
-    var deviceTypes = {};
-    $.each(deviceList, function (index, item) {
-        if (!deviceTypes[item.type]) {
-            deviceTypes[item.type] = [];
-        }
-        if (item.type == platformTypeConstants.ANDROID ||
-            item.type == platformTypeConstants.IOS || item.type == platformTypeConstants.WINDOWS) {
-            deviceTypes[item.type].push(item.id);
+function submitForm(formId) {
+    var form = $("#" + formId);
+    var uri = form.attr("action");
+    var deviceId = form.data("device-id");
+    var uriencodedQueryStr = "";
+    var uriencodedFormStr = "";
+    var payload = {};
+    form.find("input").each(function () {
+        var input = $(this);
+        if (input.data("param-type") == "path") {
+            uri = uri.replace("{" + input.attr("id") + "}", input.val());
+        } else if (input.data("param-type") == "query") {
+            var prefix = (uriencodedQueryStr == "") ? "?" : "&";
+            uriencodedQueryStr += prefix + input.attr("id") + "=" + input.val();
+        } else if (input.data("param-type") == "form") {
+            var prefix = (uriencodedFormStr == "") ? "" : "&";
+            uriencodedFormStr += prefix + input.attr("id") + "=" + input.val();
+            //payload[input.attr("id")] = input.val();
         }
     });
-    return deviceTypes;
-}
-
-//function unloadOperationBar() {
-//    $("#showOperationsBtn").addClass("hidden");
-//    $(".wr-operations").html("");
-//}
-
-function loadOperationBar(deviceType, ownership, mode) {
-    var operationBar = $("#operations-bar");
-    var operationBarSrc = operationBar.attr("src");
-
-    $.template("operations-bar", operationBarSrc, function (template) {
-        var serviceURL = "/api/device-mgt/v1.0/devices/" + deviceType + "/*/features";
-        invokerUtil.get(
-            serviceURL,
-            // success callback
-            function (data) {
-                var permittedOperations = [];
-                var i;
-                var permissionList = $("#operations-mod").data("permissions");
-                var totalFeatures = JSON.parse(data);
-                for (i = 0; i < permissionList[deviceType].length; i++) {
-                    var j;
-                    for (j = 0; j < totalFeatures.length; j++) {
-                        if (permissionList[deviceType][i] == totalFeatures[j]["code"]) {
-                            if (deviceType == platformTypeConstants.ANDROID) {
-                                if (totalFeatures[j]["code"] == "DEVICE_UNLOCK") {
-                                    if (ownership == ownershipTypeConstants.COPE) {
-                                        permittedOperations.push(totalFeatures[j]);
-                                    }
-                                } else if (totalFeatures[j]["code"] == "WIPE_DATA") {
-                                    if (mode == operationBarModeConstants.BULK) {
-                                        if (ownership == ownershipTypeConstants.COPE) {
-                                            permittedOperations.push(totalFeatures[j]);
-                                        }
-                                    } else {
-                                        permittedOperations.push(totalFeatures[j]);
-                                    }
-                                } else {
-                                    permittedOperations.push(totalFeatures[j]);
-                                }
-                            } else {
-                                permittedOperations.push(totalFeatures[j]);
-                            }
-                        }
-                    }
-                }
-
-                var viewModel = {};
-                permittedOperations = permittedOperations.filter(function (current) {
-                    var iconName;
-                    switch (deviceType) {
-                        case platformTypeConstants.ANDROID:
-                            iconName = operationModule.getAndroidIconForFeature(current.code);
-                            break;
-                        case platformTypeConstants.WINDOWS:
-                            iconName = operationModule.getWindowsIconForFeature(current.code);
-                            break;
-                        case platformTypeConstants.IOS:
-                            iconName = operationModule.getIOSIconForFeature(current.code);
-                            break;
-                    }
-
-                    /* adding ownership in addition to device-type
-                     as it's vital in cases where UI for the same feature should change
-                     according to ownership
-                      */
-                    if (ownership) {
-                        current.ownership = ownership;
-                    }
-
-                    if (iconName) {
-                        current.icon = iconName;
-                    }
-
-                    return current;
-                });
-
-                viewModel.features = permittedOperations;
-                var content = template(viewModel);
-                $(".wr-operations").html(content);
-            },
-            // error callback
-            function (message) {
-                $(".wr-operations").html(message);
-            });
-    });
-}
-
-function runOperation(operationName) {
-    var deviceIdList = getSelectedDeviceIds();
-    var list = getDevicesByTypes(deviceIdList);
-
-    var successCallback = function (data) {
-        if (operationName == "NOTIFICATION") {
-            $(modalPopupContent).html($("#messageSuccess").html());
-        } else {
-            $(modalPopupContent).html($("#operationSuccess").html());
+    uri += uriencodedQueryStr;
+    var httpMethod = form.attr("method").toUpperCase();
+    var contentType = form.attr("enctype");
+    console.log("URL "+uri);
+    console.log("Method "+httpMethod);
+    console.log("Content Type "+contentType);
+    var featurePayload = form.attr("data-payload");
+    if (featurePayload) {
+        contentType = "application/json";
+        payload = JSON.parse(atob(featurePayload));
+
+    } else if (contentType == undefined || contentType.isEmpty()) {
+        contentType = "application/x-www-form-urlencoded";
+        payload = uriencodedFormStr;
+    }
+    
+    //setting responses callbacks
+    var defaultStatusClasses = "fw fw-stack-1x";
+    var content = $("#operation-response-template").find(".content");
+    var title = content.find("#title");
+    var statusIcon = content.find("#status-icon");
+    var description = content.find("#description");
+    description.html("");
+    var successCallBack = function (response) {
+        var res = response;
+        try {
+            res = JSON.parse(response).messageFromServer;
+        } catch (err) {
+            //do nothing
         }
-        showPopup();
-    };
-    var errorCallback = function (data) {
-        $(modalPopupContent).html($("#errorOperationUnexpected").html());
-        showPopup();
+        title.html("Operation Triggered!");
+        statusIcon.attr("class", defaultStatusClasses + " fw-check");
+        description.html(res);
+        console.log("success!");
+        $(modalPopupContent).html(content.html());
     };
-
-    var payload, serviceEndPoint;
-    if (list[platformTypeConstants.IOS]) {
-        payload =
-            operationModule.generatePayload(platformTypeConstants.IOS, operationName, list[platformTypeConstants.IOS]);
-        serviceEndPoint = operationModule.getIOSServiceEndpoint(operationName);
-    } else if (list[platformTypeConstants.ANDROID]) {
-        payload = operationModule
-            .generatePayload(platformTypeConstants.ANDROID, operationName, list[platformTypeConstants.ANDROID]);
-        serviceEndPoint = operationModule.getAndroidServiceEndpoint(operationName);
-    } else if (list[platformTypeConstants.WINDOWS]) {
-        payload = operationModule.generatePayload(platformTypeConstants.WINDOWS, operationName,
-                                                  list[platformTypeConstants.WINDOWS]);
-        serviceEndPoint = operationModule.getWindowsServiceEndpoint(operationName);
-    }
-    if (operationName == "NOTIFICATION") {
-        var errorMsgWrapper = "#notification-error-msg";
-        var errorMsg = "#notification-error-msg span";
-        var messageTitle = $("#messageTitle").val();
-        var messageText = $("#messageText").val();
-        if (!(messageTitle && messageText)) {
-            $(errorMsg).text("Enter a message. It cannot be empty.");
-            $(errorMsgWrapper).removeClass("hidden");
-        } else {
-            invokerUtil.post(serviceEndPoint, payload, successCallback, errorCallback);
-            $(modalPopupContent).removeData();
-            hidePopup();
+    var errorCallBack = function (response) {
+        console.log(response);
+        title.html("An Error Occurred!");
+        statusIcon.attr("class", defaultStatusClasses + " fw-error");
+        var reason = (response.responseText == "null")?response.statusText:response.responseText;
+        try {
+            reason = JSON.parse(reason).message;
+        } catch (err) {
+            //do nothing
         }
+        description.html(reason);
+        console.log("Error!");
+        $(modalPopupContent).html(content.html());
+    };
+    //executing http request
+    if (httpMethod == "GET") {
+        invokerUtil.get(uri, successCallBack, errorCallBack, contentType);
+    } else if (httpMethod == "POST") {
+        console.log("------ cType "+contentType);
+        var payloadTest = [deviceId];
+        invokerUtil.post(uri, payloadTest, successCallBack, errorCallBack, "application/json");
+    } else if (httpMethod == "PUT") {
+        invokerUtil.put(uri, payload, successCallBack, errorCallBack, contentType);
+    } else if (httpMethod == "DELETE") {
+        invokerUtil.delete(uri, successCallBack, errorCallBack, contentType);
     } else {
-        invokerUtil.post(serviceEndPoint, payload, successCallback, errorCallback);
-        $(modalPopupContent).removeData();
-        hidePopup();
+        title.html("An Error Occurred!");
+        statusIcon.attr("class", defaultStatusClasses + " fw-error");
+        description.html("This operation requires http method: " + httpMethod + " which is not supported yet!");
+        $(modalPopupContent).html(content.html());
     }
 }
 
-/*
- * DOM ready functions.
- */
-$(document).ready(function () {
-    $(operations).show();
-});
+$(document).on('submit', 'form', function (e) {
+    cosole.log("darn!!");
+    e.preventDefault();
+    var postOperationRequest = $.ajax({
+                                          url: $(this).attr("action") + '&' + $(this).serialize(),
+                                          method: "post"
+                                      });
+
+    var btnSubmit = $('#btnSend', this);
+    btnSubmit.addClass('hidden');
+
+    var lblSending = $('#lblSending', this);
+    lblSending.removeClass('hidden');
+
+    var lblSent = $('#lblSent', this);
+    postOperationRequest.done(function (data) {
+        lblSending.addClass('hidden');
+        lblSent.removeClass('hidden');
+        setTimeout(function () {
+            hidePopup();
+        }, 3000);
+    });
+
+    postOperationRequest.fail(function (jqXHR, textStatus) {
+        lblSending.addClass('hidden');
+        lblSent.addClass('hidden');
+    });
+});
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/policy-edit.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/policy-edit.hbs
index c4bb415a1..7b9952568 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/policy-edit.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/policy-edit.hbs
@@ -1 +1,18 @@
-{{unit "mdm.unit.policy.edit"}}
\ No newline at end of file
+{{!
+  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.
+}}
+{{unit "cdmf.unit.policy.edit"}}
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/js/android-policy-edit.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/js/android-policy-edit.js
new file mode 100644
index 000000000..eb36242fe
--- /dev/null
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/js/android-policy-edit.js
@@ -0,0 +1,855 @@
+/*
+ * 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.
+ */
+// Constants to define Android Operation Constants
+var androidOperationConstants = {
+    "PASSCODE_POLICY_OPERATION": "passcode-policy",
+    "PASSCODE_POLICY_OPERATION_CODE": "PASSCODE_POLICY",
+    "CAMERA_OPERATION": "camera",
+    "CAMERA_OPERATION_CODE": "CAMERA",
+    "ENCRYPT_STORAGE_OPERATION": "encrypt-storage",
+    "ENCRYPT_STORAGE_OPERATION_CODE": "ENCRYPT_STORAGE",
+    "WIFI_OPERATION": "wifi",
+    "WIFI_OPERATION_CODE": "WIFI",
+    "VPN_OPERATION": "vpn",
+    "VPN_OPERATION_CODE": "VPN",
+    "APPLICATION_OPERATION": "app-restriction",
+    "APPLICATION_OPERATION_CODE": "APP-RESTRICTION",
+    "KIOSK_APPS_CODE": "KIOSK_APPS",
+    "KIOSK_APPS": "cosu-whitelisted-applications"
+};
+
+/**
+ * Method to update the visibility of grouped input.
+ * @param domElement HTML grouped-input element with class name "grouped-input"
+ */
+var updateGroupedInputVisibility = function (domElement) {
+    if ($(".parent-input:first", domElement).is(":checked")) {
+        if ($(".grouped-child-input:first", domElement).hasClass("disabled")) {
+            $(".grouped-child-input:first", domElement).removeClass("disabled");
+        }
+        $(".child-input", domElement).each(function () {
+            $(this).prop('disabled', false);
+        });
+    } else {
+        if (!$(".grouped-child-input:first", domElement).hasClass("disabled")) {
+            $(".grouped-child-input:first", domElement).addClass("disabled");
+        }
+        $(".child-input", domElement).each(function () {
+            $(this).prop('disabled', true);
+        });
+    }
+};
+
+var polulateProfileOperations = function (configuredOperations) {
+    $(".wr-advance-operations li.grouped-input").each(function () {
+        updateGroupedInputVisibility(this);
+    });
+    for (var i = 0; i < configuredOperations.length; ++i) {
+        var configuredOperation = configuredOperations[i];
+        $(".operation-data").filterByData("operation-code", configuredOperation)
+            .find(".panel-title .wr-input-control.switch input[type=checkbox]").each(function () {
+            $(this).click();
+        });
+    }
+};
+
+/**
+ * Checks if provided number is valid against a range.
+ *
+ * @param numberInput Number Input
+ * @param min Minimum Limit
+ * @param max Maximum Limit
+ * @returns {boolean} Returns true if input is within the specified range
+ */
+var inputIsValidAgainstRange = function (numberInput, min, max) {
+    return (numberInput == min || (numberInput > min && numberInput < max) || numberInput == max);
+};
+
+var validatePolicyProfile = function () {
+    var validationStatusArray = [];
+    var validationStatus;
+    var operation;
+
+    // starting validation process and updating validationStatus
+    if (configuredOperations.length == 0) {
+        // updating validationStatus
+        validationStatus = {
+            "error": true,
+            "mainErrorMsg": "You cannot continue. Zero configured features."
+        };
+        // updating validationStatusArray with validationStatus
+        validationStatusArray.push(validationStatus);
+    } else {
+        // validating each and every configured Operation
+        // Validating PASSCODE_POLICY
+        if ($.inArray(androidOperationConstants["PASSCODE_POLICY_OPERATION_CODE"], configuredOperations) != -1) {
+            // if PASSCODE_POLICY is configured
+            operation = androidOperationConstants["PASSCODE_POLICY_OPERATION"];
+            // initializing continueToCheckNextInputs to true
+            var continueToCheckNextInputs = true;
+
+            // validating first input: passcodePolicyMaxPasscodeAgeInDays
+            var passcodePolicyMaxPasscodeAgeInDays = $("input#passcode-policy-max-passcode-age-in-days").val();
+            if (passcodePolicyMaxPasscodeAgeInDays) {
+                if (!$.isNumeric(passcodePolicyMaxPasscodeAgeInDays)) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "Provided passcode age is not a number.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                } else if (!inputIsValidAgainstRange(passcodePolicyMaxPasscodeAgeInDays, 1, 730)) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "Provided passcode age is not with in the range of 1-to-730.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                }
+            }
+
+            // validating second and last input: passcodePolicyPasscodeHistory
+            if (continueToCheckNextInputs) {
+                var passcodePolicyPasscodeHistory = $("input#passcode-policy-passcode-history").val();
+                if (passcodePolicyPasscodeHistory) {
+                    if (!$.isNumeric(passcodePolicyPasscodeHistory)) {
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "Provided passcode history is not a number.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    } else if (!inputIsValidAgainstRange(passcodePolicyPasscodeHistory, 1, 50)) {
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "Provided passcode history is not with in the range of 1-to-50.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    }
+                }
+            }
+
+            // at-last, if the value of continueToCheckNextInputs is still true
+            // this means that no error is found
+            if (continueToCheckNextInputs) {
+                validationStatus = {
+                    "error": false,
+                    "okFeature": operation
+                };
+            }
+
+            // updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+        // Validating CAMERA
+        if ($.inArray(androidOperationConstants["CAMERA_OPERATION_CODE"], configuredOperations) != -1) {
+            // if CAMERA is configured
+            operation = androidOperationConstants["CAMERA_OPERATION"];
+            // updating validationStatus
+            validationStatus = {
+                "error": false,
+                "okFeature": operation
+            };
+            // updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+        // Validating ENCRYPT_STORAGE
+        if ($.inArray(androidOperationConstants["ENCRYPT_STORAGE_OPERATION_CODE"], configuredOperations) != -1) {
+            // if ENCRYPT_STORAGE is configured
+            operation = androidOperationConstants["ENCRYPT_STORAGE_OPERATION"];
+            // updating validationStatus
+            validationStatus = {
+                "error": false,
+                "okFeature": operation
+            };
+            // updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+        // Validating WIFI
+        if ($.inArray(androidOperationConstants["WIFI_OPERATION_CODE"], configuredOperations) != -1) {
+            // if WIFI is configured
+            operation = androidOperationConstants["WIFI_OPERATION"];
+            // initializing continueToCheckNextInputs to true
+            continueToCheckNextInputs = true;
+
+            var wifiSSID = $("input#wifi-ssid").val();
+            if (!wifiSSID) {
+                validationStatus = {
+                    "error": true,
+                    "subErrorMsg": "WIFI SSID is not given. You cannot proceed.",
+                    "erroneousFeature": operation
+                };
+                continueToCheckNextInputs = false;
+            }
+            // For the secure wifi types, it is required to have a password
+            var wifiTypeUIElement = $("#wifi-type");
+            var wifiType = wifiTypeUIElement.find("option:selected").val();
+            if (wifiTypeUIElement.is("input:checkbox")) {
+                wifiType = wifiTypeUIElement.is(":checked").toString();
+            }
+            if (wifiType != "none") {
+                if (!$("#wifi-password").val()) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "Password is required for the wifi security type " + wifiType + ". " +
+                        "Please provide a password to proceed.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                }
+            }
+            // at-last, if the value of continueToCheckNextInputs is still true
+            // this means that no error is found
+            if (continueToCheckNextInputs) {
+                validationStatus = {
+                    "error": false,
+                    "okFeature": operation
+                };
+            }
+
+            // updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+
+        if ($.inArray(androidOperationConstants["VPN_OPERATION_CODE"], configuredOperations) != -1) {
+            // if WIFI is configured
+            operation = androidOperationConstants["VPN_OPERATION"];
+            // initializing continueToCheckNextInputs to true
+            continueToCheckNextInputs = true;
+
+            var serverAddress = $("input#vpn-server-address").val();
+            if (!serverAddress) {
+                validationStatus = {
+                    "error": true,
+                    "subErrorMsg": "Server address is required. You cannot proceed.",
+                    "erroneousFeature": operation
+                };
+                continueToCheckNextInputs = false;
+            }
+
+            if (continueToCheckNextInputs) {
+                var serverPort = $("input#vpn-server-port").val();
+                if (!serverPort) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "VPN server port is required. You cannot proceed.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                } else if (!$.isNumeric(serverPort)) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "VPN server port requires a number input.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                } else if (!inputIsValidAgainstRange(serverPort, 0, 65535)) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "VPN server port is not within the range " +
+                        "of valid port numbers.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                }
+            }
+
+            // at-last, if the value of continueToCheckNextInputs is still true
+            // this means that no error is found
+            if (continueToCheckNextInputs) {
+                validationStatus = {
+                    "error": false,
+                    "okFeature": operation
+                };
+            }
+
+            // updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+        if ($.inArray(androidOperationConstants["APPLICATION_OPERATION_CODE"], configuredOperations) != -1) {
+            //If application restriction configured
+            operation = androidOperationConstants["APPLICATION_OPERATION"];
+            // Initializing continueToCheckNextInputs to true
+            continueToCheckNextInputs = true;
+
+            var appRestrictionType = $("#app-restriction-type").val();
+
+            var restrictedApplicationsGridChildInputs = "div#restricted-applications .child-input";
+
+            if (!appRestrictionType) {
+                validationStatus = {
+                    "error": true,
+                    "subErrorMsg": "Applications restriction type is not provided.",
+                    "erroneousFeature": operation
+                };
+                continueToCheckNextInputs = false;
+            }
+
+            if (continueToCheckNextInputs) {
+                if ($(restrictedApplicationsGridChildInputs).length == 0) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "Applications are not provided in application restriction list.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                }
+                else {
+                    childInputCount = 0;
+                    childInputArray = [];
+                    emptyChildInputCount = 0;
+                    duplicatesExist = false;
+                    // Looping through each child input
+                    $(restrictedApplicationsGridChildInputs).each(function () {
+                        childInputCount++;
+                        if (childInputCount % 2 == 0) {
+                            // If child input is of second column
+                            childInput = $(this).val();
+                            childInputArray.push(childInput);
+                            // Updating emptyChildInputCount
+                            if (!childInput) {
+                                // If child input field is empty
+                                emptyChildInputCount++;
+                            }
+                        }
+                    });
+                    // Checking for duplicates
+                    initialChildInputArrayLength = childInputArray.length;
+                    if (emptyChildInputCount == 0 && initialChildInputArrayLength > 1) {
+                        for (m = 0; m < (initialChildInputArrayLength - 1); m++) {
+                            poppedChildInput = childInputArray.pop();
+                            for (n = 0; n < childInputArray.length; n++) {
+                                if (poppedChildInput == childInputArray[n]) {
+                                    duplicatesExist = true;
+                                    break;
+                                }
+                            }
+                            if (duplicatesExist) {
+                                break;
+                            }
+                        }
+                    }
+                    // Updating validationStatus
+                    if (emptyChildInputCount > 0) {
+                        // If empty child inputs are present
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "One or more package names of " +
+                            "applications are empty.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    } else if (duplicatesExist) {
+                        // If duplicate input is present
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "Duplicate values exist with " +
+                            "for package names.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    }
+
+                }
+            }
+
+            if (continueToCheckNextInputs) {
+                validationStatus = {
+                    "error": false,
+                    "okFeature": operation
+                };
+            }
+
+            // Updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+        if ($.inArray(androidOperationConstants["KIOSK_APPS_CODE"], configuredOperations) != -1) {
+            //If COSU whitelisting applications configured
+            operation = androidOperationConstants["KIOSK_APPS"];
+            // Initializing continueToCheckNextInputs to true
+            continueToCheckNextInputs = true;
+            var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input";
+            if (continueToCheckNextInputs) {
+                if ($(whitelistedApplicationsGridChildInputs).length == 0) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "Applications are not provided in application whitelist list.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                }
+                else {
+                    childInputCount = 0;
+                    childInputArray = [];
+                    emptyChildInputCount = 0;
+                    duplicatesExist = false;
+                    // Looping through each child input
+                    $(whitelistedApplicationsGridChildInputs).each(function () {
+                        childInputCount++;
+                        if (childInputCount % 2 == 0) {
+                            // If child input is of second column
+                            childInput = $(this).val();
+                            childInputArray.push(childInput);
+                            // Updating emptyChildInputCount
+                            if (!childInput) {
+                                // If child input field is empty
+                                emptyChildInputCount++;
+                            }
+                        }
+                    });
+                    // Checking for duplicates
+                    initialChildInputArrayLength = childInputArray.length;
+                    if (emptyChildInputCount == 0 && initialChildInputArrayLength > 1) {
+                        for (m = 0; m < (initialChildInputArrayLength - 1); m++) {
+                            poppedChildInput = childInputArray.pop();
+                            for (n = 0; n < childInputArray.length; n++) {
+                                if (poppedChildInput == childInputArray[n]) {
+                                    duplicatesExist = true;
+                                    break;
+                                }
+                            }
+                            if (duplicatesExist) {
+                                break;
+                            }
+                        }
+                    }
+                    // Updating validationStatus
+                    if (emptyChildInputCount > 0) {
+                        // If empty child inputs are present
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "One or more package names of " +
+                            "applications are empty.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    } else if (duplicatesExist) {
+                        // If duplicate input is present
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "Duplicate values exist with " +
+                            "for package names.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    }
+                }
+            }
+            if (continueToCheckNextInputs) {
+                validationStatus = {
+                    "error": false,
+                    "okFeature": operation
+                };
+            }
+            // Updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+    }
+    // ending validation process
+
+    // start taking specific notifying actions upon validation
+    var wizardIsToBeContinued;
+    var errorCount = 0;
+    var mainErrorMsgWrapper, mainErrorMsg,
+        subErrorMsgWrapper, subErrorMsg, subErrorIcon, subOkIcon, featureConfiguredIcon;
+    var i;
+    for (i = 0; i < validationStatusArray.length; i++) {
+        validationStatus = validationStatusArray[i];
+        if (validationStatus["error"]) {
+            errorCount++;
+            if (validationStatus["mainErrorMsg"]) {
+                mainErrorMsgWrapper = "#policy-profile-main-error-msg";
+                mainErrorMsg = mainErrorMsgWrapper + " span";
+                $(mainErrorMsg).text(validationStatus["mainErrorMsg"]);
+                $(mainErrorMsgWrapper).removeClass("hidden");
+            } else if (validationStatus["subErrorMsg"]) {
+                subErrorMsgWrapper = "#" + validationStatus["erroneousFeature"] + "-feature-error-msg";
+                subErrorMsg = subErrorMsgWrapper + " span";
+                subErrorIcon = "#" + validationStatus["erroneousFeature"] + "-error";
+                subOkIcon = "#" + validationStatus["erroneousFeature"] + "-ok";
+                featureConfiguredIcon = "#" + validationStatus["erroneousFeature"] + "-configured";
+                // hiding featureConfiguredState as the first step
+                if (!$(featureConfiguredIcon).hasClass("hidden")) {
+                    $(featureConfiguredIcon).addClass("hidden");
+                }
+                // updating error state and corresponding messages
+                $(subErrorMsg).text(validationStatus["subErrorMsg"]);
+                if ($(subErrorMsgWrapper).hasClass("hidden")) {
+                    $(subErrorMsgWrapper).removeClass("hidden");
+                }
+                if (!$(subOkIcon).hasClass("hidden")) {
+                    $(subOkIcon).addClass("hidden");
+                }
+                if ($(subErrorIcon).hasClass("hidden")) {
+                    $(subErrorIcon).removeClass("hidden");
+                }
+            }
+        } else {
+            if (validationStatus["okFeature"]) {
+                subErrorMsgWrapper = "#" + validationStatus["okFeature"] + "-feature-error-msg";
+                subErrorIcon = "#" + validationStatus["okFeature"] + "-error";
+                subOkIcon = "#" + validationStatus["okFeature"] + "-ok";
+                featureConfiguredIcon = "#" + validationStatus["okFeature"] + "-configured";
+                // hiding featureConfiguredState as the first step
+                if (!$(featureConfiguredIcon).hasClass("hidden")) {
+                    $(featureConfiguredIcon).addClass("hidden");
+                }
+                // updating success state and corresponding messages
+                if (!$(subErrorMsgWrapper).hasClass("hidden")) {
+                    $(subErrorMsgWrapper).addClass("hidden");
+                }
+                if (!$(subErrorIcon).hasClass("hidden")) {
+                    $(subErrorIcon).addClass("hidden");
+                }
+                if ($(subOkIcon).hasClass("hidden")) {
+                    $(subOkIcon).removeClass("hidden");
+                }
+            }
+        }
+    }
+
+    wizardIsToBeContinued = (errorCount == 0);
+    return wizardIsToBeContinued;
+};
+
+// Start of HTML embedded invoke methods
+var showAdvanceOperation = function (operation, button) {
+    $(button).addClass('selected');
+    $(button).siblings().removeClass('selected');
+    var hiddenOperation = ".wr-hidden-operations-content > div";
+    $(hiddenOperation + '[data-operation="' + operation + '"]').show();
+    $(hiddenOperation + '[data-operation="' + operation + '"]').siblings().hide();
+};
+
+
+/**
+ * This method will display appropriate fields based on wifi type
+ * @param select
+ */
+var changeAndroidWifiPolicy = function (select) {
+    slideDownPaneAgainstValueSet(select, 'control-wifi-password', ['wep', 'wpa', '802eap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-eap', ['802eap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-phase2', ['802eap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-identity', ['802eap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-anoidentity', ['802eap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-cacert', ['802eap']);
+};
+
+/**
+ * This method will display appropriate fields based on wifi EAP type
+ * @param select
+ * @param superSelect
+ */
+var changeAndroidWifiPolicyEAP = function (select, superSelect) {
+    slideDownPaneAgainstValueSet(select, 'control-wifi-password', ['peap', 'ttls', 'pwd', 'fast', 'leap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-phase2', ['peap', 'ttls', 'fast']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-provisioning', ['fast']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-identity', ['peap', 'tls', 'ttls', 'pwd', 'fast', 'leap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-anoidentity', ['peap', 'ttls']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-cacert', ['peap', 'tls', 'ttls']);
+    if (superSelect.value != '802eap') {
+        changeAndroidWifiPolicy(superSelect);
+    }
+};
+
+/**
+ * Method to slide down a provided pane upon provided value set.
+ *
+ * @param selectElement Select HTML Element to consider
+ * @param paneID HTML ID of div element to slide down
+ * @param valueSet Applicable Value Set
+ */
+var slideDownPaneAgainstValueSet = function (selectElement, paneID, valueSet) {
+    var selectedValueOnChange = $(selectElement).find("option:selected").val();
+    if ($(selectElement).is("input:checkbox")) {
+        selectedValueOnChange = $(selectElement).is(":checked").toString();
+    }
+
+    var i, slideDownVotes = 0;
+    for (i = 0; i < valueSet.length; i++) {
+        if (selectedValueOnChange == valueSet[i]) {
+            slideDownVotes++;
+        }
+    }
+    var paneSelector = "#" + paneID;
+    if (slideDownVotes > 0) {
+        if (!$(paneSelector).hasClass("expanded")) {
+            $(paneSelector).addClass("expanded");
+        }
+        $(paneSelector).slideDown();
+    } else {
+        if ($(paneSelector).hasClass("expanded")) {
+            $(paneSelector).removeClass("expanded");
+        }
+        $(paneSelector).slideUp();
+        /** now follows the code to reinitialize all inputs of the slidable pane */
+        // reinitializing input fields into the defaults
+        $(paneSelector + " input").each(
+            function () {
+                if ($(this).is("input:text")) {
+                    $(this).val($(this).data("default"));
+                } else if ($(this).is("input:password")) {
+                    $(this).val("");
+                } else if ($(this).is("input:checkbox")) {
+                    $(this).prop("checked", $(this).data("default"));
+                    // if this checkbox is the parent input of a grouped-input
+                    if ($(this).hasClass("parent-input")) {
+                        var groupedInput = $(this).parent().parent().parent();
+                        updateGroupedInputVisibility(groupedInput);
+                    }
+                }
+            }
+        );
+        // reinitializing select fields into the defaults
+        $(paneSelector + " select").each(
+            function () {
+                var defaultOption = $(this).data("default");
+                $("option:eq(" + defaultOption + ")", this).prop("selected", "selected");
+            }
+        );
+        // collapsing expanded-panes (upon the selection of html-select-options) if any
+        $(paneSelector + " .expanded").each(
+            function () {
+                if ($(this).hasClass("expanded")) {
+                    $(this).removeClass("expanded");
+                }
+                $(this).slideUp();
+            }
+        );
+        // removing all entries of grid-input elements if exist
+        $(paneSelector + " .grouped-array-input").each(
+            function () {
+                var gridInputs = $(this).find("[data-add-form-clone]");
+                if (gridInputs.length > 0) {
+                    gridInputs.remove();
+                }
+                var helpTexts = $(this).find("[data-help-text=add-form]");
+                if (helpTexts.length > 0) {
+                    helpTexts.show();
+                }
+            }
+        );
+    }
+};
+// End of HTML embedded invoke methods
+
+
+// Start of functions related to grid-input-view
+
+/**
+ * Method to set count id to cloned elements.
+ * @param {object} addFormContainer
+ */
+var setId = function (addFormContainer) {
+    $(addFormContainer).find("[data-add-form-clone]").each(function (i) {
+        $(this).attr("id", $(this).attr("data-add-form-clone").slice(1) + "-" + (i + 1));
+        if ($(this).find(".index").length > 0) {
+            $(this).find(".index").html(i + 1);
+        }
+    });
+};
+
+/**
+ * Method to set count id to cloned elements.
+ * @param {object} addFormContainer
+ */
+var showHideHelpText = function (addFormContainer) {
+    var helpText = "[data-help-text=add-form]";
+    if ($(addFormContainer).find("[data-add-form-clone]").length > 0) {
+        $(addFormContainer).find(helpText).hide();
+    } else {
+        $(addFormContainer).find(helpText).show();
+    }
+};
+
+$(document).ready(function () {
+    // Maintains an array of configured features of the profile
+    var advanceOperations = ".wr-advance-operations";
+    $(advanceOperations).on("click", ".wr-input-control.switch", function (event) {
+        var operationCode = $(this).parents(".operation-data").data("operation-code");
+        var operation = $(this).parents(".operation-data").data("operation");
+        var operationDataWrapper = $(this).data("target");
+        // prevents event bubbling by figuring out what element it's being called from.
+        if (event.target.tagName == "INPUT") {
+            var featureConfiguredIcon;
+            if ($("input[type='checkbox']", this).is(":checked")) {
+                configuredOperations.push(operationCode);
+                // when a feature is enabled, if "zero-configured-features" msg is available, hide that.
+                var zeroConfiguredOperationsErrorMsg = "#policy-profile-main-error-msg";
+                if (!$(zeroConfiguredOperationsErrorMsg).hasClass("hidden")) {
+                    $(zeroConfiguredOperationsErrorMsg).addClass("hidden");
+                }
+                // add configured-state-icon to the feature
+                featureConfiguredIcon = "#" + operation + "-configured";
+                if ($(featureConfiguredIcon).hasClass("hidden")) {
+                    $(featureConfiguredIcon).removeClass("hidden");
+                }
+            } else {
+                //splicing the array if operation is present.
+                var index = $.inArray(operationCode, configuredOperations);
+                if (index != -1) {
+                    configuredOperations.splice(index, 1);
+                }
+                // when a feature is disabled, clearing all its current configured, error or success states
+                var subErrorMsgWrapper = "#" + operation + "-feature-error-msg";
+                var subErrorIcon = "#" + operation + "-error";
+                var subOkIcon = "#" + operation + "-ok";
+                featureConfiguredIcon = "#" + operation + "-configured";
+
+                if (!$(subErrorMsgWrapper).hasClass("hidden")) {
+                    $(subErrorMsgWrapper).addClass("hidden");
+                }
+                if (!$(subErrorIcon).hasClass("hidden")) {
+                    $(subErrorIcon).addClass("hidden");
+                }
+                if (!$(subOkIcon).hasClass("hidden")) {
+                    $(subOkIcon).addClass("hidden");
+                }
+                if (!$(featureConfiguredIcon).hasClass("hidden")) {
+                    $(featureConfiguredIcon).addClass("hidden");
+                }
+                // reinitializing input fields into the defaults
+                $(operationDataWrapper + " input").each(
+                    function () {
+                        if ($(this).is("input:text")) {
+                            $(this).val($(this).data("default"));
+                        } else if ($(this).is("input:password")) {
+                            $(this).val("");
+                        } else if ($(this).is("input:checkbox")) {
+                            $(this).prop("checked", $(this).data("default"));
+                            // if this checkbox is the parent input of a grouped-input
+                            if ($(this).hasClass("parent-input")) {
+                                var groupedInput = $(this).parent().parent().parent();
+                                updateGroupedInputVisibility(groupedInput);
+                            }
+                        }
+                    }
+                );
+                // reinitializing select fields into the defaults
+                $(operationDataWrapper + " select").each(
+                    function () {
+                        var defaultOption = $(this).data("default");
+                        $("option:eq(" + defaultOption + ")", this).prop("selected", "selected");
+                    }
+                );
+                // collapsing expanded-panes (upon the selection of html-select-options) if any
+                $(operationDataWrapper + " .expanded").each(
+                    function () {
+                        if ($(this).hasClass("expanded")) {
+                            $(this).removeClass("expanded");
+                        }
+                        $(this).slideUp();
+                    }
+                );
+                // removing all entries of grid-input elements if exist
+                $(operationDataWrapper + " .grouped-array-input").each(
+                    function () {
+                        var gridInputs = $(this).find("[data-add-form-clone]");
+                        if (gridInputs.length > 0) {
+                            gridInputs.remove();
+                        }
+                        var helpTexts = $(this).find("[data-help-text=add-form]");
+                        if (helpTexts.length > 0) {
+                            helpTexts.show();
+                        }
+                    }
+                );
+            }
+        }
+    });
+
+    // <start - fixing feature-configuring switch double-click issue>
+    $(advanceOperations).on('hidden.bs.collapse', function (event) {
+        var collapsedFeatureBody = event.target.id;
+        var operation = collapsedFeatureBody.substr(0, collapsedFeatureBody.lastIndexOf("-"));
+        var featureConfiguringSwitch = "#" + operation + "-heading input[type=checkbox]";
+        var featureConfiguredIcon = "#" + operation + "-configured";
+        if ($(featureConfiguringSwitch).prop("checked") == true) {
+            $(featureConfiguringSwitch).prop("checked", false);
+        }
+        if (!$(featureConfiguredIcon).hasClass("hidden")) {
+            $(featureConfiguredIcon).addClass("hidden");
+        }
+    });
+
+    $(advanceOperations).on('shown.bs.collapse', function (event) {
+        var expandedFeatureBody = event.target.id;
+        var operation = expandedFeatureBody.substr(0, expandedFeatureBody.lastIndexOf("-"));
+        var featureConfiguringSwitch = "#" + operation + "-heading input[type=checkbox]";
+        var featureConfiguredIcon = "#" + operation + "-configured";
+        if ($(featureConfiguringSwitch).prop("checked") == false) {
+            $(featureConfiguringSwitch).prop("checked", true);
+        }
+        if ($(featureConfiguredIcon).hasClass("hidden")) {
+            $(featureConfiguredIcon).removeClass("hidden");
+        }
+    });
+    // <end - fixing feature-configuring switch double-click issue>
+
+    // adding support for cloning multiple profiles per feature with cloneable class definitions
+    $(advanceOperations).on("click", ".multi-view.add.enabled", function () {
+        // get a copy of .cloneable and create new .cloned div element
+        var cloned = "<div class='cloned'><hr>" + $(".cloneable", $(this).parent().parent()).html() + "</div>";
+        // append newly created .cloned div element to panel-body
+        $(this).parent().parent().append(cloned);
+        // enable remove action of newly cloned div element
+        $(".cloned", $(this).parent().parent()).each(
+            function () {
+                if ($(".multi-view.remove", this).hasClass("disabled")) {
+                    $(".multi-view.remove", this).removeClass("disabled");
+                }
+                if (!$(".multi-view.remove", this).hasClass("enabled")) {
+                    $(".multi-view.remove", this).addClass("enabled");
+                }
+            }
+        );
+    });
+
+    $(advanceOperations).on("click", ".multi-view.remove.enabled", function () {
+        $(this).parent().remove();
+    });
+
+    // enabling or disabling grouped-input based on the status of a parent check-box
+    $(advanceOperations).on("click", ".grouped-input", function () {
+        updateGroupedInputVisibility(this);
+    });
+
+    // add form entry click function for grid inputs
+    $(advanceOperations).on("click", "[data-click-event=add-form]", function () {
+        var addFormContainer = $("[data-add-form-container=" + $(this).attr("href") + "]");
+        var clonedForm = $("[data-add-form=" + $(this).attr("href") + "]").clone().find("[data-add-form-element=clone]")
+            .attr("data-add-form-clone", $(this).attr("href"));
+
+        // adding class .child-input to capture text-input-array-values
+        $("input, select", clonedForm).addClass("child-input");
+
+        $(addFormContainer).append(clonedForm);
+        setId(addFormContainer);
+        showHideHelpText(addFormContainer);
+    });
+
+    // remove form entry click function for grid inputs
+    $(advanceOperations).on("click", "[data-click-event=remove-form]", function () {
+        var addFormContainer = $("[data-add-form-container=" + $(this).attr("href") + "]");
+
+        $(this).closest("[data-add-form-element=clone]").remove();
+        setId(addFormContainer);
+        showHideHelpText(addFormContainer);
+    });
+});
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
new file mode 100644
index 000000000..d1854284c
--- /dev/null
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
@@ -0,0 +1,1464 @@
+{{!
+  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.
+}}
+<div class="row no-gutter">
+    <div class="wr-hidden-operations-nav col-lg-4">
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('passcode-policy', this)" class="selected">
+                <span class="wr-hidden-operations-icon fw-stack">
+                    <i class="fw fw-key fw-stack-2x"></i>
+                </span>
+            Passcode Policy
+            <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
+                <span class="wr-hidden-operations-icon fw-stack">
+                    <i class="fw fw-block fw-stack-2x"></i>
+                </span>
+            Restrictions
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
+                <span class="wr-hidden-operations-icon fw-stack">
+                    <i class="fw fw-security fw-stack-2x"></i>
+                </span>
+            Encryption Settings
+            <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
+                    class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">
+                <span class="wr-hidden-operations-icon fw-stack">
+                    <i class="fw fw-wifi fw-stack-2x"></i>
+                </span>
+            Wi-Fi Settings
+            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('vpn', this)">
+                <span class="wr-hidden-operations-icon fw-stack">
+                    <i class="fw fw-vpn fw-stack-2x"></i>
+                </span>
+            Virtual Private Network
+            <span id="vpn-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="vpn-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)">
+             <span class="wr-hidden-operations-icon fw-stack">
+                 <i class="fw fw-service fw-stack-2x"></i>
+             </span>
+            Work-Profile Configurations
+            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
+            <span class="fw-stack fw-lg">
+                <i class="fw fw-application fw-stack-1x"></i>
+                <i class="fw fw-block fw-stack-2x"></i>
+            </span>
+            Application Restrictions
+            <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
+            <span class="wr-hidden-operation-icon fw-stack">
+                <i class="fw fw-import fw-stack-2x"></i>
+            </span>
+            System Update Policy (COSU)
+            <span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)" >
+            <span class="wr-hidden-operations-icon fw-stack">
+                <i class="fw fw-register fw-stack-2x"></i>
+            </span>
+            Whitelist Apps (COSU)
+            <span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i
+                    class="fw fw-error"></i></span>
+        </a>
+    </div>
+
+    <div class="wr-hidden-operations-content col-lg-8">
+        <!-- passcode-policy -->
+        <div class="wr-hidden-operation" data-operation="passcode-policy" style="display: block">
+            <div class="panel panel-default operation-data" data-operation="passcode-policy"
+                 data-operation-code="PASSCODE_POLICY">
+                <div id="passcode-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Passcode Policy
+                        <label id="passcode-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#passcode-policy-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to set a passcode policy to an Android Device.
+                        Once this configuration profile is installed on a device, corresponding users will not be able
+                        to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="passcode-policy-body">
+                    <hr/>
+                    <div id="passcode-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="passcode-policy-allow-simple" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple"
+                                   checked="checked"/>
+                            <span class="helper"
+                                  title="Permit the use of repeating, ascending and descending character sequences">
+                                Allow simple value
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="passcode-policy-require-alphanumeric" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
+                                   checked="checked"/>
+                            <span class="helper" title="Require passcode to contain both letters and numbers">
+                                Require alphanumeric value
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-min-length">
+                            Minimum passcode length
+                            <span class="helper" title="Minimum number of characters allowed in a passcode">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                        <select id="passcode-policy-min-length" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinLength" data-default="0">
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="4">04</option>
+                            <option value="5">05</option>
+                            <option value="6">06</option>
+                            <option value="7">07</option>
+                            <option value="8">08</option>
+                            <option value="9">09</option>
+                            <option value="10">10</option>
+                            <option value="11">11</option>
+                            <option value="12">12</option>
+                            <option value="13">13</option>
+                            <option value="14">14</option>
+                            <option value="15">15</option>
+                        </select>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-min-complex-chars">
+                            Minimum number of complex characters
+                            <span class="helper"
+                                  title="Minimum number of complex or non-alphanumeric characters allowed in a passcode">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                        <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinComplexChars" data-default="0">
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="1">01</option>
+                            <option value="2">02</option>
+                            <option value="3">03</option>
+                            <option value="4">04</option>
+                            <option value="5">05</option>
+                        </select>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-max-passcode-age-in-days">
+                            Maximum passcode age in days*
+                            <span class="helper" title="Number of days after which a passcode must be changed">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            ( Should be in between 1-to-730 days or none )
+                        </label>
+                        <input id="passcode-policy-max-passcode-age-in-days" type="text"
+                               class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
+                               maxlength="3">
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-passcode-history">
+                            Passcode history*
+                            <span class="helper" title="Number of consequent unique passcodes to be used before reuse">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            ( Should be in between 1-to-50 passcodes or none )
+                        </label>
+                        <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
+                               data-key="passcodePolicyPasscodeHistory" maxlength="2">
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
+                            Maximum number of failed attempts
+                            <span class="helper"
+                                  title="The maximum number of failed password entry attempts. If the correct password is not entered within the defined number of attempts, the data on the device will be erased">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                        <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMaxFailedAttempts" data-default="0">
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="3">03</option>
+                            <option value="4">04</option>
+                            <option value="5">05</option>
+                            <option value="6">06</option>
+                            <option value="7">07</option>
+                            <option value="8">08</option>
+                            <option value="9">09</option>
+                            <option value="10">10</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- /passcode-policy -->
+
+        <!-- camera -->
+        <div class="wr-hidden-operation" data-operation="camera">
+            <div class="panel panel-default operation-data" data-operation="camera" data-operation-code="CAMERA">
+                <div id="camera-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Restrictions
+                        <label class="wr-input-control switch" data-toggle="collapse" data-target="#camera-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configurations can be used to restrict certain settings on an Android device.
+                        Once this configuration profile is installed on a device, corresponding users will not be able
+                        to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="camera-body">
+                    <hr/>
+                    <div id="camera-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    <br>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="camera-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="cameraEnabled" checked="checked"/>
+                            <span class="helper"
+                                  title="Having this checked would enable Usage of phone camera in the device.">
+                                Allow use of camera
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <div>
+                        <ul class="message message-info">
+                            <i class="icon fw fw-info"></i>
+                            <a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is
+                                <b>work-profile owner</b> or <b>device owner</b>.</a>
+                        </ul>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-credentials-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowConfigCredentials"/>
+                            <span class="helper" title="Having this checked would disallow configuring credentials.">
+                                Disallow configuring credentials
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-VPN-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowConfigVpn"/>
+                            <span class="helper" title="Having this checked would disallow configuring VPN.">
+                                Disallow configuring VPN
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-app-control-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowAppControl"/>
+                            <span class="helper" title="Having this checked would disallow configuring app control.">
+                                Disallow configuring app control
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-cross-profile-copy-paste-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowCrossProfileCopyPaste"/>
+                            <span class="helper" title="Having this checked would disallow cross profile copy paste.">
+                                Disallow cross profile copy paste
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-debugging-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowDebugging"/>
+                            <span class="helper" title="Having this checked would disallow debugging.">
+                                Disallow debuging
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-install-apps-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowInstallApps"/>
+                            <span class="helper" title="Having this checked would disallow install apps.">
+                                Disallow install apps
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-installing-from-unknown-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowInstallUnknownSources"/>
+                            <span class="helper" title="Having this checked would disallow installing from unknown
+                            sources.">
+                                Disallow install from unknown sources
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-modify-accounts-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowModifyAccounts"/>
+                            <span class="helper" title="Having this checked would disallow modify accounts.">
+                                Disallow modify accounts
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-outgoing-beam-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowOutgoingBeam"/>
+                            <span class="helper" title="Having this checked would disallow outgoing beam.">
+                                Disallow outgoing beam
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-location-sharing-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowLocationSharing"/>
+                            <span class="helper" title="Having this checked would disallow location sharing.">
+                                Disallow location sharing
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-uninstall-apps-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowUninstallApps"/>
+                            <span class="helper" title="Having this checked would disallow uninstall apps.">
+                                Disallow uninstall apps
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-parent-profile-app-linking-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowParentProfileAppLinking"/>
+                            <span class="helper" title="Having this checked would disallow parent profile app linking.">
+                                Disallow parent profile app linking
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="ensure-verifying-apps-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="ensureVerifyApps"/>
+                            <span class="helper" title="Having this checked would ensure verifying apps .">
+                                Ensure verifying apps
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="enable-auto-timing-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="enableAutoTime"/>
+                            <span class="helper" title="Having this checked would enable auto timing .">
+                                Enable auto timing
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disableScreenCapture"/>
+                            <span class="helper" title="Having this checked would disable screen capture .">
+                                Disable screen capture
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <div>
+                        <ul class="message message-info">
+                            <i class="icon fw fw-info"></i>
+                            <a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is the
+                                <b>device owner</b>.</a>
+                        </ul>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowSMS"/>
+                            <span class="helper" title="Having this checked would disallow SMS.">
+                                Disallow SMS
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="volume-adjust-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowAdjustVolumeEnabled"/>
+                            <span class="helper" title="Having this checked would disallow volume adjust.">
+                                Disallow volume adjust
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-cell-broadcast-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowConfigCellBroadcasts"/>
+                            <span class="helper" title="Having this checked would disallow configuring cell broadcast.">
+                                Disallow cell broadcast
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-bluetooth-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowConfigBluetooth"/>
+                            <span class="helper" title="Having this checked would disallow configuring bluetooth.">
+                                Disallow configuring bluetooth.
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-mobile-networkst-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowConfigMobileNetworks"/>
+                            <span class="helper"
+                                  title="Having this checked would disallow configuring mobile networks.">
+                                Disallow configuring mobile networks
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-tethering-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowConfigTethering"/>
+                            <span class="helper" title="Having this checked would disallow configuring tethering.">
+                                Disallow configuring tethering
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-Wifi-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowConfigWifi"/>
+                            <span class="helper" title="Having this checked would disallow configuring Wifi.">
+                                Disallow configuring Wifi
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-safe-boot-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowSafeBoot"/>
+                            <span class="helper" title="Having this checked would disallow safe boot.">
+                                Disallow safe boot
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-outgoing-calls-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowOutgoingCalls"/>
+                            <span class="helper" title="Having this checked would disallow outgoing calls.">
+                                Disallow outgoing calls
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-mount-physical-media-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowMountPhysicalMedia"/>
+                            <span class="helper" title="Having this checked would disallow mount physical media.">
+                                Disallow mount physical media
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-create-window-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowCreateWindows"/>
+                            <span class="helper" title="Having this checked would disallow create window.">
+                                Disallow create window
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-factory-reset-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowFactoryReset"/>
+                            <span class="helper" title="Having this checked would disallow factory reset.">
+                                Disallow factory reset
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-remove-user-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowRemoveUser"/>
+                            <span class="helper" title="Having this checked would disallow remove user.">
+                                Disallow remove user
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-add-user-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowAddUser"/>
+                            <span class="helper" title="Having this checked would disallow add user.">
+                                Disallow add user
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-network-reset-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowNetworkReset"/>
+                            <span class="helper" title="Having this checked would disallow network reset.">
+                                Disallow network reset
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-USB-transfer-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowUSBFileTransfer"/>
+                            <span class="helper" title="Having this checked would disallow USB file transfer.">
+                                Disallow USB file transfer
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-unmute-microphone-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowUnmuteMicrophone"/>
+                            <span class="helper" title="Having this checked would disallow unmute microphone.">
+                                Disallow unmute microphone
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div>
+                        <ul class="message message-info">
+                            <i class="icon fw fw-info"></i>
+                            <a id="policy-listing-status-msg">Below restrictions will be applied on devices with Android
+                                version 6.0 Marshmallow onwards only.</a>
+                        </ul>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disable-status-bar-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disableStatusBar"/>
+                            <span class="helper" title="Having this checked would disable status bar .">
+                                Disable status bar
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                </div>
+            </div>
+        </div>
+        <!-- /camera -->
+
+        <!-- encrypt-storage -->
+        <div class="wr-hidden-operation" data-operation="encrypt-storage">
+            <div class="panel panel-default operation-data" data-operation="encrypt-storage"
+                 data-operation-code="ENCRYPT_STORAGE">
+                <div id="encrypt-storage-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Encryption Settings
+                        <label class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#encrypt-storage-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to encrypt data on an Android device, when the device is locked
+                        and make it readable when the passcode is entered. Once this configuration profile is installed
+                        on a device, corresponding users will not be able to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="encrypt-storage-body">
+                    </hr>
+                    <div id="encrypt-storage-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    Un-check following checkbox in case you do not need the device to be encrypted.
+                    <br>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="encrypt-storage-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="encryptStorageEnabled" checked="checked"/>
+                            <span class="helper"
+                                  title="Having this checked would enable Storage-encryption in the device">
+                                Enable storage-encryption
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                </div>
+            </div>
+        </div>
+        <!-- /encrypt-storage -->
+
+        <!-- wi-fi -->
+        <div class="wr-hidden-operation" data-operation="wifi">
+            <div class="panel panel-default operation-data" data-operation="wifi" data-operation-code="WIFI">
+                <div id="wifi-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Wi-Fi Settings
+                        <label class="wr-input-control switch" data-toggle="collapse" data-target="#wifi-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configurations can be used to configure Wi-Fi access on an Android device.
+                        Once this configuration profile is installed on a device, corresponding users will not be able
+                        to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="wifi-body">
+                    <hr/>
+                    Please note that * sign represents required fields of data.
+                    <br>
+                    <br>
+                    <div id="wifi-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="wifi-ssid">
+                            Service Set Identifier (SSID)*
+                            <span class="helper" title="Identification of the wireless network to be configured.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <label id="wifiSsidValidationText" class="wr-input-label hidden">
+                            Service Set Identifier should be 1-to-30 characters long
+                        </label>
+                        <input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID"
+                               maxlength="100" placeholder="[ Should be 1-to-30 characters long ]"/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="wifi-type">
+                            Security*
+                            <span class="helper"
+                                  title="Security type of the wireless network to be configured. 802.1x EAP works with
+                                  Android 4.3 and above devices only.">
+                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                    </span>
+                        </label>
+                        <select class="form-control operationDataKeys" id="wifi-type"
+                                onchange="changeAndroidWifiPolicy(this)" data-key="wifiType">
+                            <option value="none" selected>None</option>
+                            <option value="wep">WEP</option>
+                            <option value="wpa">WPA/WPA 2 PSK</option>
+                            <option value="802eap">802.1x EAP</option>
+                        </select>
+                    </div>
+
+                    <div class="wr-input-control" id="control-wifi-eap" style="display:none;">
+                        <label class="wr-input-label" for="wifi-eap">
+                            EAP Method
+                            <span class="helper" title="EAP Method of the wireless network to be configured.">
+                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                    </span>
+                        </label>
+                        <select class="form-control operationDataKeys" id="wifi-eap"
+                                onchange="changeAndroidWifiPolicyEAP(this, document.getElementById('wifi-type'))"
+                                data-key="wifiEAP">
+                            <option value="peap">PEAP</option>
+                            <option value="tls">TLS</option>
+                            <option value="ttls">TTLS</option>
+                            <option value="pwd">PWD</option>
+                            <option value="sim">SIM</option>
+                            <option value="aka">AKA</option>
+                        </select>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-phase2" style="display:none;">
+                        <label class="wr-input-label" for="wifi-phase2">
+                            Phase 2 Authentication
+                            <span class="helper"
+                                  title="Phase 2 authentication of the wireless network to be configured.">
+                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                    </span>
+                        </label>
+                        <select class="form-control operationDataKeys" id="wifi-phase2" data-key="wifiPhase2">
+                            <option value="none">None</option>
+                            <option value="pap">PAP</option>
+                            <option value="mchap">MCHAP</option>
+                            <option value="mchapv2">MCHAPV2</option>
+                            <option value="gtc">GTC</option>
+                        </select>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-provisioning" style="display:none;">
+                        <label class="wr-input-label" for="wifi-provisioning">
+                            Provisioning
+                            <span class="helper" title="Provisioning of the wireless network to be configured.">
+                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                    </span>
+                        </label>
+                        <select class="form-control operationDataKeys" id="wifi-provisioning"
+                                data-key="wifiProvisioning">
+                            <option value="0">0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                        </select>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-identity" style="display:none;">
+                        <label class="wr-input-label" for="wifi-identity">
+                            Identity
+                            <span class="helper" title="Identity of the wireless network to be configured.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <label id="wifiIdentityValidationText" class="wr-input-label hidden">
+                            Identity should be 1-to-30 characters long
+                        </label>
+                        <input id="wifi-identity" type="text" class="form-control operationDataKeys"
+                               data-key="wifiIdentity"
+                               maxlength="100" placeholder="[ Should be 1-to-30 characters long ]"/>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-anoidentity" style="display:none;">
+                        <label class="wr-input-label" for="wifi-anoidentity">
+                            Anonymous Identity
+                            <span class="helper" title="Identity of the wireless network to be configured.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <label id="wifiIdentityValidationText" class="wr-input-label hidden">
+                            Anonymous Identity should be 1-to-30 characters long
+                        </label>
+                        <input id="wifi-anoidentity" type="text" class="form-control operationDataKeys"
+                               data-key="wifiAnoIdentity"
+                               maxlength="100" placeholder="[ Should be 1-to-30 characters long ]"/>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-cacert" style="display:none;">
+                        <label class="wr-input-label" for="wifi-password">
+                            CA Certificate
+                            <span class="helper" title="CA Certificate for the wireless network.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <input id="wifi-cacert-upload" type="file" class="form-control"
+                               onchange="base64EncodeFile(this, document.getElementById('wifi-cacert'),
+                               document.getElementById('wifi-cacert-name'))"/>
+                        <input id="wifi-cacert" type="hidden" class="form-control operationDataKeys"
+                               data-key="wifiCaCert"/>
+                        <input id="wifi-cacert-name" type="hidden" class="form-control operationDataKeys"
+                               data-key="wifiCaCertName"/>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-password" style="display:none;">
+                        <label class="wr-input-label" for="wifi-password">
+                            Password
+                            <span class="helper required" title="Password for the wireless network.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <input id="wifi-password" type="password" class="form-control operationDataKeys"
+                               data-key="wifiPassword" maxlength="100"/>
+                    </div>
+                    <!--</div>-->
+                </div>
+            </div>
+        </div>
+        <!-- /wi-fi -->
+
+        <!--app-restriction-->
+        <div class="wr-hidden-operation" data-operation="app-restriction">
+            <div class="panel panel-default operation-data" data-operation="app-restriction"
+                 data-operation-code="APP-RESTRICTION">
+                <div id="app-restriction-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Application Restriction Settings
+                        <label class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#app-restriction-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to create a black list or white list of applications.
+                    </div>
+                </div>
+                <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="app-restriction-body">
+                    <hr/>
+                    <div id="app-restriction-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+
+                    <label class="wr-input-label" for="app-restriction-type">
+                        Select type
+                        <span class="helper" title="Select a type to proceed.">
+                            <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                        </span>
+                        <br>
+                    </label>
+                    <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType">
+                        <option value="" selected="selected">
+                            None
+                        </option>
+                        <option value="black-list">Black List</option>
+                        <option value="white-list">White List</option>
+                    </select>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="restricted-applications">
+                            <br><br>Restricted Application List
+                            <span class="helper" title="Add an application to restrict.">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                        <br/>
+                        <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add "
+                           data-click-event="add-form">
+                                <span class="icon fw-stack">
+                                    <i class="fw fw-add fw-stack-1x"></i>
+                                    <i class="fw fw-ring fw-stack-2x"></i>
+                                </span>
+
+                            Add Application
+                        </a>
+                        <div id="restricted-applications"
+                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                             data-key="restrictedApplications" data-column-count="2">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Application Name/Description</th>
+                                    <th>Package Name</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#restricted-applications-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="4">
+                                        No entries added yet .
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#restricted-applications-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="App Name">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                               maxlength="100" data-default="" placeholder="[ Gmail ]"/>
+                                    </td>
+                                    <td data-title="Package Name">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="packageName" maxlength="100" data-default=""
+                                               placeholder="[ com.google.android.gm ]"/>
+                                    </td>
+                                    <td>
+                                            <span class="list-group-item-actions">
+                                                <a href="#restricted-applications-grid" class="grid-input-remove"
+                                                   data-click-event="remove-form">
+                                                    <span class="fw-stack helper" title="Remove Entry">
+                                                        <i class="fw fw-ring fw-stack-2x"></i>
+                                                        <i class="fw fw-delete fw-stack-1x"></i>
+                                                    </span>
+                                                </a>
+                                            </span>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!--/app-restriction-->
+
+        <!-- VPN -->
+        <div class="wr-hidden-operation" data-operation="vpn">
+            <div class="panel panel-default operation-data" data-operation="vpn" data-operation-code="VPN">
+                <div id="vpn-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        VPN Settings
+                        <label class="wr-input-control switch" data-toggle="collapse" data-target="#vpn-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configurations can be used to configure VPN settings on an Android device.
+                        Once this configuration profile is installed on a device, corresponding users will not be able
+                        to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="vpn-body">
+                    <hr/>
+                    Please note that * sign represents required fields of data.
+                    <br>
+                    <br>
+                    <div id="vpn-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="vpn-server-address">
+                            VPN Server Address*
+                            <span class="helper" title="Address of the VPN server to be configured.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <input id="vpn-server-address" type="text" class="form-control operationDataKeys"
+                               data-key="serverAddress" maxlength="200" placeholder="[ Should be a valid hostname ]"/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="vpn-server-port">
+                            VPN Server Port
+                            <span class="helper" title="Port of the VPN server to be configured.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <input id="vpn-server-port" type="text" class="form-control operationDataKeys"
+                               data-key="serverPort" maxlength="100" placeholder="[ Optional field ]"/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="vpn-shared-secret">
+                            Shared Secret
+                            <span class="helper" title="Shared secret.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <input id="vpn-shared-secret" type="password" class="form-control operationDataKeys"
+                               data-key="sharedSecret" maxlength="100" placeholder="[ Optional field ]"/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="vpn-dns">
+                            DNS Server
+                            <span class="helper" title="DNS Server.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <input id="vpn-dns" type="text" class="form-control operationDataKeys" data-key="dnsServer"
+                               maxlength="100" placeholder="[ Optional field ]"/>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- /VPN -->
+
+        <!--Work-profile-->
+        <div class="wr-hidden-operation" data-operation="work-profile">
+            <div class="panel panel-default operation-data" data-operation="work-profile"
+                 data-operation-code="WORK_PROFILE">
+                <div id="work-profile-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Work-Profile Configurations
+                        <label id="work-profile-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#work-profile-policy-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        The configurations below can be applied to the devices where the agent is running in Android
+                        Work-Profile.
+                    </div>
+                </div>
+                <div id="work-profile-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="work-profile-policy-body">
+                    <hr/>
+                    <div id="work-profile-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    <!--<div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="work-profile-policy-allow-cross-profile" type="checkbox" class="form-control
+                            operationDataKeys" data-key="workProfilePolicyAllowCopyPaste" checked="checked" />
+                                <span class="helper" title="Permit the use of repeating, ascending and descending
+                                character sequences">
+                                    Allow cross profile copy-paste
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                    </div> -->
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-max-passcode-age-in-days">
+                            Profile Name
+                            <span class="helper" title="Name of the Work-Profile created by EMM Agent">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                        </label>
+                        <input id="work-profile-policy-profile-name" type="text" class="form-control operationDataKeys"
+                               data-key="workProfilePolicyProfileName" maxlength="20">
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-enable-system-apps">
+                            Enable System Apps
+                            <span class="helper" title="The set of system apps needed to be added to the work-profile">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps,
+                            com.google.android.calculator )
+                        </label>
+                        <textarea id="workProfilePolicyEnableSystemApps" type="text"
+                                  class="form-control operationDataKeys" rows="4"
+                                  data-key="workProfilePolicyEnableSystemApps"></textarea>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-hide-system-apps">
+                            Hide System Apps
+                            <span class="helper" title="The set of system apps needed to be hide in the work-profile">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps,
+                            com.google.android.calculator )
+                        </label>
+                        <textarea id="work-profile-policy-hide-system-apps" class="form-control operationDataKeys"
+                                  rows="4" data-key="workProfilePolicyHideSystemApps" placeholder=""></textarea>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-unhide-system-apps">
+                            Unhide System Apps
+                            <span class="helper" title="The set of system apps needed to be unhide in the work-profile">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps,
+                            com.google.android.calculator )
+                        </label>
+                        <textarea id="work-profile-policy-unhide-system-apps" class="form-control operationDataKeys"
+                                  rows="4" data-key="workProfilePolicyUnhideSystemApps" placeholder=""></textarea>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-install-playstore-apps">
+                            Enable Google Play Store Apps
+                            <span class="helper"
+                                  title="The set of apps needed to be installed from Google Playstore to work-profile">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps,
+                            com.google.android.calculator )
+                        </label>
+                        <textarea id="work-profile-policy-install-playstore-apps" class="form-control operationDataKeys"
+                                  rows="4" data-key="workProfilePolicyEnablePlaystoreApps" placeholder=""></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- cosu-system-update-policy -->
+        <div class="wr-hidden-operation" data-operation="cosu-system-update-policy">
+            <div class="panel panel-default operation-data" data-operation="cosu-system-update-policy-body"
+                 data-operation-code="SYSTEM_UPDATE_POLICY">
+                <div id="cosu-system-update-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        System Update Policy (COSU)
+                        <label id="cosu-system-update-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#cosu-system-update-policy-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to set a passcode policy to an Android Device.
+                        Once this configuration profile is installed on a device, corresponding users will not be able
+                        to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse"
+                     role="tabpanel"
+                     aria-labelledby="cosu-system-update-policy-body">
+                    <hr/>
+                    <div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden"
+                         role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label">
+                            System Update
+                            <span class="helper" title="Type of the System Update to be set by the Device Owner">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                        <br><br>
+                        <label class="wr-input-control radio light">
+                            <input id="automatic-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                                   class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                                   value="automatic"
+                                   onclick="slideDownPaneAgainstValueSetForRadioButtons(this,
+                                   'cosu-system-update-policy-window-select', ['window'])" checked/>
+                            <span class="helper"
+                                  title="Installs system update automatically as soon as one is available">
+                                Automatic
+                            </span>
+                        </label>
+                        <label class="wr-input-control radio light">
+                            <input id="postpone-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                                   class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                                   value="postpone"
+                                   onclick="slideDownPaneAgainstValueSetForRadioButtons(this,
+                                   'cosu-system-update-policy-window-select', ['window'])"/>
+                            <span class="helper"
+                                  title="Incoming system update will be blocked for a maximum of 30 days">
+                                Postpone
+                            </span>
+                        </label>
+                        <label class="wr-input-control radio light">
+                            <input id="window-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                                   class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                                   value="window"
+                                   onclick="slideDownPaneAgainstValueSetForRadioButtons(this,
+                                    'cosu-system-update-policy-window-select', ['window'])"/>
+                            <span class="helper"
+                                  title="Install system update automatically within a daily maintenance window, for a
+                                  maximum of 30 days">
+                                Window
+                            </span>
+                        </label>
+                    </div>
+                    <div id="cosu-system-update-policy-window-select">
+                        <div>
+                            <ul class="message message-info">
+                                <i class="icon fw fw-info"></i>
+                                <a id="cosu-system-update-policy-window-select-msg">
+                                    Below configuration of start time and end time are valid only when
+                                    <b>window</b> option is selected.
+                                </a>
+                            </ul>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="cosu-system-update-policy-window-start-time">
+                                Start Time
+                                <span class="helper" title="Window start time for system update">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                            </label>
+                            <select id="cosu-system-update-policy-window-start-time"
+                                    class="form-control operationDataKeys"
+                                    data-key="cosuSystemUpdatePolicyWindowStartTime" data-default="0">
+                                <option value="1440" selected="selected">12 AM</option>
+                                <option value="60">1 AM</option>
+                                <option value="120">2 AM</option>
+                                <option value="180">3 AM</option>
+                                <option value="240">4 AM</option>
+                                <option value="300">5 AM</option>
+                                <option value="360">6 AM</option>
+                                <option value="420">7 AM</option>
+                                <option value="480">8 AM</option>
+                                <option value="540">9 AM</option>
+                                <option value="600">10 AM</option>
+                                <option value="660">11 AM</option>
+                                <option value="720">12 noon</option>
+                                <option value="780">1 PM</option>
+                                <option value="840">2 PM</option>
+                                <option value="900">3 PM</option>
+                                <option value="960">4 PM</option>
+                                <option value="1020">5 PM</option>
+                                <option value="1080">6 PM</option>
+                                <option value="1140">7 PM</option>
+                                <option value="1200">8 PM</option>
+                                <option value="1260">9 PM</option>
+                                <option value="1320">10 PM</option>
+                                <option value="1380">11 PM</option>
+                            </select>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="cosu-system-update-policy-window-end-time">
+                                End Time
+                                <span class="helper" title="Window end time for system update">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                            </label>
+                            <select id="cosu-system-update-policy-window-end-time"
+                                    class="form-control operationDataKeys"
+                                    data-key="cosuSystemUpdatePolicyWindowEndTime" data-default="0">
+                                <option value="1440" selected="selected">12 AM</option>
+                                <option value="60">1 AM</option>
+                                <option value="120">2 AM</option>
+                                <option value="180">3 AM</option>
+                                <option value="240">4 AM</option>
+                                <option value="300">5 AM</option>
+                                <option value="360">6 AM</option>
+                                <option value="420">7 AM</option>
+                                <option value="480">8 AM</option>
+                                <option value="540">9 AM</option>
+                                <option value="600">10 AM</option>
+                                <option value="660">11 AM</option>
+                                <option value="720">12 Noon</option>
+                                <option value="780">1 PM</option>
+                                <option value="840">2 PM</option>
+                                <option value="900">3 PM</option>
+                                <option value="960">4 PM</option>
+                                <option value="1020">5 PM</option>
+                                <option value="1080">6 PM</option>
+                                <option value="1140">7 PM</option>
+                                <option value="1200">8 PM</option>
+                                <option value="1260">9 PM</option>
+                                <option value="1320">10 PM</option>
+                                <option value="1380">11 PM</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- cosu-whitelist-applications -->
+        <div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications">
+            <div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
+                 data-operation-code="KIOSK_APPS">
+                <div id="cosu-whitelisted-applications-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Whitelist Applications (COSU)
+                        <label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch"
+                               data-toggle="collapse"
+                               data-target="#cosu-whitelisted-applications-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to set a passcode policy to an Android Device.
+                        Once this configuration profile is installed on a device, corresponding users will not be able
+                        to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="cosu-whitelisted-applications-body">
+                    <hr/>
+                    <div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden"
+                         role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="cosu-whitelisted-applications">
+                            Whitelisted Applications to enter Lock Task Mode
+                            <span class="helper" title="Configuration information specific to a given third-party VPN
+                            solution. This has to be input as key/value pairs.">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            <a href="#cosu-whitelisted-applications-grid" class="btn btn-secondary grid-input-add"
+                               data-click-event="add-form">
+                                <span class="icon fw-stack">
+                                    <i class="fw fw-add fw-stack-1x"></i>
+                                    <i class="fw fw-ring fw-stack-2x"></i>
+                                </span>
+                                Add Application
+                            </a>
+                        </label>
+                        <div id="cosu-whitelisted-applications"
+                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                             data-key="cosuWhitelistedApplications" data-column-count="2">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Application Name / Description</th>
+                                    <th>Package Name</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#cosu-whitelisted-applications-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="4">
+                                        No entries added yet.
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#cosu-whitelisted-applications-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="Application Name / Description">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                               maxlength="100" data-default=""
+                                               placeholder="[ Application Name / Description ]"/>
+                                    </td>
+                                    <td data-title="Package Name">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="packageName"
+                                               maxlength="100" data-default="" placeholder="[ Package Name ]"/>
+                                    </td>
+                                    <td>
+                                            <span class="list-group-item-actions">
+                                                <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
+                                                   data-click-event="remove-form">
+                                                    <span class="fw-stack helper" title="Remove Entry">
+                                                        <i class="fw fw-ring fw-stack-2x"></i>
+                                                        <i class="fw fw-delete fw-stack-1x"></i>
+                                                    </span>
+                                                </a>
+                                            </span>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/policy-wizard.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/policy-wizard.hbs
index 8d2cbf4d5..fbd9fb6d0 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/policy-wizard.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/policy-wizard.hbs
@@ -1,29 +1,18 @@
-<div class="container col-centered wr-content policy-profile">
-    <div class="wr-form">
-        <h1 id="policy-profile-page-wizard-title" class="page-sub-title">ADD POLICY</h1>
-        <hr>
-        <div id="policy-profile-wizard-steps" class="row wr-wizard"></div>
-        <hr>
-        <div class="row">
-            <div class="col-lg-12">
-                <h4 class="visible-xs">Step 2: Configure profile</h4>
-                <br>
-                <div id="policy-profile-main-error-msg" class="alert alert-danger hidden" role="alert">
-                    <i class="icon fw fw-error"></i><span></span>
-                </div>
-                <div class="wr-advance-operations">
-                    <div class="wr-advance-operations-init">
-                        <br>
-                            <i class="fw fw-settings fw-spin fw-2x"></i>
-                           Loading platform features . . .
-                        <br><br>
-                    </div>
-                </div>
-                <div class="wr-input-control wr-btn-grp">
-                    <a href="javascript:void(0)" class="wr-btn wizard-stepper" data-is-back-btn="true" data-current="policy-profile" data-next="policy-platform">Back</a>
-                    <a href="javascript:void(0)" class="wr-btn wizard-stepper" data-current="policy-profile" data-next="policy-criteria" data-validate="true">Continue</a>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
\ No newline at end of file
+{{!
+  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.
+}}
+{{unit "cdmf.unit.policy.create"}}
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/js/android-policy-operations.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/js/android-policy-operations.js
new file mode 100644
index 000000000..085379107
--- /dev/null
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/js/android-policy-operations.js
@@ -0,0 +1,842 @@
+/*
+ * 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.
+ */
+
+var androidOperationConstants = {
+    "PASSCODE_POLICY_OPERATION": "passcode-policy",
+    "PASSCODE_POLICY_OPERATION_CODE": "PASSCODE_POLICY",
+    "CAMERA_OPERATION": "camera",
+    "CAMERA_OPERATION_CODE": "CAMERA",
+    "ENCRYPT_STORAGE_OPERATION": "encrypt-storage",
+    "ENCRYPT_STORAGE_OPERATION_CODE": "ENCRYPT_STORAGE",
+    "WIFI_OPERATION": "wifi",
+    "WIFI_OPERATION_CODE": "WIFI",
+    "VPN_OPERATION": "vpn",
+    "VPN_OPERATION_CODE": "VPN",
+    "APPLICATION_OPERATION": "app-restriction",
+    "APPLICATION_OPERATION_CODE": "APP-RESTRICTION",
+    "KIOSK_APPS_CODE": "KIOSK_APPS",
+    "KIOSK_APPS": "cosu-whitelisted-applications"
+};
+
+/**
+ * Method to update the visibility of grouped input.
+ * @param domElement HTML grouped-input element with class name "grouped-input"
+ */
+var updateGroupedInputVisibility = function (domElement) {
+    if ($(".parent-input:first", domElement).is(":checked")) {
+        if ($(".grouped-child-input:first", domElement).hasClass("disabled")) {
+            $(".grouped-child-input:first", domElement).removeClass("disabled");
+        }
+        $(".child-input", domElement).each(function () {
+            $(this).prop('disabled', false);
+        });
+    } else {
+        if (!$(".grouped-child-input:first", domElement).hasClass("disabled")) {
+            $(".grouped-child-input:first", domElement).addClass("disabled");
+        }
+        $(".child-input", domElement).each(function () {
+            $(this).prop('disabled', true);
+        });
+    }
+};
+
+/**
+ * Checks if provided number is valid against a range.
+ *
+ * @param numberInput Number Input
+ * @param min Minimum Limit
+ * @param max Maximum Limit
+ * @returns {boolean} Returns true if input is within the specified range
+ */
+var inputIsValidAgainstRange = function (numberInput, min, max) {
+    return (numberInput == min || (numberInput > min && numberInput < max) || numberInput == max);
+};
+
+var validatePolicyProfile = function () {
+    var validationStatusArray = [];
+    var validationStatus;
+    var operation;
+
+    // starting validation process and updating validationStatus
+    if (configuredOperations.length == 0) {
+        // updating validationStatus
+        validationStatus = {
+            "error": true,
+            "mainErrorMsg": "You cannot continue. Zero configured features."
+        };
+        // updating validationStatusArray with validationStatus
+        validationStatusArray.push(validationStatus);
+    } else {
+        // validating each and every configured Operation
+        // Validating PASSCODE_POLICY
+        if ($.inArray(androidOperationConstants["PASSCODE_POLICY_OPERATION_CODE"], configuredOperations) != -1) {
+            // if PASSCODE_POLICY is configured
+            operation = androidOperationConstants["PASSCODE_POLICY_OPERATION"];
+            // initializing continueToCheckNextInputs to true
+            var continueToCheckNextInputs = true;
+
+            // validating first input: passcodePolicyMaxPasscodeAgeInDays
+            var passcodePolicyMaxPasscodeAgeInDays = $("input#passcode-policy-max-passcode-age-in-days").val();
+            if (passcodePolicyMaxPasscodeAgeInDays) {
+                if (!$.isNumeric(passcodePolicyMaxPasscodeAgeInDays)) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "Provided passcode age is not a number.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                } else if (!inputIsValidAgainstRange(passcodePolicyMaxPasscodeAgeInDays, 1, 730)) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "Provided passcode age is not with in the range of 1-to-730.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                }
+            }
+
+            // validating second and last input: passcodePolicyPasscodeHistory
+            if (continueToCheckNextInputs) {
+                var passcodePolicyPasscodeHistory = $("input#passcode-policy-passcode-history").val();
+                if (passcodePolicyPasscodeHistory) {
+                    if (!$.isNumeric(passcodePolicyPasscodeHistory)) {
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "Provided passcode history is not a number.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    } else if (!inputIsValidAgainstRange(passcodePolicyPasscodeHistory, 1, 50)) {
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "Provided passcode history is not with in the range of 1-to-50.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    }
+                }
+            }
+
+            // at-last, if the value of continueToCheckNextInputs is still true
+            // this means that no error is found
+            if (continueToCheckNextInputs) {
+                validationStatus = {
+                    "error": false,
+                    "okFeature": operation
+                };
+            }
+
+            // updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+        // Validating CAMERA
+        if ($.inArray(androidOperationConstants["CAMERA_OPERATION_CODE"], configuredOperations) != -1) {
+            // if CAMERA is configured
+            operation = androidOperationConstants["CAMERA_OPERATION"];
+            // updating validationStatus
+            validationStatus = {
+                "error": false,
+                "okFeature": operation
+            };
+            // updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+        // Validating ENCRYPT_STORAGE
+        if ($.inArray(androidOperationConstants["ENCRYPT_STORAGE_OPERATION_CODE"], configuredOperations) != -1) {
+            // if ENCRYPT_STORAGE is configured
+            operation = androidOperationConstants["ENCRYPT_STORAGE_OPERATION"];
+            // updating validationStatus
+            validationStatus = {
+                "error": false,
+                "okFeature": operation
+            };
+            // updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+        // Validating WIFI
+        if ($.inArray(androidOperationConstants["WIFI_OPERATION_CODE"], configuredOperations) != -1) {
+            // if WIFI is configured
+            operation = androidOperationConstants["WIFI_OPERATION"];
+            // initializing continueToCheckNextInputs to true
+            continueToCheckNextInputs = true;
+
+            var wifiSSID = $("input#wifi-ssid").val();
+            if (!wifiSSID) {
+                validationStatus = {
+                    "error": true,
+                    "subErrorMsg": "WIFI SSID is not given. You cannot proceed.",
+                    "erroneousFeature": operation
+                };
+                continueToCheckNextInputs = false;
+            }
+            // For the secure wifi types, it is required to have a password
+            var wifiTypeUIElement = $("#wifi-type");
+            var wifiType = wifiTypeUIElement.find("option:selected").val();
+            if (wifiTypeUIElement.is("input:checkbox")) {
+                wifiType = wifiTypeUIElement.is(":checked").toString();
+            }
+            if (wifiType != "none") {
+                if (!$("#wifi-password").val()) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "Password is required for the wifi security type " + wifiType + ". " +
+                        "Please provide a password to proceed.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                }
+            }
+            // at-last, if the value of continueToCheckNextInputs is still true
+            // this means that no error is found
+            if (continueToCheckNextInputs) {
+                validationStatus = {
+                    "error": false,
+                    "okFeature": operation
+                };
+            }
+
+            // updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+
+        if ($.inArray(androidOperationConstants["VPN_OPERATION_CODE"], configuredOperations) != -1) {
+            // if WIFI is configured
+            operation = androidOperationConstants["VPN_OPERATION"];
+            // initializing continueToCheckNextInputs to true
+            continueToCheckNextInputs = true;
+
+            var serverAddress = $("input#vpn-server-address").val();
+            if (!serverAddress) {
+                validationStatus = {
+                    "error": true,
+                    "subErrorMsg": "Server address is required. You cannot proceed.",
+                    "erroneousFeature": operation
+                };
+                continueToCheckNextInputs = false;
+            }
+
+            if (continueToCheckNextInputs) {
+                var serverPort = $("input#vpn-server-port").val();
+                if (!serverPort) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "VPN server port is required. You cannot proceed.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                } else if (!$.isNumeric(serverPort)) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "VPN server port requires a number input.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                } else if (!inputIsValidAgainstRange(serverPort, 0, 65535)) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "VPN server port is not within the range " +
+                        "of valid port numbers.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                }
+            }
+
+            // at-last, if the value of continueToCheckNextInputs is still true
+            // this means that no error is found
+            if (continueToCheckNextInputs) {
+                validationStatus = {
+                    "error": false,
+                    "okFeature": operation
+                };
+            }
+
+            // updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+        if ($.inArray(androidOperationConstants["APPLICATION_OPERATION_CODE"], configuredOperations) != -1) {
+            //If application restriction configured
+            operation = androidOperationConstants["APPLICATION_OPERATION"];
+            // Initializing continueToCheckNextInputs to true
+            continueToCheckNextInputs = true;
+
+            var appRestrictionType = $("#app-restriction-type").val();
+
+            var restrictedApplicationsGridChildInputs = "div#restricted-applications .child-input";
+
+            if (!appRestrictionType) {
+                validationStatus = {
+                    "error": true,
+                    "subErrorMsg": "Applications restriction type is not provided.",
+                    "erroneousFeature": operation
+                };
+                continueToCheckNextInputs = false;
+            }
+
+            if (continueToCheckNextInputs) {
+                if ($(restrictedApplicationsGridChildInputs).length == 0) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "Applications are not provided in application restriction list.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                }
+                else {
+                    childInputCount = 0;
+                    childInputArray = [];
+                    emptyChildInputCount = 0;
+                    duplicatesExist = false;
+                    // Looping through each child input
+                    $(restrictedApplicationsGridChildInputs).each(function () {
+                        childInputCount++;
+                        if (childInputCount % 2 == 0) {
+                            // If child input is of second column
+                            childInput = $(this).val();
+                            childInputArray.push(childInput);
+                            // Updating emptyChildInputCount
+                            if (!childInput) {
+                                // If child input field is empty
+                                emptyChildInputCount++;
+                            }
+                        }
+                    });
+                    // Checking for duplicates
+                    initialChildInputArrayLength = childInputArray.length;
+                    if (emptyChildInputCount == 0 && initialChildInputArrayLength > 1) {
+                        for (m = 0; m < (initialChildInputArrayLength - 1); m++) {
+                            poppedChildInput = childInputArray.pop();
+                            for (n = 0; n < childInputArray.length; n++) {
+                                if (poppedChildInput == childInputArray[n]) {
+                                    duplicatesExist = true;
+                                    break;
+                                }
+                            }
+                            if (duplicatesExist) {
+                                break;
+                            }
+                        }
+                    }
+                    // Updating validationStatus
+                    if (emptyChildInputCount > 0) {
+                        // If empty child inputs are present
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "One or more package names of " +
+                            "applications are empty.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    } else if (duplicatesExist) {
+                        // If duplicate input is present
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "Duplicate values exist with " +
+                            "for package names.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    }
+
+                }
+            }
+
+            if (continueToCheckNextInputs) {
+                validationStatus = {
+                    "error": false,
+                    "okFeature": operation
+                };
+            }
+
+            // Updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+        if ($.inArray(androidOperationConstants["KIOSK_APPS_CODE"], configuredOperations) != -1) {
+            //If COSU whitelisting applications configured
+            operation = androidOperationConstants["KIOSK_APPS"];
+            // Initializing continueToCheckNextInputs to true
+            continueToCheckNextInputs = true;
+            var whitelistedApplicationsGridChildInputs = "div#cosu-whitelisted-applications .child-input";
+            if (continueToCheckNextInputs) {
+                if ($(whitelistedApplicationsGridChildInputs).length == 0) {
+                    validationStatus = {
+                        "error": true,
+                        "subErrorMsg": "Applications are not provided in application whitelist list.",
+                        "erroneousFeature": operation
+                    };
+                    continueToCheckNextInputs = false;
+                }
+                else {
+                    childInputCount = 0;
+                    childInputArray = [];
+                    emptyChildInputCount = 0;
+                    duplicatesExist = false;
+                    // Looping through each child input
+                    $(whitelistedApplicationsGridChildInputs).each(function () {
+                        childInputCount++;
+                        if (childInputCount % 2 == 0) {
+                            // If child input is of second column
+                            childInput = $(this).val();
+                            childInputArray.push(childInput);
+                            // Updating emptyChildInputCount
+                            if (!childInput) {
+                                // If child input field is empty
+                                emptyChildInputCount++;
+                            }
+                        }
+                    });
+                    // Checking for duplicates
+                    initialChildInputArrayLength = childInputArray.length;
+                    if (emptyChildInputCount == 0 && initialChildInputArrayLength > 1) {
+                        for (m = 0; m < (initialChildInputArrayLength - 1); m++) {
+                            poppedChildInput = childInputArray.pop();
+                            for (n = 0; n < childInputArray.length; n++) {
+                                if (poppedChildInput == childInputArray[n]) {
+                                    duplicatesExist = true;
+                                    break;
+                                }
+                            }
+                            if (duplicatesExist) {
+                                break;
+                            }
+                        }
+                    }
+                    // Updating validationStatus
+                    if (emptyChildInputCount > 0) {
+                        // If empty child inputs are present
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "One or more package names of " +
+                            "applications are empty.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    } else if (duplicatesExist) {
+                        // If duplicate input is present
+                        validationStatus = {
+                            "error": true,
+                            "subErrorMsg": "Duplicate values exist with " +
+                            "for package names.",
+                            "erroneousFeature": operation
+                        };
+                        continueToCheckNextInputs = false;
+                    }
+                }
+            }
+            if (continueToCheckNextInputs) {
+                validationStatus = {
+                    "error": false,
+                    "okFeature": operation
+                };
+            }
+            // Updating validationStatusArray with validationStatus
+            validationStatusArray.push(validationStatus);
+        }
+    }
+    // ending validation process
+
+    // start taking specific notifying actions upon validation
+    var wizardIsToBeContinued;
+    var errorCount = 0;
+    var mainErrorMsgWrapper, mainErrorMsg,
+        subErrorMsgWrapper, subErrorMsg, subErrorIcon, subOkIcon, featureConfiguredIcon;
+    var i;
+    for (i = 0; i < validationStatusArray.length; i++) {
+        validationStatus = validationStatusArray[i];
+        if (validationStatus["error"]) {
+            errorCount++;
+            if (validationStatus["mainErrorMsg"]) {
+                mainErrorMsgWrapper = "#policy-profile-main-error-msg";
+                mainErrorMsg = mainErrorMsgWrapper + " span";
+                $(mainErrorMsg).text(validationStatus["mainErrorMsg"]);
+                $(mainErrorMsgWrapper).removeClass("hidden");
+            } else if (validationStatus["subErrorMsg"]) {
+                subErrorMsgWrapper = "#" + validationStatus["erroneousFeature"] + "-feature-error-msg";
+                subErrorMsg = subErrorMsgWrapper + " span";
+                subErrorIcon = "#" + validationStatus["erroneousFeature"] + "-error";
+                subOkIcon = "#" + validationStatus["erroneousFeature"] + "-ok";
+                featureConfiguredIcon = "#" + validationStatus["erroneousFeature"] + "-configured";
+                // hiding featureConfiguredState as the first step
+                if (!$(featureConfiguredIcon).hasClass("hidden")) {
+                    $(featureConfiguredIcon).addClass("hidden");
+                }
+                // updating error state and corresponding messages
+                $(subErrorMsg).text(validationStatus["subErrorMsg"]);
+                if ($(subErrorMsgWrapper).hasClass("hidden")) {
+                    $(subErrorMsgWrapper).removeClass("hidden");
+                }
+                if (!$(subOkIcon).hasClass("hidden")) {
+                    $(subOkIcon).addClass("hidden");
+                }
+                if ($(subErrorIcon).hasClass("hidden")) {
+                    $(subErrorIcon).removeClass("hidden");
+                }
+            }
+        } else {
+            if (validationStatus["okFeature"]) {
+                subErrorMsgWrapper = "#" + validationStatus["okFeature"] + "-feature-error-msg";
+                subErrorIcon = "#" + validationStatus["okFeature"] + "-error";
+                subOkIcon = "#" + validationStatus["okFeature"] + "-ok";
+                featureConfiguredIcon = "#" + validationStatus["okFeature"] + "-configured";
+                // hiding featureConfiguredState as the first step
+                if (!$(featureConfiguredIcon).hasClass("hidden")) {
+                    $(featureConfiguredIcon).addClass("hidden");
+                }
+                // updating success state and corresponding messages
+                if (!$(subErrorMsgWrapper).hasClass("hidden")) {
+                    $(subErrorMsgWrapper).addClass("hidden");
+                }
+                if (!$(subErrorIcon).hasClass("hidden")) {
+                    $(subErrorIcon).addClass("hidden");
+                }
+                if ($(subOkIcon).hasClass("hidden")) {
+                    $(subOkIcon).removeClass("hidden");
+                }
+            }
+        }
+    }
+
+    wizardIsToBeContinued = (errorCount == 0);
+    return wizardIsToBeContinued;
+};
+
+// Start of HTML embedded invoke methods
+var showAdvanceOperation = function (operation, button) {
+    $(button).addClass('selected');
+    $(button).siblings().removeClass('selected');
+    var hiddenOperation = ".wr-hidden-operations-content > div";
+    $(hiddenOperation + '[data-operation="' + operation + '"]').show();
+    $(hiddenOperation + '[data-operation="' + operation + '"]').siblings().hide();
+};
+
+
+/**
+ * This method will display appropriate fields based on wifi type
+ * @param select
+ */
+var changeAndroidWifiPolicy = function (select) {
+    slideDownPaneAgainstValueSet(select, 'control-wifi-password', ['wep', 'wpa', '802eap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-eap', ['802eap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-phase2', ['802eap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-identity', ['802eap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-anoidentity', ['802eap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-cacert', ['802eap']);
+};
+
+/**
+ * This method will display appropriate fields based on wifi EAP type
+ * @param select
+ * @param superSelect
+ */
+var changeAndroidWifiPolicyEAP = function (select, superSelect) {
+    slideDownPaneAgainstValueSet(select, 'control-wifi-password', ['peap', 'ttls', 'pwd', 'fast', 'leap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-phase2', ['peap', 'ttls', 'fast']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-provisioning', ['fast']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-identity', ['peap', 'tls', 'ttls', 'pwd', 'fast', 'leap']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-anoidentity', ['peap', 'ttls']);
+    slideDownPaneAgainstValueSet(select, 'control-wifi-cacert', ['peap', 'tls', 'ttls']);
+    if (superSelect.value != '802eap') {
+        changeAndroidWifiPolicy(superSelect);
+    }
+};
+
+/**
+ * Method to slide down a provided pane upon provided value set.
+ *
+ * @param selectElement Select HTML Element to consider
+ * @param paneID HTML ID of div element to slide down
+ * @param valueSet Applicable Value Set
+ */
+var slideDownPaneAgainstValueSet = function (selectElement, paneID, valueSet) {
+    var selectedValueOnChange = $(selectElement).find("option:selected").val();
+    if ($(selectElement).is("input:checkbox")) {
+        selectedValueOnChange = $(selectElement).is(":checked").toString();
+    }
+
+    var i, slideDownVotes = 0;
+    for (i = 0; i < valueSet.length; i++) {
+        if (selectedValueOnChange == valueSet[i]) {
+            slideDownVotes++;
+        }
+    }
+    var paneSelector = "#" + paneID;
+    if (slideDownVotes > 0) {
+        if (!$(paneSelector).hasClass("expanded")) {
+            $(paneSelector).addClass("expanded");
+        }
+        $(paneSelector).slideDown();
+    } else {
+        if ($(paneSelector).hasClass("expanded")) {
+            $(paneSelector).removeClass("expanded");
+        }
+        $(paneSelector).slideUp();
+        /** now follows the code to reinitialize all inputs of the slidable pane */
+        // reinitializing input fields into the defaults
+        $(paneSelector + " input").each(
+            function () {
+                if ($(this).is("input:text")) {
+                    $(this).val($(this).data("default"));
+                } else if ($(this).is("input:password")) {
+                    $(this).val("");
+                } else if ($(this).is("input:checkbox")) {
+                    $(this).prop("checked", $(this).data("default"));
+                    // if this checkbox is the parent input of a grouped-input
+                    if ($(this).hasClass("parent-input")) {
+                        var groupedInput = $(this).parent().parent().parent();
+                        updateGroupedInputVisibility(groupedInput);
+                    }
+                }
+            }
+        );
+        // reinitializing select fields into the defaults
+        $(paneSelector + " select").each(
+            function () {
+                var defaultOption = $(this).data("default");
+                $("option:eq(" + defaultOption + ")", this).prop("selected", "selected");
+            }
+        );
+        // collapsing expanded-panes (upon the selection of html-select-options) if any
+        $(paneSelector + " .expanded").each(
+            function () {
+                if ($(this).hasClass("expanded")) {
+                    $(this).removeClass("expanded");
+                }
+                $(this).slideUp();
+            }
+        );
+        // removing all entries of grid-input elements if exist
+        $(paneSelector + " .grouped-array-input").each(
+            function () {
+                var gridInputs = $(this).find("[data-add-form-clone]");
+                if (gridInputs.length > 0) {
+                    gridInputs.remove();
+                }
+                var helpTexts = $(this).find("[data-help-text=add-form]");
+                if (helpTexts.length > 0) {
+                    helpTexts.show();
+                }
+            }
+        );
+    }
+};
+// End of HTML embedded invoke methods
+
+
+// Start of functions related to grid-input-view
+
+/**
+ * Method to set count id to cloned elements.
+ * @param {object} addFormContainer
+ */
+var setId = function (addFormContainer) {
+    $(addFormContainer).find("[data-add-form-clone]").each(function (i) {
+        $(this).attr("id", $(this).attr("data-add-form-clone").slice(1) + "-" + (i + 1));
+        if ($(this).find(".index").length > 0) {
+            $(this).find(".index").html(i + 1);
+        }
+    });
+};
+
+/**
+ * Method to set count id to cloned elements.
+ * @param {object} addFormContainer
+ */
+var showHideHelpText = function (addFormContainer) {
+    var helpText = "[data-help-text=add-form]";
+    if ($(addFormContainer).find("[data-add-form-clone]").length > 0) {
+        $(addFormContainer).find(helpText).hide();
+    } else {
+        $(addFormContainer).find(helpText).show();
+    }
+};
+
+$(document).ready(function () {
+    // Maintains an array of configured features of the profile
+    var advanceOperations = ".wr-advance-operations";
+    $(advanceOperations).on("click", ".wr-input-control.switch", function (event) {
+        var operationCode = $(this).parents(".operation-data").data("operation-code");
+        var operation = $(this).parents(".operation-data").data("operation");
+        var operationDataWrapper = $(this).data("target");
+        // prevents event bubbling by figuring out what element it's being called from.
+        if (event.target.tagName == "INPUT") {
+            var featureConfiguredIcon;
+            if ($("input[type='checkbox']", this).is(":checked")) {
+                configuredOperations.push(operationCode);
+                // when a feature is enabled, if "zero-configured-features" msg is available, hide that.
+                var zeroConfiguredOperationsErrorMsg = "#policy-profile-main-error-msg";
+                if (!$(zeroConfiguredOperationsErrorMsg).hasClass("hidden")) {
+                    $(zeroConfiguredOperationsErrorMsg).addClass("hidden");
+                }
+                // add configured-state-icon to the feature
+                featureConfiguredIcon = "#" + operation + "-configured";
+                if ($(featureConfiguredIcon).hasClass("hidden")) {
+                    $(featureConfiguredIcon).removeClass("hidden");
+                }
+            } else {
+                //splicing the array if operation is present.
+                var index = $.inArray(operationCode, configuredOperations);
+                if (index != -1) {
+                    configuredOperations.splice(index, 1);
+                }
+                // when a feature is disabled, clearing all its current configured, error or success states
+                var subErrorMsgWrapper = "#" + operation + "-feature-error-msg";
+                var subErrorIcon = "#" + operation + "-error";
+                var subOkIcon = "#" + operation + "-ok";
+                featureConfiguredIcon = "#" + operation + "-configured";
+
+                if (!$(subErrorMsgWrapper).hasClass("hidden")) {
+                    $(subErrorMsgWrapper).addClass("hidden");
+                }
+                if (!$(subErrorIcon).hasClass("hidden")) {
+                    $(subErrorIcon).addClass("hidden");
+                }
+                if (!$(subOkIcon).hasClass("hidden")) {
+                    $(subOkIcon).addClass("hidden");
+                }
+                if (!$(featureConfiguredIcon).hasClass("hidden")) {
+                    $(featureConfiguredIcon).addClass("hidden");
+                }
+                // reinitializing input fields into the defaults
+                $(operationDataWrapper + " input").each(
+                    function () {
+                        if ($(this).is("input:text")) {
+                            $(this).val($(this).data("default"));
+                        } else if ($(this).is("input:password")) {
+                            $(this).val("");
+                        } else if ($(this).is("input:checkbox")) {
+                            $(this).prop("checked", $(this).data("default"));
+                            // if this checkbox is the parent input of a grouped-input
+                            if ($(this).hasClass("parent-input")) {
+                                var groupedInput = $(this).parent().parent().parent();
+                                updateGroupedInputVisibility(groupedInput);
+                            }
+                        }
+                    }
+                );
+                // reinitializing select fields into the defaults
+                $(operationDataWrapper + " select").each(
+                    function () {
+                        var defaultOption = $(this).data("default");
+                        $("option:eq(" + defaultOption + ")", this).prop("selected", "selected");
+                    }
+                );
+                // collapsing expanded-panes (upon the selection of html-select-options) if any
+                $(operationDataWrapper + " .expanded").each(
+                    function () {
+                        if ($(this).hasClass("expanded")) {
+                            $(this).removeClass("expanded");
+                        }
+                        $(this).slideUp();
+                    }
+                );
+                // removing all entries of grid-input elements if exist
+                $(operationDataWrapper + " .grouped-array-input").each(
+                    function () {
+                        var gridInputs = $(this).find("[data-add-form-clone]");
+                        if (gridInputs.length > 0) {
+                            gridInputs.remove();
+                        }
+                        var helpTexts = $(this).find("[data-help-text=add-form]");
+                        if (helpTexts.length > 0) {
+                            helpTexts.show();
+                        }
+                    }
+                );
+            }
+        }
+    });
+
+    // <start - fixing feature-configuring switch double-click issue>
+    $(advanceOperations).on('hidden.bs.collapse', function (event) {
+        var collapsedFeatureBody = event.target.id;
+        var operation = collapsedFeatureBody.substr(0, collapsedFeatureBody.lastIndexOf("-"));
+        var featureConfiguringSwitch = "#" + operation + "-heading input[type=checkbox]";
+        var featureConfiguredIcon = "#" + operation + "-configured";
+        if ($(featureConfiguringSwitch).prop("checked") == true) {
+            $(featureConfiguringSwitch).prop("checked", false);
+        }
+        if (!$(featureConfiguredIcon).hasClass("hidden")) {
+            $(featureConfiguredIcon).addClass("hidden");
+        }
+    });
+
+    $(advanceOperations).on('shown.bs.collapse', function (event) {
+        var expandedFeatureBody = event.target.id;
+        var operation = expandedFeatureBody.substr(0, expandedFeatureBody.lastIndexOf("-"));
+        var featureConfiguringSwitch = "#" + operation + "-heading input[type=checkbox]";
+        var featureConfiguredIcon = "#" + operation + "-configured";
+        if ($(featureConfiguringSwitch).prop("checked") == false) {
+            $(featureConfiguringSwitch).prop("checked", true);
+        }
+        if ($(featureConfiguredIcon).hasClass("hidden")) {
+            $(featureConfiguredIcon).removeClass("hidden");
+        }
+    });
+    // <end - fixing feature-configuring switch double-click issue>
+
+    // adding support for cloning multiple profiles per feature with cloneable class definitions
+    $(advanceOperations).on("click", ".multi-view.add.enabled", function () {
+        // get a copy of .cloneable and create new .cloned div element
+        var cloned = "<div class='cloned'><hr>" + $(".cloneable", $(this).parent().parent()).html() + "</div>";
+        // append newly created .cloned div element to panel-body
+        $(this).parent().parent().append(cloned);
+        // enable remove action of newly cloned div element
+        $(".cloned", $(this).parent().parent()).each(
+            function () {
+                if ($(".multi-view.remove", this).hasClass("disabled")) {
+                    $(".multi-view.remove", this).removeClass("disabled");
+                }
+                if (!$(".multi-view.remove", this).hasClass("enabled")) {
+                    $(".multi-view.remove", this).addClass("enabled");
+                }
+            }
+        );
+    });
+
+    $(advanceOperations).on("click", ".multi-view.remove.enabled", function () {
+        $(this).parent().remove();
+    });
+
+    // enabling or disabling grouped-input based on the status of a parent check-box
+    $(advanceOperations).on("click", ".grouped-input", function () {
+        updateGroupedInputVisibility(this);
+    });
+
+    // add form entry click function for grid inputs
+    $(advanceOperations).on("click", "[data-click-event=add-form]", function () {
+        var addFormContainer = $("[data-add-form-container=" + $(this).attr("href") + "]");
+        var clonedForm = $("[data-add-form=" + $(this).attr("href") + "]").clone().find("[data-add-form-element=clone]")
+            .attr("data-add-form-clone", $(this).attr("href"));
+
+        // adding class .child-input to capture text-input-array-values
+        $("input, select", clonedForm).addClass("child-input");
+
+        $(addFormContainer).append(clonedForm);
+        setId(addFormContainer);
+        showHideHelpText(addFormContainer);
+    });
+
+    // remove form entry click function for grid inputs
+    $(advanceOperations).on("click", "[data-click-event=remove-form]", function () {
+        var addFormContainer = $("[data-add-form-container=" + $(this).attr("href") + "]");
+
+        $(this).closest("[data-add-form-element=clone]").remove();
+        setId(addFormContainer);
+        showHideHelpText(addFormContainer);
+    });
+});
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
new file mode 100644
index 000000000..61c351954
--- /dev/null
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
@@ -0,0 +1,1464 @@
+{{!
+  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.
+}}
+<div class="row no-gutter">
+    <div class="wr-hidden-operations-nav col-lg-4">
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('passcode-policy', this)" class="selected">
+                <span class="wr-hidden-operations-icon fw-stack">
+                    <i class="fw fw-key fw-stack-2x"></i>
+                </span>
+            Passcode Policy
+            <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
+                <span class="wr-hidden-operations-icon fw-stack">
+                    <i class="fw fw-block fw-stack-2x"></i>
+                </span>
+            Restrictions
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
+                <span class="wr-hidden-operations-icon fw-stack">
+                    <i class="fw fw-security fw-stack-2x"></i>
+                </span>
+            Encryption Settings
+            <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
+                    class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('wifi', this)">
+                <span class="wr-hidden-operations-icon fw-stack">
+                    <i class="fw fw-wifi fw-stack-2x"></i>
+                </span>
+            Wi-Fi Settings
+            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('vpn', this)">
+                <span class="wr-hidden-operations-icon fw-stack">
+                    <i class="fw fw-vpn fw-stack-2x"></i>
+                </span>
+            Virtual Private Network
+            <span id="vpn-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="vpn-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)">
+             <span class="wr-hidden-operations-icon fw-stack">
+                 <i class="fw fw-service fw-stack-2x"></i>
+             </span>
+            Work-Profile Configurations
+            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
+            <span class="fw-stack fw-lg">
+                <i class="fw fw-application fw-stack-1x"></i>
+                <i class="fw fw-block fw-stack-2x"></i>
+            </span>
+            Application Restrictions
+            <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
+            <span class="wr-hidden-operation-icon fw-stack">
+                <i class="fw fw-import fw-stack-2x"></i>
+            </span>
+            System Update Policy (COSU)
+            <span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
+        </a>
+        <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)">
+            <span class="wr-hidden-operations-icon fw-stack">
+                <i class="fw fw-register fw-stack-2x"></i>
+            </span>
+            Whitelist Apps (COSU)
+            <span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i
+                    class="fw fw-ok"></i></span>
+            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i
+                    class="fw fw-error"></i></span>
+        </a>
+    </div>
+
+    <div class="wr-hidden-operations-content col-lg-8">
+        <!-- passcode-policy -->
+        <div class="wr-hidden-operation" data-operation="passcode-policy" style="display: block">
+            <div class="panel panel-default operation-data" data-operation="passcode-policy"
+                 data-operation-code="PASSCODE_POLICY">
+                <div id="passcode-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Passcode Policy
+                        <label id="passcode-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#passcode-policy-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to set a passcode policy to an Android Device.
+                        Once this configuration profile is installed on a device, corresponding users will not be able
+                        to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="passcode-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="passcode-policy-body">
+                    <hr/>
+                    <div id="passcode-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="passcode-policy-allow-simple" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyAllowSimple"
+                                   checked="checked"/>
+                            <span class="helper"
+                                  title="Permit the use of repeating, ascending and descending character sequences">
+                                Allow simple value
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="passcode-policy-require-alphanumeric" type="checkbox"
+                                   class="form-control operationDataKeys" data-key="passcodePolicyRequireAlphanumeric"
+                                   checked="checked"/>
+                            <span class="helper" title="Require passcode to contain both letters and numbers">
+                                Require alphanumeric value
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-min-length">
+                            Minimum passcode length
+                            <span class="helper" title="Minimum number of characters allowed in a passcode">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                        <select id="passcode-policy-min-length" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinLength" data-default="0">
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="4">04</option>
+                            <option value="5">05</option>
+                            <option value="6">06</option>
+                            <option value="7">07</option>
+                            <option value="8">08</option>
+                            <option value="9">09</option>
+                            <option value="10">10</option>
+                            <option value="11">11</option>
+                            <option value="12">12</option>
+                            <option value="13">13</option>
+                            <option value="14">14</option>
+                            <option value="15">15</option>
+                        </select>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-min-complex-chars">
+                            Minimum number of complex characters
+                            <span class="helper"
+                                  title="Minimum number of complex or non-alphanumeric characters allowed in a passcode">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                        <select id="passcode-policy-min-complex-chars" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMinComplexChars" data-default="0">
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="1">01</option>
+                            <option value="2">02</option>
+                            <option value="3">03</option>
+                            <option value="4">04</option>
+                            <option value="5">05</option>
+                        </select>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-max-passcode-age-in-days">
+                            Maximum passcode age in days*
+                            <span class="helper" title="Number of days after which a passcode must be changed">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            ( Should be in between 1-to-730 days or none )
+                        </label>
+                        <input id="passcode-policy-max-passcode-age-in-days" type="text"
+                               class="form-control operationDataKeys" data-key="passcodePolicyMaxPasscodeAgeInDays"
+                               maxlength="3">
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcode-policy-passcode-history">
+                            Passcode history*
+                            <span class="helper" title="Number of consequent unique passcodes to be used before reuse">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            ( Should be in between 1-to-50 passcodes or none )
+                        </label>
+                        <input id="passcode-policy-passcode-history" type="text" class="form-control operationDataKeys"
+                               data-key="passcodePolicyPasscodeHistory" maxlength="2">
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="passcodePolicyMaxFailedAttempts">
+                            Maximum number of failed attempts
+                            <span class="helper"
+                                  title="The maximum number of failed password entry attempts. If the correct password is not entered within the defined number of attempts, the data on the device will be erased">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                        <select id="passcode-policy-max-failed-attempts" class="form-control operationDataKeys"
+                                data-key="passcodePolicyMaxFailedAttempts" data-default="0">
+                            <option value="" selected="selected">
+                                None
+                            </option>
+                            <option value="3">03</option>
+                            <option value="4">04</option>
+                            <option value="5">05</option>
+                            <option value="6">06</option>
+                            <option value="7">07</option>
+                            <option value="8">08</option>
+                            <option value="9">09</option>
+                            <option value="10">10</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- /passcode-policy -->
+
+        <!-- camera -->
+        <div class="wr-hidden-operation" data-operation="camera">
+            <div class="panel panel-default operation-data" data-operation="camera" data-operation-code="CAMERA">
+                <div id="camera-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Restrictions
+                        <label class="wr-input-control switch" data-toggle="collapse" data-target="#camera-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configurations can be used to restrict certain settings on an Android device.
+                        Once this configuration profile is installed on a device, corresponding users will not be able
+                        to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="camera-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="camera-body">
+                    <hr/>
+                    <div id="camera-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    <br>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="camera-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="cameraEnabled" checked="checked"/>
+                            <span class="helper"
+                                  title="Having this checked would enable Usage of phone camera in the device.">
+                                Allow use of camera
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <div>
+                        <ul class="message message-info">
+                            <i class="icon fw fw-info"></i>
+                            <a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is
+                                <b>work-profile owner</b> or <b>device owner</b>.</a>
+                        </ul>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-credentials-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowConfigCredentials"/>
+                            <span class="helper" title="Having this checked would disallow configuring credentials.">
+                                Disallow configuring credentials
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-VPN-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowConfigVpn"/>
+                            <span class="helper" title="Having this checked would disallow configuring VPN.">
+                                Disallow configuring VPN
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-app-control-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowAppControl"/>
+                            <span class="helper" title="Having this checked would disallow configuring app control.">
+                                Disallow configuring app control
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-cross-profile-copy-paste-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowCrossProfileCopyPaste"/>
+                            <span class="helper" title="Having this checked would disallow cross profile copy paste.">
+                                Disallow cross profile copy paste
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-debugging-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowDebugging"/>
+                            <span class="helper" title="Having this checked would disallow debugging.">
+                                Disallow debuging
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-install-apps-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowInstallApps"/>
+                            <span class="helper" title="Having this checked would disallow install apps.">
+                                Disallow install apps
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-installing-from-unknown-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowInstallUnknownSources"/>
+                            <span class="helper" title="Having this checked would disallow installing from unknown
+                            sources.">
+                                Disallow install from unknown sources
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-modify-accounts-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowModifyAccounts"/>
+                            <span class="helper" title="Having this checked would disallow modify accounts.">
+                                Disallow modify accounts
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-outgoing-beam-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowOutgoingBeam"/>
+                            <span class="helper" title="Having this checked would disallow outgoing beam.">
+                                Disallow outgoing beam
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-location-sharing-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowLocationSharing"/>
+                            <span class="helper" title="Having this checked would disallow location sharing.">
+                                Disallow location sharing
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-uninstall-apps-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowUninstallApps"/>
+                            <span class="helper" title="Having this checked would disallow uninstall apps.">
+                                Disallow uninstall apps
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-parent-profile-app-linking-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowParentProfileAppLinking"/>
+                            <span class="helper" title="Having this checked would disallow parent profile app linking.">
+                                Disallow parent profile app linking
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="ensure-verifying-apps-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="ensureVerifyApps"/>
+                            <span class="helper" title="Having this checked would ensure verifying apps .">
+                                Ensure verifying apps
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="enable-auto-timing-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="enableAutoTime"/>
+                            <span class="helper" title="Having this checked would enable auto timing .">
+                                Enable auto timing
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disable-screen-capture-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disableScreenCapture"/>
+                            <span class="helper" title="Having this checked would disable screen capture .">
+                                Disable screen capture
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <div>
+                        <ul class="message message-info">
+                            <i class="icon fw fw-info"></i>
+                            <a id="policy-listing-status-msg"> Below Restrictions are valid only when the Agent is the
+                                <b>device owner</b>.</a>
+                        </ul>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-SMS-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowSMS"/>
+                            <span class="helper" title="Having this checked would disallow SMS.">
+                                Disallow SMS
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="volume-adjust-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowAdjustVolumeEnabled"/>
+                            <span class="helper" title="Having this checked would disallow volume adjust.">
+                                Disallow volume adjust
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-cell-broadcast-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowConfigCellBroadcasts"/>
+                            <span class="helper" title="Having this checked would disallow configuring cell broadcast.">
+                                Disallow cell broadcast
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-bluetooth-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowConfigBluetooth"/>
+                            <span class="helper" title="Having this checked would disallow configuring bluetooth.">
+                                Disallow configuring bluetooth.
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-mobile-networkst-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowConfigMobileNetworks"/>
+                            <span class="helper"
+                                  title="Having this checked would disallow configuring mobile networks.">
+                                Disallow configuring mobile networks
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-tethering-enabled" type="checkbox"
+                                   class="operationDataKeys"
+                                   data-key="disallowConfigTethering"/>
+                            <span class="helper" title="Having this checked would disallow configuring tethering.">
+                                Disallow configuring tethering
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-configuring-Wifi-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowConfigWifi"/>
+                            <span class="helper" title="Having this checked would disallow configuring Wifi.">
+                                Disallow configuring Wifi
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-safe-boot-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowSafeBoot"/>
+                            <span class="helper" title="Having this checked would disallow safe boot.">
+                                Disallow safe boot
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-outgoing-calls-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowOutgoingCalls"/>
+                            <span class="helper" title="Having this checked would disallow outgoing calls.">
+                                Disallow outgoing calls
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-mount-physical-media-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowMountPhysicalMedia"/>
+                            <span class="helper" title="Having this checked would disallow mount physical media.">
+                                Disallow mount physical media
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-create-window-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowCreateWindows"/>
+                            <span class="helper" title="Having this checked would disallow create window.">
+                                Disallow create window
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-factory-reset-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowFactoryReset"/>
+                            <span class="helper" title="Having this checked would disallow factory reset.">
+                                Disallow factory reset
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-remove-user-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowRemoveUser"/>
+                            <span class="helper" title="Having this checked would disallow remove user.">
+                                Disallow remove user
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-add-user-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowAddUser"/>
+                            <span class="helper" title="Having this checked would disallow add user.">
+                                Disallow add user
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-network-reset-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowNetworkReset"/>
+                            <span class="helper" title="Having this checked would disallow network reset.">
+                                Disallow network reset
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-USB-transfer-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowUSBFileTransfer"/>
+                            <span class="helper" title="Having this checked would disallow USB file transfer.">
+                                Disallow USB file transfer
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disallow-unmute-microphone-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disallowUnmuteMicrophone"/>
+                            <span class="helper" title="Having this checked would disallow unmute microphone.">
+                                Disallow unmute microphone
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                    <div>
+                        <ul class="message message-info">
+                            <i class="icon fw fw-info"></i>
+                            <a id="policy-listing-status-msg">Below restrictions will be applied on devices with Android
+                                version 6.0 Marshmallow onwards only.</a>
+                        </ul>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="disable-status-bar-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="disableStatusBar"/>
+                            <span class="helper" title="Having this checked would disable status bar .">
+                                Disable status bar
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                </div>
+            </div>
+        </div>
+        <!-- /camera -->
+
+        <!-- encrypt-storage -->
+        <div class="wr-hidden-operation" data-operation="encrypt-storage">
+            <div class="panel panel-default operation-data" data-operation="encrypt-storage"
+                 data-operation-code="ENCRYPT_STORAGE">
+                <div id="encrypt-storage-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Encryption Settings
+                        <label class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#encrypt-storage-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to encrypt data on an Android device, when the device is locked
+                        and make it readable when the passcode is entered. Once this configuration profile is installed
+                        on a device, corresponding users will not be able to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="encrypt-storage-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="encrypt-storage-body">
+                    </hr>
+                    <div id="encrypt-storage-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    Un-check following checkbox in case you do not need the device to be encrypted.
+                    <br>
+                    <br>
+                    <div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="encrypt-storage-enabled" type="checkbox" class="operationDataKeys"
+                                   data-key="encryptStorageEnabled" checked="checked"/>
+                            <span class="helper"
+                                  title="Having this checked would enable Storage-encryption in the device">
+                                Enable storage-encryption
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                    </div>
+                    <br>
+                </div>
+            </div>
+        </div>
+        <!-- /encrypt-storage -->
+
+        <!-- wi-fi -->
+        <div class="wr-hidden-operation" data-operation="wifi">
+            <div class="panel panel-default operation-data" data-operation="wifi" data-operation-code="WIFI">
+                <div id="wifi-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Wi-Fi Settings
+                        <label class="wr-input-control switch" data-toggle="collapse" data-target="#wifi-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configurations can be used to configure Wi-Fi access on an Android device.
+                        Once this configuration profile is installed on a device, corresponding users will not be able
+                        to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="wifi-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="wifi-body">
+                    <hr/>
+                    Please note that * sign represents required fields of data.
+                    <br>
+                    <br>
+                    <div id="wifi-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="wifi-ssid">
+                            Service Set Identifier (SSID)*
+                            <span class="helper" title="Identification of the wireless network to be configured.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <label id="wifiSsidValidationText" class="wr-input-label hidden">
+                            Service Set Identifier should be 1-to-30 characters long
+                        </label>
+                        <input id="wifi-ssid" type="text" class="form-control operationDataKeys" data-key="wifiSSID"
+                               maxlength="100" placeholder="[ Should be 1-to-30 characters long ]"/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="wifi-type">
+                            Security*
+                            <span class="helper"
+                                  title="Security type of the wireless network to be configured. 802.1x EAP works with
+                                  Android 4.3 and above devices only.">
+                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                    </span>
+                        </label>
+                        <select class="form-control operationDataKeys" id="wifi-type"
+                                onchange="changeAndroidWifiPolicy(this)" data-key="wifiType">
+                            <option value="none" selected>None</option>
+                            <option value="wep">WEP</option>
+                            <option value="wpa">WPA/WPA 2 PSK</option>
+                            <option value="802eap">802.1x EAP</option>
+                        </select>
+                    </div>
+
+                    <div class="wr-input-control" id="control-wifi-eap" style="display:none;">
+                        <label class="wr-input-label" for="wifi-eap">
+                            EAP Method
+                            <span class="helper" title="EAP Method of the wireless network to be configured.">
+                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                    </span>
+                        </label>
+                        <select class="form-control operationDataKeys" id="wifi-eap"
+                                onchange="changeAndroidWifiPolicyEAP(this, document.getElementById('wifi-type'))"
+                                data-key="wifiEAP">
+                            <option value="peap">PEAP</option>
+                            <option value="tls">TLS</option>
+                            <option value="ttls">TTLS</option>
+                            <option value="pwd">PWD</option>
+                            <option value="sim">SIM</option>
+                            <option value="aka">AKA</option>
+                        </select>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-phase2" style="display:none;">
+                        <label class="wr-input-label" for="wifi-phase2">
+                            Phase 2 Authentication
+                            <span class="helper"
+                                  title="Phase 2 authentication of the wireless network to be configured.">
+                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                    </span>
+                        </label>
+                        <select class="form-control operationDataKeys" id="wifi-phase2" data-key="wifiPhase2">
+                            <option value="none">None</option>
+                            <option value="pap">PAP</option>
+                            <option value="mchap">MCHAP</option>
+                            <option value="mchapv2">MCHAPV2</option>
+                            <option value="gtc">GTC</option>
+                        </select>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-provisioning" style="display:none;">
+                        <label class="wr-input-label" for="wifi-provisioning">
+                            Provisioning
+                            <span class="helper" title="Provisioning of the wireless network to be configured.">
+                                        <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                    </span>
+                        </label>
+                        <select class="form-control operationDataKeys" id="wifi-provisioning"
+                                data-key="wifiProvisioning">
+                            <option value="0">0</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                        </select>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-identity" style="display:none;">
+                        <label class="wr-input-label" for="wifi-identity">
+                            Identity
+                            <span class="helper" title="Identity of the wireless network to be configured.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <label id="wifiIdentityValidationText" class="wr-input-label hidden">
+                            Identity should be 1-to-30 characters long
+                        </label>
+                        <input id="wifi-identity" type="text" class="form-control operationDataKeys"
+                               data-key="wifiIdentity"
+                               maxlength="100" placeholder="[ Should be 1-to-30 characters long ]"/>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-anoidentity" style="display:none;">
+                        <label class="wr-input-label" for="wifi-anoidentity">
+                            Anonymous Identity
+                            <span class="helper" title="Identity of the wireless network to be configured.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <label id="wifiIdentityValidationText" class="wr-input-label hidden">
+                            Anonymous Identity should be 1-to-30 characters long
+                        </label>
+                        <input id="wifi-anoidentity" type="text" class="form-control operationDataKeys"
+                               data-key="wifiAnoIdentity"
+                               maxlength="100" placeholder="[ Should be 1-to-30 characters long ]"/>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-cacert" style="display:none;">
+                        <label class="wr-input-label" for="wifi-password">
+                            CA Certificate
+                            <span class="helper" title="CA Certificate for the wireless network.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <input id="wifi-cacert-upload" type="file" class="form-control"
+                               onchange="base64EncodeFile(this, document.getElementById('wifi-cacert'),
+                               document.getElementById('wifi-cacert-name'))"/>
+                        <input id="wifi-cacert" type="hidden" class="form-control operationDataKeys"
+                               data-key="wifiCaCert"/>
+                        <input id="wifi-cacert-name" type="hidden" class="form-control operationDataKeys"
+                               data-key="wifiCaCertName"/>
+                    </div>
+                    <div class="wr-input-control" id="control-wifi-password" style="display:none;">
+                        <label class="wr-input-label" for="wifi-password">
+                            Password
+                            <span class="helper required" title="Password for the wireless network.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <input id="wifi-password" type="password" class="form-control operationDataKeys"
+                               data-key="wifiPassword" maxlength="100"/>
+                    </div>
+                    <!--</div>-->
+                </div>
+            </div>
+        </div>
+        <!-- /wi-fi -->
+
+        <!--app-restriction-->
+        <div class="wr-hidden-operation" data-operation="app-restriction">
+            <div class="panel panel-default operation-data" data-operation="app-restriction"
+                 data-operation-code="APP-RESTRICTION">
+                <div id="app-restriction-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Application Restriction Settings
+                        <label class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#app-restriction-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to create a black list or white list of applications.
+                    </div>
+                </div>
+                <div id="app-restriction-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="app-restriction-body">
+                    <hr/>
+                    <div id="app-restriction-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+
+                    <label class="wr-input-label" for="app-restriction-type">
+                        Select type
+                        <span class="helper" title="Select a type to proceed.">
+                            <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                        </span>
+                        <br>
+                    </label>
+                    <select id="app-restriction-type" class="form-control operationDataKeys" data-key="restrictionType">
+                        <option value="" selected="selected">
+                            None
+                        </option>
+                        <option value="black-list">Black List</option>
+                        <option value="white-list">White List</option>
+                    </select>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="restricted-applications">
+                            <br><br>Restricted Application List
+                            <span class="helper" title="Add an application to restrict.">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                        <br/>
+                        <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add "
+                           data-click-event="add-form">
+                                <span class="icon fw-stack">
+                                    <i class="fw fw-add fw-stack-1x"></i>
+                                    <i class="fw fw-ring fw-stack-2x"></i>
+                                </span>
+
+                            Add Application
+                        </a>
+                        <div id="restricted-applications"
+                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                             data-key="restrictedApplications" data-column-count="2">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Application Name/Description</th>
+                                    <th>Package Name</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#restricted-applications-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="4">
+                                        No entries added yet .
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#restricted-applications-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="App Name">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                               maxlength="100" data-default="" placeholder="[ Gmail ]"/>
+                                    </td>
+                                    <td data-title="Package Name">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="packageName" maxlength="100" data-default=""
+                                               placeholder="[ com.google.android.gm ]"/>
+                                    </td>
+                                    <td>
+                                            <span class="list-group-item-actions">
+                                                <a href="#restricted-applications-grid" class="grid-input-remove"
+                                                   data-click-event="remove-form">
+                                                    <span class="fw-stack helper" title="Remove Entry">
+                                                        <i class="fw fw-ring fw-stack-2x"></i>
+                                                        <i class="fw fw-delete fw-stack-1x"></i>
+                                                    </span>
+                                                </a>
+                                            </span>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!--/app-restriction-->
+
+        <!-- VPN -->
+        <div class="wr-hidden-operation" data-operation="vpn">
+            <div class="panel panel-default operation-data" data-operation="vpn" data-operation-code="VPN">
+                <div id="vpn-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        VPN Settings
+                        <label class="wr-input-control switch" data-toggle="collapse" data-target="#vpn-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configurations can be used to configure VPN settings on an Android device.
+                        Once this configuration profile is installed on a device, corresponding users will not be able
+                        to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="vpn-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="vpn-body">
+                    <hr/>
+                    Please note that * sign represents required fields of data.
+                    <br>
+                    <br>
+                    <div id="vpn-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="vpn-server-address">
+                            VPN Server Address*
+                            <span class="helper" title="Address of the VPN server to be configured.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <input id="vpn-server-address" type="text" class="form-control operationDataKeys"
+                               data-key="serverAddress" maxlength="200" placeholder="[ Should be a valid hostname ]"/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="vpn-server-port">
+                            VPN Server Port
+                            <span class="helper" title="Port of the VPN server to be configured.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <input id="vpn-server-port" type="text" class="form-control operationDataKeys"
+                               data-key="serverPort" maxlength="100" placeholder="[ Optional field ]"/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="vpn-shared-secret">
+                            Shared Secret
+                            <span class="helper" title="Shared secret.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <input id="vpn-shared-secret" type="password" class="form-control operationDataKeys"
+                               data-key="sharedSecret" maxlength="100" placeholder="[ Optional field ]"/>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="vpn-dns">
+                            DNS Server
+                            <span class="helper" title="DNS Server.">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                        <input id="vpn-dns" type="text" class="form-control operationDataKeys" data-key="dnsServer"
+                               maxlength="100" placeholder="[ Optional field ]"/>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- /VPN -->
+
+        <!--Work-profile-->
+        <div class="wr-hidden-operation" data-operation="work-profile">
+            <div class="panel panel-default operation-data" data-operation="work-profile"
+                 data-operation-code="WORK_PROFILE">
+                <div id="work-profile-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Work-Profile Configurations
+                        <label id="work-profile-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#work-profile-policy-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        The configurations below can be applied to the devices where the agent is running in Android
+                        Work-Profile.
+                    </div>
+                </div>
+                <div id="work-profile-policy-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="work-profile-policy-body">
+                    <hr/>
+                    <div id="work-profile-policy-feature-error-msg" class="alert alert-danger hidden" role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    <!--<div class="wr-input-control">
+                        <label class="wr-input-control checkbox">
+                            <input id="work-profile-policy-allow-cross-profile" type="checkbox" class="form-control
+                            operationDataKeys" data-key="workProfilePolicyAllowCopyPaste" checked="checked" />
+                                <span class="helper" title="Permit the use of repeating, ascending and descending
+                                character sequences">
+                                    Allow cross profile copy-paste
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                        </label>
+                    </div> -->
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-max-passcode-age-in-days">
+                            Profile Name
+                            <span class="helper" title="Name of the Work-Profile created by EMM Agent">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                        </label>
+                        <input id="work-profile-policy-profile-name" type="text" class="form-control operationDataKeys"
+                               data-key="workProfilePolicyProfileName" maxlength="20">
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-enable-system-apps">
+                            Enable System Apps
+                            <span class="helper" title="The set of system apps needed to be added to the work-profile">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps,
+                            com.google.android.calculator )
+                        </label>
+                        <textarea id="workProfilePolicyEnableSystemApps" type="text"
+                                  class="form-control operationDataKeys" rows="4"
+                                  data-key="workProfilePolicyEnableSystemApps"></textarea>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-hide-system-apps">
+                            Hide System Apps
+                            <span class="helper" title="The set of system apps needed to be hide in the work-profile">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps,
+                            com.google.android.calculator )
+                        </label>
+                        <textarea id="work-profile-policy-hide-system-apps" class="form-control operationDataKeys"
+                                  rows="4" data-key="workProfilePolicyHideSystemApps" placeholder=""></textarea>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-unhide-system-apps">
+                            Unhide System Apps
+                            <span class="helper" title="The set of system apps needed to be unhide in the work-profile">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps,
+                            com.google.android.calculator )
+                        </label>
+                        <textarea id="work-profile-policy-unhide-system-apps" class="form-control operationDataKeys"
+                                  rows="4" data-key="workProfilePolicyUnhideSystemApps" placeholder=""></textarea>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="work-profile-policy-install-playstore-apps">
+                            Enable Google Play Store Apps
+                            <span class="helper"
+                                  title="The set of apps needed to be installed from Google Playstore to work-profile">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            ( Should be exact package names seperated by commas. Ex: com.google.android.apps.maps,
+                            com.google.android.calculator )
+                        </label>
+                        <textarea id="work-profile-policy-install-playstore-apps" class="form-control operationDataKeys"
+                                  rows="4" data-key="workProfilePolicyEnablePlaystoreApps" placeholder=""></textarea>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- cosu-system-update-policy -->
+        <div class="wr-hidden-operation" data-operation="cosu-system-update-policy">
+            <div class="panel panel-default operation-data" data-operation="cosu-system-update-policy-body"
+                 data-operation-code="SYSTEM_UPDATE_POLICY">
+                <div id="cosu-system-update-policy-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        System Update Policy (COSU)
+                        <label id="cosu-system-update-policy-lbl" class="wr-input-control switch" data-toggle="collapse"
+                               data-target="#cosu-system-update-policy-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to set a passcode policy to an Android Device.
+                        Once this configuration profile is installed on a device, corresponding users will not be able
+                        to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="cosu-system-update-policy-body" class="panel-collapse panel-body collapse"
+                     role="tabpanel"
+                     aria-labelledby="cosu-system-update-policy-body">
+                    <hr/>
+                    <div id="cosu-system-update-policy-feature-error-msg" class="alert alert-danger hidden"
+                         role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+                    <div class="wr-input-control">
+                        <label class="wr-input-label">
+                            System Update
+                            <span class="helper" title="Type of the System Update to be set by the Device Owner">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                        </label>
+                        <br><br>
+                        <label class="wr-input-control radio light">
+                            <input id="automatic-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                                   class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                                   value="automatic"
+                                   onclick="slideDownPaneAgainstValueSetForRadioButtons(this,
+                                   'cosu-system-update-policy-window-select', ['window'])" checked/>
+                            <span class="helper"
+                                  title="Installs system update automatically as soon as one is available">
+                                Automatic
+                            </span>
+                        </label>
+                        <label class="wr-input-control radio light">
+                            <input id="postpone-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                                   class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                                   value="postpone"
+                                   onclick="slideDownPaneAgainstValueSetForRadioButtons(this,
+                                   'cosu-system-update-policy-window-select', ['window'])"/>
+                            <span class="helper"
+                                  title="Incoming system update will be blocked for a maximum of 30 days">
+                                Postpone
+                            </span>
+                        </label>
+                        <label class="wr-input-control radio light">
+                            <input id="window-system-update-radio-btn" type="radio" name="cosu-system-update-type"
+                                   class="form-control operationDataKeys" data-key="cosuSystemUpdatePolicyType"
+                                   value="window"
+                                   onclick="slideDownPaneAgainstValueSetForRadioButtons(this,
+                                    'cosu-system-update-policy-window-select', ['window'])"/>
+                            <span class="helper"
+                                  title="Install system update automatically within a daily maintenance window, for a
+                                  maximum of 30 days">
+                                Window
+                            </span>
+                        </label>
+                    </div>
+                    <div id="cosu-system-update-policy-window-select">
+                        <div>
+                            <ul class="message message-info">
+                                <i class="icon fw fw-info"></i>
+                                <a id="cosu-system-update-policy-window-select-msg">
+                                    Below configuration of start time and end time are valid only when
+                                    <b>window</b> option is selected.
+                                </a>
+                            </ul>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="cosu-system-update-policy-window-start-time">
+                                Start Time
+                                <span class="helper" title="Window start time for system update">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                            </label>
+                            <select id="cosu-system-update-policy-window-start-time"
+                                    class="form-control operationDataKeys"
+                                    data-key="cosuSystemUpdatePolicyWindowStartTime" data-default="0">
+                                <option value="1440" selected="selected">12 AM</option>
+                                <option value="60">1 AM</option>
+                                <option value="120">2 AM</option>
+                                <option value="180">3 AM</option>
+                                <option value="240">4 AM</option>
+                                <option value="300">5 AM</option>
+                                <option value="360">6 AM</option>
+                                <option value="420">7 AM</option>
+                                <option value="480">8 AM</option>
+                                <option value="540">9 AM</option>
+                                <option value="600">10 AM</option>
+                                <option value="660">11 AM</option>
+                                <option value="720">12 noon</option>
+                                <option value="780">1 PM</option>
+                                <option value="840">2 PM</option>
+                                <option value="900">3 PM</option>
+                                <option value="960">4 PM</option>
+                                <option value="1020">5 PM</option>
+                                <option value="1080">6 PM</option>
+                                <option value="1140">7 PM</option>
+                                <option value="1200">8 PM</option>
+                                <option value="1260">9 PM</option>
+                                <option value="1320">10 PM</option>
+                                <option value="1380">11 PM</option>
+                            </select>
+                        </div>
+                        <div class="wr-input-control">
+                            <label class="wr-input-label" for="cosu-system-update-policy-window-end-time">
+                                End Time
+                                <span class="helper" title="Window end time for system update">
+                                    <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                                </span>
+                            </label>
+                            <select id="cosu-system-update-policy-window-end-time"
+                                    class="form-control operationDataKeys"
+                                    data-key="cosuSystemUpdatePolicyWindowEndTime" data-default="0">
+                                <option value="1440" selected="selected">12 AM</option>
+                                <option value="60">1 AM</option>
+                                <option value="120">2 AM</option>
+                                <option value="180">3 AM</option>
+                                <option value="240">4 AM</option>
+                                <option value="300">5 AM</option>
+                                <option value="360">6 AM</option>
+                                <option value="420">7 AM</option>
+                                <option value="480">8 AM</option>
+                                <option value="540">9 AM</option>
+                                <option value="600">10 AM</option>
+                                <option value="660">11 AM</option>
+                                <option value="720">12 Noon</option>
+                                <option value="780">1 PM</option>
+                                <option value="840">2 PM</option>
+                                <option value="900">3 PM</option>
+                                <option value="960">4 PM</option>
+                                <option value="1020">5 PM</option>
+                                <option value="1080">6 PM</option>
+                                <option value="1140">7 PM</option>
+                                <option value="1200">8 PM</option>
+                                <option value="1260">9 PM</option>
+                                <option value="1320">10 PM</option>
+                                <option value="1380">11 PM</option>
+                            </select>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <!-- cosu-whitelist-applications -->
+        <div class="wr-hidden-operation" data-operation="cosu-whitelisted-applications">
+            <div class="panel panel-default operation-data" data-operation="cosu-whitelisted-applications"
+                 data-operation-code="KIOSK_APPS">
+                <div id="cosu-whitelisted-applications-heading" class="panel-heading" role="tab">
+                    <h2 class="sub-title panel-title">
+                        Whitelist Applications (COSU)
+                        <label id="cosu-whitelisted-applications-lbl" class="wr-input-control switch"
+                               data-toggle="collapse"
+                               data-target="#cosu-whitelisted-applications-body">
+                            <input type="checkbox"/>
+                            <span class="helper"></span>
+                            <span class="text"></span>
+                        </label>
+                    </h2>
+                    <div class="panel-title-description">
+                        This configuration can be used to set a passcode policy to an Android Device.
+                        Once this configuration profile is installed on a device, corresponding users will not be able
+                        to modify these settings on their devices.
+                    </div>
+                </div>
+                <div id="cosu-whitelisted-applications-body" class="panel-collapse panel-body collapse" role="tabpanel"
+                     aria-labelledby="cosu-whitelisted-applications-body">
+                    <hr/>
+                    <div id="cosu-whitelisted-applications-feature-error-msg" class="alert alert-danger hidden"
+                         role="alert">
+                        <i class="icon fw fw-error"></i><span></span>
+                    </div>
+
+                    <div class="wr-input-control">
+                        <label class="wr-input-label" for="cosu-whitelisted-applications">
+                            Whitelisted Applications to enter Lock Task Mode
+                            <span class="helper" title="Configuration information specific to a given third-party VPN
+                            solution. This has to be input as key/value pairs.">
+                                <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
+                            </span>
+                            <br>
+                            <a href="#cosu-whitelisted-applications-grid" class="btn btn-secondary grid-input-add"
+                               data-click-event="add-form">
+                                <span class="icon fw-stack">
+                                    <i class="fw fw-add fw-stack-1x"></i>
+                                    <i class="fw fw-ring fw-stack-2x"></i>
+                                </span>
+                                Add Application
+                            </a>
+                        </label>
+                        <div id="cosu-whitelisted-applications"
+                             class="operationDataKeys grouped-array-input multi-column-key-value-pair-array"
+                             data-key="cosuWhitelistedApplications" data-column-count="2">
+                            <table class="table table-responsive table-striped">
+                                <thead>
+                                <tr>
+                                    <th>No:</th>
+                                    <th>Application Name / Description</th>
+                                    <th>Package Name</th>
+                                    <th></th>
+                                </tr>
+                                </thead>
+                                <tbody data-add-form-container="#cosu-whitelisted-applications-grid">
+                                <tr data-help-text="add-form">
+                                    <td colspan="4">
+                                        No entries added yet.
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="template hidden">
+                                <tbody data-add-form="#cosu-whitelisted-applications-grid">
+                                <tr data-add-form-element="clone">
+                                    <td data-title="No:">
+                                        <span class="index"></span>
+                                    </td>
+                                    <td data-title="Application Name / Description">
+                                        <input type="text" class="form-control grid-input-text" data-child-key="appName"
+                                               maxlength="100" data-default=""
+                                               placeholder="[ Application Name / Description ]"/>
+                                    </td>
+                                    <td data-title="Package Name">
+                                        <input type="text" class="form-control grid-input-text"
+                                               data-child-key="packageName"
+                                               maxlength="100" data-default="" placeholder="[ Package Name ]"/>
+                                    </td>
+                                    <td>
+                                            <span class="list-group-item-actions">
+                                                <a href="#cosu-whitelisted-applications-grid" class="grid-input-remove"
+                                                   data-click-event="remove-form">
+                                                    <span class="fw-stack helper" title="Remove Entry">
+                                                        <i class="fw fw-ring fw-stack-2x"></i>
+                                                        <i class="fw fw-delete fw-stack-1x"></i>
+                                                    </span>
+                                                </a>
+                                            </span>
+                                    </td>
+                                </tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
index c71fcbc04..d01f42f88 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/config.json
@@ -3,6 +3,43 @@
         "label": "Android",
         "category": "mobile",
         "analyticsEnabled": "false",
-        "groupingEnabled": "false"
+        "groupingEnabled": "false",
+        "features": {
+            "DEVICE_RING": {
+                "icon" : "fw-dial-up"
+            },
+            "DEVICE_LOCK": {
+                "icon" : "fw-lock"
+            },
+            "DEVICE_LOCATION": {
+                "icon" : "fw-map-location"
+            },
+            "CLEAR_PASSWORD": {
+                "icon" : "fw-clear"
+            },
+            "DEVICE_REBOOT": {
+                "icon" : "fw-refresh"
+            },
+            "UPGRADE_FIRMWARE": {
+                "icon" : "fw-hardware"
+            },
+            "DEVICE_MUTE": {
+                "icon" : "fw-mute"
+            },
+            "NOTIFICATION": {
+                "icon" : "fw-message"
+            },
+            "CHANGE_LOCK_CODE": {
+                "icon" : "fw-security"
+            },
+            "ENTERPRISE_WIPE": {
+                "icon" : "fw-block"
+            },
+            "WIPE_DATA": {
+                "icon" : "fw-delete"
+            }
+        }
     }
 }
+
+
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.hbs
new file mode 100644
index 000000000..544dc23d7
--- /dev/null
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.hbs
@@ -0,0 +1,64 @@
+{{!
+  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.
+}}
+{{#zone "content"}}
+    <div id="qr-code-modal" data-enrollment-url="{{enrollmentURL}}" class="hidden">
+        <div class="modal-header">
+            <h4 class="pull-left modal-title">
+                <span class="fw-stack">
+                    <i class="fw fw-mobile fw-stack-2x"></i>
+                    <span class="fw-stack fw-move-right fw-move-bottom">
+                      <i class="fw fw-ring fw-stack-2x"></i>
+                      <i class="fw fw-circle fw-stack-2x fw-stroke text-info"></i>
+                      <i class="fw fw-add fw-stack-1x fw-inverse"></i>
+                   </span>
+                </span>
+                  Add your new mobile device to {{@app.conf.appName}}
+            </h4>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+        </div>
+        <hr>
+        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
+            <div class="panel-body col-centered text-center">
+                <h5>
+                    Please scan the following QR code using your new <b>Android</b>, <b>iPhone</b> or <b>Windows</b> mobile device.
+                </h5>
+                <br>
+                <div class="panel panel-default">
+                    <div class="panel-body">
+                        <div class="qr-code"></div>
+                    </div>
+                </div>
+                <br>
+                <h5>
+                    Not having a QR code scanner in your device?
+                    <br><br>
+                    Try following link
+                    <br><br>
+                    <b>{{enrollmentURL}}</b>
+                    <br><br>
+                    on your device's Internet browser instead.
+                </h5>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
+                <a href="javascript:hidePopup()" class="btn-operations btn-default">Ok</a>
+            </div>
+        </div>
+    </div>
+{{/zone}}
\ No newline at end of file
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.js b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.js
new file mode 100644
index 000000000..5177e51f3
--- /dev/null
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.js
@@ -0,0 +1,23 @@
+/*
+ *  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+function onRequest() {
+    var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
+    var viewModel = {};
+    //TODO: Move enrollment URL into app-conf.json
+    viewModel["enrollmentURL"] = mdmProps["generalConfig"]["host"] + mdmProps["windowsEnrollmentDir"];
+    return viewModel;
+}
\ No newline at end of file
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.json b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.json
new file mode 100644
index 000000000..688e93980
--- /dev/null
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.qr-modal/qr-modal.json
@@ -0,0 +1,3 @@
+{
+  "version": "1.0.0"
+}
\ No newline at end of file
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
index e4199de38..ed4654d77 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/type-view.hbs
@@ -1,22 +1,8 @@
-{{!
-  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+{{unit "cdmf.unit.lib.qrcode"}}
+{{unit "cdmf.unit.device.type.windows.qr-modal"}}
 
-  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.
-}}
 <div class="col-lg-12  margin-top-double">
-    <h1 class="grey">Windows Mobile</h1>
+    <h1 class="grey ">Windows Mobile</h1>
     <hr>
 </div>
 <div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
@@ -24,39 +10,39 @@
 </div>
 
 <div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
-    <h4 class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Windows" target="_blank">[ here ]</a> for
-                         latest instructions and troubleshooting.</h4>
+    <h4 class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Windows"
+                                  target="_blank">[ here ]</a> for latest instructions and troubleshooting.</h4>
 </div>
 
 <div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
 
     <h3 class="uppercase">What it Does</h3>
-    <hr />
-    <p class="grey margin-top">Connect and manage your Windows device with WSO2 IoT Server.</p>
+    <hr>
+    <p class="grey margin-top">Connect and manage your Android device with WSO2 IoT Server.</p>
     <br>
 
     <h3 class="uppercase">What You Need</h3>
     <hr>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">STEP 01</span>   Windows Mobile.</li>
-        <li class="padding-top-double"><span class="circle">STEP 02</span>   Go ahead and click [Enroll Device].
+        <li class="padding-top-double"><span class="circle">STEP 01</span>   Windows
+            Mobile.
         </li>
-        <li class="padding-top-double"><span class="circle">STEP 03</span>   Proceed to [Prepare] section.
+        <li class="padding-top-double"><span class="circle">STEP 02</span>   Go ahead
+            and click [Enroll Device].
+        </li>
+        <li class="padding-top-double"><span class="circle">STEP 03</span>   Proceed
+            to the [Prepare] section.
         </li>
     </ul>
     <br>
-
-    <a href="#" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg"></i>
-        Enroll Device</a>
-
-    <br /><br />
+    <a href="javascript:toggleEnrollment()" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg"></i> Enroll Device</a>
+    <br/><br/>
 </div>
 
 <div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double grey-bg">
-    <h3 class="uppercase">Prepare</h3>
-    <hr>
+    <h3 class="uppercase">Prepare</h3><hr>
     <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="circle">01</span> Scan QR code.</li>
+        <li class="padding-top-double"><span class="circle">01</span>  Scan QR code..</li>
         <li class="padding-top-double"><span class="circle">02</span> Follow instructions in wizard.</li>
         <li class="padding-top-double"><span class="circle">03</span> Configure your workspace account</li>
     </ul>
@@ -73,40 +59,12 @@
     </center>
 </div>
 
-<br />
-
-<div id="qr-code-modal"
-     data-enrollment-url="{{@app.context}}/device/windows/enroll" class="hidden">
-
-    <div class="content">
-        <div class="row">
-            <div class="col-lg-5 col-md-6 col-centered">
-                <h3>Scan QR code to start enrollment</h3>
-                <p>Please scan the QR code using your mobile device to retrieve enrollment URL.</p>
-                <div class="panel panel-default">
-                    <div class="panel-body col-centered">
-                        <div class="qr-code"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-{{#zone "bottomJs"}}
-    <script type="text/javascript">
-        $(".download-link").click(function () {
-            toggleEnrollment();
-        });
-
-        function toggleEnrollment() {
-            $(".modalpopup-content").html($("#qr-code-modal").html());
-            generateQRCode(".modalpopup-content .qr-code");
-            showPopup();
-        }
-    </script>
-{{/zone}}
+<br/>
 
 {{#zone "topCss"}}
     {{css "css/styles.css"}}
+{{/zone}}
+
+{{#zone "bottomJs"}}
+    {{js "js/type-view.js"}}
 {{/zone}}
\ No newline at end of file
diff --git a/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
index 9680a4c60..06e2c9d7f 100644
--- a/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
+++ b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
@@ -94,7 +94,7 @@
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
                 <version>${carbon.p2.plugin.version}</version>
-                    <executions>
+                <executions>
                     <execution>
                         <id>p2-feature-generation</id>
                         <phase>package</phase>
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml b/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml
index 2aa7be9fc..02168e50f 100644
--- a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml
+++ b/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml
@@ -48,31 +48,30 @@
     <build>
         <plugins>
             <plugin>
-                <artifactId>maven-clean-plugin</artifactId>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>auto-clean</id>
-                        <phase>initialize</phase>
+                        <id>unpack</id>
+                        <phase>package</phase>
                         <goals>
-                            <goal>clean</goal>
+                            <goal>unpack</goal>
                         </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
                         <configuration>
-                            <target>
-                                <ant antfile="build.xml" target="zip"/>
-                            </target>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
+                                    <artifactId>org.wso2.carbon.iot.geo.dashboard</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>zip</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>
+                                        ${project.build.directory}/maven-shared-archive-resources
+                                    </outputDirectory>
+                                    <includes>**/*</includes>
+                                </artifactItem>
+                            </artifactItems>
                         </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
                     </execution>
                 </executions>
             </plugin>
diff --git a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
index 3da1f798b..1e41b795d 100644
--- a/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
+++ b/features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/devicetypes/android.xml
@@ -58,347 +58,274 @@
     </DataSource>
 
     <Features>
+        <Feature code="DEVICE_RING">
+            <Name>Ring</Name>
+            <Description>Ring the device</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/ring" method="POST">
+            </Operation>
+        </Feature>
         <Feature code="DEVICE_LOCK">
             <Name>Device Lock</Name>
             <Description>Lock the device</Description>
-            <Operation context="android/lock_devices" method="POST">
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/lock-devices" method="POST" conent-type="application/json">
+                <FormParameters>
+                    <Parameter id="message" optional="true" type="text">Message to be sent to the device</Parameter>
+                </FormParameters>
             </Operation>
         </Feature>
         <Feature code="DEVICE_LOCATION">
             <Name>Location</Name>
             <Description>Request coordinates of device location</Description>
-            <Operation context="" method="POST">
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/location" method="POST" conent-type="application/json">
             </Operation>
         </Feature>
-        <Feature code="WIFI">
-            <Name>Wifi</Name>
-            <Description>Setting up wifi configuration</Description>
-            <Operation context="" method="POST">
+        <Feature code="CLEAR_PASSWORD">
+            <Name>Clear Password</Name>
+            <Description>Clear current password</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/clear-password" method="POST" conent-type="application/json">
             </Operation>
         </Feature>
-        <Feature code="CAMERA">
-            <Name>Camera</Name>
-            <Description>Enable or disable camera</Description>
-            <Operation context="" method="POST">
+        <Feature code="DEVICE_REBOOT">
+            <Name>Reboot</Name>
+            <Description>Reboot the device</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/reboot" method="POST" conent-type="application/json">
             </Operation>
         </Feature>
-        <Feature code="EMAIL">
-            <Name>Email</Name>
-            <Description>Configure email settings</Description>
-            <Operation context="" method="POST">
+        <Feature code="UPGRADE_FIRMWARE">
+            <Name>Upgrade Firmware</Name>
+            <Description>Upgrade Firmware</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/upgrade-firmware" method="POST" conent-type="application/json">
+                <FormParameters>
+                    <Parameter id="immediate" optional="true" type="check" helper-text="Once enabled, device firmware upgrade process will start instantly.">Instant Upgrade</Parameter>
+                    <Parameter id="schedule" optional="false" type="text">Enter the date and time to schedule firmware upgrade.</Parameter>
+                    <Parameter id="server" optional="true" type="text">Enter firmware upgrade server URL (ie. http://abc.com or http://abc.com/ota) (Optional).</Parameter>
+                </FormParameters>
             </Operation>
         </Feature>
         <Feature code="DEVICE_MUTE">
             <Name>Mute</Name>
             <Description>Enable mute in the device</Description>
-            <Operation context="" method="POST">
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/mute" method="POST" conent-type="application/json">
             </Operation>
         </Feature>
-        <Feature code="DEVICE_INFO">
-            <Name>Device info</Name>
-            <Description>Request device information</Description>
-            <Operation context="" method="POST">
+        <Feature code="NOTIFICATION">
+            <Name>Message</Name>
+            <Description>Send message</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/send-notification" method="POST" conent-type="application/json">
+                <FormParameters>
+                    <Parameter id="messageText" optional="false" type="text">Title Here...</Parameter>
+                    <Parameter id="messageTitle" optional="false" type="text-area">Message Here...</Parameter>
+                </FormParameters>
+            </Operation>
+        </Feature>
+        <Feature code="CHANGE_LOCK_CODE">
+            <Name>Change Lock-code</Name>
+            <Description>Change current lock code</Description>
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/change-lock-code" method="POST" conent-type="application/json">
+                <FormParameters>
+                    <Parameter id="lockCode" optional="false" type="text">Lock Code</Parameter>
+                </FormParameters>
             </Operation>
         </Feature>
         <Feature code="ENTERPRISE_WIPE">
             <Name>Enterprise Wipe</Name>
             <Description>Remove enterprise applications</Description>
-            <Operation context="" method="POST">
-            </Operation>
-        </Feature>
-        <Feature code="CLEAR_PASSWORD">
-            <Name>Clear Password</Name>
-            <Description>Clear current password</Description>
-            <Operation context="" method="POST">
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/enterprise-wipe" method="POST" conent-type="application/json">
             </Operation>
         </Feature>
         <Feature code="WIPE_DATA">
             <Name>Wipe Data</Name>
             <Description>Factory reset the device</Description>
-            <Operation context="" method="POST">
+            <Operation context="/api/device-mgt/android/v1.0/admin/devices/wipe" method="POST" conent-type="application/json">
+                <FormParameters>
+                    <!-- Needs to be converted to a unit -->
+                    <Parameter id="pin" optional="false" type="text">Enter PIN code* of the device.</Parameter>
+                </FormParameters>
             </Operation>
         </Feature>
+        <Feature code="WIFI">
+            <Name>Wifi</Name>
+            <Description>Setting up wifi configuration</Description>
+        </Feature>
+        <Feature code="CAMERA">
+            <Name>Camera</Name>
+            <Description>Enable or disable camera</Description>
+        </Feature>
+        <Feature code="EMAIL">
+            <Name>Email</Name>
+            <Description>Configure email settings</Description>
+        </Feature>
+        <Feature code="DEVICE_INFO">
+            <Name>Device info</Name>
+            <Description>Request device information</Description>
+        </Feature>
         <Feature code="APPLICATION_LIST">
             <Name>Application List</Name>
             <Description>Request list of current installed applications</Description>
-            <Operation context="" method="POST">
-            </Operation>
-        </Feature>
-        <Feature code="CHANGE_LOCK_CODE">
-            <Name>Change Lock-code</Name>
-            <Description>Change current lock code</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="INSTALL_APPLICATION">
             <Name>Install App</Name>
             <Description>Install App</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="UNINSTALL_APPLICATION">
             <Name>Uninstall App</Name>
             <Description>Uninstall App</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="BLACKLIST_APPLICATIONS">
             <Name>Blacklist app</Name>
             <Description>Blacklist applications</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="ENCRYPT_STORAGE">
             <Name>Encrypt Storage</Name>
             <Description>Encrypt storage</Description>
-            <Operation context="" method="POST">
-            </Operation>
-        </Feature>
-        <Feature code="DEVICE_RING">
-            <Name>Ring</Name>
-            <Description>Ring the device</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="PASSCODE_POLICY">
             <Name>Password Policy</Name>
             <Description>Set passcode policy</Description>
-            <Operation context="" method="POST">
-            </Operation>
-        </Feature>
-        <Feature code="NOTIFICATION">
-            <Name>Message</Name>
-            <Description>Send message</Description>
-            <Operation context="" method="POST">
-            </Operation>
-        </Feature>
-        <Feature code="DEVICE_REBOOT">
-            <Name>Reboot</Name>
-            <Description>Reboot the device</Description>
-            <Operation context="" method="POST">
-            </Operation>
-        </Feature>
-        <Feature code="UPGRADE_FIRMWARE">
-            <Name>Upgrade Firmware</Name>
-            <Description>Upgrade Firmware</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="VPN">
             <Name>Configure VPN</Name>
             <Description>Configure VPN settings</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_ADJUST_VOLUME">
             <Name>Disallow user to change volume</Name>
             <Description>Allow or disallow user to change volume"</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_CONFIG_BLUETOOTH">
             <Name>Disallow bluetooth configuration</Name>
             <Description>Allow or disallow bluetooth configuration</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_CONFIG_CELL_BROADCASTS">
             <Name>Disallow user to change cell broadcast configurations</Name>
             <Description>Allow or disallow user to change cell broadcast configurations</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_CONFIG_CREDENTIALS">
             <Name>Disallow user to change user credentials</Name>
             <Description>Allow or disallow user to change user credentials</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_CONFIG_MOBILE_NETWORKS">
             <Name>Disallow user to change mobile networks configurations</Name>
             <Description>Allow or disallow user to change mobile networks configurations</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_CONFIG_TETHERING">
             <Name>Disallow user to change tethering configurations</Name>
             <Description>Allow or disallow user to change tethering configurations</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_CONFIG_VPN">
             <Name>Disallow user to change VPN configurations</Name>
             <Description>Allow or disallow user to change VPN configurations</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_CONFIG_WIFI">
             <Name>Disallow user to change WIFI configurations</Name>
             <Description>Allow or disallow user to change WIFI configurations</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_APPS_CONTROL">
             <Name>Disallow user to change app control</Name>
             <Description>Allow or disallow user to change app control</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_CREATE_WINDOWS">
             <Name>Disallow window creation</Name>
             <Description>Allow or disallow window creation</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_APPS_CONTROL">
             <Name>Disallow user to change app control configurations</Name>
             <Description>Allow or disallow user to change app control configurations</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_CROSS_PROFILE_COPY_PASTE">
             <Name>Disallow cross profile copy paste</Name>
             <Description>Allow or disallow cross profile copy paste</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_DEBUGGING_FEATURES">
             <Name>Disallow debugging features</Name>
             <Description>Allow or disallow debugging features</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_FACTORY_RESET">
             <Name>Disallow factory reset</Name>
             <Description>Allow or disallow factory reset</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_ADD_USER">
             <Name>Disallow add user</Name>
             <Description>Allow or disallow add user</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_INSTALL_APPS">
             <Name>Disallow install apps</Name>
             <Description>Allow or disallow install apps</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_INSTALL_UNKNOWN_SOURCES">
             <Name>Disallow install unknown sources</Name>
             <Description>Allow or disallow install unknown sources</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_MODIFY_ACCOUNTS">
             <Name>Disallow modify account</Name>
             <Description>Allow or disallow modify account</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_MOUNT_PHYSICAL_MEDIA">
             <Name>Disallow mount physical media</Name>
             <Description>Allow or disallow mount physical media</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_NETWORK_RESET">
             <Name>Disallow network reset</Name>
             <Description>Allow or disallow network reset</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_OUTGOING_BEAM">
             <Name>Disallow outgoing beam</Name>
             <Description>Allow or disallow outgoing beam</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_OUTGOING_CALLS">
             <Name>Disallow outgoing calls</Name>
             <Description>Allow or disallow outgoing calls</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_REMOVE_USER">
             <Name>Disallow remove users</Name>
             <Description>Allow or disallow remove users</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_SAFE_BOOT">
             <Name>Disallow safe boot</Name>
             <Description>Allow or disallow safe boot</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_SHARE_LOCATION">
             <Name>Disallow share location</Name>
             <Description>Allow or disallow share location</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_SMS">
             <Name>Disallow sms</Name>
             <Description>Allow or disallow sms</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_UNINSTALL_APPS">
             <Name>Disallow uninstall app</Name>
             <Description>Allow or disallow uninstall app</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_UNMUTE_MICROPHONE">
             <Name>Disallow unmute mic</Name>
             <Description>Allow or disallow unmute mic</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DISALLOW_USB_FILE_TRANSFER">
             <Name>Disallow usb file transfer</Name>
             <Description>Allow or disallow usb file transfer</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="ALLOW_PARENT_PROFILE_APP_LINKING">
             <Name>Disallow parent profile app linking</Name>
             <Description>Allow or disallow parent profile app linking</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="ENSURE_VERIFY_APPS">
             <Name>Disallow ensure verify apps</Name>
             <Description>Allow or disallow ensure verify apps</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="AUTO_TIME">
             <Name>Disallow auto timing</Name>
             <Description>Allow or disallow auto timing</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="REMOVE_DEVICE_OWNER">
             <Name>Remove device owner</Name>
             <Description>Remove device owner</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="LOGCAT">
             <Name>Fetch device logcat</Name>
             <Description>Fetch device logcat</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
         <Feature code="DEVICE_UNLOCK">
             <Name>Unlock the device</Name>
             <Description>Unlock the device</Description>
-            <Operation context="" method="POST">
-            </Operation>
         </Feature>
     </Features>
     <TaskConfiguration>

From d66292f93371309dc33e8c8cdbe0459639ebfac0 Mon Sep 17 00:00:00 2001
From: madhawap <madhawa.818@gmail.com>
Date: Thu, 1 Dec 2016 16:11:01 +0530
Subject: [PATCH 4/5] refactored code

---
 .../impl/AndroidDeviceManagementService.java     | 16 +---------------
 .../config/MobileDeviceManagementConfig.java     | 12 ------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
index 7f9913b01..b6376fbe9 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManagementService.java
@@ -53,23 +53,9 @@ public class AndroidDeviceManagementService implements DeviceManagementService {
         return AndroidDeviceManagementService.DEVICE_TYPE_ANDROID;
     }
 
-//    This method is not in use
     @Override
     public List<TaskOperation> getTasksForPlatform() {
-//            List<String> operationsForPlatform = new ArrayList<>();
-//            TaskConfiguration taskConfiguration =
-//                    MobileDeviceConfigurationManager.getInstance().getMobileDeviceManagementConfig()
-//                            .getTaskConfiguration();
-//
-//            List<TaskConfiguration.Operation> ops = taskConfiguration.getOperations();
-//            List<TaskOperation> taskOperations = new ArrayList<>();
-//            for (TaskConfiguration.Operation op : ops) {
-//                TaskOperation taskOperation = new TaskOperation();
-//                taskOperation.setTaskName(op.getOperationName());
-//                taskOperation.setRecurrentTimes(op.getRecurrency());
-//                taskOperations.add(taskOperation);
-//            }
-            return null;
+        return null;
     }
 
     @Override
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java
index dd873b444..2c65375c7 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/MobileDeviceManagementConfig.java
@@ -18,8 +18,6 @@
 
 package org.wso2.carbon.device.mgt.mobile.android.impl.config;
 
-
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -30,7 +28,6 @@ import javax.xml.bind.annotation.XmlRootElement;
 public final class MobileDeviceManagementConfig {
 
     private MobileDeviceManagementRepository mobileDeviceMgtRepository;
-//    private TaskConfiguration taskConfiguration;
 
     @XmlElement(name = "ManagementRepository", nillable = false)
     public MobileDeviceManagementRepository getMobileDeviceMgtRepository() {
@@ -42,13 +39,4 @@ public final class MobileDeviceManagementConfig {
         this.mobileDeviceMgtRepository = mobileDeviceMgtRepository;
     }
 
-//    @XmlElement(name = "TaskConfiguration", required = true)
-//    public TaskConfiguration getTaskConfiguration() {
-//        return taskConfiguration;
-//    }
-//
-//    public void setTaskConfiguration(TaskConfiguration taskConfiguration) {
-//        this.taskConfiguration = taskConfiguration;
-//    }
-
 }

From d7c3f5c18a1e2d97039acadcf2f9a72ab23de9b8 Mon Sep 17 00:00:00 2001
From: madhawap <madhawa.818@gmail.com>
Date: Thu, 1 Dec 2016 16:34:49 +0530
Subject: [PATCH 5/5] refactored code

---
 .../impl/config/task/TaskConfiguration.java    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/task/TaskConfiguration.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/task/TaskConfiguration.java
index 06eb83956..9c98306fb 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/task/TaskConfiguration.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/config/task/TaskConfiguration.java
@@ -1,3 +1,21 @@
+/*
+ * Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
 package org.wso2.carbon.device.mgt.mobile.android.impl.config.task;
 
 import javax.xml.bind.annotation.XmlElement;