diff --git a/BUCK b/BUCK
index 0fd1df6..e618ef0 100644
--- a/BUCK
+++ b/BUCK
@@ -73,6 +73,9 @@
 ]
 
 APPS = [
+    #Drivers
+    '//drivers/default:onos-drivers-default-oar',
+
     # Providers
     '//providers/bgp:onos-providers-bgp-oar',
     '//providers/host:onos-providers-host-oar',
diff --git a/apps/fwd/BUCK b/apps/fwd/BUCK
index 565e275..2c69a19 100644
--- a/apps/fwd/BUCK
+++ b/apps/fwd/BUCK
@@ -1,7 +1,5 @@
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
-    '//lib:org.apache.karaf.shell.console',
-    '//cli:onos-cli',
 ]
 
 osgi_jar_with_tests (
@@ -12,5 +10,5 @@
     title = 'Reactive Forwarding App',
     category = 'Traffic Steering',
     url = 'http://onosproject.org',
-    description = 'Reactive forwarding application using flow subsystem.',
+    description = 'Reactive forwarding application using flow objective subsystem.',
 )
diff --git a/cli/BUCK b/cli/BUCK
index fe1d102..d2333d0 100644
--- a/cli/BUCK
+++ b/cli/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-cli'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:org.apache.karaf.shell.console',
@@ -11,12 +6,8 @@
     '//core/common:onos-core-common',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar (
     deps = COMPILE_DEPS,
     visibility = ['PUBLIC'],
-    resources_root = 'src/main/resources',
-    resources = glob(['src/main/resources/**']),
 )
 
diff --git a/core/common/BUCK b/core/common/BUCK
index 70ea817..a00d4fd 100644
--- a/core/common/BUCK
+++ b/core/common/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-common'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 SRC_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
@@ -13,21 +8,9 @@
     '//core/api:onos-api-tests',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-common',
     deps = SRC_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'onos-core-common-tests',
-    visibility = ['PUBLIC'],
-    srcs = glob([TEST + '/*.java']),
-    resources_root = 'src/test/resources',
-    resources = glob(['src/test/resources/**']),
-    deps = SRC_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)
diff --git a/core/net/BUCK b/core/net/BUCK
index bffb300..7070fb7 100644
--- a/core/net/BUCK
+++ b/core/net/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-net'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
@@ -15,20 +10,9 @@
     '//core/store/dist:onos-core-dist-tests',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-net',
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
-)
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-    resources_root = 'src/test/resources',
-    resources = glob(['src/test/resources/**']),
-)
+)
\ No newline at end of file
diff --git a/core/store/dist/BUCK b/core/store/dist/BUCK
index 6c56b3f..075612f 100644
--- a/core/store/dist/BUCK
+++ b/core/store/dist/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-dist'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//core/common:onos-core-common',
@@ -18,23 +13,13 @@
 
 TEST_DEPS = [
     '//lib:TEST',
-     '//core/api:onos-api-tests',
-     '//core/common:onos-core-common-tests',
+    '//core/api:onos-api-tests',
+    '//core/common:onos-core-common-tests',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-dist',
     deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
-)
-
-java_test(
-    name= 'onos-core-dist-tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
diff --git a/core/store/persistence/BUCK b/core/store/persistence/BUCK
index 0791c14..496160d 100644
--- a/core/store/persistence/BUCK
+++ b/core/store/persistence/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-persistence'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:catalyst-serializer',
@@ -13,18 +8,9 @@
     '//lib:TEST',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-persistence',
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)
diff --git a/core/store/primitives/BUCK b/core/store/primitives/BUCK
index ffdb294..c4a9b8f 100644
--- a/core/store/primitives/BUCK
+++ b/core/store/primitives/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-primitives'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//core/common:onos-core-common',
@@ -32,18 +27,9 @@
     '//core/api:onos-api-tests',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-primitives',
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)
diff --git a/core/store/serializers/BUCK b/core/store/serializers/BUCK
index f5d9ced..1b8efcf 100644
--- a/core/store/serializers/BUCK
+++ b/core/store/serializers/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-CURRENT_NAME = 'onos-core-serializers'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
@@ -12,18 +7,9 @@
     '//lib:TEST',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-core-serializers',
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)
diff --git a/drivers/default/BUCK b/drivers/default/BUCK
index f999454..e64db2d 100644
--- a/drivers/default/BUCK
+++ b/drivers/default/BUCK
@@ -18,4 +18,9 @@
     category = 'Drivers',
     url = 'http://onosproject.org',
     description = 'ONOS Default device drivers application.',
