diff --git a/BUCK b/BUCK
deleted file mode 100644
index b37025a..0000000
--- a/BUCK
+++ /dev/null
@@ -1,14 +0,0 @@
-COMPILE_DEPS = [
-    '//lib:CORE_DEPS',
-]
-
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
-)
-
-onos_app (
-    title = 'CORD Configuration',
-    category = 'Utility',
-    url = 'http://onosproject.org',
-    description = 'CORD configuration meta application.',
-)
diff --git a/pom.xml b/pom.xml
index 0ae7ec1..351957a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,19 +21,21 @@
 
     <parent>
         <groupId>org.onosproject</groupId>
-        <artifactId>onos-apps</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>onos</artifactId>
+        <version>1.6.0-SNAPSHOT</version>
+        <relativePath></relativePath>
     </parent>
 
-
-    <artifactId>onos-cord-config</artifactId>
+    <groupId>org.opencord</groupId>
+    <artifactId>config</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <description>CORD configuration meta application</description>
 
     <properties>
-        <onos.app.name>org.onosproject.cord-config</onos.app.name>
+        <onos.app.name>org.opencord.config</onos.app.name>
+        <onos.version>1.6.0-SNAPSHOT</onos.version>
         <onos.app.title>CORD Configuratuon Meta Application</onos.app.title>
         <onos.app.category>Utility</onos.app.category>
         <onos.app.url>http://opencord.org</onos.app.url>
@@ -43,8 +45,94 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
+            <version>${onos.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+        </dependency>
+       
+         <!-- TODO FIX ONOS ROOT POM to split thirdparty and onos dependencies -->        
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onlab-misc</artifactId>
+            <version>${onos.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onlab-osgi</artifactId>
+            <version>${onos.version}</version>
+        </dependency>
+
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.0.1</version>
+                <extensions>true</extensions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.5.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+                <version>1.21.0</version>
+                <executions>
+                    <execution>
+                        <id>generate-scr-srcdescriptor</id>
+                        <goals>
+                            <goal>scr</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <supportedProjectTypes>
+                        <supportedProjectType>bundle</supportedProjectType>
+                        <supportedProjectType>war</supportedProjectType>
+                    </supportedProjectTypes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.onosproject</groupId>
+                <artifactId>onos-maven-plugin</artifactId>
+                <version>1.7</version>
+                <executions>
+                    <execution>
+                        <id>cfg</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>cfg</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>swagger</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>swagger</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>app</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>app</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 
 </project>
diff --git a/src/main/java/org/onosproject/cordconfig/access/AccessAgentConfig.java b/src/main/java/org/opencord/cordconfig/access/AccessAgentConfig.java
similarity index 98%
rename from src/main/java/org/onosproject/cordconfig/access/AccessAgentConfig.java
rename to src/main/java/org/opencord/cordconfig/access/AccessAgentConfig.java
index 6dc5c9d..4d3150a 100644
--- a/src/main/java/org/onosproject/cordconfig/access/AccessAgentConfig.java
+++ b/src/main/java/org/opencord/cordconfig/access/AccessAgentConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.cordconfig.access;
+package org.opencord.cordconfig.access;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/src/main/java/org/onosproject/cordconfig/access/AccessAgentData.java b/src/main/java/org/opencord/cordconfig/access/AccessAgentData.java
similarity index 98%
rename from src/main/java/org/onosproject/cordconfig/access/AccessAgentData.java
rename to src/main/java/org/opencord/cordconfig/access/AccessAgentData.java
index de7a342..66ec357 100644
--- a/src/main/java/org/onosproject/cordconfig/access/AccessAgentData.java
+++ b/src/main/java/org/opencord/cordconfig/access/AccessAgentData.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.cordconfig.access;
+package org.opencord.cordconfig.access;
 
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang3.tuple.Pair;
diff --git a/src/main/java/org/onosproject/cordconfig/access/AccessDeviceConfig.java b/src/main/java/org/opencord/cordconfig/access/AccessDeviceConfig.java
similarity index 97%
rename from src/main/java/org/onosproject/cordconfig/access/AccessDeviceConfig.java
rename to src/main/java/org/opencord/cordconfig/access/AccessDeviceConfig.java
index 47f35da..d627499 100644
--- a/src/main/java/org/onosproject/cordconfig/access/AccessDeviceConfig.java
+++ b/src/main/java/org/opencord/cordconfig/access/AccessDeviceConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.cordconfig.access;
+package org.opencord.cordconfig.access;
 
 import org.onosproject.net.DeviceId;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/src/main/java/org/onosproject/cordconfig/access/AccessDeviceData.java b/src/main/java/org/opencord/cordconfig/access/AccessDeviceData.java
similarity index 98%
rename from src/main/java/org/onosproject/cordconfig/access/AccessDeviceData.java
rename to src/main/java/org/opencord/cordconfig/access/AccessDeviceData.java
index 74894d5..a5b7895 100644
--- a/src/main/java/org/onosproject/cordconfig/access/AccessDeviceData.java
+++ b/src/main/java/org/opencord/cordconfig/access/AccessDeviceData.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.cordconfig.access;
+package org.opencord.cordconfig.access;
 
 import org.onlab.packet.VlanId;
 import org.onosproject.net.DeviceId;
diff --git a/src/main/java/org/onosproject/cordconfig/access/CordConfig.java b/src/main/java/org/opencord/cordconfig/access/CordConfig.java
similarity index 99%
rename from src/main/java/org/onosproject/cordconfig/access/CordConfig.java
rename to src/main/java/org/opencord/cordconfig/access/CordConfig.java
index 2bc47b4..3393e5f 100644
--- a/src/main/java/org/onosproject/cordconfig/access/CordConfig.java
+++ b/src/main/java/org/opencord/cordconfig/access/CordConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.cordconfig.access;
+package org.opencord.cordconfig.access;
 
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Activate;
diff --git a/src/main/java/org/onosproject/cordconfig/access/CordConfigService.java b/src/main/java/org/opencord/cordconfig/access/CordConfigService.java
similarity index 97%
rename from src/main/java/org/onosproject/cordconfig/access/CordConfigService.java
rename to src/main/java/org/opencord/cordconfig/access/CordConfigService.java
index fdab6c0..fc2ed66 100644
--- a/src/main/java/org/onosproject/cordconfig/access/CordConfigService.java
+++ b/src/main/java/org/opencord/cordconfig/access/CordConfigService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.cordconfig.access;
+package org.opencord.cordconfig.access;
 
 import org.onosproject.net.DeviceId;
 
diff --git a/src/main/java/org/onosproject/cordconfig/access/package-info.java b/src/main/java/org/opencord/cordconfig/access/package-info.java
similarity index 94%
rename from src/main/java/org/onosproject/cordconfig/access/package-info.java
rename to src/main/java/org/opencord/cordconfig/access/package-info.java
index 55c553a..9539f11 100644
--- a/src/main/java/org/onosproject/cordconfig/access/package-info.java
+++ b/src/main/java/org/opencord/cordconfig/access/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Meta Application for hosting common cord configuration classes.
  */
-package org.onosproject.cordconfig.access;
\ No newline at end of file
+package org.opencord.cordconfig.access;
\ No newline at end of file