diff --git a/qmk_cli/script_qmk.py b/qmk_cli/script_qmk.py
index 7a685e6..a3bd062 100644
--- a/qmk_cli/script_qmk.py
+++ b/qmk_cli/script_qmk.py
@@ -73,7 +73,7 @@ def main():
     All other subcommands are dispatched to the local `qmk`, either the one we are currently in or whatever the user's default qmk_firmware is.
     """
     subcommand, subcommand_args = parse_args()
-    subcommand_module = 'qmk_cli.' + subcommand
+    subcommand_module = 'qmk_cli.subcommands.' + subcommand
     sys.argv = ['qmk-'+subcommand] + subcommand_args
     qmk_firmware = find_qmk_firmware()
     qmk_bin = qmk_firmware / 'bin' / 'qmk'
diff --git a/qmk_cli/subcommands/__init__.py b/qmk_cli/subcommands/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/qmk_cli/clone.py b/qmk_cli/subcommands/clone.py
similarity index 100%
rename from qmk_cli/clone.py
rename to qmk_cli/subcommands/clone.py
diff --git a/qmk_cli/doctor.py b/qmk_cli/subcommands/doctor.py
similarity index 100%
rename from qmk_cli/doctor.py
rename to qmk_cli/subcommands/doctor.py