diff --git a/protocols/isis/BUCK b/protocols/isis/BUCK
deleted file mode 100644
index 77dba5a..0000000
--- a/protocols/isis/BUCK
+++ /dev/null
@@ -1,56 +0,0 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-COMPILE_DEPS = [
-    '//lib:CORE_DEPS',
-    '//lib:netty-buffer',
-]
-
-TEST_DEPS = [
-    '//lib:TEST',
-]
-
-java_library(
-   name = 'onos-isis',
-   visibility = ['PUBLIC'],
-   deps = [':onos-isis-api',
-           ':onos-isis-isisio',
-   ],
-)
-
-# onos-isis-api
-
-osgi_jar(
-    name = 'onos-isis-api',
-    srcs = glob(['api/' + SRC + '*.java']),
-    deps = COMPILE_DEPS,
-    visibility = ['PUBLIC'],
-)
-
-java_test(
-    name = 'onos-isis-api-tests',
-    srcs = glob(['api/' + TEST + '*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [':onos-isis-api'],
-    source_under_test = [':onos-isis-api'],
-)
-
-# onos-isis-isisio
-
-osgi_jar(
-    name = 'onos-isis-isisio',
-    srcs = glob(['isisio/' + SRC + '*.java']),
-    deps = COMPILE_DEPS + [':onos-isis-api'],
-    visibility = ['PUBLIC'],
-)
-
-java_test(
-    name = 'onos-isis-isisio-tests',
-    srcs = glob(['isisio/' + TEST + '*.java']),
-    deps = COMPILE_DEPS +
-           TEST_DEPS +
-           [':onos-isis-isisio'],
-    source_under_test = [':onos-isis-isisio'],
-)
-
diff --git a/protocols/isis/api/BUCK b/protocols/isis/api/BUCK
new file mode 100644
index 0000000..3cc9301
--- /dev/null
+++ b/protocols/isis/api/BUCK
@@ -0,0 +1,8 @@
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+]
+
+osgi_jar_with_tests (
+    deps = COMPILE_DEPS,
+)
+
diff --git a/protocols/isis/ctl/BUCK b/protocols/isis/ctl/BUCK
new file mode 100644
index 0000000..b491fe9
--- /dev/null
+++ b/protocols/isis/ctl/BUCK
@@ -0,0 +1,9 @@
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+    '//protocols/isis/api:onos-protocols-isis-api',
+    '//protocols/isis/isisio:onos-protocols-isis-isisio',
+]
+
+osgi_jar_with_tests (
+    deps = COMPILE_DEPS,
+)
diff --git a/protocols/isis/isisio/BUCK b/protocols/isis/isisio/BUCK
new file mode 100644
index 0000000..a8795b9
--- /dev/null
+++ b/protocols/isis/isisio/BUCK
@@ -0,0 +1,8 @@
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+    '//protocols/isis/api:onos-protocols-isis-api',
+]
+
+osgi_jar_with_tests (
+    deps = COMPILE_DEPS,
+)