diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index e45d239f..50fd397b 100755
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -864,6 +864,22 @@
             </outputDirectory>
         </fileSet>
 
+		<fileSet>
+			<directory>
+				../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/eventstreams/
+			</directory>
+			<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventstreams/
+			</outputDirectory>
+		</fileSet>
+
+		<fileSet>
+			<directory>
+				../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/deployment/server/eventreceivers/
+			</directory>
+			<outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/repository/deployment/server/eventreceivers/
+			</outputDirectory>
+		</fileSet>
+
         <fileSet>
             <directory>
                 ../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/resources
@@ -899,6 +915,12 @@
             <filtered>true</filtered>
         </fileSet>
 
+        <fileSet>
+            <directory>src/analytics/plugins</directory>
+            <outputDirectory>${pom.artifactId}-${pom.version}/wso2/analytics/plugins</outputDirectory>
+			<filtered>true</filtered>
+        </fileSet>
+
         <fileSet>
             <directory>../p2-profile/analytics-profile/target/wso2carbon-core-${carbon.kernel.version}/wso2/components
             </directory>
diff --git a/modules/p2-profile/analytics-profile/pom.xml b/modules/p2-profile/analytics-profile/pom.xml
index af59e28c..b628623f 100644
--- a/modules/p2-profile/analytics-profile/pom.xml
+++ b/modules/p2-profile/analytics-profile/pom.xml
@@ -115,9 +115,6 @@
                                 </featureArtifactDef>
                                 <!-- END - Analytics features -->
 
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.cdmf.analytics.feature:${carbon.device.mgt.plugin.version}
-                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.analytics-common:org.wso2.carbon.analytics.gadget.template.feature:${carbon.analytics.common.version}
                                 </featureArtifactDef>
@@ -392,7 +389,7 @@
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.extension.siddhi.execution.json.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
 								<featureArtifactDef>
-                                    org.wso2.carbon.identity.carbon.auth.mutualssl:org.wso2.carbon.identity.authenticator.mutualssl.feature:${identity.carbon.auth.mutual.ssl.version}
+									org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature:${carbon.device.mgt.plugin.version}
 								</featureArtifactDef>
                             </featureArtifacts>
                         </configuration>
@@ -806,12 +803,6 @@
                                     <id>org.wso2.carbon.identity.jwt.client.extension.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-
-                                <!-- IoT Analytics Features -->
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.cdmf.analytics.feature.group</id>
-                                    <version>${carbon.device.mgt.plugin.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.analytics.gadget.template.feature.group</id>
                                     <version>${carbon.analytics.common.version}</version>
@@ -831,6 +822,12 @@
                                     <id>org.wso2.extension.siddhi.execution.json.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
+
+								<!--android sense analytics feature-->
+								<feature>
+									<id>org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature.group</id>
+									<version>${carbon.device.mgt.plugin.version}</version>
+								</feature>
                             </features>
                         </configuration>
                     </execution>