diff --git a/BUCK b/BUCK
index f473d55..056750b 100644
--- a/BUCK
+++ b/BUCK
@@ -1,167 +1,3 @@
-CORE = [
-    '//utils/osgi:onlab-osgi',
-    '//utils/junit:onlab-junit',
-    '//utils/misc:onlab-misc',
-    '//utils/rest:onlab-rest',
-
-    '//core/api:onos-api',
-    '//core/net:onos-core-net',
-    '//core/common:onos-core-common',
-    '//core/store/primitives:onos-core-primitives',
-    '//core/store/serializers:onos-core-serializers',
-    '//core/store/dist:onos-core-dist',
-    '//core/security:onos-security',
-    '//core/store/persistence:onos-core-persistence',
-
-    '//incubator/api:onos-incubator-api',
-    '//incubator/net:onos-incubator-net',
-    '//incubator/core:onos-incubator-core',
-    '//incubator/store:onos-incubator-store',
-    '//incubator/rpc:onos-incubator-rpc',
-
-    '//cli:onos-cli',
-
-    '//protocols/rest/api:onos-protocols-rest-api',
-    '//protocols/rest/ctl:onos-protocols-rest-ctl',
-    '//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
-    '//protocols/bgp/api:onos-protocols-bgp-api',
-    '//protocols/bgp/ctl:onos-protocols-bgp-ctl',
-    '//protocols/netconf/api:onos-protocols-netconf-api',
-    '//protocols/netconf/ctl:onos-protocols-netconf-ctl',
-    '//protocols/openflow/api:onos-protocols-openflow-api',
-    '//protocols/openflow/ctl:onos-protocols-openflow-ctl',
-    '//protocols/ospf/api:onos-protocols-ospf-api',
-    '//protocols/ospf/protocol:onos-protocols-ospf-protocol',
-    '//protocols/ospf/ctl:onos-protocols-ospf-ctl',
-    '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
-    '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
-    '//protocols/ovsdb/ctl:onos-protocols-ovsdb-ctl',
-    '//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
-    '//protocols/pcep/api:onos-protocols-pcep-api',
-    '//protocols/pcep/ctl:onos-protocols-pcep-ctl',
-    '//protocols/snmp/api:onos-protocols-snmp-api',
-    '//protocols/snmp/ctl:onos-protocols-snmp-ctl',
-    '//protocols/isis/api:onos-protocols-isis-api',
-    '//protocols/isis/ctl:onos-protocols-isis-ctl',
-    '//protocols/isis/isisio:onos-protocols-isis-isisio',
-
-    '//drivers/utilities:onos-drivers-utilities',
-    '//drivers/bti:onos-drivers-bti-oar',
-    '//drivers/ciena:onos-drivers-ciena-oar',
-    '//drivers/cisco:onos-drivers-cisco-oar',
-    '//drivers/default:onos-drivers-default-oar',
-    '//drivers/fujitsu:onos-drivers-fujitsu-oar',
-    '//drivers/lumentum:onos-drivers-lumentum-oar',
-    '//drivers/netconf:onos-drivers-netconf-oar',
-    '//drivers/ovsdb:onos-drivers-ovsdb-oar',
-    '//drivers/optical:onos-drivers-optical-oar',
-    '//drivers/arista:onos-drivers-arista-oar',
-
-    '//providers/netconf/device:onos-providers-netconf-device',
-    '//providers/openflow/device:onos-providers-openflow-device',
-    '//providers/openflow/packet:onos-providers-openflow-packet',
-    '//providers/openflow/flow:onos-providers-openflow-flow',
-    '//providers/openflow/group:onos-providers-openflow-group',
-    '//providers/openflow/meter:onos-providers-openflow-meter',
-    '//providers/ovsdb/device:onos-providers-ovsdb-device',
-    '//providers/ovsdb/tunnel:onos-providers-ovsdb-tunnel',
-    '//providers/rest/device:onos-providers-rest-device',
-    '//providers/snmp/device:onos-providers-snmp-device',
-    '//providers/isis/cfg:onos-providers-isis-cfg',
-    '//providers/isis/topology:onos-providers-isis-topology',
-
-    '//web/api:onos-rest',
-    '//web/gui:onos-gui',
-]
-
-APPS = [
-    # Drivers
-    '//drivers/default:onos-drivers-default-oar',
-    '//drivers/corsa:onos-drivers-corsa-oar',
-    '//drivers/ovsdb:onos-drivers-ovsdb-oar',
-
-    # Providers
-    '//providers/bgp:onos-providers-bgp-oar',
-    '//providers/host:onos-providers-host-oar',
-    '//providers/lldp:onos-providers-lldp-oar',
-    '//providers/netcfghost:onos-providers-netcfghost-oar',
-    '//providers/netcfglinks:onos-providers-netcfglinks-oar',
-    '//providers/netconf:onos-providers-netconf-oar',
-    '//providers/openflow/message:onos-providers-openflow-message-oar',
-    '//providers/ovsdb:onos-providers-ovsdb-oar',
-    '//providers/ovsdb/host:onos-providers-ovsdb-host-oar',
-    '//providers/ovsdb/base:onos-providers-ovsdb-base-oar',
-    '//providers/pcep:onos-providers-pcep-oar',
-    '//providers/null:onos-providers-null-oar',
-    '//providers/openflow/base:onos-providers-openflow-base-oar',
-    '//providers/openflow/app:onos-providers-openflow-app-oar',
-    '//providers/rest:onos-providers-rest-oar',
-    '//providers/isis:onos-providers-isis-oar',
-
-    # Apps
-    '//apps/dhcp:onos-apps-dhcp-oar',
-    '//apps/dhcprelay:onos-apps-dhcprelay-oar',
-    '//apps/fwd:onos-apps-fwd-oar',
-    '//apps/acl:onos-apps-acl-oar',
-    '//apps/bgprouter:onos-apps-bgprouter-oar',
-    '//apps/cip:onos-apps-cip-oar',
-    '//apps/drivermatrix:onos-apps-drivermatrix-oar',
-    '//apps/events:onos-apps-events-oar',
-    '//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/flowanalyzer:onos-apps-flowanalyzer-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/openstacknetworking:onos-apps-openstacknetworking-oar',
-    '//apps/openstacknetworking/routing:onos-apps-openstacknetworking-routing-oar',
-    '//apps/openstacknetworking/switching:onos-apps-openstacknetworking-switching-oar',
-    '//apps/mobility:onos-apps-mobility-oar',
-    '//apps/optical:onos-apps-optical-oar',
-    '//apps/newoptical:onos-apps-newoptical-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/test/demo:onos-apps-test-demo-oar',
-    '//apps/test/distributed-primitives:onos-apps-test-distributed-primitives-oar',
-    '//apps/test/election:onos-apps-test-election-oar',
-    '//apps/test/flow-perf:onos-apps-test-flow-perf-oar',
-    '//apps/test/intent-perf:onos-apps-test-intent-perf-oar',
-    '//apps/test/loadtest:onos-apps-test-loadtest-oar',
-    '//apps/test/messaging-perf:onos-apps-test-messaging-perf-oar',
-    '//apps/virtualbng:onos-apps-virtualbng-oar',
-    '//apps/vpls:onos-apps-vpls-oar',
-    '//apps/vrouter:onos-apps-vrouter-oar',
-    '//apps/vtn:onos-apps-vtn-oar',
-    '//apps/faultmanagement:onos-apps-faultmanagement-oar',
-    '//apps/openstacknode:onos-apps-openstacknode-oar',
-    '//apps/cpman/app:onos-apps-cpman-app-oar',
-    '//apps/xosclient:onos-apps-xosclient-oar',
-    '//apps/scalablegateway:onos-apps-scalablegateway-oar',
-]
-
-APP_JARS = [
-    '//apps/cpman/api:onos-apps-cpman-api',
-    '//apps/routing-api:onos-apps-routing-api',
-    '//apps/dhcp/api:onos-apps-dhcp-api',
-    '//apps/dhcp/app:onos-apps-dhcp-app',
-    '//apps/dhcprelay:onos-apps-dhcprelay',
-    '//apps/fwd:onos-apps-fwd',
-    '//apps/iptopology-api:onos-apps-iptopology-api',
-    '//apps/openstacknode:onos-apps-openstacknode',
-    '//apps/routing:onos-apps-routing',
-    '//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc',
-    '//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr',
-    '//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr',
-    '//apps/vtn/vtnweb:onos-apps-vtn-vtnweb',
-]
-
 java_library(
     name = 'core',
     visibility = ['PUBLIC'],
diff --git a/buck-tools/build.defs b/buck-tools/build.defs
deleted file mode 100644
index 3ea506c..0000000
--- a/buck-tools/build.defs
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright (C) 2013 The Android Open Source Project
-#
-# 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.
-
-# These definitions support building a runnable version of Gerrit.
-
-DOCS_HTML = '//Documentation:html'
-DOCS_LIB = '//Documentation:index_lib'
-LIBS = [
-  '//gerrit-war:log4j-config',
-  '//gerrit-war:init',
-  '//lib:postgresql',
-  '//lib/log:impl_log4j',
-]
-PGMLIBS = ['//gerrit-pgm:pgm']
-
-def scan_plugins():
-  import os
-  deps = []
-  for n in os.listdir('plugins'):
-    if os.path.exists(os.path.join('plugins', n, 'BUCK')):
-      deps.append('//plugins/%s:%s__plugin' % (n, n))
-  return deps
-
-def war(
-    name,
-    libs = [],
-    pgmlibs = [],
-    context = [],
-    visibility = [],
-    docs = False
-    ):
-  cmd = ['$(exe //tools:pack_war)', '-o', '$OUT', '--tmp', '$TMP']
-  for l in libs:
-    cmd.extend(['--lib', '$(classpath %s)' % l])
-  for l in pgmlibs:
-    cmd.extend(['--pgmlib', '$(classpath %s)' % l])
-
-  if docs:
-    cmd.append('$(location %s)' % DOCS_HTML)
-    cmd.extend(['--lib', '$(classpath %s)' % DOCS_LIB])
-  if context:
-    for t in context:
-      cmd.append('$(location %s)' % t)
-
-  genrule(
-    name = name,
-    cmd = ' '.join(cmd),
-    out = name + '.war',
-    visibility = visibility,
-  )
-
-def gerrit_war(name, ui = 'ui_optdbg', context = [], docs = False, visibility = []):
-  ui_deps = []
-  if ui:
-    if ui == 'polygerrit' or ui == 'ui_optdbg' or ui == 'ui_optdbg_r':
-      ui_deps.append('//polygerrit-ui/app:polygerrit_ui')
-    if ui != 'polygerrit':
-      ui_deps.append('//gerrit-gwtui:%s' % ui)
-  war(
-    name = name,
-    libs = LIBS + ['//gerrit-war:version'],
-    pgmlibs = PGMLIBS,
-    context = ui_deps + context + [
-      '//gerrit-main:main_bin',
-      '//gerrit-war:webapp_assets',
-    ],
-    docs = docs,
-    visibility = visibility,
-  )
diff --git a/buck-tools/default.defs b/buck-tools/default.defs
index 125fee4..9c72161 100644
--- a/buck-tools/default.defs
+++ b/buck-tools/default.defs
@@ -1,3 +1,4 @@
+include_defs('//onos.defs')
 include_defs('//bucklets/maven_jar.bucklet')
 include_defs('//bucklets/onos.bucklet')
 include_defs('//bucklets/onos_app.bucklet')
@@ -8,4 +9,6 @@
     '//lib:hamcrest-all',
     '//lib:slf4j-api',
     '//lib:guava-testlib',
-]
\ No newline at end of file
+]
+
+
diff --git a/modules.defs b/modules.defs
new file mode 100644
index 0000000..cf92e27
--- /dev/null
+++ b/modules.defs
@@ -0,0 +1,169 @@
+CORE = [
+    '//utils/osgi:onlab-osgi',
+    '//utils/junit:onlab-junit',
+    '//utils/misc:onlab-misc',
+    '//utils/rest:onlab-rest',
+
+    '//core/api:onos-api',
+    '//core/net:onos-core-net',
+    '//core/common:onos-core-common',
+    '//core/store/primitives:onos-core-primitives',
+    '//core/store/serializers:onos-core-serializers',
+    '//core/store/dist:onos-core-dist',
+    '//core/security:onos-security',
+    '//core/store/persistence:onos-core-persistence',
+
+    '//incubator/api:onos-incubator-api',
+    '//incubator/net:onos-incubator-net',
+    '//incubator/core:onos-incubator-core',
+    '//incubator/store:onos-incubator-store',
+    '//incubator/rpc:onos-incubator-rpc',
+
+    '//cli:onos-cli',
+
+    '//protocols/rest/api:onos-protocols-rest-api',
+    '//protocols/rest/ctl:onos-protocols-rest-ctl',
+    '//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
+    '//protocols/bgp/api:onos-protocols-bgp-api',
+    '//protocols/bgp/ctl:onos-protocols-bgp-ctl',
+    '//protocols/netconf/api:onos-protocols-netconf-api',
+    '//protocols/netconf/ctl:onos-protocols-netconf-ctl',
+    '//protocols/openflow/api:onos-protocols-openflow-api',
+    '//protocols/openflow/ctl:onos-protocols-openflow-ctl',
+    '//protocols/ospf/api:onos-protocols-ospf-api',
+    '//protocols/ospf/protocol:onos-protocols-ospf-protocol',
+    '//protocols/ospf/ctl:onos-protocols-ospf-ctl',
+    '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
+    '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
+    '//protocols/ovsdb/ctl:onos-protocols-ovsdb-ctl',
+    '//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
+    '//protocols/pcep/api:onos-protocols-pcep-api',
+    '//protocols/pcep/ctl:onos-protocols-pcep-ctl',
+    '//protocols/snmp/api:onos-protocols-snmp-api',
+    '//protocols/snmp/ctl:onos-protocols-snmp-ctl',
+    '//protocols/isis/api:onos-protocols-isis-api',
+    '//protocols/isis/ctl:onos-protocols-isis-ctl',
+    '//protocols/isis/isisio:onos-protocols-isis-isisio',
+
+    '//drivers/utilities:onos-drivers-utilities',
+    '//drivers/bti:onos-drivers-bti-oar',
+    '//drivers/ciena:onos-drivers-ciena-oar',
+    '//drivers/cisco:onos-drivers-cisco-oar',
+    '//drivers/default:onos-drivers-default-oar',
+    '//drivers/fujitsu:onos-drivers-fujitsu-oar',
+    '//drivers/lumentum:onos-drivers-lumentum-oar',
+    '//drivers/netconf:onos-drivers-netconf-oar',
+    '//drivers/ovsdb:onos-drivers-ovsdb-oar',
+    '//drivers/optical:onos-drivers-optical-oar',
+    '//drivers/arista:onos-drivers-arista-oar',
+
+    '//providers/netconf/device:onos-providers-netconf-device',
+    '//providers/openflow/device:onos-providers-openflow-device',
+    '//providers/openflow/packet:onos-providers-openflow-packet',
+    '//providers/openflow/flow:onos-providers-openflow-flow',
+    '//providers/openflow/group:onos-providers-openflow-group',
+    '//providers/openflow/meter:onos-providers-openflow-meter',
+    '//providers/ovsdb/device:onos-providers-ovsdb-device',
+    '//providers/ovsdb/tunnel:onos-providers-ovsdb-tunnel',
+    '//providers/rest/device:onos-providers-rest-device',
+    '//providers/snmp/device:onos-providers-snmp-device',
+    '//providers/isis/cfg:onos-providers-isis-cfg',
+    '//providers/isis/topology:onos-providers-isis-topology',
+
+    '//web/api:onos-rest',
+    '//web/gui:onos-gui',
+]
+
+ONOS_DRIVERS = [
+    # Drivers
+    '//drivers/default:onos-drivers-default-oar',
+    '//drivers/corsa:onos-drivers-corsa-oar',
+    '//drivers/ovsdb:onos-drivers-ovsdb-oar',
+]
+
+ONOS_PROVIDERS = [
+    # Providers
+    '//providers/bgp:onos-providers-bgp-oar',
+    '//providers/host:onos-providers-host-oar',
+    '//providers/lldp:onos-providers-lldp-oar',
+    '//providers/netcfghost:onos-providers-netcfghost-oar',
+    '//providers/netcfglinks:onos-providers-netcfglinks-oar',
+    '//providers/netconf:onos-providers-netconf-oar',
+    '//providers/openflow/message:onos-providers-openflow-message-oar',
+    '//providers/ovsdb:onos-providers-ovsdb-oar',
+    '//providers/ovsdb/host:onos-providers-ovsdb-host-oar',
+    '//providers/ovsdb/base:onos-providers-ovsdb-base-oar',
+    '//providers/pcep:onos-providers-pcep-oar',
+    '//providers/null:onos-providers-null-oar',
+    '//providers/openflow/base:onos-providers-openflow-base-oar',
+    '//providers/openflow/app:onos-providers-openflow-app-oar',
+    '//providers/rest:onos-providers-rest-oar',
+    '//providers/isis:onos-providers-isis-oar',
+]
+
+ONOS_APPS = [
+    # Apps
+    '//apps/dhcp:onos-apps-dhcp-oar',
+    '//apps/dhcprelay:onos-apps-dhcprelay-oar',
+    '//apps/fwd:onos-apps-fwd-oar',
+    '//apps/acl:onos-apps-acl-oar',
+    '//apps/bgprouter:onos-apps-bgprouter-oar',
+    '//apps/cip:onos-apps-cip-oar',
+    '//apps/drivermatrix:onos-apps-drivermatrix-oar',
+    '//apps/events:onos-apps-events-oar',
+    '//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/flowanalyzer:onos-apps-flowanalyzer-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/openstacknetworking:onos-apps-openstacknetworking-oar',
+    '//apps/openstacknetworking/routing:onos-apps-openstacknetworking-routing-oar',
+    '//apps/openstacknetworking/switching:onos-apps-openstacknetworking-switching-oar',
+    '//apps/mobility:onos-apps-mobility-oar',
+    '//apps/optical:onos-apps-optical-oar',
+    '//apps/newoptical:onos-apps-newoptical-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/test/demo:onos-apps-test-demo-oar',
+    '//apps/test/distributed-primitives:onos-apps-test-distributed-primitives-oar',
+    '//apps/test/election:onos-apps-test-election-oar',
+    '//apps/test/flow-perf:onos-apps-test-flow-perf-oar',
+    '//apps/test/intent-perf:onos-apps-test-intent-perf-oar',
+    '//apps/test/loadtest:onos-apps-test-loadtest-oar',
+    '//apps/test/messaging-perf:onos-apps-test-messaging-perf-oar',
+    '//apps/virtualbng:onos-apps-virtualbng-oar',
+    '//apps/vpls:onos-apps-vpls-oar',
+    '//apps/vrouter:onos-apps-vrouter-oar',
+    '//apps/vtn:onos-apps-vtn-oar',
+    '//apps/faultmanagement:onos-apps-faultmanagement-oar',
+    '//apps/openstacknode:onos-apps-openstacknode-oar',
+    '//apps/cpman/app:onos-apps-cpman-app-oar',
+    '//apps/xosclient:onos-apps-xosclient-oar',
+    '//apps/scalablegateway:onos-apps-scalablegateway-oar',
+]
+
+APP_JARS = [
+    '//apps/cpman/api:onos-apps-cpman-api',
+    '//apps/routing-api:onos-apps-routing-api',
+    '//apps/dhcp/api:onos-apps-dhcp-api',
+    '//apps/dhcp/app:onos-apps-dhcp-app',
+    '//apps/dhcprelay:onos-apps-dhcprelay',
+    '//apps/fwd:onos-apps-fwd',
+    '//apps/iptopology-api:onos-apps-iptopology-api',
+    '//apps/openstacknode:onos-apps-openstacknode',
+    '//apps/routing:onos-apps-routing',
+    '//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc',
+    '//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr',
+    '//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr',
+    '//apps/vtn/vtnweb:onos-apps-vtn-vtnweb',
+]
+
+APPS = ONOS_DRIVERS + ONOS_PROVIDERS + ONOS_APPS
diff --git a/onos.defs b/onos.defs
new file mode 100644
index 0000000..2a659e2
--- /dev/null
+++ b/onos.defs
@@ -0,0 +1,9 @@
+#FIXME - these should be shared with bucklets
+ONOS_ORIGIN = 'ON.Lab'
+ONOS_GROUP_ID = 'org.onosproject'
+ONOS_VERSION = '1.7.0-SNAPSHOT'
+DEFAULT_APP_CATEGORY = 'Utility'
+ONOS_ARTIFACT_BASE = 'onos-'
+APP_PREFIX = ONOS_GROUP_ID + '.'
+
+include_defs('//modules.defs')
diff --git a/tools/package/BUCK b/tools/package/BUCK
index d6d1fb4..b3432e8 100644
--- a/tools/package/BUCK
+++ b/tools/package/BUCK
@@ -13,73 +13,6 @@
 #'//features:onos-security',
 ]
 
