diff --git a/requirements/base.txt b/requirements/base.txt
index f74eb3e9..9eab39c7 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -8,10 +8,10 @@ appdirs==1.4.4
     # via fs
 asgiref==3.5.2
     # via django
-django==3.2.13
+django==3.2.16
     # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/base.in
+    #   -c common_constraints.txt
+    #   -r base.in
 fs==2.4.16
     # via xblock
 lxml==4.9.0
@@ -34,7 +34,7 @@ simplejson==3.17.6
     # via xblock-utils
 six==1.16.0
     # via
-    #   -r requirements/base.in
+    #   -r base.in
     #   fs
     #   python-dateutil
 sqlparse==0.4.2
@@ -47,10 +47,10 @@ webob==1.8.7
     # via xblock
 xblock==1.6.1
     # via
-    #   -r requirements/base.in
+    #   -r base.in
     #   xblock-utils
 xblock-utils==3.0.0
-    # via -r requirements/base.in
+    # via -r base.in
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools
diff --git a/requirements/quality.txt b/requirements/quality.txt
index da4bc0e0..b5ce6d42 100644
--- a/requirements/quality.txt
+++ b/requirements/quality.txt
@@ -6,252 +6,245 @@
 #
 appdirs==1.4.4
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   fs
 arrow==1.2.2
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   jinja2-time
 asgiref==3.5.2
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   django
 astroid==2.11.6
     # via pylint
 binaryornot==0.4.4
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   cookiecutter
 boto==2.49.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   xblock-sdk
 boto3==1.24.10
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   fs-s3fs
 botocore==1.27.10
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   boto3
     #   s3transfer
 certifi==2022.6.15
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   requests
 chardet==4.0.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   binaryornot
 charset-normalizer==2.0.12
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   requests
 click==8.1.3
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   cookiecutter
 cookiecutter==2.1.1
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   xblock-sdk
 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 pylint
-django==3.2.13
+django==3.2.16
     # via
-    #   -c requirements/common_constraints.txt
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -c common_constraints.txt
+    #   -r base.txt
     #   django-pyfs
     #   xblock-sdk
 django-pyfs==3.2.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   xblock-sdk
 edx-opaque-keys==2.3.0
-    # via -r requirements/test.txt
+    # via -r test.txt
 fs==2.4.16
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   django-pyfs
     #   fs-s3fs
     #   xblock
 fs-s3fs==1.1.1
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   django-pyfs
     #   xblock-sdk
 idna==3.3
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   requests
 isort==5.10.1
     # via pylint
 jinja2==3.1.2
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   cookiecutter
     #   jinja2-time
 jinja2-time==0.2.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   cookiecutter
 jmespath==1.0.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   boto3
     #   botocore
 lazy==1.4
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   xblock-sdk
 lazy-object-proxy==1.7.1
     # via astroid
 lxml==4.9.0
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   xblock
     #   xblock-sdk
 mako==1.2.0
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   xblock-utils
 markupsafe==2.1.1
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   jinja2
     #   mako
     #   xblock
 mccabe==0.7.0
     # via pylint
 mock==4.0.3
-    # via -r requirements/test.txt
+    # via -r test.txt
 pbr==5.9.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   stevedore
 platformdirs==2.5.2
     # via pylint
 pycodestyle==2.8.0
-    # via -r requirements/quality.in
+    # via -r quality.in
 pylint==2.14.2
-    # via -r requirements/quality.in
+    # via -r quality.in
 pymongo==3.12.3
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   edx-opaque-keys
 pypng==0.0.21
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   xblock-sdk
 python-dateutil==2.8.2
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   arrow
     #   botocore
     #   xblock
 python-slugify==6.1.2
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   cookiecutter
 pytz==2022.1
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   django
     #   xblock
 pyyaml==6.0
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   cookiecutter
     #   xblock
 requests==2.28.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   cookiecutter
     #   xblock-sdk
 s3transfer==0.6.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   boto3
 simplejson==3.17.6
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   xblock-sdk
     #   xblock-utils
 six==1.16.0
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   fs
     #   fs-s3fs
     #   python-dateutil
 sqlparse==0.4.2
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   django
 stevedore==3.5.0
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   edx-opaque-keys
 text-unidecode==1.3
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   python-slugify
-tomli==2.0.1
-    # via pylint
 tomlkit==0.11.0
     # via pylint
-typing-extensions==4.2.0
-    # via
-    #   astroid
-    #   pylint
 urllib3==1.26.9
     # via
-    #   -r requirements/test.txt
+    #   -r test.txt
     #   botocore
     #   requests
 web-fragments==2.0.0
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   xblock
     #   xblock-sdk
     #   xblock-utils
 webob==1.8.7
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   xblock
     #   xblock-sdk
 wrapt==1.14.1
     # via astroid
 xblock==1.6.1
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
     #   xblock-sdk
     #   xblock-utils
 xblock-sdk==0.5.1
-    # via -r requirements/test.txt
+    # via -r test.txt
 xblock-utils==3.0.0
     # via
-    #   -r requirements/base.txt
-    #   -r requirements/test.txt
+    #   -r base.txt
+    #   -r test.txt
 
 # The following packages are considered to be unsafe in a requirements file:
 # setuptools