diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/datasources/androidsense-datasources.xml b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/datasources/androidsense-datasources.xml
new file mode 100644
index 0000000000..9a1374b09e
--- /dev/null
+++ b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/datasources/androidsense-datasources.xml
@@ -0,0 +1,46 @@
+<!--
+  ~ Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+  ~
+  ~ WSO2 Inc. licenses this file to you under the Apache License,
+  ~ Version 2.0 (the "License"); you may not use this file except
+  ~ in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
+    <providers>
+        <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
+    </providers>
+    <datasources>
+        <datasource>
+            <name>AndroidSenseDM_DB</name>
+            <description>The datasource used for the Android Sense database</description>
+            <jndiConfig>
+                <name>jdbc/AndroidSenseDM_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/AndroidSenseDM_DB;DB_CLOSE_ON_EXIT=FALSE
+                    </url>
+                    <username>wso2carbon</username>
+                    <password>wso2carbon</password>
+                    <driverClassName>org.h2.Driver</driverClassName>
+                    <maxActive>50</maxActive>
+                    <maxWait>60000</maxWait>
+                    <testOnBorrow>true</testOnBorrow>
+                    <validationQuery>SELECT 1</validationQuery>
+                    <validationInterval>30000</validationInterval>
+                </configuration>
+            </definition>
+        </datasource>
+    </datasources>
+</datasources-configuration>
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/h2_android_sense.sql b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/h2.sql
similarity index 100%
rename from features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/h2_android_sense.sql
rename to features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/h2.sql
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/mysql_android_sense.sql b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/mysql.sql
similarity index 100%
rename from features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/mysql_android_sense.sql
rename to features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/dbscripts/mysql.sql
diff --git a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/p2.inf b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/p2.inf
index 41a72428c5..44e567796a 100644
--- a/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/p2.inf
+++ b/features/device-mgt-iot-androidsense-feature/org.wso2.carbon.device.mgt.iot.androidsense.feature/src/main/resources/p2.inf
@@ -1,6 +1,8 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.androidsense_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.androidsense_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/androidsense,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.androidsense_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/android_sense,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/datasources/devicemgt/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.androidsense_${feature.version}/datasources/,target:${installFolder}/../../conf/datasources/devicemgt,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.androidsense_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml
index 4b1ec5ee13..0061d37641 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/conf/devicetype-config.xml
@@ -1,3 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <IoTDeviceTypeConfigManager>
+    <IotDeviceTypeConfig type="virtual_firealarm">
+        <DatasourceName>jdbc/VirtualFireAlarmDM_DB</DatasourceName>
+        <!--TODO: Uncomment this to work with apim @ 192.168.67.21 -->
+        <!--ApiApplicationName>firealarm</ApiApplicationName-->
+    </IotDeviceTypeConfig>
+    <IotDeviceTypeConfig type="android_sense">
+        <DatasourceName>jdbc/AndroidSenseDM_DB</DatasourceName>
+    </IotDeviceTypeConfig>
 </IoTDeviceTypeConfigManager>