-#FIXME this list is currently mirrored from the root Buck file
-APPS = [
-  # Drivers
-  '//drivers/default:onos-drivers-default-oar',
-  '//drivers/corsa:onos-drivers-corsa-oar',
-  '//drivers/ovsdb:onos-drivers-ovsdb-oar',
-
-  # Providers
-  '//providers/bgp:onos-providers-bgp-oar',
-  '//providers/host:onos-providers-host-oar',
-  '//providers/lldp:onos-providers-lldp-oar',
-  '//providers/netcfghost:onos-providers-netcfghost-oar',
-  '//providers/netcfglinks:onos-providers-netcfglinks-oar',
-  '//providers/netconf:onos-providers-netconf-oar',
-  '//providers/openflow/message:onos-providers-openflow-message-oar',
-  '//providers/ovsdb:onos-providers-ovsdb-oar',
-  '//providers/pcep:onos-providers-pcep-oar',
-  '//providers/null:onos-providers-null-oar',
-  '//providers/openflow/base:onos-providers-openflow-base-oar',
-  '//providers/openflow/app:onos-providers-openflow-app-oar',
-  '//providers/rest:onos-providers-rest-oar',
-  '//providers/isis:onos-providers-isis-oar',
-  '//providers/ovsdb/host:onos-providers-ovsdb-host-oar',
-  '//providers/ovsdb/base:onos-providers-ovsdb-base-oar',
-
-  # Apps
-  '//apps/dhcp:onos-apps-dhcp-oar',
-  '//apps/dhcprelay:onos-apps-dhcprelay-oar',
-  '//apps/fwd:onos-apps-fwd-oar',
-  '//apps/acl:onos-apps-acl-oar',
-  '//apps/bgprouter:onos-apps-bgprouter-oar',
-  '//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/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/openstacknetworking:onos-apps-openstacknetworking-oar',
-  '//apps/openstacknetworking/routing:onos-apps-openstacknetworking-routing-oar',
-  '//apps/openstacknetworking/switching:onos-apps-openstacknetworking-switching-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/vpls:onos-apps-vpls-oar',
-  '//apps/vrouter:onos-apps-vrouter-oar',
-  '//apps/vtn:onos-apps-vtn-oar',
-  '//apps/faultmanagement:onos-apps-faultmanagement-oar',
-  '//apps/openstacknode:onos-apps-openstacknode-oar',
-  '//apps/cpman/app:onos-apps-cpman-app-oar',
-  '//apps/xosclient:onos-apps-xosclient-oar',
-  '//apps/scalablegateway:onos-apps-scalablegateway-oar',
-  '//apps/events:onos-apps-events-oar',
-  '//apps/test/election:onos-apps-test-election-oar',
-  '//apps/test/distributed-primitives:onos-apps-test-distributed-primitives-oar',
-  '//apps/test/intent-perf:onos-apps-test-intent-perf-oar',
-  '//apps/test/loadtest:onos-apps-test-loadtest-oar',
-  '//apps/test/demo:onos-apps-test-demo-oar',
-]
-
 #TODO move to buck-tools
 export_file (
   name = 'onos-prep-karaf',