diff --git a/BUCK b/BUCK
deleted file mode 100644
index 9310e9e..0000000
--- a/BUCK
+++ /dev/null
@@ -1,24 +0,0 @@
-COMPILE_DEPS = [
-    '//lib:CORE_DEPS',
-    '//lib:org.apache.karaf.shell.console',
-    '//cli:onos-cli',
-    '//apps/olt:onos-apps-olt-api',
-    '//apps/cordconfig:onos-apps-cordconfig',
-]
-
-BUNDLES = [
-    '//apps/olt:onos-apps-olt-api',
-    '//apps/igmp:onos-apps-igmp',
-]
-
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
-)
-
-onos_app (
-    title = 'IGMP App',
-    category = 'Traffic Steering',
-    url = 'http://onosproject.org',
-    description = 'Internet Group Message Protocol',
-    included_bundles = BUNDLES,
-)
diff --git a/pom.xml b/pom.xml
index 416c483..3d2fb6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,21 +21,24 @@
 
     <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-igmp</artifactId>
+    <groupId>org.opencord</groupId>
+    <artifactId>igmp</artifactId>
+    <version>1.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <description>Internet Group Message Protocol</description>
 
     <properties>
-        <onos.app.name>org.onosproject.igmp</onos.app.name>
+        <onos.app.name>org.opencord.igmp</onos.app.name>
+        <onos.version>1.6.0-SNAPSHOT</onos.version>
         <onos.app.title>IGMP App</onos.app.title>
         <onos.app.category>Traffic Steering</onos.app.category>
-        <onos.app.url>http://onosproject.org</onos.app.url>
+        <onos.app.url>http://opencord.org</onos.app.url>
         <onos.app.readme>IGMP implementation.</onos.app.readme>
         <onos.app.requires>org.onosproject.cord-config</onos.app.requires>
     </properties>
@@ -44,36 +47,38 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-api</artifactId>
-            <version>${project.version}</version>
+            <version>${onos.version}</version>
         </dependency>
 
         <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-app-olt-api</artifactId>
+            <groupId>org.opencord</groupId>
+            <artifactId>olt-api</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onlab-osgi</artifactId>
-            <version>${project.version}</version>
+            <version>${onos.version}</version>
         </dependency>
-
+        
+        <!-- FIXME when cord-config is pulled to opencord -->
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-cord-config</artifactId>
-            <version>${project.version}</version>
+            <version>${onos.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onlab-junit</artifactId>
+            <version>${onos.version}</version>
             <scope>test</scope>
         </dependency>
 
@@ -88,7 +93,94 @@
             <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-misc</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-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/igmp/IgmpSnoop.java b/src/main/java/org/opencord/igmp/IgmpSnoop.java
similarity index 99%
rename from src/main/java/org/onosproject/igmp/IgmpSnoop.java
rename to src/main/java/org/opencord/igmp/IgmpSnoop.java
index aba5bbf..cf79a4b 100644
--- a/src/main/java/org/onosproject/igmp/IgmpSnoop.java
+++ b/src/main/java/org/opencord/igmp/IgmpSnoop.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.onosproject.igmp;
+package org.opencord.igmp;
 
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
diff --git a/src/main/java/org/onosproject/igmp/IgmpSsmTranslateConfig.java b/src/main/java/org/opencord/igmp/IgmpSsmTranslateConfig.java
similarity index 98%
rename from src/main/java/org/onosproject/igmp/IgmpSsmTranslateConfig.java
rename to src/main/java/org/opencord/igmp/IgmpSsmTranslateConfig.java
index ddc6209..3f2add2 100644
--- a/src/main/java/org/onosproject/igmp/IgmpSsmTranslateConfig.java
+++ b/src/main/java/org/opencord/igmp/IgmpSsmTranslateConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.igmp;
+package org.opencord.igmp;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
diff --git a/src/main/java/org/onosproject/igmp/package-info.java b/src/main/java/org/opencord/igmp/package-info.java
similarity index 95%
rename from src/main/java/org/onosproject/igmp/package-info.java
rename to src/main/java/org/opencord/igmp/package-info.java
index f501339..9483d9e 100644
--- a/src/main/java/org/onosproject/igmp/package-info.java
+++ b/src/main/java/org/opencord/igmp/package-info.java
@@ -17,4 +17,4 @@
 /**
  * IGMP implementation.
  */
-package org.onosproject.igmp;
+package org.opencord.igmp;