diff --git a/BUILD b/BUILD
index 69e31ee..dd60f38 100644
--- a/BUILD
+++ b/BUILD
@@ -1,5 +1,5 @@
 load("//tools/build/bazel:variables.bzl", "ONOS_VERSION")
-load(":modules.bzl", "APPS", "CORE", "FEATURES")
+load("//tools/build/bazel:modules.bzl", "APPS", "CORE", "FEATURES")
 
 filegroup(
     name = "onos",
diff --git a/modules.bzl b/tools/build/bazel/modules.bzl
similarity index 100%
rename from modules.bzl
rename to tools/build/bazel/modules.bzl
diff --git a/tools/package/features/BUILD b/tools/package/features/BUILD
index f4a68f8..3ff75fe 100644
--- a/tools/package/features/BUILD
+++ b/tools/package/features/BUILD
@@ -1,5 +1,5 @@
 load("//tools/build/bazel:osgi_features.bzl", "osgi_feature", "osgi_feature_repo")
-load("//:modules.bzl", "FEATURES")
+load("//tools/build/bazel:modules.bzl", "FEATURES")
 
 osgi_feature_repo(
     name = "onos-features",