diff --git a/requirements/dev.txt b/requirements/dev.txt
index 653a80d..906ebd1 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -6,209 +6,205 @@
 #
 astroid==2.11.6
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   pylint
     #   pylint-celery
 attrs==21.4.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   pytest
 click==8.1.3
     # via
-    #   -r requirements/pip-tools.txt
-    #   -r requirements/test.txt
+    #   -r pip-tools.txt
+    #   -r test.txt
     #   click-log
     #   code-annotations
     #   edx-lint
     #   pip-tools
 click-log==0.4.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   edx-lint
 code-annotations==1.3.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   edx-lint
 coverage==6.4.1
-    # via -r requirements/test.txt
+    # via -r test.txt
 ddt==1.5.0
-    # via -r requirements/test.txt
+    # via -r test.txt
 dill==0.3.5.1
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   pylint
 distlib==0.3.4
     # via
-    #   -r requirements/ci.txt
-    #   -r requirements/test.txt
+    #   -r ci.txt
+    #   -r test.txt
     #   virtualenv
 edx-lint==5.2.4
-    # via -r requirements/test.txt
+    # via -r test.txt
 edx-opaque-keys==2.3.0
-    # via -r requirements/test.txt
+    # via -r test.txt
 filelock==3.7.1
     # via
-    #   -r requirements/ci.txt
-    #   -r requirements/test.txt
+    #   -r ci.txt
+    #   -r test.txt
     #   tox
     #   virtualenv
 iniconfig==1.1.1
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   pytest
 isort==5.10.1
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   pylint
 jinja2==3.1.2
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   code-annotations
 lazy-object-proxy==1.7.1
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   astroid
 markupsafe==2.1.1
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   jinja2
 mccabe==0.7.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   pylint
 mock==4.0.3
-    # via -r requirements/test.txt
+    # via -r test.txt
 packaging==21.3
     # via
-    #   -r requirements/ci.txt
-    #   -r requirements/test.txt
+    #   -r ci.txt
+    #   -r test.txt
     #   pytest
     #   tox
 pbr==5.9.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   stevedore
 pep517==0.12.0
     # via
-    #   -r requirements/pip-tools.txt
+    #   -r pip-tools.txt
     #   pip-tools
 pip-tools==6.6.2
-    # via -r requirements/pip-tools.txt
+    # via -r pip-tools.txt
 platformdirs==2.5.2
     # via
-    #   -r requirements/ci.txt
-    #   -r requirements/test.txt
+    #   -r ci.txt
+    #   -r test.txt
     #   pylint
     #   virtualenv
 pluggy==1.0.0
     # via
-    #   -r requirements/ci.txt
-    #   -r requirements/test.txt
+    #   -r ci.txt
+    #   -r test.txt
     #   pytest
     #   tox
 py==1.11.0
     # via
-    #   -r requirements/ci.txt
-    #   -r requirements/test.txt
+    #   -r ci.txt
+    #   -r test.txt
     #   pytest
     #   tox
 pycodestyle==2.8.0
-    # via -r requirements/test.txt
+    # via -r test.txt
 pylint==2.14.3
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   edx-lint
     #   pylint-celery
     #   pylint-django
     #   pylint-plugin-utils
 pylint-celery==0.3
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   edx-lint
 pylint-django==2.5.3
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   edx-lint
 pylint-plugin-utils==0.7
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   pylint-celery
     #   pylint-django
 pymongo==3.12.3
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   edx-opaque-keys
 pyparsing==3.0.9
     # via
-    #   -r requirements/ci.txt
-    #   -r requirements/test.txt
+    #   -r ci.txt
+    #   -r test.txt
     #   packaging
 pytest==7.1.2
-    # via -r requirements/test.txt
+    # via -r test.txt
 python-slugify==6.1.2
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   code-annotations
 pyyaml==6.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   code-annotations
 six==1.16.0
     # via
-    #   -r requirements/ci.txt
-    #   -r requirements/test.txt
+    #   -r ci.txt
+    #   -r test.txt
     #   edx-lint
     #   tox
     #   virtualenv
 stevedore==3.5.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   code-annotations
     #   edx-opaque-keys
 text-unidecode==1.3
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   python-slugify
 toml==0.10.2
     # via
-    #   -r requirements/ci.txt
-    #   -r requirements/test.txt
+    #   -r ci.txt
+    #   -r test.txt
     #   tox
 tomli==2.0.1
     # via
-    #   -r requirements/pip-tools.txt
-    #   -r requirements/test.txt
+    #   -r pip-tools.txt
+    #   -r test.txt
     #   pep517
-    #   pylint
     #   pytest
 tomlkit==0.11.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   pylint
 tox==3.25.0
     # via
-    #   -r requirements/ci.txt
-    #   -r requirements/test.txt
+    #   -r ci.txt
+    #   -r test.txt
     #   tox-battery
 tox-battery==0.6.1
-    # via -r requirements/dev.in
+    # via -r dev.in
 typing-extensions==4.2.0
-    # via
-    #   -r requirements/test.txt
-    #   astroid
-    #   pylint
+    # via -r test.txt
 virtualenv==20.14.1
     # via
-    #   -r requirements/ci.txt
-    #   -r requirements/test.txt
+    #   -r ci.txt
+    #   -r test.txt
     #   tox
-wheel==0.37.1
+wheel==0.38.1
     # via
-    #   -r requirements/pip-tools.txt
+    #   -r pip-tools.txt
     #   pip-tools
 wrapt==1.14.1
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   astroid
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
index ce56f4c..25e4cdb 100644
--- a/requirements/pip-tools.txt
+++ b/requirements/pip-tools.txt
@@ -9,10 +9,10 @@ click==8.1.3
 pep517==0.12.0
     # via pip-tools
 pip-tools==6.6.2
-    # via -r requirements/pip-tools.in
+    # via -r pip-tools.in
 tomli==2.0.1
     # via pep517
-wheel==0.37.1
+wheel==0.38.1
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/pip.txt b/requirements/pip.txt
index 8a667c4..cd421ba 100644
--- a/requirements/pip.txt
+++ b/requirements/pip.txt
@@ -4,13 +4,13 @@
 #
 #    make upgrade
 #
-wheel==0.37.1
-    # via -r requirements/pip.in
+wheel==0.38.1
+    # via -r pip.in
 
 # The following packages are considered to be unsafe in a requirements file:
 pip==22.1.2
-    # via -r requirements/pip.in
+    # via -r pip.in
 setuptools==59.8.0
     # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/pip.in
+    #   -c common_constraints.txt
+    #   -r pip.in