diff --git a/skylark/BUILD b/skylark/BUILD
index 2f22d1b..57c908b 100644
--- a/skylark/BUILD
+++ b/skylark/BUILD
@@ -4,7 +4,6 @@ package(default_visibility = ["//visibility:public"])
 
 load("@bazel_skylib//:skylark_library.bzl", "skylark_library")
 load("//skylark:skylark.bzl", "skylark_doc")
-load("//skylark:stardoc.bzl", "stardoc")
 
 skylark_library(
     name = "skylark",
@@ -14,14 +13,6 @@ skylark_library(
     ],
 )
 
-skylark_library(
-    name = "stardoc_lib",
-    srcs = ["stardoc.bzl"],
-    deps = [
-        "@bazel_skylib//:skylark_library",
-    ],
-)
-
 skylark_doc(
     name = "skylark-docs",
     srcs = ["skylark.bzl"],
@@ -30,10 +21,3 @@ skylark_doc(
     deps = [":skylark"],
 )
 
-stardoc(
-    name = "stardoc_doc",
-    out = "stardoc_doc.md",
-    input = ":stardoc.bzl",
-    symbol_names = ["stardoc"],
-    deps = [":stardoc_lib"],
-)
diff --git a/stardoc/BUILD b/stardoc/BUILD
new file mode 100644
index 0000000..75720d8
--- /dev/null
+++ b/stardoc/BUILD
@@ -0,0 +1,22 @@
+licenses(["notice"])  # Apache 2.0
+
+package(default_visibility = ["//visibility:public"])
+
+load("@bazel_skylib//:skylark_library.bzl", "skylark_library")
+load("//stardoc:stardoc.bzl", "stardoc")
+
+skylark_library(
+    name = "stardoc_lib",
+    srcs = ["stardoc.bzl"],
+    deps = [
+        "@bazel_skylib//:skylark_library",
+    ],
+)
+
+stardoc(
+    name = "stardoc_doc",
+    out = "stardoc_doc.md",
+    input = ":stardoc.bzl",
+    symbol_names = ["stardoc"],
+    deps = [":stardoc_lib"],
+)
diff --git a/skylark/stardoc.bzl b/stardoc/stardoc.bzl
similarity index 100%
rename from skylark/stardoc.bzl
rename to stardoc/stardoc.bzl
diff --git a/test/BUILD b/test/BUILD
index 872ef23..7102640 100644
--- a/test/BUILD
+++ b/test/BUILD
@@ -1,14 +1,14 @@
 licenses(["notice"])  # Apache 2.0
 
 sh_test(
-    name = "skydoc_self_gen_test",
+    name = "stardoc_self_gen_test",
     srcs = ["diff_test_runner.sh"],
     args = [
-        "$(location //skylark:stardoc_doc.md)",
+        "$(location //stardoc:stardoc_doc.md)",
         "$(location :self_doc_golden.md)",
     ],
     data = [
         "self_doc_golden.md",
-        "//skylark:stardoc_doc.md",
+        "//stardoc:stardoc_doc.md",
     ],
 )