diff --git a/cli/maintain/copy_admin_templates.py b/cli/maintain/copy_admin_templates/main.py
similarity index 100%
rename from cli/maintain/copy_admin_templates.py
rename to cli/maintain/copy_admin_templates/main.py
diff --git a/cli/maintain/reset_admin_password.py b/cli/maintain/reset_admin_password/main.py
similarity index 100%
rename from cli/maintain/reset_admin_password.py
rename to cli/maintain/reset_admin_password/main.py
diff --git a/cli/setup/generate_secrets.py b/cli/setup/generate_secrets/main.py
similarity index 100%
rename from cli/setup/generate_secrets.py
rename to cli/setup/generate_secrets/main.py
diff --git a/cli/setup/init_db.py b/cli/setup/init_db/main.py
similarity index 100%
rename from cli/setup/init_db.py
rename to cli/setup/init_db/main.py
diff --git a/test/assistant_names.py b/cli/test/generate_test_db/assistant_names.py
similarity index 100%
rename from test/assistant_names.py
rename to cli/test/generate_test_db/assistant_names.py
diff --git a/test/experiment_titles.py b/cli/test/generate_test_db/experiment_titles.py
similarity index 100%
rename from test/experiment_titles.py
rename to cli/test/generate_test_db/experiment_titles.py
diff --git a/cli/test/generate_test_db.py b/cli/test/generate_test_db/main.py
similarity index 97%
rename from cli/test/generate_test_db.py
rename to cli/test/generate_test_db/main.py
index 67ea9f6..7fb3d17 100644
--- a/cli/test/generate_test_db.py
+++ b/cli/test/generate_test_db/main.py
@@ -2,9 +2,6 @@ from datetime import date
 from math import ceil
 from pathlib import Path
 from random import randint, random
-from test.assistant_names import assistant_names
-from test.experiment_titles import experiment_titles
-from test.student_names import student_names
 
 import click
 from flask_security.utils import hash_password
@@ -26,6 +23,9 @@ from advlabdb.models import (
     Student,
     db,
 )
+from cli.test.generate_test_db.assistant_names import assistant_names
+from cli.test.generate_test_db.experiment_titles import experiment_titles
+from cli.test.generate_test_db.student_names import student_names
 
 
 def db_add(obj):
diff --git a/test/student_names.py b/cli/test/generate_test_db/student_names.py
similarity index 100%
rename from test/student_names.py
rename to cli/test/generate_test_db/student_names.py
diff --git a/manage.py b/manage.py
index 271c008..0036a2d 100755
--- a/manage.py
+++ b/manage.py
@@ -4,11 +4,11 @@ import subprocess  # nosec 404
 
 import click
 
-from cli.maintain.copy_admin_templates import _copy_admin_templates
-from cli.maintain.reset_admin_password import _reset_admin_password
-from cli.setup.generate_secrets import _generate_secrets
-from cli.setup.init_db import _init_db
-from cli.test.generate_test_db import _generate_test_db
+from cli.maintain.copy_admin_templates.main import _copy_admin_templates
+from cli.maintain.reset_admin_password.main import _reset_admin_password
+from cli.setup.generate_secrets.main import _generate_secrets
+from cli.setup.init_db.main import _init_db
+from cli.test.generate_test_db.main import _generate_test_db
 
 
 class Manage: