diff --git a/oar/app.xml b/app/app.xml
similarity index 100%
rename from oar/app.xml
rename to app/app.xml
diff --git a/oar/features.xml b/app/features.xml
similarity index 100%
rename from oar/features.xml
rename to app/features.xml
diff --git a/app/pom.xml b/app/pom.xml
index c43447e..eaea0db 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -29,115 +29,7 @@
     <artifactId>segmentrouting-app</artifactId>
     <packaging>bundle</packaging>
     <url>http://trellisfabric.org</url>
-    <description>Trellis control app</description>
-
-    <dependencies>
-        <!-- ONOS core -->
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-api</artifactId>
-            <version>${onos.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-net</artifactId>
-            <version>${onos.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-serializers</artifactId>
-            <version>${onos.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Other Trellis apps -->
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>segmentrouting-api</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-apps-portloadbalancer</artifactId>
-            <version>${onos.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-apps-route-service-api</artifactId>
-            <version>${onos.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-apps-mcast-api</artifactId>
-            <version>${onos.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-apps-mcast-cli</artifactId>
-            <version>${onos.version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- Tests -->
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-api</artifactId>
-            <version>${onos.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-core-common</artifactId>
-            <version>${onos.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>segmentrouting-api</artifactId>
-            <version>${project.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-apps-route-service-api</artifactId>
-            <version>${onos.version}</version>
-            <classifier>tests</classifier>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onlab-junit</artifactId>
-            <version>${onos.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <!-- CLI -->
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.console</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.karaf.shell</groupId>
-            <artifactId>org.apache.karaf.shell.core</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.onosproject</groupId>
-            <artifactId>onos-cli</artifactId>
-            <version>${onos.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+    <description>Trellis control OAR wrapper</description>
 
     <build>
         <plugins>
@@ -145,16 +37,6 @@
                 <groupId>org.onosproject</groupId>
                 <artifactId>onos-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Karaf-Commands>org.onosproject.segmentrouting.cli</Karaf-Commands>
-                    </instructions>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
\ No newline at end of file
diff --git a/impl/pom.xml b/impl/pom.xml
new file mode 100644
index 0000000..2c908da
--- /dev/null
+++ b/impl/pom.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2015-present Open Networking Foundation
+  ~
+  ~ Licensed 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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onosproject</groupId>
+        <artifactId>segmentrouting</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>segmentrouting-impl</artifactId>
+    <packaging>bundle</packaging>
+    <url>http://trellisfabric.org</url>
+    <description>Trellis control implementation</description>
+
+    <dependencies>
+        <!-- ONOS core -->
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-api</artifactId>
+            <version>${onos.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-core-net</artifactId>
+            <version>${onos.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-core-serializers</artifactId>
+            <version>${onos.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Other Trellis apps -->
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>segmentrouting-api</artifactId>
+            <version>${project.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-apps-portloadbalancer</artifactId>
+            <version>${onos.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-apps-route-service-api</artifactId>
+            <version>${onos.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-apps-mcast-api</artifactId>
+            <version>${onos.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-apps-mcast-cli</artifactId>
+            <version>${onos.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- Tests -->
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-api</artifactId>
+            <version>${onos.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-core-common</artifactId>
+            <version>${onos.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>segmentrouting-api</artifactId>
+            <version>${project.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-apps-route-service-api</artifactId>
+            <version>${onos.version}</version>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onlab-junit</artifactId>
+            <version>${onos.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- CLI -->
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.console</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.shell</groupId>
+            <artifactId>org.apache.karaf.shell.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onos-cli</artifactId>
+            <version>${onos.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.onosproject</groupId>
+                <artifactId>onos-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Karaf-Commands>org.onosproject.segmentrouting.cli</Karaf-Commands>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/ArpHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/ArpHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/ArpHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/ArpHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/DefaultTunnel.java b/impl/src/main/java/org/onosproject/segmentrouting/DefaultTunnel.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/DefaultTunnel.java
rename to impl/src/main/java/org/onosproject/segmentrouting/DefaultTunnel.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/EcmpShortestPathGraph.java b/impl/src/main/java/org/onosproject/segmentrouting/EcmpShortestPathGraph.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/EcmpShortestPathGraph.java
rename to impl/src/main/java/org/onosproject/segmentrouting/EcmpShortestPathGraph.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/EdgePair.java b/impl/src/main/java/org/onosproject/segmentrouting/EdgePair.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/EdgePair.java
rename to impl/src/main/java/org/onosproject/segmentrouting/EdgePair.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/HostHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/HostHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/HostHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/HostHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/IpHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/IpHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/IpHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/IpHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/LinkHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/LinkHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/LinkHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/LinkHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/OsgiPropertyConstants.java b/impl/src/main/java/org/onosproject/segmentrouting/OsgiPropertyConstants.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/OsgiPropertyConstants.java
rename to impl/src/main/java/org/onosproject/segmentrouting/OsgiPropertyConstants.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/Policy.java b/impl/src/main/java/org/onosproject/segmentrouting/Policy.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/Policy.java
rename to impl/src/main/java/org/onosproject/segmentrouting/Policy.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/PolicyHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/PolicyHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/PolicyHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/PolicyHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/PortAuthTracker.java b/impl/src/main/java/org/onosproject/segmentrouting/PortAuthTracker.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/PortAuthTracker.java
rename to impl/src/main/java/org/onosproject/segmentrouting/PortAuthTracker.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/PortFilterInfo.java b/impl/src/main/java/org/onosproject/segmentrouting/PortFilterInfo.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/PortFilterInfo.java
rename to impl/src/main/java/org/onosproject/segmentrouting/PortFilterInfo.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/RouteHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/RouteSimplifierUtils.java b/impl/src/main/java/org/onosproject/segmentrouting/RouteSimplifierUtils.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/RouteSimplifierUtils.java
rename to impl/src/main/java/org/onosproject/segmentrouting/RouteSimplifierUtils.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/impl/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
rename to impl/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/SRLinkWeigher.java b/impl/src/main/java/org/onosproject/segmentrouting/SRLinkWeigher.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/SRLinkWeigher.java
rename to impl/src/main/java/org/onosproject/segmentrouting/SRLinkWeigher.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/impl/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
rename to impl/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourDispatcher.java b/impl/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourDispatcher.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourDispatcher.java
rename to impl/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourDispatcher.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingService.java b/impl/src/main/java/org/onosproject/segmentrouting/SegmentRoutingService.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingService.java
rename to impl/src/main/java/org/onosproject/segmentrouting/SegmentRoutingService.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/TopologyHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/TopologyHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/TopologyHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/TopologyHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/Tunnel.java b/impl/src/main/java/org/onosproject/segmentrouting/Tunnel.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/Tunnel.java
rename to impl/src/main/java/org/onosproject/segmentrouting/Tunnel.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/TunnelPolicy.java b/impl/src/main/java/org/onosproject/segmentrouting/TunnelPolicy.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/TunnelPolicy.java
rename to impl/src/main/java/org/onosproject/segmentrouting/TunnelPolicy.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/BlackHoleCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/BlackHoleCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/BlackHoleCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/BlackHoleCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/DeviceSubnetListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/DeviceSubnetListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/DeviceSubnetListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/DeviceSubnetListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/EcmpGraphCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/EcmpGraphCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/EcmpGraphCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/EcmpGraphCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/InvalidateNextCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/InvalidateNextCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/InvalidateNextCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/InvalidateNextCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/LinkStateCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/LinkStateCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/LinkStateCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/LinkStateCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/McastFilterListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/McastFilterListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/McastFilterListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/McastFilterListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/McastLeaderListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/McastLeaderListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/McastLeaderListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/McastLeaderListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/McastNextListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/McastNextListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/McastNextListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/McastNextListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/McastRoleListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/McastRoleListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/McastRoleListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/McastRoleListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/McastTreeListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/McastTreeListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/McastTreeListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/McastTreeListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/NextDstCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/NextDstCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/NextDstCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/NextDstCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/NextMacVlanCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/NextMacVlanCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/NextMacVlanCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/NextMacVlanCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/NextPortCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/NextPortCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/NextPortCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/NextPortCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/NextVlanCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/NextVlanCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/NextVlanCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/NextVlanCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/PhaseCompleter.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/PhaseCompleter.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/PhaseCompleter.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/PhaseCompleter.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/PhasedRecoveryListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/PhasedRecoveryListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/PhasedRecoveryListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/PhasedRecoveryListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/PhasedRecoverySetCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/PhasedRecoverySetCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/PhasedRecoverySetCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/PhasedRecoverySetCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/PolicyAddCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/PolicyAddCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/PolicyAddCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/PolicyAddCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/PolicyListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/PolicyListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/PolicyListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/PolicyListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/PolicyRemoveCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/PolicyRemoveCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/PolicyRemoveCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/PolicyRemoveCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/PortsCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/PortsCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/PortsCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/PortsCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireAddCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/PseudowireAddCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireAddCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/PseudowireAddCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireIdCompleter.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/PseudowireIdCompleter.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireIdCompleter.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/PseudowireIdCompleter.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireNextListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/PseudowireNextListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireNextListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/PseudowireNextListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireRemoveCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/PseudowireRemoveCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireRemoveCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/PseudowireRemoveCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/RerouteNetworkCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/RerouteNetworkCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/RerouteNetworkCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/RerouteNetworkCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/ShouldProgramCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/ShouldProgramCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/ShouldProgramCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/ShouldProgramCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/TunnelAddCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/TunnelAddCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/TunnelAddCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/TunnelAddCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/TunnelListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/TunnelListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/TunnelListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/TunnelListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/TunnelRemoveCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/TunnelRemoveCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/TunnelRemoveCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/TunnelRemoveCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/VerifyGroupsCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/VerifyGroupsCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/VerifyGroupsCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/VerifyGroupsCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/XconnectAddCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/XconnectAddCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/XconnectAddCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/XconnectAddCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/XconnectListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/XconnectListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/XconnectListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/XconnectListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/XconnectNextListCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/XconnectNextListCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/XconnectNextListCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/XconnectNextListCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/XconnectRemoveCommand.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/XconnectRemoveCommand.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/XconnectRemoveCommand.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/XconnectRemoveCommand.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/cli/package-info.java b/impl/src/main/java/org/onosproject/segmentrouting/cli/package-info.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/cli/package-info.java
rename to impl/src/main/java/org/onosproject/segmentrouting/cli/package-info.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java b/impl/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
rename to impl/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/config/package-info.java b/impl/src/main/java/org/onosproject/segmentrouting/config/package-info.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/config/package-info.java
rename to impl/src/main/java/org/onosproject/segmentrouting/config/package-info.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DestinationSet.java b/impl/src/main/java/org/onosproject/segmentrouting/grouphandler/DestinationSet.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/grouphandler/DestinationSet.java
rename to impl/src/main/java/org/onosproject/segmentrouting/grouphandler/DestinationSet.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/grouphandler/GroupBucketIdentifier.java b/impl/src/main/java/org/onosproject/segmentrouting/grouphandler/GroupBucketIdentifier.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/grouphandler/GroupBucketIdentifier.java
rename to impl/src/main/java/org/onosproject/segmentrouting/grouphandler/GroupBucketIdentifier.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/grouphandler/NextNeighbors.java b/impl/src/main/java/org/onosproject/segmentrouting/grouphandler/NextNeighbors.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/grouphandler/NextNeighbors.java
rename to impl/src/main/java/org/onosproject/segmentrouting/grouphandler/NextNeighbors.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupIdentifier.java b/impl/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupIdentifier.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupIdentifier.java
rename to impl/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupIdentifier.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupParams.java b/impl/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupParams.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupParams.java
rename to impl/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupParams.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/grouphandler/package-info.java b/impl/src/main/java/org/onosproject/segmentrouting/grouphandler/package-info.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/grouphandler/package-info.java
rename to impl/src/main/java/org/onosproject/segmentrouting/grouphandler/package-info.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastFilteringObjStoreKey.java b/impl/src/main/java/org/onosproject/segmentrouting/mcast/McastFilteringObjStoreKey.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/mcast/McastFilteringObjStoreKey.java
rename to impl/src/main/java/org/onosproject/segmentrouting/mcast/McastFilteringObjStoreKey.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastFilteringObjStoreSerializer.java b/impl/src/main/java/org/onosproject/segmentrouting/mcast/McastFilteringObjStoreSerializer.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/mcast/McastFilteringObjStoreSerializer.java
rename to impl/src/main/java/org/onosproject/segmentrouting/mcast/McastFilteringObjStoreSerializer.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/mcast/McastHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/mcast/McastHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/mcast/McastHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastPathStoreKey.java b/impl/src/main/java/org/onosproject/segmentrouting/mcast/McastPathStoreKey.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/mcast/McastPathStoreKey.java
rename to impl/src/main/java/org/onosproject/segmentrouting/mcast/McastPathStoreKey.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastPathStoreKeySerializer.java b/impl/src/main/java/org/onosproject/segmentrouting/mcast/McastPathStoreKeySerializer.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/mcast/McastPathStoreKeySerializer.java
rename to impl/src/main/java/org/onosproject/segmentrouting/mcast/McastPathStoreKeySerializer.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastRole.java b/impl/src/main/java/org/onosproject/segmentrouting/mcast/McastRole.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/mcast/McastRole.java
rename to impl/src/main/java/org/onosproject/segmentrouting/mcast/McastRole.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastRoleStoreKey.java b/impl/src/main/java/org/onosproject/segmentrouting/mcast/McastRoleStoreKey.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/mcast/McastRoleStoreKey.java
rename to impl/src/main/java/org/onosproject/segmentrouting/mcast/McastRoleStoreKey.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastRoleStoreKeySerializer.java b/impl/src/main/java/org/onosproject/segmentrouting/mcast/McastRoleStoreKeySerializer.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/mcast/McastRoleStoreKeySerializer.java
rename to impl/src/main/java/org/onosproject/segmentrouting/mcast/McastRoleStoreKeySerializer.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastStoreKey.java b/impl/src/main/java/org/onosproject/segmentrouting/mcast/McastStoreKey.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/mcast/McastStoreKey.java
rename to impl/src/main/java/org/onosproject/segmentrouting/mcast/McastStoreKey.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastStoreKeySerializer.java b/impl/src/main/java/org/onosproject/segmentrouting/mcast/McastStoreKeySerializer.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/mcast/McastStoreKeySerializer.java
rename to impl/src/main/java/org/onosproject/segmentrouting/mcast/McastStoreKeySerializer.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java b/impl/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java
rename to impl/src/main/java/org/onosproject/segmentrouting/mcast/McastUtils.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/mcast/package-info.java b/impl/src/main/java/org/onosproject/segmentrouting/mcast/package-info.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/mcast/package-info.java
rename to impl/src/main/java/org/onosproject/segmentrouting/mcast/package-info.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/package-info.java b/impl/src/main/java/org/onosproject/segmentrouting/package-info.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/package-info.java
rename to impl/src/main/java/org/onosproject/segmentrouting/package-info.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/OsgiPropertyConstants.java b/impl/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/OsgiPropertyConstants.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/OsgiPropertyConstants.java
rename to impl/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/OsgiPropertyConstants.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/Phase.java b/impl/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/Phase.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/Phase.java
rename to impl/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/Phase.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/PhasedRecoveryService.java b/impl/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/PhasedRecoveryService.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/PhasedRecoveryService.java
rename to impl/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/PhasedRecoveryService.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/package-info.java b/impl/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/package-info.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/package-info.java
rename to impl/src/main/java/org/onosproject/segmentrouting/phasedrecovery/api/package-info.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/phasedrecovery/impl/PhasedRecoveryManager.java b/impl/src/main/java/org/onosproject/segmentrouting/phasedrecovery/impl/PhasedRecoveryManager.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/phasedrecovery/impl/PhasedRecoveryManager.java
rename to impl/src/main/java/org/onosproject/segmentrouting/phasedrecovery/impl/PhasedRecoveryManager.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/phasedrecovery/impl/package-info.java b/impl/src/main/java/org/onosproject/segmentrouting/phasedrecovery/impl/package-info.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/phasedrecovery/impl/package-info.java
rename to impl/src/main/java/org/onosproject/segmentrouting/phasedrecovery/impl/package-info.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2Tunnel.java b/impl/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2Tunnel.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2Tunnel.java
rename to impl/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2Tunnel.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelDescription.java b/impl/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelDescription.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelDescription.java
rename to impl/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelDescription.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelPolicy.java b/impl/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelPolicy.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelPolicy.java
rename to impl/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelPolicy.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2Mode.java b/impl/src/main/java/org/onosproject/segmentrouting/pwaas/L2Mode.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/pwaas/L2Mode.java
rename to impl/src/main/java/org/onosproject/segmentrouting/pwaas/L2Mode.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2Tunnel.java b/impl/src/main/java/org/onosproject/segmentrouting/pwaas/L2Tunnel.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/pwaas/L2Tunnel.java
rename to impl/src/main/java/org/onosproject/segmentrouting/pwaas/L2Tunnel.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelDescription.java b/impl/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelDescription.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelDescription.java
rename to impl/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelDescription.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java b/impl/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
rename to impl/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelPolicy.java b/impl/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelPolicy.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelPolicy.java
rename to impl/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelPolicy.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/pwaas/PwaasUtil.java b/impl/src/main/java/org/onosproject/segmentrouting/pwaas/PwaasUtil.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/pwaas/PwaasUtil.java
rename to impl/src/main/java/org/onosproject/segmentrouting/pwaas/PwaasUtil.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/pwaas/package-info.java b/impl/src/main/java/org/onosproject/segmentrouting/pwaas/package-info.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/pwaas/package-info.java
rename to impl/src/main/java/org/onosproject/segmentrouting/pwaas/package-info.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/storekey/DestinationSetNextObjectiveStoreKey.java b/impl/src/main/java/org/onosproject/segmentrouting/storekey/DestinationSetNextObjectiveStoreKey.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/storekey/DestinationSetNextObjectiveStoreKey.java
rename to impl/src/main/java/org/onosproject/segmentrouting/storekey/DestinationSetNextObjectiveStoreKey.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/storekey/MacVlanNextObjectiveStoreKey.java b/impl/src/main/java/org/onosproject/segmentrouting/storekey/MacVlanNextObjectiveStoreKey.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/storekey/MacVlanNextObjectiveStoreKey.java
rename to impl/src/main/java/org/onosproject/segmentrouting/storekey/MacVlanNextObjectiveStoreKey.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/storekey/PortNextObjectiveStoreKey.java b/impl/src/main/java/org/onosproject/segmentrouting/storekey/PortNextObjectiveStoreKey.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/storekey/PortNextObjectiveStoreKey.java
rename to impl/src/main/java/org/onosproject/segmentrouting/storekey/PortNextObjectiveStoreKey.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/storekey/VlanNextObjectiveStoreKey.java b/impl/src/main/java/org/onosproject/segmentrouting/storekey/VlanNextObjectiveStoreKey.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/storekey/VlanNextObjectiveStoreKey.java
rename to impl/src/main/java/org/onosproject/segmentrouting/storekey/VlanNextObjectiveStoreKey.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/storekey/XConnectStoreKey.java b/impl/src/main/java/org/onosproject/segmentrouting/storekey/XConnectStoreKey.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/storekey/XConnectStoreKey.java
rename to impl/src/main/java/org/onosproject/segmentrouting/storekey/XConnectStoreKey.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/storekey/package-info.java b/impl/src/main/java/org/onosproject/segmentrouting/storekey/package-info.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/storekey/package-info.java
rename to impl/src/main/java/org/onosproject/segmentrouting/storekey/package-info.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectCodec.java b/impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectCodec.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectCodec.java
rename to impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectCodec.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectDesc.java b/impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectDesc.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectDesc.java
rename to impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectDesc.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectEndpoint.java b/impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectEndpoint.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectEndpoint.java
rename to impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectEndpoint.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectKey.java b/impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectKey.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectKey.java
rename to impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectKey.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectLoadBalancerEndpoint.java b/impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectLoadBalancerEndpoint.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectLoadBalancerEndpoint.java
rename to impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectLoadBalancerEndpoint.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectPortEndpoint.java b/impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectPortEndpoint.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectPortEndpoint.java
rename to impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectPortEndpoint.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectService.java b/impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectService.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectService.java
rename to impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/XconnectService.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/xconnect/api/package-info.java b/impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/package-info.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/xconnect/api/package-info.java
rename to impl/src/main/java/org/onosproject/segmentrouting/xconnect/api/package-info.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java b/impl/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java
rename to impl/src/main/java/org/onosproject/segmentrouting/xconnect/impl/XconnectManager.java
diff --git a/app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/package-info.java b/impl/src/main/java/org/onosproject/segmentrouting/xconnect/impl/package-info.java
similarity index 100%
rename from app/src/main/java/org/onosproject/segmentrouting/xconnect/impl/package-info.java
rename to impl/src/main/java/org/onosproject/segmentrouting/xconnect/impl/package-info.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/AugmentedPortAuthTracker.java b/impl/src/test/java/org/onosproject/segmentrouting/AugmentedPortAuthTracker.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/AugmentedPortAuthTracker.java
rename to impl/src/test/java/org/onosproject/segmentrouting/AugmentedPortAuthTracker.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/DefaultRoutingHandlerTest.java b/impl/src/test/java/org/onosproject/segmentrouting/DefaultRoutingHandlerTest.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/DefaultRoutingHandlerTest.java
rename to impl/src/test/java/org/onosproject/segmentrouting/DefaultRoutingHandlerTest.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/HostHandlerTest.java b/impl/src/test/java/org/onosproject/segmentrouting/HostHandlerTest.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/HostHandlerTest.java
rename to impl/src/test/java/org/onosproject/segmentrouting/HostHandlerTest.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/IcmpHandlerTest.java b/impl/src/test/java/org/onosproject/segmentrouting/IcmpHandlerTest.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/IcmpHandlerTest.java
rename to impl/src/test/java/org/onosproject/segmentrouting/IcmpHandlerTest.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockBridgingTableKey.java b/impl/src/test/java/org/onosproject/segmentrouting/MockBridgingTableKey.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockBridgingTableKey.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockBridgingTableKey.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockBridgingTableValue.java b/impl/src/test/java/org/onosproject/segmentrouting/MockBridgingTableValue.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockBridgingTableValue.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockBridgingTableValue.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java b/impl/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockDevice.java b/impl/src/test/java/org/onosproject/segmentrouting/MockDevice.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockDevice.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockDevice.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockDeviceService.java b/impl/src/test/java/org/onosproject/segmentrouting/MockDeviceService.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockDeviceService.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockDeviceService.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockFlowObjectiveService.java b/impl/src/test/java/org/onosproject/segmentrouting/MockFlowObjectiveService.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockFlowObjectiveService.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockFlowObjectiveService.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockHostProbingService.java b/impl/src/test/java/org/onosproject/segmentrouting/MockHostProbingService.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockHostProbingService.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockHostProbingService.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockHostService.java b/impl/src/test/java/org/onosproject/segmentrouting/MockHostService.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockHostService.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockHostService.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockInterfaceService.java b/impl/src/test/java/org/onosproject/segmentrouting/MockInterfaceService.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockInterfaceService.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockInterfaceService.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockLinkHandler.java b/impl/src/test/java/org/onosproject/segmentrouting/MockLinkHandler.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockLinkHandler.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockLinkHandler.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockMastershipService.java b/impl/src/test/java/org/onosproject/segmentrouting/MockMastershipService.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockMastershipService.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockMastershipService.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockNeighbourResolutionService.java b/impl/src/test/java/org/onosproject/segmentrouting/MockNeighbourResolutionService.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockNeighbourResolutionService.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockNeighbourResolutionService.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockNetworkConfigRegistry.java b/impl/src/test/java/org/onosproject/segmentrouting/MockNetworkConfigRegistry.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockNetworkConfigRegistry.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockNetworkConfigRegistry.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockPacketService.java b/impl/src/test/java/org/onosproject/segmentrouting/MockPacketService.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockPacketService.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockPacketService.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockRouteService.java b/impl/src/test/java/org/onosproject/segmentrouting/MockRouteService.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockRouteService.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockRouteService.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockRoutingRulePopulator.java b/impl/src/test/java/org/onosproject/segmentrouting/MockRoutingRulePopulator.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockRoutingRulePopulator.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockRoutingRulePopulator.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockRoutingTableKey.java b/impl/src/test/java/org/onosproject/segmentrouting/MockRoutingTableKey.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockRoutingTableKey.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockRoutingTableKey.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockRoutingTableValue.java b/impl/src/test/java/org/onosproject/segmentrouting/MockRoutingTableValue.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockRoutingTableValue.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockRoutingTableValue.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/MockSegmentRoutingManager.java b/impl/src/test/java/org/onosproject/segmentrouting/MockSegmentRoutingManager.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/MockSegmentRoutingManager.java
rename to impl/src/test/java/org/onosproject/segmentrouting/MockSegmentRoutingManager.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/PortAuthTrackerTest.java b/impl/src/test/java/org/onosproject/segmentrouting/PortAuthTrackerTest.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/PortAuthTrackerTest.java
rename to impl/src/test/java/org/onosproject/segmentrouting/PortAuthTrackerTest.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/RouteHandlerTest.java b/impl/src/test/java/org/onosproject/segmentrouting/RouteHandlerTest.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/RouteHandlerTest.java
rename to impl/src/test/java/org/onosproject/segmentrouting/RouteHandlerTest.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/RoutingRulePopulatorTest.java b/impl/src/test/java/org/onosproject/segmentrouting/RoutingRulePopulatorTest.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/RoutingRulePopulatorTest.java
rename to impl/src/test/java/org/onosproject/segmentrouting/RoutingRulePopulatorTest.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/TestUtils.java b/impl/src/test/java/org/onosproject/segmentrouting/TestUtils.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/TestUtils.java
rename to impl/src/test/java/org/onosproject/segmentrouting/TestUtils.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/config/DeviceConfigurationTest.java b/impl/src/test/java/org/onosproject/segmentrouting/config/DeviceConfigurationTest.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/config/DeviceConfigurationTest.java
rename to impl/src/test/java/org/onosproject/segmentrouting/config/DeviceConfigurationTest.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/grouphandler/DestinationSetTest.java b/impl/src/test/java/org/onosproject/segmentrouting/grouphandler/DestinationSetTest.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/grouphandler/DestinationSetTest.java
rename to impl/src/test/java/org/onosproject/segmentrouting/grouphandler/DestinationSetTest.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/pwaas/PwaasUtilTest.java b/impl/src/test/java/org/onosproject/segmentrouting/pwaas/PwaasUtilTest.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/pwaas/PwaasUtilTest.java
rename to impl/src/test/java/org/onosproject/segmentrouting/pwaas/PwaasUtilTest.java
diff --git a/app/src/test/java/org/onosproject/segmentrouting/xconnect/api/XconnectCodecTest.java b/impl/src/test/java/org/onosproject/segmentrouting/xconnect/api/XconnectCodecTest.java
similarity index 100%
rename from app/src/test/java/org/onosproject/segmentrouting/xconnect/api/XconnectCodecTest.java
rename to impl/src/test/java/org/onosproject/segmentrouting/xconnect/api/XconnectCodecTest.java
diff --git a/app/src/test/resources/interface1.json b/impl/src/test/resources/interface1.json
similarity index 100%
rename from app/src/test/resources/interface1.json
rename to impl/src/test/resources/interface1.json
diff --git a/app/src/test/resources/interface2.json b/impl/src/test/resources/interface2.json
similarity index 100%
rename from app/src/test/resources/interface2.json
rename to impl/src/test/resources/interface2.json
diff --git a/app/src/test/resources/pwaas-conflicting-vlan.json b/impl/src/test/resources/pwaas-conflicting-vlan.json
similarity index 100%
rename from app/src/test/resources/pwaas-conflicting-vlan.json
rename to impl/src/test/resources/pwaas-conflicting-vlan.json
diff --git a/app/src/test/resources/pwaas-invalid-mode.json b/impl/src/test/resources/pwaas-invalid-mode.json
similarity index 100%
rename from app/src/test/resources/pwaas-invalid-mode.json
rename to impl/src/test/resources/pwaas-invalid-mode.json
diff --git a/app/src/test/resources/pwaas-invalid-pwlabel.json b/impl/src/test/resources/pwaas-invalid-pwlabel.json
similarity index 100%
rename from app/src/test/resources/pwaas-invalid-pwlabel.json
rename to impl/src/test/resources/pwaas-invalid-pwlabel.json
diff --git a/app/src/test/resources/pwaas-invalid-vlan.json b/impl/src/test/resources/pwaas-invalid-vlan.json
similarity index 100%
rename from app/src/test/resources/pwaas-invalid-vlan.json
rename to impl/src/test/resources/pwaas-invalid-vlan.json
diff --git a/app/src/test/resources/pwaas.json b/impl/src/test/resources/pwaas.json
similarity index 100%
rename from app/src/test/resources/pwaas.json
rename to impl/src/test/resources/pwaas.json
diff --git a/app/src/test/resources/xconnect1.json b/impl/src/test/resources/xconnect1.json
similarity index 100%
rename from app/src/test/resources/xconnect1.json
rename to impl/src/test/resources/xconnect1.json
diff --git a/app/src/test/resources/xconnect2.json b/impl/src/test/resources/xconnect2.json
similarity index 100%
rename from app/src/test/resources/xconnect2.json
rename to impl/src/test/resources/xconnect2.json
diff --git a/oar/pom.xml b/oar/pom.xml
deleted file mode 100644
index 03b40d4..0000000
--- a/oar/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright 2015-present Open Networking Foundation
-  ~
-  ~ Licensed 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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onosproject</groupId>
-        <artifactId>segmentrouting</artifactId>
-        <version>3.0.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>segmentrouting-oar</artifactId>
-    <packaging>bundle</packaging>
-    <url>http://trellisfabric.org</url>
-    <description>Trellis control OAR wrapper</description>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.onosproject</groupId>
-                <artifactId>onos-maven-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 3ac1eb4..7c68482 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,9 +34,9 @@
 
     <modules>
         <module>api</module>
-        <module>app</module>
+        <module>impl</module>
         <module>web</module>
-        <module>oar</module>
+        <module>app</module>
     </modules>
 
     <build>
diff --git a/web/pom.xml b/web/pom.xml
index da8840a..745a6e9 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -42,10 +42,10 @@
     </properties>
 
     <dependencies>
-        <!-- Trellis app -->
+        <!-- Trellis impl -->
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>segmentrouting-app</artifactId>
+            <artifactId>segmentrouting-impl</artifactId>
             <version>${project.parent.version}</version>
             <scope>provided</scope>
         </dependency>