+    included_bundles = [
+        ':onos-drivers-default',
+        '//lib:openflowj',
+        '//protocols/openflow/api:onos-protocols-openflow-api',
+    ]
 )
diff --git a/incubator/api/BUCK b/incubator/api/BUCK
index 2689f58..55f80e0 100644
--- a/incubator/api/BUCK
+++ b/incubator/api/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/incubator/**/'
-TEST = 'src/test/java/org/onosproject/incubator/**/'
-CURRENT_NAME = 'onos-incubator-api'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
 ]
@@ -11,21 +6,9 @@
     '//lib:TEST_ADAPTERS',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
+    name = 'onos-incubator-api',
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'onos-incubator-api-tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-    visibility = ['PUBLIC'],
-    resources_root = 'src/test/resources',
-    resources = glob(['src/test/resources/**']),
-)
diff --git a/incubator/core/BUCK b/incubator/core/BUCK
index aa3a537..068a43b 100644
--- a/incubator/core/BUCK
+++ b/incubator/core/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/incubator/**/'
-TEST = 'src/test/java/org/onosproject/incubator/**/'
-CURRENT_NAME = 'onos-incubator-core'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
@@ -12,18 +7,8 @@
     '//lib:TEST',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)
diff --git a/incubator/rpc/BUCK b/incubator/rpc/BUCK
index 52945d8..068a43b 100644
--- a/incubator/rpc/BUCK
+++ b/incubator/rpc/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/incubator/**/'
-TEST = 'src/test/java/org/onosproject/incubator/**/'
-CURRENT_NAME = 'onos-incubator-rpc'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//incubator/api:onos-incubator-api',
@@ -12,18 +7,8 @@
     '//lib:TEST',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)
diff --git a/incubator/store/BUCK b/incubator/store/BUCK
index d117f29..83ac2b8 100644
--- a/incubator/store/BUCK
+++ b/incubator/store/BUCK
@@ -1,8 +1,3 @@
-SRC = 'src/main/java/org/onosproject/incubator/store/**/'
-TEST = 'src/test/java/org/onosproject/incubator/store/**/'
-CURRENT_NAME = 'onos-incubator-store'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
 COMPILE_DEPS = [
     '//lib:CORE_DEPS',
     '//lib:concurrent-trees',
@@ -17,18 +12,8 @@
     '//core/common:onos-core-common-tests',
 ]
 
-osgi_jar(
-    name = CURRENT_NAME,
-    srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
     visibility = ['PUBLIC'],
 )
-
-java_test(
-    name = 'tests',
-    srcs = glob([TEST + '/*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [CURRENT_TARGET],
-    source_under_test = [CURRENT_TARGET],
-)
diff --git a/providers/netconf/device/BUCK b/providers/netconf/device/BUCK
index 569ee07..c8d3fb5 100644
--- a/providers/netconf/device/BUCK
+++ b/providers/netconf/device/BUCK
@@ -4,6 +4,6 @@
     '//protocols/netconf/api:onos-protocols-netconf-api',
 ]
 
-osgi_jar(
+osgi_jar_with_tests (
     deps = COMPILE_DEPS,
 )
diff --git a/providers/openflow/base/BUCK b/providers/openflow/base/BUCK
index a621b93..417d09f 100644
--- a/providers/openflow/base/BUCK
+++ b/providers/openflow/base/BUCK
@@ -10,6 +10,7 @@
 ]
 
 onos_app (
+    app_name = 'org.onosproject.openflow-base',
     title = 'OpenFlow Provider',
     category = 'Provider',
     url = 'http://onosproject.org',