\ No newline at end of file
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/public/images/thumb.png b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/public/images/thumb.png
index 7fee78a646..6bbaf4b508 100644
Binary files a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/public/images/thumb.png and b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/public/images/thumb.png differ
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/public/images/virtual_fire.png b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/public/images/virtual_fire.png
deleted file mode 100644
index dcaa711eea..0000000000
Binary files a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.device-view/public/images/virtual_fire.png and /dev/null differ
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/conf/device-type.json b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/conf/device-type.json
index a1bdd15a96..d0ede06a9e 100644
--- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/conf/device-type.json
+++ b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/conf/device-type.json
@@ -1,25 +1,6 @@
 {
   "deviceType": {
     "displayName": "Virtual Firealarm",
-    "image": "/public/cdmf.unit.device.type.virtual_firealarm/images/thumb.png",
-    "downloadBtnText": "Download",
-    "ingredients": [
-      "Raspberry Pi (Internet Enabled)",
-      "DHT11 Temperature Sensor",
-      "LED",
-      "Buzzer(3v)"
-    ],
-    "prepareSteps": [
-      "Set up your RaspberryPi device as shown in the schematic below and get the FireAlarm setup.",
-      "Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device.",
-      "Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS"
-    ],
-    "schematicDiagram": "/public/cdmf.unit.device.type.virtual_firealarm/images/schematicsGuide.png",
-    "quickStartup": [
-      "<b>Click on the <i>'Create DEB'</i> button above to get the download link for the FireAlarm setup files</b>",
-      "<i>(The following commands can be issued by directly typing into the terminal of the device or by an <b>'ssh'<b> login from a remote PC)</i>",
-      "<b>Download the FireAlarm setup files using the following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'</b><br/><i>This will download a zip file named 'Agent.zip'</i>"
-    ],
-    "additionalHtml" : ""
+    "category" : "iot"
   }
 }
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/pages/device-type-details.hbs b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/pages/device-type-details.hbs
deleted file mode 100644
index b8a3956f41..0000000000
--- a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/private/pages/device-type-details.hbs
+++ /dev/null
@@ -1,151 +0,0 @@
-<div class="col-lg-12  margin-top-double">
-    <h1 class="grey ">{{@uriParams.deviceType}} Virtual Firealarm</h1>
-    <hr>
-    <p class="margin-bottom-double light-grey ">Connect your Virtual Firealarm device
-        to the WSO2 device cloud.</p>
-</div>
-<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
-    <img src="/devicemgt/public/cdmf.unit.device.type.virtual_firealarm/images/thumb.png" class="img-responsive">
-</div>
-<div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
-        <h3 class="uppercase">Ingredients</h3>
-        <hr>
-        <p class="grey margin-top">Hardware Requirements </p>
-        <br>
-        <ul>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> Raspberry Pi (Internet Enabled)<br/>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> DHT11 Temperature Sensor<br/>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> LED<br/>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> Buzzer(3v)<br/>
-
-        </ul>
-        <br>
-
-
-        <a href="#" class="download-link btn-operations" data-devicetype="{{@uriParams.deviceType}}" data-sketchtype="{{@uriParams.deviceType}}"><i class="fw fw-download"></i> Download</a>
-
-    <br/><br/>
-</div>
-
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
-        <h3 class="uppercase">Prepare</h3><hr>
-        <p class="grey margin-top">Get your device ready</p>
-        <br/>
-        <ul>
-            <p class="padding-top-double"><span class="circle">01</span> Set up your RaspberryPi device as shown in the schematic below and get the FireAlarm setup.</p>
-            <p class="padding-top-double"><span class="circle">02</span> Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device.</p>
-            <p class="padding-top-double"><span class="circle">03</span> Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS</p>
-        </ul>
-        <br>
-    </div>
-
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
-        <h3 class="uppercase">Schematic Diagram</h3><hr>
-        <p class="grey margin-top">Click on the image to zoom</p>
-        <center>
-            <a href="/public/cdmf.unit.device.type.virtual_firealarm/images/schematicsGuide.png" target="_blank">
-                <img src="/public/cdmf.unit.device.type.virtual_firealarm/images/schematicsGuide.png" class="img-responsive" style="max-width: 500px; max-height: 500px">
-            </a>
-        </center>
-        <br/>
-    </div>
-
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
-        <h3 class="uppercase">Connect (Quick Start)</h3><hr>
-        <p class="grey margin-top">Internet of Things Foundation Quickstart connection</p>
-        <br/>
-        <ul>
-            <p class="padding-top-double"><span class="circle">01</span> <b>Click on the <i>'Create DEB'</i> button above to get the download link for the FireAlarm setup files</b></p>
-            <p class="padding-top-double"><span class="circle">02</span> <i>(The following commands can be issued by directly typing into the terminal of the device or by an <b>'ssh'<b> login from a remote PC)</i></p>
-            <p class="padding-top-double"><span class="circle">03</span> <b>Download the FireAlarm setup files using the following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'</b><br/><i>This will download a zip file named 'Agent.zip'</i></p>
-        </ul>
-        <br>
-    </div>
-
-</div>
-
-<div id="qr-code-modal" data-enrollment-url="{{deviceType.enrollmentURL}}" 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>
-                <h4>
-                    Please scan the QR code using your mobile device to retrieve enrollment URL.
-                </h4>
-
-                <div class="panel panel-default">
-                    <div class="panel-body col-centered ">
-                        <div class="qr-code"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script type="text/javascript">
-
-    $(document).ready(function(){
-        toggleEnrollment();
-    });
-
-
-    function toggleEnrollment(){
-        $(".modalpopup-content").html($("#qr-code-modal").html());
-        generateQRCode(".modalpopup-content .qr-code");
-        showPopup();
-    }
-
-</script>
-<style type="text/css">
-    .circle {
-        background: none repeat scroll 0 0 #191919;
-        border-radius: 50px;
-        height: 50px;
-        padding: 10px;
-        width: 50px;
-        color: #fff;
-    }
-    .padding-top-double {
-        padding-top: 20px;
-    }
-    .padding-double {
-        padding: 20px;
-    }
-    .grey {
-        color: #333;
-    }
-    hr {
-        display: block;
-        height: 1px;
-        border: 0;
-        border-top: 1px solid #7f7f7f;
-        margin: 1em 0;
-        padding: 0;
-        opacity: 0.2;
-    }
-    .light-grey {
-        color: #7c7c7c;
-    }
-    .uppercase {
-        text-transform: uppercase;
-    }
-    .grey-bg {
-        background-color: #f6f4f4;
-    }
-</style>
\ No newline at end of file
diff --git a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/images/thumb.png b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/images/thumb.png
index f50a287b05..6bbaf4b508 100644
Binary files a/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/images/thumb.png and b/features/device-mgt-iot-virtualfirealarm-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/images/thumb.png differ
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/conf/device-type.json b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/conf/device-type.json
index 6b9e900963..b6586ddde5 100644
--- a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/conf/device-type.json
+++ b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/conf/device-type.json
@@ -1,25 +1,6 @@
 {
   "deviceType": {
     "displayName": "Android",
-    "image": "/public/cdmf.unit.device.type.android/images/thumb.png",
-    "downloadBtnText": "Download",
-    "ingredients": [
-      "Raspberry Pi (Internet Enabled)",
-      "DHT11 Temperature Sensor",
-      "LED",
-      "Buzzer(3v)"
-    ],
-    "prepareSteps": [
-      "Set up your RaspberryPi device as shown in the schematic below and get the FireAlarm setup.",
-      "Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device.",
-      "Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS"
-    ],
-    "schematicDiagram": "/public/cdmf.unit.device.type.windows/images/schematicsGuide.png",
-    "quickStartup": [
-      "<b>Click on the <i>'Create DEB'</i> button above to get the download link for the FireAlarm setup files</b>",
-      "<i>(The following commands can be issued by directly typing into the terminal of the device or by an <b>'ssh'<b> login from a remote PC)</i>",
-      "<b>Download the FireAlarm setup files using the following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'</b><br/><i>This will download a zip file named 'Agent.zip'</i>"
-    ],
-    "additionalHtml" : ""
+    "category" : "mobile"
   }
 }
