diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/modules/tools/cdmf-devicetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index c91df1b3..41220ebb 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -19,6 +19,14 @@
+
+
+ installer
+
+ **/*.xml
+
+
+
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/p2.inf b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/p2.inf
index c62d56a1..a94662de 100644
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/p2.inf
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/feature/feature/src/main/resources/p2.inf
@@ -1,16 +1,14 @@
instructions.configure = \
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../conf/device-types/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${package}.${rootArtifactId}_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${groupId}.${rootArtifactId}_${feature.version}/configs/,target:${installFolder}/../../conf/device-types/,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/webapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${package}.${rootArtifactId}_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/carbonapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${package}.${rootArtifactId}_${feature.version}/carbonapps/,target:${installFolder}/../../deployment/server/carbonapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${groupId}.${rootArtifactId}_${feature.version}/webapps/,target:${installFolder}/../../deployment/server/webapps/,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/);\
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../resources/sketches/${rootArtifactId}/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${package}.${rootArtifactId}_${feature.version}/agent/,target:${installFolder}/../../resources/sketches/${deviceType}/,overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${package}.${rootArtifactId}_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/${deviceType},overwrite:true);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${package}.${rootArtifactId}_${feature.version}/datasources/,target:${installFolder}/../../conf/datasources/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${groupId}.${rootArtifactId}_${feature.version}/agent/,target:${installFolder}/../../resources/sketches/${deviceType}/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${groupId}.${rootArtifactId}_${feature.version}/dbscripts/,target:${installFolder}/../../../dbscripts/cdm/plugins/${deviceType},overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${groupId}.${rootArtifactId}_${feature.version}/datasources/,target:${installFolder}/../../conf/datasources/,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../deployment/server/jaggeryapps/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${package}.${rootArtifactId}_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${groupId}.${rootArtifactId}_${feature.version}/jaggeryapps/,target:${installFolder}/../../deployment/server/jaggeryapps/,overwrite:true);\
org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../database/);\
-org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${package}.${rootArtifactId}_${feature.version}/database/,target:${installFolder}/../../database/,overwrite:true);\
\ No newline at end of file
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/${groupId}.${rootArtifactId}_${feature.version}/database/,target:${installFolder}/../../database/,overwrite:true);\
\ No newline at end of file
diff --git a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/installer/device-deployer.xml b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/installer/device-deployer.xml
new file mode 100644
index 00000000..aec0d951
--- /dev/null
+++ b/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/installer/device-deployer.xml
@@ -0,0 +1,139 @@
+
+
+
+
+ org.wso2
+ wso2
+ 1
+
+ 4.0.0
+ ${groupId}
+ devicetype-feature-installation
+ ${version}
+ pom
+ Creating custom distribution
+ http://wso2.org
+
+
+ samples/${rootArtifactId}
+
+
+
+
+ org.wso2.maven
+ carbon-p2-plugin
+ 1.5.3
+
+
+
+ 2-p2-repo-generation
+ package
+
+ p2-repo-gen
+
+
+ file:${basedir}/samples/p2-repo
+ file:${basedir}/samples/p2-repo
+ true
+ true
+
+
+
+
+ ${groupId}:${groupId}.${rootArtifactId}.feature:${version}
+
+
+
+
+
+
+
+
+ org.wso2.maven
+ carbon-p2-plugin
+ 1.5.3
+
+
+ feature-install
+ package
+
+ p2-profile-gen
+
+
+ default
+ file:${basedir}/samples/p2-repo
+ file:${basedir}/samples/p2-repo
+ repository/components
+ true
+
+
+
+ ${groupId}.${rootArtifactId}.feature.group
+ ${version}
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-antrun-plugin
+ 1.1
+
+
+ package
+
+
+
+
+
+
+
+
+ run
+
+
+
+
+
+
+
+
+ wso2-nexus
+ WSO2 internal Repository
+ http://maven.wso2.org/nexus/content/groups/wso2-public/
+
+ true
+ daily
+ ignore
+
+
+
+
+
+ wso2-maven2-repository
+ http://dist.wso2.org/maven2
+
+
+ wso2-maven2-snapshot-repository
+ http://dist.wso2.org/snapshots/maven2
+
+
+
\ No newline at end of file