diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml
index 7332606e59a..40747d13418 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml
@@ -22,12 +22,13 @@
     <parent>
         <artifactId>application-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.45-SNAPSHOT</version>
+        <version>2.0.63-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.application.mgt.api</artifactId>
+    <version>2.0.63-SNAPSHOT</version>
     <packaging>war</packaging>
     <name>WSO2 Carbon - Mobile Application Management API</name>
     <description>WSO2 Carbon - Mobile Application Management API</description>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml
index 5a7933cd2da..46a9c6e7dce 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml
@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>application-mgt</artifactId>
-        <version>2.0.45-SNAPSHOT</version>
+        <version>2.0.63-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
-    <version>2.0.45-SNAPSHOT</version>
+    <version>2.0.63-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Application Management Core</name>
     <description>WSO2 Carbon - Application Management Core</description>
diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml
index 1823e25fbb7..158a54d665b 100644
--- a/components/application-mgt/pom.xml
+++ b/components/application-mgt/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.45-SNAPSHOT</version>
+        <version>2.0.63-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -30,7 +30,7 @@
     <artifactId>application-mgt</artifactId>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <packaging>pom</packaging>
-    <name>WSO2 Carbon - Device Application Management Component</name>
+    <name>WSO2 Carbon - Application Management Component</name>
     <description>WSO2 Carbon - Application Management Component</description>
     <url>http://wso2.org</url>
 
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml
new file mode 100644
index 00000000000..968740c38b2
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml
@@ -0,0 +1,122 @@
+<?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</groupId>
+        <artifactId>application-mgt-feature</artifactId>
+        <version>2.0.63-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId>
+    <version>2.0.63-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>WSO2 Carbon - Application Management API Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the APIs required for Application Management console UI</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.wso2.carbon.devicemgt</groupId>
+                                    <artifactId>org.wso2.carbon.device.application.mgt.api
+                                    </artifactId>
+                                    <version>${project.version}</version>
+                                    <type>war</type>
+                                    <overWrite>true</overWrite>
+                                    <outputDirectory>
+                                        ${project.build.directory}/maven-shared-archive-resources/webapps
+                                    </outputDirectory>
+                                    <destFileName>api#application-mgt#v1.0.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <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>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.wso2.carbon.device.mgt.api</id>
+                            <propertiesFile>../../../features/etc/feature.properties
+                            </propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server
+                                    </propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false
+                                    </propertyDef>
+                                </properties>
+                            </adviceFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/build.properties b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/build.properties
new file mode 100644
index 00000000000..9c86577d768
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/build.properties
@@ -0,0 +1 @@
+custom = true
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf
new file mode 100644
index 00000000000..2a0bb7342f8
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/src/main/resources/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure = \
+org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.api_${feature.version}/webapps/api#application-mgt#v1.0.war,target:${installFolder}/../../deployment/server/webapps/api#application-mgt#v1.0.war,overwrite:true);\
\ No newline at end of file
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml
new file mode 100644
index 00000000000..74b83031376
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.feature/pom.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2014, 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/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <artifactId>application-mgt-feature</artifactId>
+        <version>2.0.63-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.device.application.mgt.feature</artifactId>
+    <version>2.0.63-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>WSO2 Carbon - Application Management Aggregate Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains all the bundles required for application management related functionalities</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.application.mgt.server.feature</artifactId>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.orbit.org.scannotation</groupId>
+            <artifactId>scannotation</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.wso2.carbon.device.application.mgt</id>
+                            <propertiesFile>../../../etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:true</propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <includedFeatures>
+                                <includedFeatureDef>org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.server.feature:${carbon.device.mgt.version}</includedFeatureDef>
+                            </includedFeatures>
+                            <bundles>
+                                <bundleDef>javax.servlet.jsp:javax.servlet.jsp-api</bundleDef>
+                            	<bundleDef>org.wso2.orbit.org.scannotation:scannotation:${scannotation.version}</bundleDef>
+							</bundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml
new file mode 100644
index 00000000000..c69b51b1c41
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml
@@ -0,0 +1,118 @@
+<?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</groupId>
+        <artifactId>application-mgt-feature</artifactId>
+        <version>2.0.63-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.wso2.carbon.device.application.mgt.server.feature</artifactId>
+    <packaging>pom</packaging>
+    <version>2.0.63-SNAPSHOT</version>
+    <name>WSO2 Carbon - Application Management Server Feature</name>
+    <url>http://wso2.org</url>
+    <description>This feature contains the core bundles required for Back-end Application Management functionality
+    </description>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <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>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>org.wso2.carbon.device.application.mgt.server</id>
+                            <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server</propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:false</propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <includedFeatures>
+                                <includedFeatureDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.api.feature:${carbon.device.mgt.version}
+                                </includedFeatureDef>
+                            </includedFeatures>
+                            <bundles>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.application.mgt.core:${carbon.device.mgt.version}
+                                </bundleDef>
+                            </bundles>
+                            <importBundles>
+                            </importBundles>
+                            <importFeatures>
+                                <importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}</importFeatureDef>
+                            </importFeatures>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/build.properties b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/build.properties
new file mode 100644
index 00000000000..9c86577d768
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/build.properties
@@ -0,0 +1 @@
+custom = true
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml
new file mode 100644
index 00000000000..e773738c3bd
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/datasources/application-mgt-datasources.xml
@@ -0,0 +1,47 @@
+<!--
+  ~ 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.
+  -->
+
+<datasources-configuration xmlns:svns="http://org.wso2.securevault/configuration">
+	<providers>
+		<provider>org.wso2.carbon.ndatasource.rdbms.RDBMSDataSourceReader</provider>
+	</providers>
+
+	<datasources>
+		<datasource>
+			<name>APPM_DS</name>
+			<description>The datasource used for CDM Application Management</description>
+			<jndiConfig>
+				<name>jdbc/APPM_DS</name>
+			</jndiConfig>
+			<definition type="RDBMS">
+				<configuration>
+					<url>jdbc:h2:repository/database/WSO2DM_APPM_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/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql
new file mode 100644
index 00000000000..d512eafa36f
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/h2.sql
@@ -0,0 +1,44 @@
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_TYPE (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+			DESCRIPTION TEXT,
+             CODE VARCHAR (255),
+             PARAMTERS LONGTEXT,
+             PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_CATEGORY (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+             DESCRIPTION TEXT,
+             PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+             UUID VARCHAR (255),
+             DESCRIPTION MEDIUMTEXT,
+             ICON_NAME VARCHAR (255),
+             BANNER_NAME VARCHAR (255),
+             VIDEO_NAME VARCHAR (255),
+             SCREENSHOTS TEXT,
+             TAGS TEXT,
+             APPLICATION_TYPE_ID INTEGER,
+             CATEGORY_ID INTEGER,
+             CREATED_AT DATETIME,
+             MODIFIED_AT DATETIME,
+             PRIMARY KEY (ID),
+             FOREIGN KEY (CATEGORY_ID) REFERENCES APPM_APPLICATION_CATEGORY(ID),
+             FOREIGN KEY (APPLICATION_TYPE_ID) REFERENCES APPM_APPLICATION_TYPE(ID)
+)ENGINE INNODB;
+
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_PROPERTIES (
+             PROP_KEY VARCHAR (255),
+             PROP_VAL MEDIUMTEXT,
+             APPLICATION_ID INTEGER,
+             PRIMARY KEY (APPLICATION_ID, PROP_KEY),
+             FOREIGN KEY (APPLICATION_ID) REFERENCES APPM_APPLICATION(ID)
+)ENGINE INNODB;
\ No newline at end of file
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql
new file mode 100644
index 00000000000..d512eafa36f
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mssql.sql
@@ -0,0 +1,44 @@
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_TYPE (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+			DESCRIPTION TEXT,
+             CODE VARCHAR (255),
+             PARAMTERS LONGTEXT,
+             PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_CATEGORY (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+             DESCRIPTION TEXT,
+             PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+             UUID VARCHAR (255),
+             DESCRIPTION MEDIUMTEXT,
+             ICON_NAME VARCHAR (255),
+             BANNER_NAME VARCHAR (255),
+             VIDEO_NAME VARCHAR (255),
+             SCREENSHOTS TEXT,
+             TAGS TEXT,
+             APPLICATION_TYPE_ID INTEGER,
+             CATEGORY_ID INTEGER,
+             CREATED_AT DATETIME,
+             MODIFIED_AT DATETIME,
+             PRIMARY KEY (ID),
+             FOREIGN KEY (CATEGORY_ID) REFERENCES APPM_APPLICATION_CATEGORY(ID),
+             FOREIGN KEY (APPLICATION_TYPE_ID) REFERENCES APPM_APPLICATION_TYPE(ID)
+)ENGINE INNODB;
+
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_PROPERTIES (
+             PROP_KEY VARCHAR (255),
+             PROP_VAL MEDIUMTEXT,
+             APPLICATION_ID INTEGER,
+             PRIMARY KEY (APPLICATION_ID, PROP_KEY),
+             FOREIGN KEY (APPLICATION_ID) REFERENCES APPM_APPLICATION(ID)
+)ENGINE INNODB;
\ No newline at end of file
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql
new file mode 100644
index 00000000000..d512eafa36f
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/mysql.sql
@@ -0,0 +1,44 @@
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_TYPE (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+			DESCRIPTION TEXT,
+             CODE VARCHAR (255),
+             PARAMTERS LONGTEXT,
+             PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_CATEGORY (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+             DESCRIPTION TEXT,
+             PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+             UUID VARCHAR (255),
+             DESCRIPTION MEDIUMTEXT,
+             ICON_NAME VARCHAR (255),
+             BANNER_NAME VARCHAR (255),
+             VIDEO_NAME VARCHAR (255),
+             SCREENSHOTS TEXT,
+             TAGS TEXT,
+             APPLICATION_TYPE_ID INTEGER,
+             CATEGORY_ID INTEGER,
+             CREATED_AT DATETIME,
+             MODIFIED_AT DATETIME,
+             PRIMARY KEY (ID),
+             FOREIGN KEY (CATEGORY_ID) REFERENCES APPM_APPLICATION_CATEGORY(ID),
+             FOREIGN KEY (APPLICATION_TYPE_ID) REFERENCES APPM_APPLICATION_TYPE(ID)
+)ENGINE INNODB;
+
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_PROPERTIES (
+             PROP_KEY VARCHAR (255),
+             PROP_VAL MEDIUMTEXT,
+             APPLICATION_ID INTEGER,
+             PRIMARY KEY (APPLICATION_ID, PROP_KEY),
+             FOREIGN KEY (APPLICATION_ID) REFERENCES APPM_APPLICATION(ID)
+)ENGINE INNODB;
\ No newline at end of file
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql
new file mode 100644
index 00000000000..d512eafa36f
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/oracle.sql
@@ -0,0 +1,44 @@
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_TYPE (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+			DESCRIPTION TEXT,
+             CODE VARCHAR (255),
+             PARAMTERS LONGTEXT,
+             PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_CATEGORY (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+             DESCRIPTION TEXT,
+             PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+             UUID VARCHAR (255),
+             DESCRIPTION MEDIUMTEXT,
+             ICON_NAME VARCHAR (255),
+             BANNER_NAME VARCHAR (255),
+             VIDEO_NAME VARCHAR (255),
+             SCREENSHOTS TEXT,
+             TAGS TEXT,
+             APPLICATION_TYPE_ID INTEGER,
+             CATEGORY_ID INTEGER,
+             CREATED_AT DATETIME,
+             MODIFIED_AT DATETIME,
+             PRIMARY KEY (ID),
+             FOREIGN KEY (CATEGORY_ID) REFERENCES APPM_APPLICATION_CATEGORY(ID),
+             FOREIGN KEY (APPLICATION_TYPE_ID) REFERENCES APPM_APPLICATION_TYPE(ID)
+)ENGINE INNODB;
+
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_PROPERTIES (
+             PROP_KEY VARCHAR (255),
+             PROP_VAL MEDIUMTEXT,
+             APPLICATION_ID INTEGER,
+             PRIMARY KEY (APPLICATION_ID, PROP_KEY),
+             FOREIGN KEY (APPLICATION_ID) REFERENCES APPM_APPLICATION(ID)
+)ENGINE INNODB;
\ No newline at end of file
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql
new file mode 100644
index 00000000000..d512eafa36f
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/dbscripts/cdm/application-mgt/postgresql.sql
@@ -0,0 +1,44 @@
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_TYPE (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+			DESCRIPTION TEXT,
+             CODE VARCHAR (255),
+             PARAMTERS LONGTEXT,
+             PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_CATEGORY (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+             DESCRIPTION TEXT,
+             PRIMARY KEY (ID)
+)ENGINE INNODB;
+
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION (
+             ID INTEGER AUTO_INCREMENT,
+             NAME VARCHAR (255),
+             UUID VARCHAR (255),
+             DESCRIPTION MEDIUMTEXT,
+             ICON_NAME VARCHAR (255),
+             BANNER_NAME VARCHAR (255),
+             VIDEO_NAME VARCHAR (255),
+             SCREENSHOTS TEXT,
+             TAGS TEXT,
+             APPLICATION_TYPE_ID INTEGER,
+             CATEGORY_ID INTEGER,
+             CREATED_AT DATETIME,
+             MODIFIED_AT DATETIME,
+             PRIMARY KEY (ID),
+             FOREIGN KEY (CATEGORY_ID) REFERENCES APPM_APPLICATION_CATEGORY(ID),
+             FOREIGN KEY (APPLICATION_TYPE_ID) REFERENCES APPM_APPLICATION_TYPE(ID)
+)ENGINE INNODB;
+
+
+CREATE TABLE IF NOT EXISTS APPM_APPLICATION_PROPERTIES (
+             PROP_KEY VARCHAR (255),
+             PROP_VAL MEDIUMTEXT,
+             APPLICATION_ID INTEGER,
+             PRIMARY KEY (APPLICATION_ID, PROP_KEY),
+             FOREIGN KEY (APPLICATION_ID) REFERENCES APPM_APPLICATION(ID)
+)ENGINE INNODB;
\ No newline at end of file
diff --git a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/p2.inf b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/p2.inf
new file mode 100644
index 00000000000..51c8838ca6f
--- /dev/null
+++ b/features/application-mgt/org.wso2.carbon.device.application.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.application.mgt.server_${feature.version}/conf/datasources/application-mgt-datasources.xml,target:${installFolder}/../../conf/datasources/application-mgt-datasources.xml,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.device.application.mgt.server_${feature.version}/dbscripts/cdm/application-mgt,target:${installFolder}/../../../dbscripts/cdm/application-mgt,overwrite:true);\
\ No newline at end of file
diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml
new file mode 100644
index 00000000000..b103aa5ecce
--- /dev/null
+++ b/features/application-mgt/pom.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2014, 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/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <artifactId>carbon-devicemgt</artifactId>
+        <version>2.0.63-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.wso2.carbon.devicemgt</groupId>
+    <artifactId>application-mgt-feature</artifactId>
+    <version>2.0.63-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>WSO2 Carbon - Application Management Feature</name>
+    <url>http://wso2.org</url>
+
+    <modules>
+        <module>org.wso2.carbon.device.application.mgt.api.feature</module>
+        <module>org.wso2.carbon.device.application.mgt.feature</module>
+        <module>org.wso2.carbon.device.application.mgt.server.feature</module>
+    </modules>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3e4403169fc..685d253959a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,13 +39,14 @@
         <module>components/device-mgt-extensions</module>
 		<module>components/identity-extensions</module>
         <module>components/apimgt-extensions</module>
+        <module>components/application-mgt</module>
         <module>components/policy-mgt</module>
         <module>components/certificate-mgt</module>
-        <module>components/application-mgt</module>
         <module>components/webapp-authenticator-framework</module>
         <module>components/email-sender</module>
         <module>features/device-mgt</module>
         <module>features/apimgt-extensions</module>
+        <module>features/application-mgt</module>
         <module>features/policy-mgt</module>
         <module>features/webapp-authenticator-framework</module>
         <module>features/certificate-mgt</module>
@@ -176,6 +177,11 @@
                 <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.application.mgt.api</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
                 <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
@@ -328,6 +334,24 @@
                 <artifactId>org.wso2.carbon.apimgt.handlers</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.application.mgt.server.feature</artifactId>
+                <type>zip</type>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId>
+                <type>zip</type>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>org.wso2.carbon.device.application.mgt.feature</artifactId>
+                <type>zip</type>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
             <!-- Device Management dependencies -->
 
             <!-- Governance dependencies -->