diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java
new file mode 100644
index 000000000..8287e60c8
--- /dev/null
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/common/MobilePluginConstants.java
@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+package org.wso2.carbon.device.mgt.mobile.common;
+
+public class MobilePluginConstants {
+    public static final String MOBILE_DB_SCRIPTS_FOLDER = "cdm";
+
+}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/resources/sql/h2.sql b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/resources/sql/h2.sql
deleted file mode 100644
index dbcc64dac..000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/resources/sql/h2.sql
+++ /dev/null
@@ -1,98 +0,0 @@
--- -----------------------------------------------------
--- Table AD_DEVICE
--- -----------------------------------------------------
-
-CREATE TABLE IF NOT EXISTS AD_FEATURE(
-    ID INTEGER NOT NULL,
-    CODE VARCHAR(50) NOT NULL,
-    NAME VARCHAR(100) NOT NULL,
-    DESCRIPTION VARCHAR(200) NOT NULL,
-)
-
--- -----------------------------------------------------
--- Table AD_DEVICE
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS AD_DEVICE (
-  MOBILE_DEVICE_ID VARCHAR(45) NOT NULL ,
-  PUSH_TOKEN VARCHAR(45) NULL DEFAULT NULL ,
-  IMEI VARCHAR(45) NULL DEFAULT NULL ,
-  IMSI VARCHAR(45) NULL DEFAULT NULL ,
-  OS_VERSION VARCHAR(45) NULL DEFAULT NULL ,
-  DEVICE_MODEL VARCHAR(45) NULL DEFAULT NULL ,
-  VENDOR VARCHAR(45) NULL DEFAULT NULL ,
-  LATITUDE VARCHAR(45) NULL DEFAULT NULL,
-  LONGITUDE VARCHAR(45) NULL DEFAULT NULL,
-  CHALLENGE VARCHAR(45) NULL DEFAULT NULL,
-  TOKEN VARCHAR(500) NULL DEFAULT NULL,
-  UNLOCK_TOKEN VARCHAR(500) NULL DEFAULT NULL,
-  SERIAL VARCHAR(45) NULL DEFAULT NULL,
-  PRIMARY KEY (MOBILE_DEVICE_ID) );
-
-
--- -----------------------------------------------------
--- Table AD_FEATURE
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS AD_FEATURE (
-  FEATURE_ID INT NOT NULL AUTO_INCREMENT ,
-  CODE VARCHAR(45) NOT NULL,
-  NAME VARCHAR(100) NULL ,
-  DESCRIPTION VARCHAR(200) NULL ,
-  DEVICE_TYPE VARCHAR(50) NULL ,
-  PRIMARY KEY (FEATURE_ID) );
-
--- -----------------------------------------------------
--- Table AD_OPERATION
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS AD_OPERATION (
-  OPERATION_ID INT NOT NULL AUTO_INCREMENT ,
-  FEATURE_CODE VARCHAR(45) NOT NULL ,
-  CREATED_DATE BIGINT NULL ,
-  PRIMARY KEY (OPERATION_ID));
-
--- -----------------------------------------------------
--- Table AD_DEVICE_OPERATION_MAPPING
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS AD_DEVICE_OPERATION_MAPPING (
-  DEVICE_ID VARCHAR(45) NOT NULL ,
-  OPERATION_ID INT NOT NULL ,
-  SENT_DATE BIGINT NULL ,
-  RECEIVED_DATE BIGINT NULL ,
-  STATUS VARCHAR(10) NOT NULL ,
-  PRIMARY KEY (DEVICE_ID, OPERATION_ID) ,
-  CONSTRAINT fk_AD_DEVICE_OPERATION_AD_DEVICE
-    FOREIGN KEY (DEVICE_ID )
-    REFERENCES AD_DEVICE (MOBILE_DEVICE_ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION,
-  CONSTRAINT fk_AD_DEVICE_OPERATION_AD_OPERATION1
-    FOREIGN KEY (OPERATION_ID )
-    REFERENCES AD_OPERATION (OPERATION_ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION);
-
--- -----------------------------------------------------
--- Table AD_OPERATION_PROPERTY
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS AD_OPERATION_PROPERTY (
-  OPERATION_ID INT NOT NULL ,
-  PROPERTY VARCHAR(45) NOT NULL ,
-  VALUE TEXT NULL ,
-  PRIMARY KEY (OPERATION_ID, PROPERTY) ,
-  CONSTRAINT fk_AD_OPERATION_PROPERTY_AD_OPERATION1
-    FOREIGN KEY (OPERATION_ID )
-    REFERENCES AD_OPERATION (OPERATION_ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION);
-
--- -----------------------------------------------------
--- Table AD_FEATURE_PROPERTY
--- -----------------------------------------------------
-CREATE TABLE IF NOT EXISTS AD_FEATURE_PROPERTY (
-  PROPERTY VARCHAR(45) NOT NULL ,
-  FEATURE_ID INT NOT NULL ,
-  PRIMARY KEY (PROPERTY) ,
-  CONSTRAINT fk_AD_FEATURE_PROPERTY_AD_FEATURE1
-    FOREIGN KEY (FEATURE_ID )
-    REFERENCES AD_FEATURE (FEATURE_ID )
-    ON DELETE NO ACTION
-    ON UPDATE NO ACTION);