diff --git a/apps/segmentrouting/BUCK b/apps/segmentrouting/BUCK
index 420a3b3..f70eb88 100644
--- a/apps/segmentrouting/BUCK
+++ b/apps/segmentrouting/BUCK
@@ -1,33 +1,8 @@
-COMPILE_DEPS = [
-    '//lib:CORE_DEPS',
-    '//lib:JACKSON',
-    '//lib:KRYO',
-    '//lib:org.apache.karaf.shell.console',
-    '//lib:javax.ws.rs-api',
-    '//cli:onos-cli',
-    '//core/common:onos-core-common',
-    '//core/store/serializers:onos-core-serializers',
-    '//incubator/api:onos-incubator-api',
-    '//utils/rest:onlab-rest',
-    '//apps/route-service/api:onos-apps-route-service-api',
-]
-
 BUNDLES = [
-    '//apps/segmentrouting:onos-apps-segmentrouting',
-    '//apps/routing-api:onos-apps-routing-api',
+    '//apps/segmentrouting/app:onos-apps-segmentrouting-app',
+    '//apps/segmentrouting/web:onos-apps-segmentrouting-web',
 ]
 
-TEST_DEPS = [
-    '//lib:TEST_ADAPTERS',
-    '//incubator/api:onos-incubator-api-tests',
-    '//apps/route-service/api:onos-apps-route-service-api-tests',
-]
-
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
-    test_deps = TEST_DEPS,
-)
-
 onos_app (
     title = 'Segment Routing',
     category = 'Traffic Steering',
diff --git a/apps/segmentrouting/app/BUCK b/apps/segmentrouting/app/BUCK
new file mode 100644
index 0000000..9674f76
--- /dev/null
+++ b/apps/segmentrouting/app/BUCK
@@ -0,0 +1,22 @@
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+    '//lib:JACKSON',
+    '//lib:KRYO',
+    '//lib:org.apache.karaf.shell.console',
+    '//cli:onos-cli',
+    '//core/common:onos-core-common',
+    '//core/store/serializers:onos-core-serializers',
+    '//incubator/api:onos-incubator-api',
+    '//apps/route-service/api:onos-apps-route-service-api',
+]
+
+TEST_DEPS = [
+    '//lib:TEST_ADAPTERS',
+    '//incubator/api:onos-incubator-api-tests',
+    '//apps/route-service/api:onos-apps-route-service-api-tests',
+]
+
+osgi_jar_with_tests (
+    deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
+)
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/AppConfigHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/ArpHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/ArpHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/ArpHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/ArpHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/DefaultRoutingHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultTunnel.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/DefaultTunnel.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DefaultTunnel.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/DefaultTunnel.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/EcmpShortestPathGraph.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/EcmpShortestPathGraph.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/EcmpShortestPathGraph.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/EcmpShortestPathGraph.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/HostHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/HostHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/HostHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/HostHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/IcmpHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IpHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/IpHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/IpHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/IpHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/LinkHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/LinkHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/LinkHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/LinkHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/McastHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/McastHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/McastHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/McastHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/Policy.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/Policy.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/Policy.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/Policy.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/PolicyHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/PolicyHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/PolicyHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/PolicyHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/PortAuthTracker.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/PortAuthTracker.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/PortAuthTracker.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/PortAuthTracker.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RouteHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/RouteHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/RoutingRulePopulator.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourDispatcher.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourDispatcher.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourDispatcher.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourDispatcher.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingNeighbourHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingService.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingService.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/SegmentRoutingService.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingService.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/Tunnel.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/Tunnel.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/Tunnel.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/Tunnel.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/TunnelPolicy.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/TunnelPolicy.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/TunnelPolicy.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/TunnelPolicy.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/XConnectHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/XConnectHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/XConnectHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/XConnectHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/DeviceSubnetListCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/DeviceSubnetListCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/DeviceSubnetListCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/DeviceSubnetListCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/EcmpGraphCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/EcmpGraphCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/EcmpGraphCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/EcmpGraphCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/LinkStateCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/LinkStateCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/LinkStateCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/LinkStateCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/McastNextListCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/McastNextListCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/McastNextListCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/McastNextListCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/McastTreeListCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/McastTreeListCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/McastTreeListCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/McastTreeListCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/NextHopCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/NextHopCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/NextHopCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/NextHopCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PolicyAddCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PolicyAddCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PolicyAddCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PolicyAddCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PolicyListCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PolicyListCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PolicyListCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PolicyListCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PolicyRemoveCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PolicyRemoveCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PolicyRemoveCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PolicyRemoveCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireAddCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireAddCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireAddCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireAddCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireIdCompleter.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireIdCompleter.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireIdCompleter.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireIdCompleter.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireListCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireRemoveCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireRemoveCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/PseudowireRemoveCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/PseudowireRemoveCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/RerouteNetworkCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/RerouteNetworkCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/RerouteNetworkCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/RerouteNetworkCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/TunnelAddCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/TunnelAddCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/TunnelAddCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/TunnelAddCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/TunnelListCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/TunnelListCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/TunnelListCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/TunnelListCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/TunnelRemoveCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/TunnelRemoveCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/TunnelRemoveCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/TunnelRemoveCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/VerifyGroupsCommand.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/VerifyGroupsCommand.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/VerifyGroupsCommand.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/VerifyGroupsCommand.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/package-info.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/package-info.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/cli/package-info.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/cli/package-info.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/BlockedPortsConfig.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/BlockedPortsConfig.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/BlockedPortsConfig.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/BlockedPortsConfig.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfigNotFoundException.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfigNotFoundException.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfigNotFoundException.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfigNotFoundException.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/DeviceConfiguration.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceProperties.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/DeviceProperties.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/DeviceProperties.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/DeviceProperties.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/PwaasConfig.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/PwaasConfig.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/PwaasConfig.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/PwaasConfig.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/SegmentRoutingAppConfig.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/SegmentRoutingAppConfig.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/SegmentRoutingAppConfig.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/SegmentRoutingAppConfig.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/SegmentRoutingDeviceConfig.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/SegmentRoutingDeviceConfig.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/SegmentRoutingDeviceConfig.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/SegmentRoutingDeviceConfig.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/XConnectConfig.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/XConnectConfig.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/XConnectConfig.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/XConnectConfig.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/package-info.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/package-info.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/config/package-info.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/config/package-info.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DefaultGroupHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DestinationSet.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DestinationSet.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/DestinationSet.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/DestinationSet.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/GroupBucketIdentifier.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/GroupBucketIdentifier.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/GroupBucketIdentifier.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/GroupBucketIdentifier.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/NextNeighbors.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/NextNeighbors.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/NextNeighbors.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/NextNeighbors.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupIdentifier.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupIdentifier.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupIdentifier.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupIdentifier.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupParams.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupParams.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupParams.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/PolicyGroupParams.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/RandomDestinationSet.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/RandomDestinationSet.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/RandomDestinationSet.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/RandomDestinationSet.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/package-info.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/package-info.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/grouphandler/package-info.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/grouphandler/package-info.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/package-info.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/package-info.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/package-info.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/package-info.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2Tunnel.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2Tunnel.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2Tunnel.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2Tunnel.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelDescription.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelDescription.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelDescription.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelDescription.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelPolicy.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelPolicy.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelPolicy.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/DefaultL2TunnelPolicy.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2Mode.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2Mode.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2Mode.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2Mode.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2Tunnel.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2Tunnel.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2Tunnel.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2Tunnel.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelDescription.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelDescription.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelDescription.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelDescription.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelHandler.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelPolicy.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelPolicy.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelPolicy.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/L2TunnelPolicy.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/package-info.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/package-info.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/pwaas/package-info.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/pwaas/package-info.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/storekey/DestinationSetNextObjectiveStoreKey.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/storekey/DestinationSetNextObjectiveStoreKey.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/storekey/DestinationSetNextObjectiveStoreKey.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/storekey/DestinationSetNextObjectiveStoreKey.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/storekey/McastStoreKey.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/storekey/McastStoreKey.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/storekey/McastStoreKey.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/storekey/McastStoreKey.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/storekey/PortNextObjectiveStoreKey.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/storekey/PortNextObjectiveStoreKey.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/storekey/PortNextObjectiveStoreKey.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/storekey/PortNextObjectiveStoreKey.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/storekey/VlanNextObjectiveStoreKey.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/storekey/VlanNextObjectiveStoreKey.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/storekey/VlanNextObjectiveStoreKey.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/storekey/VlanNextObjectiveStoreKey.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/storekey/XConnectStoreKey.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/storekey/XConnectStoreKey.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/storekey/XConnectStoreKey.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/storekey/XConnectStoreKey.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/storekey/package-info.java b/apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/storekey/package-info.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/storekey/package-info.java
rename to apps/segmentrouting/app/src/main/java/org/onosproject/segmentrouting/storekey/package-info.java
diff --git a/apps/segmentrouting/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/segmentrouting/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
similarity index 100%
rename from apps/segmentrouting/src/main/resources/OSGI-INF/blueprint/shell-config.xml
rename to apps/segmentrouting/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/AugmentedPortAuthTracker.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/AugmentedPortAuthTracker.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/AugmentedPortAuthTracker.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/AugmentedPortAuthTracker.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/HostHandlerTest.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/HostHandlerTest.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/HostHandlerTest.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/HostHandlerTest.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockBridgingTableKey.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockBridgingTableKey.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockBridgingTableKey.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockBridgingTableKey.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockBridgingTableValue.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockBridgingTableValue.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockBridgingTableValue.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockBridgingTableValue.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockDefaultRoutingHandler.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockDevice.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockDevice.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockDevice.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockDevice.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockDeviceService.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockDeviceService.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockDeviceService.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockDeviceService.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockFlowObjectiveService.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockFlowObjectiveService.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockFlowObjectiveService.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockFlowObjectiveService.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockHostService.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockHostService.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockHostService.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockHostService.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockInterfaceService.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockInterfaceService.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockInterfaceService.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockInterfaceService.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockLinkHandler.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockLinkHandler.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockLinkHandler.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockLinkHandler.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockLocationProbingService.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockLocationProbingService.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockLocationProbingService.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockLocationProbingService.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockMastershipService.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockMastershipService.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockMastershipService.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockMastershipService.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockNetworkConfigRegistry.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockNetworkConfigRegistry.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockNetworkConfigRegistry.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockNetworkConfigRegistry.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockRouteService.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockRouteService.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockRouteService.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockRouteService.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockRoutingRulePopulator.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockRoutingRulePopulator.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockRoutingRulePopulator.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockRoutingRulePopulator.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockRoutingTableKey.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockRoutingTableKey.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockRoutingTableKey.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockRoutingTableKey.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockRoutingTableValue.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockRoutingTableValue.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockRoutingTableValue.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockRoutingTableValue.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockSegmentRoutingManager.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockSegmentRoutingManager.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/MockSegmentRoutingManager.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/MockSegmentRoutingManager.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/PortAuthTrackerTest.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/PortAuthTrackerTest.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/PortAuthTrackerTest.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/PortAuthTrackerTest.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/PwaasConfigTest.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/PwaasConfigTest.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/PwaasConfigTest.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/PwaasConfigTest.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/RouteHandlerTest.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/RouteHandlerTest.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/RouteHandlerTest.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/RouteHandlerTest.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/config/BlockedPortsConfigTest.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/config/BlockedPortsConfigTest.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/config/BlockedPortsConfigTest.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/config/BlockedPortsConfigTest.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/config/SegmentRoutingAppConfigTest.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/config/SegmentRoutingAppConfigTest.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/config/SegmentRoutingAppConfigTest.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/config/SegmentRoutingAppConfigTest.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/config/SegmentRoutingDeviceConfigTest.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/config/SegmentRoutingDeviceConfigTest.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/config/SegmentRoutingDeviceConfigTest.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/config/SegmentRoutingDeviceConfigTest.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/config/XConnectConfigTest.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/config/XConnectConfigTest.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/config/XConnectConfigTest.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/config/XConnectConfigTest.java
diff --git a/apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/grouphandler/DestinationSetTest.java b/apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/grouphandler/DestinationSetTest.java
similarity index 100%
rename from apps/segmentrouting/src/test/java/org/onosproject/segmentrouting/grouphandler/DestinationSetTest.java
rename to apps/segmentrouting/app/src/test/java/org/onosproject/segmentrouting/grouphandler/DestinationSetTest.java
diff --git a/apps/segmentrouting/src/test/resources/app-ecmp.json b/apps/segmentrouting/app/src/test/resources/app-ecmp.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/app-ecmp.json
rename to apps/segmentrouting/app/src/test/resources/app-ecmp.json
diff --git a/apps/segmentrouting/src/test/resources/app-invalid.json b/apps/segmentrouting/app/src/test/resources/app-invalid.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/app-invalid.json
rename to apps/segmentrouting/app/src/test/resources/app-invalid.json
diff --git a/apps/segmentrouting/src/test/resources/app.json b/apps/segmentrouting/app/src/test/resources/app.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/app.json
rename to apps/segmentrouting/app/src/test/resources/app.json
diff --git a/apps/segmentrouting/src/test/resources/blocked-ports-alt.json b/apps/segmentrouting/app/src/test/resources/blocked-ports-alt.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/blocked-ports-alt.json
rename to apps/segmentrouting/app/src/test/resources/blocked-ports-alt.json
diff --git a/apps/segmentrouting/src/test/resources/blocked-ports.json b/apps/segmentrouting/app/src/test/resources/blocked-ports.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/blocked-ports.json
rename to apps/segmentrouting/app/src/test/resources/blocked-ports.json
diff --git a/apps/segmentrouting/src/test/resources/device-invalid.json b/apps/segmentrouting/app/src/test/resources/device-invalid.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/device-invalid.json
rename to apps/segmentrouting/app/src/test/resources/device-invalid.json
diff --git a/apps/segmentrouting/src/test/resources/device-ipv6.json b/apps/segmentrouting/app/src/test/resources/device-ipv6.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/device-ipv6.json
rename to apps/segmentrouting/app/src/test/resources/device-ipv6.json
diff --git a/apps/segmentrouting/src/test/resources/device-pair.json b/apps/segmentrouting/app/src/test/resources/device-pair.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/device-pair.json
rename to apps/segmentrouting/app/src/test/resources/device-pair.json
diff --git a/apps/segmentrouting/src/test/resources/device.json b/apps/segmentrouting/app/src/test/resources/device.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/device.json
rename to apps/segmentrouting/app/src/test/resources/device.json
diff --git a/apps/segmentrouting/src/test/resources/pwaas-conflicting-vlan.json b/apps/segmentrouting/app/src/test/resources/pwaas-conflicting-vlan.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/pwaas-conflicting-vlan.json
rename to apps/segmentrouting/app/src/test/resources/pwaas-conflicting-vlan.json
diff --git a/apps/segmentrouting/src/test/resources/pwaas-invalid-mode.json b/apps/segmentrouting/app/src/test/resources/pwaas-invalid-mode.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/pwaas-invalid-mode.json
rename to apps/segmentrouting/app/src/test/resources/pwaas-invalid-mode.json
diff --git a/apps/segmentrouting/src/test/resources/pwaas-invalid-pwlabel.json b/apps/segmentrouting/app/src/test/resources/pwaas-invalid-pwlabel.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/pwaas-invalid-pwlabel.json
rename to apps/segmentrouting/app/src/test/resources/pwaas-invalid-pwlabel.json
diff --git a/apps/segmentrouting/src/test/resources/pwaas-invalid-vlan.json b/apps/segmentrouting/app/src/test/resources/pwaas-invalid-vlan.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/pwaas-invalid-vlan.json
rename to apps/segmentrouting/app/src/test/resources/pwaas-invalid-vlan.json
diff --git a/apps/segmentrouting/src/test/resources/pwaas.json b/apps/segmentrouting/app/src/test/resources/pwaas.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/pwaas.json
rename to apps/segmentrouting/app/src/test/resources/pwaas.json
diff --git a/apps/segmentrouting/src/test/resources/xconnect-invalid.json b/apps/segmentrouting/app/src/test/resources/xconnect-invalid.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/xconnect-invalid.json
rename to apps/segmentrouting/app/src/test/resources/xconnect-invalid.json
diff --git a/apps/segmentrouting/src/test/resources/xconnect.json b/apps/segmentrouting/app/src/test/resources/xconnect.json
similarity index 100%
rename from apps/segmentrouting/src/test/resources/xconnect.json
rename to apps/segmentrouting/app/src/test/resources/xconnect.json
diff --git a/apps/segmentrouting/web/BUCK b/apps/segmentrouting/web/BUCK
new file mode 100644
index 0000000..bf6864c
--- /dev/null
+++ b/apps/segmentrouting/web/BUCK
@@ -0,0 +1,16 @@
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+    '//lib:JACKSON',
+    '//lib:javax.ws.rs-api',
+    '//utils/rest:onlab-rest',
+    '//apps/segmentrouting/app:onos-apps-segmentrouting-app',
+]
+
+osgi_jar_with_tests (
+    deps = COMPILE_DEPS,
+    web_context = '/onos/segmentrouting',
+    api_title = 'Segment Routing Rest Server',
+    api_version = '1.0',
+    api_description = 'REST API for Segment Routing Application',
+    api_package = 'org.onosproject.segmentrouting.web',
+)
diff --git a/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/package-info.java b/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/package-info.java
new file mode 100644
index 0000000..ff9555e
--- /dev/null
+++ b/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * 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.
+ */
+
+/**
+ * Segment routing application components.
+ */
+package org.onosproject.segmentrouting.web;
\ No newline at end of file
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/web/PolicyCodec.java b/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PolicyCodec.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/web/PolicyCodec.java
rename to apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PolicyCodec.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/web/PolicyWebResource.java b/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PolicyWebResource.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/web/PolicyWebResource.java
rename to apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/PolicyWebResource.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/web/TunnelCodec.java b/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/TunnelCodec.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/web/TunnelCodec.java
rename to apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/TunnelCodec.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/web/TunnelWebResource.java b/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/TunnelWebResource.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/web/TunnelWebResource.java
rename to apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/TunnelWebResource.java
diff --git a/apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/web/package-info.java b/apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/package-info.java
similarity index 100%
rename from apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/web/package-info.java
rename to apps/segmentrouting/web/src/main/java/org/onosproject/segmentrouting/web/package-info.java
diff --git a/apps/segmentrouting/src/main/webapp/WEB-INF/web.xml b/apps/segmentrouting/web/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from apps/segmentrouting/src/main/webapp/WEB-INF/web.xml
rename to apps/segmentrouting/web/src/main/webapp/WEB-INF/web.xml
diff --git a/apps/t3/BUCK b/apps/t3/BUCK
index a37fab3..50905b2 100644
--- a/apps/t3/BUCK
+++ b/apps/t3/BUCK
@@ -7,7 +7,7 @@
     '//lib:org.apache.karaf.shell.console',
     '//cli:onos-cli',
     '//drivers/default:onos-drivers-default',
-    '//apps/segmentrouting:onos-apps-segmentrouting',
+    '//apps/segmentrouting/app:onos-apps-segmentrouting-app',
 ]
 
 TEST_DEPS = [