diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/build.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/build.xml
deleted file mode 100644
index ebf679b8f..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/build.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<project name="create-device-analytics-capps" default="zip" basedir="">
-
-    <property name="project-name" value="${ant.project.name}"/>
-    <property name="target-dir" value="target/carbonapps"/>
-    <property name="src-dir" value="src/main/resources/carbonapps"/>
-
-    <property name="capp-dir" value="device_analytics"/>
-    <property name="capp-name" value="org.wso2.carbon.iot.device.analytics_1.0.0"/>
-
-    <target name="clean">
-        <delete dir="${target-dir}" />
-    </target>
-
-    <target name="zip" depends="clean">
-        <mkdir dir="${target-dir}"/>
-        <zip destfile="${target-dir}/${capp-name}.car">
-            <zipfileset dir="${src-dir}/${capp-dir}"/>
-        </zip>
-    </target>
-</project>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml
deleted file mode 100644
index 365ad97d2..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-    <parent>
-        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <artifactId>iot-analytics</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.iot.analytics</artifactId>
-    <name>WSO2 Carbon - IoT Server  Analytics C-APP</name>
-    <packaging>pom</packaging>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <configuration>
-                            <target>
-                                <ant antfile="build.xml" target="zip" />
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.5.5</version>
-                <configuration>
-                    <finalName>${project.artifactId}-${carbon.devicemgt.plugins.version}</finalName>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptors>
-                        <descriptor>src/assembly/src.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>create-archive</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/assembly/src.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/assembly/src.xml
deleted file mode 100644
index a5a375010..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/assembly/src.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<assembly
-        xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>src</id>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <baseDirectory>${basedir}/src</baseDirectory>
-    <fileSets>
-        <fileSet>
-            <directory>${basedir}/target/carbonapps</directory>
-            <outputDirectory>/</outputDirectory>
-            <useDefaultExcludes>true</useDefaultExcludes>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-DeviceInfo-Receiver_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-DeviceInfo-Receiver_1.0.0/artifact.xml
deleted file mode 100644
index e9e608f57..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-DeviceInfo-Receiver_1.0.0/artifact.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<artifact name="WSO2IoT-DeviceInfo-Receiver" version="1.0.0" type="event/receiver" serverRole="DataAnalyticsServer">
-    <file>WSO2IoT-DeviceInfo-Receiver_1.0.0.xml</file>
-</artifact>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-Operation-ExecutionPlan_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-Operation-ExecutionPlan_1.0.0/artifact.xml
deleted file mode 100644
index ae461dddf..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-Operation-ExecutionPlan_1.0.0/artifact.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied. See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<artifact name= "WSO2IoT-Operation-ExecutionPlan" version="1.0.0" type="event/execution-plan" serverRole="DataAnalyticsServer">
-	<file>WSO2IoT-Operation-ExecutionPlan.siddhiql</file>
-</artifact>
-
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-OperationResponse-Receiver_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-OperationResponse-Receiver_1.0.0/artifact.xml
deleted file mode 100644
index 6acd0797f..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-OperationResponse-Receiver_1.0.0/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-  ~ Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<artifact name="WSO2IoT-OperationResponse-Receiver" version="1.0.0" type="event/receiver"
-          serverRole="DataAnalyticsServer">
-    <file>WSO2IoT-OperationResponse-Receiver_1.0.0.xml</file>
-</artifact>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/artifacts.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/artifacts.xml
deleted file mode 100644
index baddee4b4..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/artifacts.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<artifacts>
-    <artifact name="org.wso2.carbon.iot.device.analytics" version="1.0.0" type="carbon/application">
-        <!-- CEP Artifacts -->
-        <dependency artifact="org.wso2.iot.DeviceInfoStream" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="org.wso2.iot.OperationResponseStream" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="org.wso2.iot.operation" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="WSO2IoT-DeviceInfo-Receiver" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="WSO2IoT-OperationResponse-Receiver" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-        <dependency artifact="WSO2IoT-Operation-ExecutionPlan" version="1.0.0" include="true"
-                    serverRole="DataAnalyticsServer"/>
-    </artifact>
-</artifacts>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.DeviceInfoStream_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.DeviceInfoStream_1.0.0/artifact.xml
deleted file mode 100644
index 3594a8bf8..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.DeviceInfoStream_1.0.0/artifact.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-  ~ Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<artifact name="org.wso2.iot.DeviceInfoStream" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-    <file>org.wso2.iot.DeviceInfoStream_1.0.0.json</file>
-</artifact>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.OperationResponseStream_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.OperationResponseStream_1.0.0/artifact.xml
deleted file mode 100644
index 23d9921e8..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.OperationResponseStream_1.0.0/artifact.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-  ~ Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~   http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<artifact name="org.wso2.iot.OperationResponseStream" version="1.0.0" type="event/stream"
-          serverRole="DataAnalyticsServer">
-    <file>org.wso2.iot.OperationResponseStream_1.0.0.json</file>
-</artifact>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.operation_1.0.0/artifact.xml b/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.operation_1.0.0/artifact.xml
deleted file mode 100644
index 2cc91e5d9..000000000
--- a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.operation_1.0.0/artifact.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-  ~ Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
-  ~
-  ~ WSO2 Inc. licenses this file to you under the Apache License,
-  ~ Version 2.0 (the "License"); you may not use this file except
-  ~ in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~ http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-
-<artifact name="org.wso2.iot.operation" version="1.0.0" type="event/stream" serverRole="DataAnalyticsServer">
-    <file>org.wso2.iot.operation_1.0.0.json</file>
-</artifact>
diff --git a/components/analytics/iot-analytics/pom.xml b/components/analytics/iot-analytics/pom.xml
index 467fcaf2c..0b5ea22dc 100644
--- a/components/analytics/iot-analytics/pom.xml
+++ b/components/analytics/iot-analytics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>analytics</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -33,8 +33,7 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <module>org.wso2.carbon.device.mgt.iot.analytics</module>
-        <module>org.wso2.carbon.iot.geo.dashboard</module>
+<!--        <module>org.wso2.carbon.iot.geo.dashboard</module>-->
     </modules>
 
 </project>
