diff --git a/rats-apps/src/python/rats/cli/__init__.py b/rats-apps/src/python/rats/cli/__init__.py
index 4353f432..6dc9113a 100644
--- a/rats-apps/src/python/rats/cli/__init__.py
+++ b/rats-apps/src/python/rats/cli/__init__.py
@@ -1,6 +1,6 @@
 """Uses `rats.cli` to streamline the creation of CLI commands written with Click."""
 
-from ._annotations import command, get_class_commands, get_class_groups, group
+from ._annotations import CommandId, command, get_class_commands, get_class_groups, group
 from ._app import ClickApp
 from ._container import CommandContainer
 from ._plugin import PluginContainer, PluginServices
@@ -13,5 +13,6 @@
     "group",
     "ClickApp",
     "PluginServices",
+    "CommandId",
     "CommandContainer",
 ]
diff --git a/rats-devtools/src/python/rats/devtools/__main__.py b/rats-devtools/src/python/rats/devtools/__main__.py
index f5d5637f..8fc135b1 100644
--- a/rats-devtools/src/python/rats/devtools/__main__.py
+++ b/rats-devtools/src/python/rats/devtools/__main__.py
@@ -1,6 +1,5 @@
 """rats-devtools provides tooling for building commands that help us develop the rats libraries."""
 
-from ._app import run
+from rats.devtools import run
 
-if __name__ == "__main__":
-    run()
+run()