diff --git a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/pages/device-type-details.hbs b/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/pages/device-type-details.hbs
deleted file mode 100644
index 5b6e3d186b..0000000000
--- a/features/device-mgt-mdm-android-feature/org.wso2.carbon.device.mgt.mobile.android.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/private/pages/device-type-details.hbs
+++ /dev/null
@@ -1,151 +0,0 @@
-<div class="col-lg-12  margin-top-double">
-    <h1 class="grey ">Android Mobile</h1>
-    <hr>
-    <p class="margin-bottom-double light-grey ">Connect your Android device
-        to the WSO2 device cloud.</p>
-</div>
-<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
-    <img src="/devicemgt/public/cdmf.unit.device.type.virtual_firealarm/images/thumb.png" class="img-responsive">
-</div>
-<div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
-        <h3 class="uppercase">Ingredients</h3>
-        <hr>
-        <p class="grey margin-top">Hardware Requirements </p>
-        <br>
-        <ul>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> Raspberry Pi (Internet Enabled)<br/>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> DHT11 Temperature Sensor<br/>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> LED<br/>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> Buzzer(3v)<br/>
-
-        </ul>
-        <br>
-
-
-        <a href="#" class="download-link btn-operations" data-devicetype="{{@uriParams.deviceType}}" data-sketchtype="{{@uriParams.deviceType}}"><i class="fw fw-download"></i> Download</a>
-
-    <br/><br/>
-</div>
-
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
-        <h3 class="uppercase">Prepare</h3><hr>
-        <p class="grey margin-top">Get your device ready</p>
-        <br/>
-        <ul>
-            <p class="padding-top-double"><span class="circle">01</span> Set up your RaspberryPi device as shown in the schematic below and get the FireAlarm setup.</p>
-            <p class="padding-top-double"><span class="circle">02</span> Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device.</p>
-            <p class="padding-top-double"><span class="circle">03</span> Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS</p>
-        </ul>
-        <br>
-    </div>
-
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
-        <h3 class="uppercase">Schematic Diagram</h3><hr>
-        <p class="grey margin-top">Click on the image to zoom</p>
-        <center>
-            <a href="/public/cdmf.unit.device.type.virtual_firealarm/images/schematicsGuide.png" target="_blank">
-                <img src="/public/cdmf.unit.device.type.virtual_firealarm/images/schematicsGuide.png" class="img-responsive" style="max-width: 500px; max-height: 500px">
-            </a>
-        </center>
-        <br/>
-    </div>
-
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
-        <h3 class="uppercase">Connect (Quick Start)</h3><hr>
-        <p class="grey margin-top">Internet of Things Foundation Quickstart connection</p>
-        <br/>
-        <ul>
-            <p class="padding-top-double"><span class="circle">01</span> <b>Click on the <i>'Create DEB'</i> button above to get the download link for the FireAlarm setup files</b></p>
-            <p class="padding-top-double"><span class="circle">02</span> <i>(The following commands can be issued by directly typing into the terminal of the device or by an <b>'ssh'<b> login from a remote PC)</i></p>
-            <p class="padding-top-double"><span class="circle">03</span> <b>Download the FireAlarm setup files using the following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'</b><br/><i>This will download a zip file named 'Agent.zip'</i></p>
-        </ul>
-        <br>
-    </div>
-
-</div>
-
-<div id="qr-code-modal" data-enrollment-url="{{deviceType.enrollmentURL}}" 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>
-                <h4>
-                    Please scan the QR code using your mobile device to retrieve enrollment URL.
-                </h4>
-
-                <div class="panel panel-default">
-                    <div class="panel-body col-centered ">
-                        <div class="qr-code"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script type="text/javascript">
-
-    $(document).ready(function(){
-        toggleEnrollment();
-    });
-
-
-    function toggleEnrollment(){
-        $(".modalpopup-content").html($("#qr-code-modal").html());
-        generateQRCode(".modalpopup-content .qr-code");
-        showPopup();
-    }
-
-</script>
-<style type="text/css">
-    .circle {
-        background: none repeat scroll 0 0 #191919;
-        border-radius: 50px;
-        height: 50px;
-        padding: 10px;
-        width: 50px;
-        color: #fff;
-    }
-    .padding-top-double {
-        padding-top: 20px;
-    }
-    .padding-double {
-        padding: 20px;
-    }
-    .grey {
-        color: #333;
-    }
-    hr {
-        display: block;
-        height: 1px;
-        border: 0;
-        border-top: 1px solid #7f7f7f;
-        margin: 1em 0;
-        padding: 0;
-        opacity: 0.2;
-    }
-    .light-grey {
-        color: #7c7c7c;
-    }
-    .uppercase {
-        text-transform: uppercase;
-    }
-    .grey-bg {
-        background-color: #f6f4f4;
-    }
-</style>
\ No newline at end of file
diff --git a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/conf/device-type.json b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/conf/device-type.json
index 39959991ef..6f2b0650e8 100644
--- a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/conf/device-type.json
+++ b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/conf/device-type.json
@@ -1,25 +1,6 @@
 {
   "deviceType": {
     "displayName": "Windows",
-    "image": "/public/cdmf.unit.device.type.windows/images/thumb.png",
-    "downloadBtnText": "Download",
-    "ingredients": [
-      "Raspberry Pi (Internet Enabled)",
-      "DHT11 Temperature Sensor",
-      "LED",
-      "Buzzer(3v)"
-    ],
-    "prepareSteps": [
-      "Set up your RaspberryPi device as shown in the schematic below and get the FireAlarm setup.",
-      "Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device.",
-      "Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS"
-    ],
-    "schematicDiagram": "/public/cdmf.unit.device.type.windows/images/schematicsGuide.png",
-    "quickStartup": [
-      "<b>Click on the <i>'Create DEB'</i> button above to get the download link for the FireAlarm setup files</b>",
-      "<i>(The following commands can be issued by directly typing into the terminal of the device or by an <b>'ssh'<b> login from a remote PC)</i>",
-      "<b>Download the FireAlarm setup files using the following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'</b><br/><i>This will download a zip file named 'Agent.zip'</i>"
-    ],
-    "additionalHtml" : ""
+    "category" : "mobile"
   }
 }