diff --git a/components/analytics/pom.xml b/components/analytics/pom.xml
index 8df45e52e..56af3b137 100644
--- a/components/analytics/pom.xml
+++ b/components/analytics/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
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 bd51a078c..36b886d89 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
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>analytics-feature</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -36,58 +36,58 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-                                    <artifactId>org.wso2.carbon.device.mgt.iot.analytics</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>zip</type>
-                                    <overWrite>true</overWrite>
-                                    <outputDirectory>
-                                        ${project.build.directory}/maven-shared-archive-resources/carbonapps
-                                    </outputDirectory>
-                                    <includes>**/*</includes>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>src/main/resources</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>resources</directory>
-                                    <includes>
-                                        <include>build.properties</include>
-                                        <include>p2.inf</include>
-                                    </includes>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+<!--            <plugin>-->
+<!--                <groupId>org.apache.maven.plugins</groupId>-->
+<!--                <artifactId>maven-dependency-plugin</artifactId>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>unpack</id>-->
+<!--                        <phase>package</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>unpack</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            <artifactItems>-->
+<!--                                <artifactItem>-->
+<!--                                    <groupId>org.wso2.carbon.devicemgt-plugins</groupId>-->
+<!--                                    <artifactId>org.wso2.carbon.device.mgt.iot.analytics</artifactId>-->
+<!--                                    <version>${project.version}</version>-->
+<!--                                    <type>zip</type>-->
+<!--                                    <overWrite>true</overWrite>-->
+<!--                                    <outputDirectory>-->
+<!--                                        ${project.build.directory}/maven-shared-archive-resources/carbonapps-->
+<!--                                    </outputDirectory>-->
+<!--                                    <includes>**/*</includes>-->
+<!--                                </artifactItem>-->
+<!--                            </artifactItems>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
+<!--            <plugin>-->
+<!--                <artifactId>maven-resources-plugin</artifactId>-->
+<!--                <executions>-->
+<!--                    <execution>-->
+<!--                        <id>copy-resources</id>-->
+<!--                        <phase>generate-resources</phase>-->
+<!--                        <goals>-->
+<!--                            <goal>copy-resources</goal>-->
+<!--                        </goals>-->
+<!--                        <configuration>-->
+<!--                            <outputDirectory>src/main/resources</outputDirectory>-->
+<!--                            <resources>-->
+<!--                                <resource>-->
+<!--                                    <directory>resources</directory>-->
+<!--                                    <includes>-->
+<!--                                        <include>build.properties</include>-->
+<!--                                        <include>p2.inf</include>-->
+<!--                                    </includes>-->
+<!--                                </resource>-->
+<!--                            </resources>-->
+<!--                        </configuration>-->
+<!--                    </execution>-->
+<!--                </executions>-->
+<!--            </plugin>-->
             <plugin>
                 <groupId>org.wso2.maven</groupId>
                 <artifactId>carbon-p2-plugin</artifactId>
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-DeviceInfo-Receiver_1.0.0/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml
similarity index 100%
rename from components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-DeviceInfo-Receiver_1.0.0/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml
rename to features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-OperationResponse-Receiver_1.0.0/WSO2IoT-OperationResponse-Receiver_1.0.0.xml b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml
similarity index 100%
rename from components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-OperationResponse-Receiver_1.0.0/WSO2IoT-OperationResponse-Receiver_1.0.0.xml
rename to features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.DeviceInfoStream_1.0.0/org.wso2.iot.DeviceInfoStream_1.0.0.json b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json
similarity index 100%
rename from components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.DeviceInfoStream_1.0.0/org.wso2.iot.DeviceInfoStream_1.0.0.json
rename to features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.OperationResponseStream_1.0.0/org.wso2.iot.OperationResponseStream_1.0.0.json b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json
similarity index 100%
rename from components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.OperationResponseStream_1.0.0/org.wso2.iot.OperationResponseStream_1.0.0.json
rename to features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.operation_1.0.0/org.wso2.iot.operation_1.0.0.json b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json
similarity index 100%
rename from components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/org.wso2.iot.operation_1.0.0/org.wso2.iot.operation_1.0.0.json
rename to features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json
diff --git a/components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-Operation-ExecutionPlan_1.0.0/WSO2IoT-Operation-ExecutionPlan.siddhiql b/features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql
similarity index 100%
rename from components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/src/main/resources/carbonapps/device_analytics/WSO2IoT-Operation-ExecutionPlan_1.0.0/WSO2IoT-Operation-ExecutionPlan.siddhiql
rename to features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/src/main/resources/deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql
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 1a7837bcf..0846274b4 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,8 +1,16 @@
 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}/../../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);\
