diff --git a/modules/distribution/src/repository/patches/patch0001/org.wso2.carbon.analytics.dataservice.core_1.0.4.jar b/modules/distribution/src/repository/patches/patch0001/org.wso2.carbon.analytics.dataservice.core_1.0.4.jar
deleted file mode 100644
index 906c5cd8..00000000
Binary files a/modules/distribution/src/repository/patches/patch0001/org.wso2.carbon.analytics.dataservice.core_1.0.4.jar and /dev/null differ
diff --git a/modules/distribution/src/repository/patches/patch0002/org.wso2.carbon.analytics.spark.core_1.0.4.jar b/modules/distribution/src/repository/patches/patch0002/org.wso2.carbon.analytics.spark.core_1.0.4.jar
deleted file mode 100644
index bcdc1134..00000000
Binary files a/modules/distribution/src/repository/patches/patch0002/org.wso2.carbon.analytics.spark.core_1.0.4.jar and /dev/null differ
diff --git a/modules/distribution/src/repository/patches/patch0003/andes_3.0.1.jar b/modules/distribution/src/repository/patches/patch0003/andes_3.0.1.jar
deleted file mode 100644
index 44b9fb51..00000000
Binary files a/modules/distribution/src/repository/patches/patch0003/andes_3.0.1.jar and /dev/null differ
diff --git a/modules/distribution/src/repository/patches/patch0003/hadoop-client_2.6.0.wso2v2.jar b/modules/distribution/src/repository/patches/patch0003/hadoop-client_2.6.0.wso2v2.jar
deleted file mode 100644
index 0fc2d7b0..00000000
Binary files a/modules/distribution/src/repository/patches/patch0003/hadoop-client_2.6.0.wso2v2.jar and /dev/null differ
diff --git a/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.analytics.spark.core_1.0.4.jar b/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.analytics.spark.core_1.0.4.jar
deleted file mode 100644
index 2a36b346..00000000
Binary files a/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.analytics.spark.core_1.0.4.jar and /dev/null differ
diff --git a/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.agent_5.0.6.jar b/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.agent_5.0.6.jar
deleted file mode 100644
index e6d29aee..00000000
Binary files a/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.agent_5.0.6.jar and /dev/null differ
diff --git a/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.commons.thrift_5.0.6.jar b/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.commons.thrift_5.0.6.jar
deleted file mode 100644
index f4cda46b..00000000
Binary files a/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.commons.thrift_5.0.6.jar and /dev/null differ
diff --git a/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.receiver.thrift_5.0.6.jar b/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.receiver.thrift_5.0.6.jar
deleted file mode 100644
index 50067d31..00000000
Binary files a/modules/distribution/src/repository/patches/patch0003/org.wso2.carbon.databridge.receiver.thrift_5.0.6.jar and /dev/null differ
diff --git a/modules/samples/connectedcup/component/pom.xml b/modules/samples/connectedcup/component/pom.xml
index 56052b98..02e55fdb 100644
--- a/modules/samples/connectedcup/component/pom.xml
+++ b/modules/samples/connectedcup/component/pom.xml
@@ -248,7 +248,7 @@
                 <version>${commons-json.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar
+                    ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
                 </systemPath>
             </dependency>
             <dependency>
diff --git a/modules/samples/currentsensor/component/pom.xml b/modules/samples/currentsensor/component/pom.xml
index 8e40ec18..daeecf24 100644
--- a/modules/samples/currentsensor/component/pom.xml
+++ b/modules/samples/currentsensor/component/pom.xml
@@ -241,7 +241,7 @@
                 <version>${commons-json.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar
+                    ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -260,4 +260,4 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/samples/doormanager/component/pom.xml b/modules/samples/doormanager/component/pom.xml
index 5be5a50d..411ca15a 100644
--- a/modules/samples/doormanager/component/pom.xml
+++ b/modules/samples/doormanager/component/pom.xml
@@ -236,7 +236,7 @@
                 <version>${commons-json.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar
+                    ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -280,4 +280,4 @@
         <module>analytics</module>
         <module>ui</module>
     </modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/samples/firealarm/component/pom.xml b/modules/samples/firealarm/component/pom.xml
index 45d5e76c..c99a631d 100644
--- a/modules/samples/firealarm/component/pom.xml
+++ b/modules/samples/firealarm/component/pom.xml
@@ -239,7 +239,7 @@
                 <version>${commons-json.version}</version>
                 <scope>system</scope>
                 <systemPath>
-                    ${basedir}/../../../../repository/components/plugins/json_2.0.0.wso2v1.jar
+                    ${basedir}/../../../../repository/components/plugins/json_3.0.0.wso2v1.jar
                 </systemPath>
             </dependency>
             <dependency>
@@ -265,4 +265,4 @@
         <module>analytics</module>
         <module>ui</module>
     </modules>
-</project>
\ No newline at end of file
+</project>
diff --git a/modules/tools/cdmf-devicetype-archetype/pom.xml b/modules/tools/cdmf-devicetype-archetype/pom.xml
index ccef2c78..b39c8ab4 100644
--- a/modules/tools/cdmf-devicetype-archetype/pom.xml
+++ b/modules/tools/cdmf-devicetype-archetype/pom.xml
@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-parent</artifactId>
+        <artifactId>wso2cdmf-tools</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>