diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagementSchemaInitializer.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagementSchemaInitializer.java
index 4ed4e8ad5d5..448ae42007e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagementSchemaInitializer.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagementSchemaInitializer.java
@@ -27,18 +27,19 @@ import java.io.File;
 public final class DeviceManagementSchemaInitializer extends DatabaseCreator {
 
     private static final Log log = LogFactory.getLog(DeviceManagementSchemaInitializer.class);
-    private static final String setupSQLScriptLocation = CarbonUtils.getCarbonHome() + File.separator + "dbscripts" ;
+    private static final String setupSQLScriptBaseLocation =
+            CarbonUtils.getCarbonHome() + File.separator + "dbscripts" + File.separator + "cdm" + File.separator;
 
     public DeviceManagementSchemaInitializer(DataSourceConfig config) {
         super(DeviceManagerUtil.resolveDataSource(config));
     }
 
     protected String getDbScriptLocation(String databaseType) {
-        String scriptName = "wso2_cdm_" + databaseType + ".sql";
+        String scriptName = databaseType + ".sql";
         if (log.isDebugEnabled()) {
             log.debug("Loading database script from :" + scriptName);
         }
-        return setupSQLScriptLocation.replaceFirst("DBTYPE", databaseType) + scriptName;
+        return setupSQLScriptBaseLocation.replaceFirst("DBTYPE", databaseType) + scriptName;
     }
 
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml
index 043e0dd60e5..8dd8ef138c2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml
@@ -35,6 +35,7 @@
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${project.version}</Bundle-Version>
                         <Bundle-Description>Device Management Mobile Impl Bundle</Bundle-Description>
+                        <Bundle-Activator>org.wso2.carbon.device.mgt.mobile.impl.internal.MobileDeviceManagementBundleActivator</Bundle-Activator>
                         <Private-Package>org.wso2.carbon.device.mgt.mobile.impl.internal</Private-Package>
                         <Import-Package>
                             org.osgi.framework,
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/internal/MobileDeviceManagementServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/internal/MobileDeviceManagementBundleActivator.java
similarity index 96%
rename from components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/internal/MobileDeviceManagementServiceComponent.java
rename to components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/internal/MobileDeviceManagementBundleActivator.java
index 79782149699..e6141194929 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/internal/MobileDeviceManagementServiceComponent.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/internal/MobileDeviceManagementBundleActivator.java
@@ -26,9 +26,9 @@ import org.wso2.carbon.device.mgt.mobile.impl.android.AndroidDeviceManagerServic
 import org.wso2.carbon.device.mgt.mobile.impl.ios.IOSDeviceManagerService;
 import org.wso2.carbon.device.mgt.mobile.impl.windows.WindowsDeviceManagerService;
 
-public class MobileDeviceManagementServiceComponent implements BundleActivator {
+public class MobileDeviceManagementBundleActivator implements BundleActivator {
 
-	private static final Log log = LogFactory.getLog(MobileDeviceManagementServiceComponent.class);
+	private static final Log log = LogFactory.getLog(MobileDeviceManagementBundleActivator.class);
 	private ServiceRegistration androidServiceRegRef;
 	private ServiceRegistration iOSServiceRegRef;
 	private ServiceRegistration windowsServiceRegRef;
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
index e69de29bb2d..b5222094b32 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.mgt.server_${feature.version}/conf/cdm-config.xml,target:${installFolder}/../../conf/cdm-config.xml,overwrite:true);\
+
diff --git a/product/modules/distribution/src/assembly/bin.xml b/product/modules/distribution/src/assembly/bin.xml
index eee52239eb6..6b06f312f58 100644
--- a/product/modules/distribution/src/assembly/bin.xml
+++ b/product/modules/distribution/src/assembly/bin.xml
@@ -153,7 +153,7 @@
             <includes>
                 <include>**/api-manager.xml</include>
                 <include>**/sso-idp-config.xml</include>
-                <include>**/emm-config.xml</include>
+               <!-- <include>**/emm-config.xml</include>-->
             </includes>
         </fileSet>
         <fileSet>
@@ -170,6 +170,7 @@
             <outputDirectory>wso2cdm-${project.version}/repository/conf/datasources</outputDirectory>
             <includes>
                 <include>**/master-datasources.xml</include>
+                <include>**/cdm-datasources.xml</include>
             </includes>
         </fileSet>
         <fileSet>
@@ -358,6 +359,16 @@
             <filtered>true</filtered>
             <fileMode>644</fileMode>
         </file>
+
+           <!--cdm config file-->
+        <file>
+            <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/cdm-config.xml</source>
+            <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf</outputDirectory>
+            <filtered>true</filtered>
+            <fileMode>644</fileMode>
+        </file>
+
+
         <file>
             <source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/tomcat/webapp-classloading-environments.xml</source>
             <outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/tomcat</outputDirectory>
diff --git a/product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml b/product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
new file mode 100755
index 00000000000..e24759f81b3
--- /dev/null
+++ b/product/modules/distribution/src/repository/conf/datasources/cdm-datasources.xml
@@ -0,0 +1,28 @@
+<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
+    <providers>
+        <provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
+    </providers>
+
+    <datasources>
+        <datasource>
+            <name>WSO2DEVICE_DB</name>
+            <description>The datasource used for EMM</description>
+            <jndiConfig>
+                <name>jdbc/WSO2DEVICE_DB</name>
+            </jndiConfig>
+            <definition type="RDBMS">
+                <configuration>
+                    <url>jdbc:h2:repository/database/WSO2DEVICE_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/product/modules/p2-profile-gen/pom.xml b/product/modules/p2-profile-gen/pom.xml
index 97d4a18cddd..5418904a505 100644
--- a/product/modules/p2-profile-gen/pom.xml
+++ b/product/modules/p2-profile-gen/pom.xml
@@ -107,7 +107,7 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.device.mgt.server.feature:${project.version}
                                 </featureArtifactDef>
-				<featureArtifactDef>
+                                <featureArtifactDef>
                                     org.wso2.carbon:org.wso2.carbon.device.mgt.mobile.feature:${project.version}
                                 </featureArtifactDef>
                                 <featureArtifactDef>
@@ -164,7 +164,7 @@
                                     <id>org.wso2.carbon.device.mgt.server.feature.group</id>
                                     <version>${project.version}</version>
                                 </feature>
-				<feature>
+                                <feature>
                                     <id>org.wso2.carbon.device.mgt.mobile.feature.group</id>
                                     <version>${project.version}</version>
                                 </feature>
diff --git a/product/pom.xml b/product/pom.xml
index c9fbafc3d0e..3c381596631 100644
--- a/product/pom.xml
+++ b/product/pom.xml
@@ -34,7 +34,7 @@
     <name>WSO2 Connected Device Manager (CDM) - Parent</name>
 
     <modules>
-        <!--<module>modules/agents/android/jax-rs</module>-->
+        <module>modules/agents/android/jax-rs</module>
         <module>modules/p2-profile-gen</module>
         <module>modules/distribution</module>
         <module>modules/integration</module>