diff --git a/BUCK b/BUCK
index 5503e80..dd3ef13 100644
--- a/BUCK
+++ b/BUCK
@@ -73,8 +73,6 @@
     '//providers/ovsdb/device:onos-ovsdb-provider-device',
     '//providers/ovsdb/host:onos-ovsdb-provider-host',
     '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel',
-    '//providers/pcep/topology:onos-pcep-provider-topology',
-    '//providers/pcep/tunnel:onos-pcep-provider-tunnel',
     '//providers/rest/device:onos-restsb-provider-device',
     '//providers/snmp/device:onos-snmp-provider-device',
 
@@ -83,6 +81,7 @@
 ]
 
 APPS = [
+    '//providers/pcep:onos-providers-pcep-oar',
     '//apps/dhcp:onos-apps-dhcp-oar',
     '//apps/fwd:onos-apps-fwd-oar',
     '//apps/aaa:onos-apps-aaa-oar',
@@ -91,6 +90,26 @@
     '//apps/proxyarp:onos-apps-proxyarp-oar',
     '//apps/segmentrouting:onos-apps-segmentrouting-oar',
     '//apps/gangliametrics:onos-apps-gangliametrics-oar',
+    '//apps/graphitemetrics:onos-apps-graphitemetrics-oar',
+    '//apps/igmp:onos-apps-igmp-oar',
+    '//apps/cordmcast:onos-apps-cordmcast-oar',
+    '//apps/olt:onos-apps-olt-oar',
+    '//apps/influxdbmetrics:onos-apps-influxdbmetrics-oar',
+    '//apps/metrics:onos-apps-metrics-oar',
+    '//apps/mfwd:onos-apps-mfwd-oar',
+    '//apps/mlb:onos-apps-mlb-oar',
+    '//apps/openstackinterface:onos-apps-openstackinterface-oar',
+    '//apps/mobility:onos-apps-mobility-oar',
+    '//apps/optical:onos-apps-optical-oar',
+    '//apps/pathpainter:onos-apps-pathpainter-oar',
+    '//apps/pcep-api:onos-apps-pcep-api-oar',
+    '//apps/pim:onos-apps-pim-oar',
+    '//apps/reactive-routing:onos-apps-reactive-routing-oar',
+    '//apps/sdnip:onos-apps-sdnip-oar',
+    '//apps/virtualbng:onos-apps-virtualbng-oar',
+    '//apps/cordvtn:onos-apps-cordvtn-oar',
+    '//apps/vpls:onos-apps-vpls-oar',
+    '//apps/vrouter:onos-apps-vrouter-oar',
 ]
 
 APP_JARS = [
@@ -98,8 +117,6 @@
     '//apps/cpman/app:onos-app-cpman-app',
     '//apps/routing-api:onos-apps-routing-api',
     '//apps/cip:onos-app-cip',
-    '//apps/cordmcast:onos-app-cord-mcast',
-    '//apps/cordvtn:onos-apps-cordvtn',
     '//apps/dhcp/api:onos-apps-dhcp-api',
     '//apps/dhcp/app:onos-apps-dhcp-app',
     '//apps/drivermatrix:onos-app-drivermatrix',
@@ -107,30 +124,14 @@
     '//apps/faultmanagement:onos-app-fm',
     '//apps/flowanalyzer:onos-app-flowanalyzer',
     '//apps/fwd:onos-apps-fwd',
-    '//apps/igmp:onos-app-igmp',
-    '//apps/influxdbmetrics:onos-app-influxdb',
-    '//apps/olt:onos-app-olt-api',
-    '//apps/olt:onos-app-olt-app',
-    '//apps/iptopology-api:onos-app-iptopology-api',
-    '//apps/metrics:onos-app-metrics',
-    '//apps/graphitemetrics:onos-app-graphite',
-    '//apps/mfwd:onos-app-mfwd',
-    '//apps/mlb:onos-app-mlb',
-    '//apps/mobility:onos-app-mobility',
-    '//apps/openstackinterface:onos-app-openstackinterface-api',
-    '//apps/openstackinterface:onos-app-openstackinterface-app',
+    '//apps/olt:onos-apps-olt-api',
+    '//apps/iptopology-api:onos-apps-iptopology-api',
+    '//apps/openstackinterface:onos-apps-openstackinterface-api',
     '//apps/openstacknetworking:onos-app-openstacknetworking',
-    '//apps/openstacknode:onos-app-openstacknode',
-    '//apps/optical:onos-app-optical',
-    '//apps/pathpainter:onos-app-pp',
-    '//apps/pim:onos-app-pim',
+    '//apps/openstacknode:onos-apps-openstacknode',
     '//apps/routing:onos-apps-routing',
-    '//apps/sdnip:onos-app-sdnip',
     '//apps/test:onos-app-test',
     '//apps/vtn:onos-app-vtn',
-    '//apps/virtualbng:onos-app-virtualbng',
-    '//apps/vpls:onos-app-vpls',
-    '//apps/vrouter:onos-app-vrouter',
 ]
 
 java_library(