diff --git a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/pages/device-type-details.hbs b/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/pages/device-type-details.hbs
deleted file mode 100644
index f6e275e339..0000000000
--- a/features/device-mgt-mdm-windows-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.type-view/private/pages/device-type-details.hbs
+++ /dev/null
@@ -1,151 +0,0 @@
-<div class="col-lg-12  margin-top-double">
-    <h1 class="grey ">Windows Mobile</h1>
-    <hr>
-    <p class="margin-bottom-double light-grey ">Connect your Windows device
-        to the WSO2 device cloud.</p>
-</div>
-<div class="col-xs-12 col-sm-6 col-md-4 col-lg-4 padding-top">
-    <img src="/devicemgt/public/cdmf.unit.device.type.virtual_firealarm/images/thumb.png" class="img-responsive">
-</div>
-<div class="col-xs-12 col-sm-6 col-md-8 col-lg-8 padding-top">
-        <h3 class="uppercase">Ingredients</h3>
-        <hr>
-        <p class="grey margin-top">Hardware Requirements </p>
-        <br>
-        <ul>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> Raspberry Pi (Internet Enabled)<br/>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> DHT11 Temperature Sensor<br/>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> LED<br/>
-            <span class="fw-stack fw-lg margin-right">
-                    <i class="fw fw-ring fw-stack-2x"> </i>
-                    <i class="fw fw-right-arrow fw-stack-1x"></i>
-                </span> Buzzer(3v)<br/>
-
-        </ul>
-        <br>
-
-
-        <a href="#" class="download-link btn-operations" data-devicetype="{{@uriParams.deviceType}}" data-sketchtype="{{@uriParams.deviceType}}"><i class="fw fw-download"></i> Download</a>
-
-    <br/><br/>
-</div>
-
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double grey-bg ">
-        <h3 class="uppercase">Prepare</h3><hr>
-        <p class="grey margin-top">Get your device ready</p>
-        <br/>
-        <ul>
-            <p class="padding-top-double"><span class="circle">01</span> Set up your RaspberryPi device as shown in the schematic below and get the FireAlarm setup.</p>
-            <p class="padding-top-double"><span class="circle">02</span> Connect a monitor to your RaspberryPi via the HDMI cable to get a UI view of the device.</p>
-            <p class="padding-top-double"><span class="circle">03</span> Get the RaspberryPi to connect to the internet (via Ethernet or Wifi) and note its IP_ADDRESS</p>
-        </ul>
-        <br>
-    </div>
-
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
-        <h3 class="uppercase">Schematic Diagram</h3><hr>
-        <p class="grey margin-top">Click on the image to zoom</p>
-        <center>
-            <a href="/public/cdmf.unit.device.type.virtual_firealarm/images/schematicsGuide.png" target="_blank">
-                <img src="/public/cdmf.unit.device.type.virtual_firealarm/images/schematicsGuide.png" class="img-responsive" style="max-width: 500px; max-height: 500px">
-            </a>
-        </center>
-        <br/>
-    </div>
-
-    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-12 padding-double">
-        <h3 class="uppercase">Connect (Quick Start)</h3><hr>
-        <p class="grey margin-top">Internet of Things Foundation Quickstart connection</p>
-        <br/>
-        <ul>
-            <p class="padding-top-double"><span class="circle">01</span> <b>Click on the <i>'Create DEB'</i> button above to get the download link for the FireAlarm setup files</b></p>
-            <p class="padding-top-double"><span class="circle">02</span> <i>(The following commands can be issued by directly typing into the terminal of the device or by an <b>'ssh'<b> login from a remote PC)</i></p>
-            <p class="padding-top-double"><span class="circle">03</span> <b>Download the FireAlarm setup files using the following command: 'curl -k < url_link_received_from_the_above_step >> Agent.zip'</b><br/><i>This will download a zip file named 'Agent.zip'</i></p>
-        </ul>
-        <br>
-    </div>
-
-</div>
-
-<div id="qr-code-modal" data-enrollment-url="{{deviceType.enrollmentURL}}" 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>
-                <h4>
-                    Please scan the QR code using your mobile device to retrieve enrollment URL.
-                </h4>
-
-                <div class="panel panel-default">
-                    <div class="panel-body col-centered ">
-                        <div class="qr-code"></div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-
-<script type="text/javascript">
-
-    $(document).ready(function(){
-        toggleEnrollment();
-    });
-
-
-    function toggleEnrollment(){
-        $(".modalpopup-content").html($("#qr-code-modal").html());
-        generateQRCode(".modalpopup-content .qr-code");
-        showPopup();
-    }
-
-</script>
-<style type="text/css">
-    .circle {
-        background: none repeat scroll 0 0 #191919;
-        border-radius: 50px;
-        height: 50px;
-        padding: 10px;
-        width: 50px;
-        color: #fff;
-    }
-    .padding-top-double {
-        padding-top: 20px;
-    }
-    .padding-double {
-        padding: 20px;
-    }
-    .grey {
-        color: #333;
-    }
-    hr {
-        display: block;
-        height: 1px;
-        border: 0;
-        border-top: 1px solid #7f7f7f;
-        margin: 1em 0;
-        padding: 0;
-        opacity: 0.2;
-    }
-    .light-grey {
-        color: #7c7c7c;
-    }
-    .uppercase {
-        text-transform: uppercase;
-    }
-    .grey-bg {
-        background-color: #f6f4f4;
-    }
-</style>
\ No newline at end of file