diff --git a/src/BUILD b/src/BUILD
index e86757d..ce5cd0d 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -440,7 +440,7 @@
         "//src/main/java/com/google/devtools/build/skydoc:srcs",
         "//src/main/java/com/google/devtools/build/skyframe:srcs",
         "//src/main/java/com/google/devtools/common/options:srcs",
-        "//src/main/java/com/google/devtools/starlark:srcs",
+        "//src/main/java/com/google/devtools/starlark/cmd:srcs",
         "//src/main/native:srcs",
         "//src/main/protobuf:srcs",
         "//src/main/tools:srcs",
diff --git a/src/main/java/com/google/devtools/starlark/BUILD b/src/main/java/com/google/devtools/starlark/cmd/BUILD
similarity index 93%
rename from src/main/java/com/google/devtools/starlark/BUILD
rename to src/main/java/com/google/devtools/starlark/cmd/BUILD
index 4c1a46e..04add19 100644
--- a/src/main/java/com/google/devtools/starlark/BUILD
+++ b/src/main/java/com/google/devtools/starlark/cmd/BUILD
@@ -17,7 +17,7 @@
         # ... but only on JDK >= 9
         "-XX:+IgnoreUnrecognizedVMOptions",
     ],
-    main_class = "com.google.devtools.starlark.Starlark",
+    main_class = "com.google.devtools.starlark.cmd.Starlark",
     visibility = ["//visibility:public"],
     deps = [
         "//src/main/java/com/google/devtools/build/lib:events",
diff --git a/src/main/java/com/google/devtools/starlark/Starlark.java b/src/main/java/com/google/devtools/starlark/cmd/Starlark.java
similarity index 99%
rename from src/main/java/com/google/devtools/starlark/Starlark.java
rename to src/main/java/com/google/devtools/starlark/cmd/Starlark.java
index ac1f058..907dba6 100644
--- a/src/main/java/com/google/devtools/starlark/Starlark.java
+++ b/src/main/java/com/google/devtools/starlark/cmd/Starlark.java
@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-package com.google.devtools.starlark;
+package com.google.devtools.starlark.cmd;
 
 import com.google.devtools.build.lib.events.Event;
 import com.google.devtools.build.lib.syntax.EvalException;
diff --git a/src/test/starlark/BUILD b/src/test/starlark/BUILD
index 48e827e..63185c2 100644
--- a/src/test/starlark/BUILD
+++ b/src/test/starlark/BUILD
@@ -21,7 +21,7 @@
         ],
         args = [test_file],
         data = [
-            "//src/main/java/com/google/devtools/starlark:Starlark",
+            "//src/main/java/com/google/devtools/starlark/cmd:Starlark",
             test_file,
         ],
         main = "starlark_test.py",
diff --git a/src/test/starlark/testenv.py b/src/test/starlark/testenv.py
index b88be8c..68e49d1 100644
--- a/src/test/starlark/testenv.py
+++ b/src/test/starlark/testenv.py
@@ -13,5 +13,5 @@
 # limitations under the License.
 """Test constants for src/test/starlark."""
 
-STARLARK_BINARY_PATH = "src/main/java/com/google/devtools/starlark/Starlark"
+STARLARK_BINARY_PATH = "src/main/java/com/google/devtools/starlark/cmd/Starlark"
 STARLARK_TESTDATA_PATH = "src/test/starlark/"