diff --git a/tools/package/features/BUILD b/tools/package/features/BUILD
index 6880c26..a474981 100644
--- a/tools/package/features/BUILD
+++ b/tools/package/features/BUILD
@@ -1,6 +1,12 @@
 load("//tools/build/bazel:osgi_features.bzl", "osgi_feature", "osgi_feature_repo")
 load("//:modules.bzl", "FEATURES")
 
+osgi_feature_repo(
+    name = "onos-features",
+    exported_features = FEATURES,
+    visibility = ["//visibility:public"],
+)
+
 osgi_feature(
     name = "onos-thirdparty-base",
     description = "ONOS 3rd party dependencies",
@@ -112,33 +118,39 @@
     visibility = ["//visibility:public"],
 )
 
-osgi_feature_repo(
-    name = "onos-features",
-    exported_features = FEATURES,
+osgi_feature (
+    name = "onos-incubator",
+    description = "ONOS core incubator components",
+    required_features = ["onos-core"],
+    included_bundles = [
+      "//incubator/net:onos-incubator-net",
+      "//incubator/store:onos-incubator-store",
+      "//incubator/rpc:onos-incubator-rpc",
+    ],
     visibility = ["//visibility:public"],
 )
 
-#osgi_feature (
-#  name = "onos-incubator",
-#  description = "ONOS core incubator components",
-#  required_features = ["onos-core"],
-#  included_bundles = [
-#    "//incubator/net:onos-incubator-net",
-#    "//incubator/store:onos-incubator-store",
-#    "//incubator/rpc:onos-incubator-rpc",
-#  ]
-#)
-#
-#osgi_feature (
-#  name = "onos-rest",
-#  description = "ONOS REST API components",
-#  required_features = ["onos-api", "onos-thirdparty-web"],
-#  included_bundles = [
-#    "//utils/rest:onlab-rest",
-#    "//web/api:onos-rest",
-#  ]
-#)
-#
+osgi_feature (
+    name = "onos-rest",
+    description = "ONOS REST API components",
+    required_features = ["onos-api", "onos-thirdparty-web"],
+    included_bundles = [
+      "//utils/rest:onlab-rest",
+      "//web/api:onos-rest",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+osgi_feature (
+    name = "onos-cli",
+    description ="ONOS admin command console components",
+    required_features = ["onos-api"],
+    included_bundles = [
+      "//cli:onos-cli",
+    ],
+    visibility = ["//visibility:public"],
+)
+
 #osgi_feature (
 #  name = "onos-gui",
 #  description = "ONOS GUI console components",
@@ -149,7 +161,7 @@
 #    "//web/gui:onos-gui",
 #  ]
 #)
-#
+
 #osgi_feature (
 #  name = "onos-gui2",
 #  description = "ONOS GUI2 console components",
@@ -160,16 +172,7 @@
 #    "//web/gui2:onos-gui2",
 #  ]
 #)
-#
-#osgi_feature (
-#  name = "onos-cli",
-#  description ="ONOS admin command console components",
-#  required_features = ["onos-api"],
-#  included_bundles = [
-#    "//cli:onos-cli",
-#  ]
-#)
-#
+
 #osgi_feature (
 #  name = "onos-security",
 #  description ="Security-Mode ONOS",