diff --git a/modules/tools/cdmf-devicetype-archetype/README.md b/modules/tools/cdmf-devicetype-archetype/README.md
index e9e81d48..2e653ad7 100644
--- a/modules/tools/cdmf-devicetype-archetype/README.md
+++ b/modules/tools/cdmf-devicetype-archetype/README.md
@@ -5,19 +5,23 @@ To create new project
 
      mvn archetype:generate -DarchetypeCatalog=local
      
-Then select the cdmf.devicetype:cdmf-devicetype-archetype as new archetype. Then you need to provide groupId, artifactId, version and packaging as shown bellow.
+Then select the cdmf.devicetype:cdmf-devicetype-archetype as new archetype. Then you need to provide groupId, artifactId,
+version, packaging and name of your device type as shown bellow.
 
-       Choose a number or apply filter (format: [groupId:]artifactId, case sensitive contains): : 3
+       Choose a number or apply filter (format: [groupId:]artifactId, case sensitive contains): : 12
        Define value for property 'groupId': : org.coffeeking
        Define value for property 'artifactId': : connectedcup
        Define value for property 'version':  1.0-SNAPSHOT: : 1.0.0-SNAPSHOT
        Define value for property 'package':  org.coffeeking: : 
+       Define value for property 'deviceType': : connectedCup
        Confirm properties configuration:
        groupId: org.coffeeking
        artifactId: connectedcup
        version: 1.0.0-SNAPSHOT
        package: org.coffeeking
-       Y: : Y
+       deviceType: connectedCup
+        Y: : 
+
        
 
 
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 41220ebb..c91df1b3 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,14 +19,6 @@
     <requiredProperties>
         <requiredProperty key="deviceType"></requiredProperty>
     </requiredProperties>
-    <fileSets>
-        <fileSet filtered="true" encoding="UTF-8">
-            <directory>installer</directory>
-            <includes>
-                <include>**/*.xml</include>
-            </includes>
-        </fileSet>
-    </fileSets>
     <modules>
         <module id="component" dir="component" name="component">
             <modules>
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
deleted file mode 100644
index aec0d951..00000000
--- a/modules/tools/cdmf-devicetype-archetype/src/main/resources/archetype-resources/installer/device-deployer.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<!--
-  ~ 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</groupId>
-        <artifactId>wso2</artifactId>
-        <version>1</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>${groupId}</groupId>
-    <artifactId>devicetype-feature-installation</artifactId>
-    <version>${version}</version>
-    <packaging>pom</packaging>
-    <name>Creating custom distribution</name>
-    <url>http://wso2.org</url>
-    <modules>
-        <!-- maven module of your device-type -->
-        <module>samples/${rootArtifactId}</module>
-    </modules>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <version>1.5.3</version>
-
-                <executions>
-                    <execution>
-                        <id>2-p2-repo-generation</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-repo-gen</goal>
-                        </goals>
-                        <configuration>
-                            <metadataRepository>file:${basedir}/samples/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/samples/p2-repo</artifactRepository>
-                            <publishArtifacts>true</publishArtifacts>
-                            <publishArtifactRepository>true</publishArtifactRepository>
-
-                            <featureArtifacts>
-                                <featureArtifactDef>
-                                    <!-- STEP#1. ADD YOUR DEVICE TYPE FEATURE HERE  "< GROUP_ID:ARTIFACT_ID:VERSION >" -->
-                                    ${groupId}:${groupId}.${rootArtifactId}.feature:${version}
-                                </featureArtifactDef>
-                            </featureArtifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.wso2.maven</groupId>
-                <artifactId>carbon-p2-plugin</artifactId>
-                <version>1.5.3</version>
-                <executions>
-                    <execution>
-                        <id>feature-install</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>p2-profile-gen</goal>
-                        </goals>
-                        <configuration>
-                            <profile>default</profile>
-                            <metadataRepository>file:${basedir}/samples/p2-repo</metadataRepository>
-                            <artifactRepository>file:${basedir}/samples/p2-repo</artifactRepository>
-                            <destination>repository/components</destination>
-                            <deleteOldProfileFiles>true</deleteOldProfileFiles>
-                            <features>
-                                <!-- STEP#2. ADD YOUR DEVICE TYPE FEATURE GROUP HERE  "<ARTIFACT_ID>.group" -->
-                                <feature>
-                                    <id>${groupId}.${rootArtifactId}.feature.group</id>
-                                    <version>${version}</version>
-                                </feature>
-                            </features>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.1</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <configuration>
-                            <tasks>
-                                <replace token="false" value="true" dir="repository/components/default/configuration/org.eclipse.equinox.simpleconfigurator">
-                                    <include name="**/bundles.info"/>
-                                </replace>
-                            </tasks>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    <repositories>
-        <repository>
-            <id>wso2-nexus</id>
-            <name>WSO2 internal Repository</name>
-            <url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
-            <releases>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </releases>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <id>wso2-maven2-repository</id>
-            <url>http://dist.wso2.org/maven2</url>
-        </pluginRepository>
-        <pluginRepository>
-            <id>wso2-maven2-snapshot-repository</id>
-            <url>http://dist.wso2.org/snapshots/maven2</url>
-        </pluginRepository>
-    </pluginRepositories>
-</project>
\ No newline at end of file