diff --git a/BUCK b/BUCK
deleted file mode 100644
index e5da35b..0000000
--- a/BUCK
+++ /dev/null
@@ -1,26 +0,0 @@
-COMPILE_DEPS = [
-    '//lib:CORE_DEPS',
-    '//lib:javax.ws.rs-api',
-    '//lib:jersey-client',
-    '//lib:jersey-common',
-    '//utils/rest:onlab-rest',
-    '//apps/olt:onos-apps-olt-api',
-    '//apps/cordconfig:onos-apps-cordconfig',
-]
-
-BUNDLES = [
-    '//apps/olt:onos-apps-olt-api',
-    '//apps/cordmcast:onos-apps-cordmcast',
-]
-
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
-)
-
-onos_app (
-    title = 'CORD Multicast App',
-    category = 'Traffic Steering',
-    url = 'http://onosproject.org',
-    description = 'CORD Multicast application',
-    included_bundles = BUNDLES,
-)
diff --git a/pom.xml b/pom.xml
index a28547d..8965c8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,18 +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-app-cord-mcast</artifactId>
+    <groupId>org.opencord</groupId>
+    <artifactId>mcast</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <description>CORD Multicast application</description>
 
     <properties>
         <onos.app.name>org.onosproject.cordmcast</onos.app.name>
+        <onos.version>1.6.0-SNAPSHOT</onos.version>
         <onos.app.category>Traffic Steering</onos.app.category>
         <onos.app.title>CORD Multicast App</onos.app.title>
         <onos.app.url>http://opencord.org</onos.app.url>
@@ -43,11 +46,11 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-cli</artifactId>
-            <version>${project.version}</version>
+            <version>${onos.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-cord-config</artifactId>
+            <groupId>org.opencord</groupId>
+            <artifactId>config</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -61,11 +64,11 @@
       <dependency>
         <groupId>org.onosproject</groupId>
         <artifactId>onlab-misc</artifactId>
+        <version>${onos.version}</version>
       </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.scr</artifactId>
-            <version>1.8.2</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -78,9 +81,109 @@
             <version>2.22.2</version>
         </dependency>
         <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-app-olt-api</artifactId>
+            <groupId>org.opencord</groupId>
+            <artifactId>olt-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.scr.annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- TODO FIX ONOS ROOT POM to split thirdparty and onos dependencies -->
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onlab-osgi</artifactId>
+            <version>${onos.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-incubator-api</artifactId>
+            <version>${onos.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-api</artifactId>
+            <version>${onos.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-core-common</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/cordmcast/CordMcast.java b/src/main/java/org/opencord/cordmcast/CordMcast.java
similarity index 98%
rename from src/main/java/org/onosproject/cordmcast/CordMcast.java
rename to src/main/java/org/opencord/cordmcast/CordMcast.java
index 13500dd..4400041 100644
--- a/src/main/java/org/onosproject/cordmcast/CordMcast.java
+++ b/src/main/java/org/opencord/cordmcast/CordMcast.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.cordmcast;
+package org.opencord.cordmcast;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -37,9 +37,7 @@
 import org.onosproject.cfg.ComponentConfigService;
 import org.onosproject.codec.CodecService;
 import org.onosproject.codec.JsonCodec;
-import org.onosproject.cordconfig.access.AccessAgentData;
-import org.onosproject.cordconfig.access.AccessDeviceData;
-import org.onosproject.cordconfig.access.CordConfigService;
+
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
 import org.onosproject.net.ConnectPoint;
@@ -60,6 +58,9 @@
 import org.onosproject.net.mcast.McastRouteInfo;
 import org.onosproject.net.mcast.MulticastRouteService;
 import org.onosproject.rest.AbstractWebResource;
+import org.opencord.cordconfig.access.AccessAgentData;
+import org.opencord.cordconfig.access.AccessDeviceData;
+import org.opencord.cordconfig.access.CordConfigService;
 import org.osgi.service.component.ComponentContext;
 import org.slf4j.Logger;
 
diff --git a/src/main/java/org/onosproject/cordmcast/package-info.java b/src/main/java/org/opencord/cordmcast/package-info.java
similarity index 95%
rename from src/main/java/org/onosproject/cordmcast/package-info.java
rename to src/main/java/org/opencord/cordmcast/package-info.java
index 1b7713f..af91daa 100644
--- a/src/main/java/org/onosproject/cordmcast/package-info.java
+++ b/src/main/java/org/opencord/cordmcast/package-info.java
@@ -17,4 +17,4 @@
 /**
  * Application for provisioning multicast streams in the context of cord.
  */
-package org.onosproject.cordmcast;
\ No newline at end of file
+package org.opencord.cordmcast;
\ No newline at end of file