+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}/deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml,target:${installFolder}/../../deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.analytics_${feature.version}/deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml,target:${installFolder}/../../deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.analytics_${feature.version}/deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.analytics_${feature.version}/deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.analytics_${feature.version}/deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json,target:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.iot.analytics_${feature.version}/deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql,target:${installFolder}/../../deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql,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);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventreceivers/WSO2IoT-DeviceInfo-Receiver_1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventreceivers/WSO2IoT-OperationResponse-Receiver_1.0.0.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.DeviceInfoStream_1.0.0.json,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.operation_1.0.0.json,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/eventstreams/org.wso2.iot.OperationResponseStream_1.0.0.json,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/../../deployment/server/executionplans/WSO2IoT-Operation-ExecutionPlan.siddhiql,overwrite:true);\
diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml
index ea052c514..950072bce 100644
--- a/features/analytics-feature/pom.xml
+++ b/features/analytics-feature/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
         <artifactId>carbon-device-mgt-plugins-parent</artifactId>
-        <version>6.0.0-SNAPSHOT</version>
+        <version>6.0.12-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
 
     <modules>
         <module>org.wso2.carbon.device.mgt.iot.analytics.feature</module>
-        <module>org.wso2.carbon.iot.geo.dashboard.feature</module>
+<!--        <module>org.wso2.carbon.iot.geo.dashboard.feature</module>-->
     </modules>
 
 </project>