diff --git a/test/lib/ansible_test/_internal/coverage/__init__.py b/test/lib/ansible_test/_internal/commands/coverage/__init__.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/__init__.py
rename to test/lib/ansible_test/_internal/commands/coverage/__init__.py
diff --git a/test/lib/ansible_test/_internal/coverage/analyze/__init__.py b/test/lib/ansible_test/_internal/commands/coverage/analyze/__init__.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/analyze/__init__.py
rename to test/lib/ansible_test/_internal/commands/coverage/analyze/__init__.py
diff --git a/test/lib/ansible_test/_internal/coverage/analyze/targets/__init__.py b/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/__init__.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/analyze/targets/__init__.py
rename to test/lib/ansible_test/_internal/commands/coverage/analyze/targets/__init__.py
diff --git a/test/lib/ansible_test/_internal/coverage/analyze/targets/combine.py b/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/combine.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/analyze/targets/combine.py
rename to test/lib/ansible_test/_internal/commands/coverage/analyze/targets/combine.py
diff --git a/test/lib/ansible_test/_internal/coverage/analyze/targets/expand.py b/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/expand.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/analyze/targets/expand.py
rename to test/lib/ansible_test/_internal/commands/coverage/analyze/targets/expand.py
diff --git a/test/lib/ansible_test/_internal/coverage/analyze/targets/filter.py b/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/filter.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/analyze/targets/filter.py
rename to test/lib/ansible_test/_internal/commands/coverage/analyze/targets/filter.py
diff --git a/test/lib/ansible_test/_internal/coverage/analyze/targets/generate.py b/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/generate.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/analyze/targets/generate.py
rename to test/lib/ansible_test/_internal/commands/coverage/analyze/targets/generate.py
diff --git a/test/lib/ansible_test/_internal/coverage/analyze/targets/missing.py b/test/lib/ansible_test/_internal/commands/coverage/analyze/targets/missing.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/analyze/targets/missing.py
rename to test/lib/ansible_test/_internal/commands/coverage/analyze/targets/missing.py
diff --git a/test/lib/ansible_test/_internal/coverage/combine.py b/test/lib/ansible_test/_internal/commands/coverage/combine.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/combine.py
rename to test/lib/ansible_test/_internal/commands/coverage/combine.py
diff --git a/test/lib/ansible_test/_internal/coverage/erase.py b/test/lib/ansible_test/_internal/commands/coverage/erase.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/erase.py
rename to test/lib/ansible_test/_internal/commands/coverage/erase.py
diff --git a/test/lib/ansible_test/_internal/coverage/html.py b/test/lib/ansible_test/_internal/commands/coverage/html.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/html.py
rename to test/lib/ansible_test/_internal/commands/coverage/html.py
diff --git a/test/lib/ansible_test/_internal/coverage/report.py b/test/lib/ansible_test/_internal/commands/coverage/report.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/report.py
rename to test/lib/ansible_test/_internal/commands/coverage/report.py
diff --git a/test/lib/ansible_test/_internal/coverage/xml.py b/test/lib/ansible_test/_internal/commands/coverage/xml.py
similarity index 100%
rename from test/lib/ansible_test/_internal/coverage/xml.py
rename to test/lib/ansible_test/_internal/commands/coverage/xml.py
diff --git a/test/lib/ansible_test/_internal/env.py b/test/lib/ansible_test/_internal/commands/env/__init__.py
similarity index 100%
rename from test/lib/ansible_test/_internal/env.py
rename to test/lib/ansible_test/_internal/commands/env/__init__.py
diff --git a/test/lib/ansible_test/_internal/integration/__init__.py b/test/lib/ansible_test/_internal/commands/integration/__init__.py
similarity index 100%
rename from test/lib/ansible_test/_internal/integration/__init__.py
rename to test/lib/ansible_test/_internal/commands/integration/__init__.py
diff --git a/test/lib/ansible_test/_internal/cloud/__init__.py b/test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/__init__.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/__init__.py
diff --git a/test/lib/ansible_test/_internal/cloud/acme.py b/test/lib/ansible_test/_internal/commands/integration/cloud/acme.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/acme.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/acme.py
diff --git a/test/lib/ansible_test/_internal/cloud/aws.py b/test/lib/ansible_test/_internal/commands/integration/cloud/aws.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/aws.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/aws.py
diff --git a/test/lib/ansible_test/_internal/cloud/azure.py b/test/lib/ansible_test/_internal/commands/integration/cloud/azure.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/azure.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/azure.py
diff --git a/test/lib/ansible_test/_internal/cloud/cloudscale.py b/test/lib/ansible_test/_internal/commands/integration/cloud/cloudscale.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/cloudscale.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/cloudscale.py
diff --git a/test/lib/ansible_test/_internal/cloud/cs.py b/test/lib/ansible_test/_internal/commands/integration/cloud/cs.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/cs.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/cs.py
diff --git a/test/lib/ansible_test/_internal/cloud/foreman.py b/test/lib/ansible_test/_internal/commands/integration/cloud/foreman.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/foreman.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/foreman.py
diff --git a/test/lib/ansible_test/_internal/cloud/galaxy.py b/test/lib/ansible_test/_internal/commands/integration/cloud/galaxy.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/galaxy.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/galaxy.py
diff --git a/test/lib/ansible_test/_internal/cloud/gcp.py b/test/lib/ansible_test/_internal/commands/integration/cloud/gcp.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/gcp.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/gcp.py
diff --git a/test/lib/ansible_test/_internal/cloud/hcloud.py b/test/lib/ansible_test/_internal/commands/integration/cloud/hcloud.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/hcloud.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/hcloud.py
diff --git a/test/lib/ansible_test/_internal/cloud/httptester.py b/test/lib/ansible_test/_internal/commands/integration/cloud/httptester.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/httptester.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/httptester.py
diff --git a/test/lib/ansible_test/_internal/cloud/nios.py b/test/lib/ansible_test/_internal/commands/integration/cloud/nios.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/nios.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/nios.py
diff --git a/test/lib/ansible_test/_internal/cloud/opennebula.py b/test/lib/ansible_test/_internal/commands/integration/cloud/opennebula.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/opennebula.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/opennebula.py
diff --git a/test/lib/ansible_test/_internal/cloud/openshift.py b/test/lib/ansible_test/_internal/commands/integration/cloud/openshift.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/openshift.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/openshift.py
diff --git a/test/lib/ansible_test/_internal/cloud/scaleway.py b/test/lib/ansible_test/_internal/commands/integration/cloud/scaleway.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/scaleway.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/scaleway.py
diff --git a/test/lib/ansible_test/_internal/cloud/vcenter.py b/test/lib/ansible_test/_internal/commands/integration/cloud/vcenter.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/vcenter.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/vcenter.py
diff --git a/test/lib/ansible_test/_internal/cloud/vultr.py b/test/lib/ansible_test/_internal/commands/integration/cloud/vultr.py
similarity index 100%
rename from test/lib/ansible_test/_internal/cloud/vultr.py
rename to test/lib/ansible_test/_internal/commands/integration/cloud/vultr.py
diff --git a/test/lib/ansible_test/_internal/sanity/__init__.py b/test/lib/ansible_test/_internal/commands/sanity/__init__.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/__init__.py
rename to test/lib/ansible_test/_internal/commands/sanity/__init__.py
diff --git a/test/lib/ansible_test/_internal/sanity/ansible_doc.py b/test/lib/ansible_test/_internal/commands/sanity/ansible_doc.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/ansible_doc.py
rename to test/lib/ansible_test/_internal/commands/sanity/ansible_doc.py
diff --git a/test/lib/ansible_test/_internal/sanity/bin_symlinks.py b/test/lib/ansible_test/_internal/commands/sanity/bin_symlinks.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/bin_symlinks.py
rename to test/lib/ansible_test/_internal/commands/sanity/bin_symlinks.py
diff --git a/test/lib/ansible_test/_internal/sanity/compile.py b/test/lib/ansible_test/_internal/commands/sanity/compile.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/compile.py
rename to test/lib/ansible_test/_internal/commands/sanity/compile.py
diff --git a/test/lib/ansible_test/_internal/sanity/ignores.py b/test/lib/ansible_test/_internal/commands/sanity/ignores.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/ignores.py
rename to test/lib/ansible_test/_internal/commands/sanity/ignores.py
diff --git a/test/lib/ansible_test/_internal/sanity/import.py b/test/lib/ansible_test/_internal/commands/sanity/import.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/import.py
rename to test/lib/ansible_test/_internal/commands/sanity/import.py
diff --git a/test/lib/ansible_test/_internal/sanity/integration_aliases.py b/test/lib/ansible_test/_internal/commands/sanity/integration_aliases.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/integration_aliases.py
rename to test/lib/ansible_test/_internal/commands/sanity/integration_aliases.py
diff --git a/test/lib/ansible_test/_internal/sanity/pep8.py b/test/lib/ansible_test/_internal/commands/sanity/pep8.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/pep8.py
rename to test/lib/ansible_test/_internal/commands/sanity/pep8.py
diff --git a/test/lib/ansible_test/_internal/sanity/pslint.py b/test/lib/ansible_test/_internal/commands/sanity/pslint.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/pslint.py
rename to test/lib/ansible_test/_internal/commands/sanity/pslint.py
diff --git a/test/lib/ansible_test/_internal/sanity/pylint.py b/test/lib/ansible_test/_internal/commands/sanity/pylint.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/pylint.py
rename to test/lib/ansible_test/_internal/commands/sanity/pylint.py
diff --git a/test/lib/ansible_test/_internal/sanity/sanity_docs.py b/test/lib/ansible_test/_internal/commands/sanity/sanity_docs.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/sanity_docs.py
rename to test/lib/ansible_test/_internal/commands/sanity/sanity_docs.py
diff --git a/test/lib/ansible_test/_internal/sanity/shellcheck.py b/test/lib/ansible_test/_internal/commands/sanity/shellcheck.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/shellcheck.py
rename to test/lib/ansible_test/_internal/commands/sanity/shellcheck.py
diff --git a/test/lib/ansible_test/_internal/sanity/validate_modules.py b/test/lib/ansible_test/_internal/commands/sanity/validate_modules.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/validate_modules.py
rename to test/lib/ansible_test/_internal/commands/sanity/validate_modules.py
diff --git a/test/lib/ansible_test/_internal/sanity/yamllint.py b/test/lib/ansible_test/_internal/commands/sanity/yamllint.py
similarity index 100%
rename from test/lib/ansible_test/_internal/sanity/yamllint.py
rename to test/lib/ansible_test/_internal/commands/sanity/yamllint.py
diff --git a/test/lib/ansible_test/_internal/units/__init__.py b/test/lib/ansible_test/_internal/commands/units/__init__.py
similarity index 100%
rename from test/lib/ansible_test/_internal/units/__init__.py
rename to test/lib/ansible_test/_internal/commands/units/__init__.py