diff --git a/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/p2.inf b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/p2.inf
index ffbc1a492a..1a7837bcf2 100644
--- a/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/p2.inf
+++ b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/p2.inf
@@ -1,9 +1,8 @@
 instructions.configure = \
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/);\
 org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/devicetypes/);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/carbonapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.analytics_${feature.version}/carbonapps/,target:${installFolder}/../../deployment/server/carbonapps/,overwrite:true);\
-
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/devicetypes/analytics/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.analytics_${feature.version}/carbonapps/,target:${installFolder}/../../resources/devicetypes/analytics/,overwrite:true);\
 
+instructions.uninstall = \
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../resources/devicetypes/analytics/org.wso2.carbon.iot.device.analytics_1.0.0.car,overwrite:true);\
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 c9ebbb4f2b..f0ba73b640 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
@@ -65,7 +65,7 @@
                                     <type>zip</type>
                                     <overWrite>true</overWrite>
                                     <outputDirectory>
-                                        ${project.build.directory}/maven-shared-archive-resources
+                                        ${project.build.directory}/maven-shared-archive-resources/carbonapps
                                     </outputDirectory>
                                     <includes>**/*</includes>
                                 </artifactItem>
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/resources/org_wso2_carbon_iot_geo_dashboard-1.0.0.car b/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/resources/org_wso2_carbon_iot_geo_dashboard-1.0.0.car
deleted file mode 100644
index e4f04be18d..0000000000
Binary files a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/resources/org_wso2_carbon_iot_geo_dashboard-1.0.0.car and /dev/null differ
diff --git a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/resources/p2.inf b/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/resources/p2.inf
index de1c31555c..eb4814ef1f 100644
--- a/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/resources/p2.inf
+++ b/features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/src/main/resources/p2.inf
@@ -1,8 +1,8 @@
 instructions.configure = \
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/carbonapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.iot.geo.dashboard_${feature.version}/org_wso2_carbon_iot_geo_dashboard-1.0.0.car,target:${installFolder}/../../deployment/server/carbonapps/org_wso2_carbon_iot_geo_dashboard-1.0.0.car,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/devicetypes/);\
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/devicetypes/analytics/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.iot.geo.dashboard_${feature.version}/carbonapps/,target:${installFolder}/../../resources/devicetypes/analytics/,overwrite:true);\
 
 instructions.uninstall = \
-org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/carbonapps/org_wso2_carbon_iot_geo_dashboard-1.0.0.car,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../resources/devicetypes/analytics/org_wso2_carbon_iot_geo_dashboard-1.0.0.car,overwrite:true);\