diff --git a/docs/proposed/psa-driver-wrappers-codegen-migration-guide.md b/docs/proposed/psa-driver-wrappers-codegen-migration-guide.md
index a5ef2a296..2e3585ffa 100644
--- a/docs/proposed/psa-driver-wrappers-codegen-migration-guide.md
+++ b/docs/proposed/psa-driver-wrappers-codegen-migration-guide.md
@@ -28,5 +28,5 @@ While that is the larger goal, for version 1.0 here's what's changed
 #### What's changed
 
 (1) psa_crypto_driver_wrappers.c will from this point on be auto generated.
-(2) The auto generation is based on the template file at scripts/codegen_driverwrappers/psa_crypto_driver_wrappers.conf.
+(2) The auto generation is based on the template file at scripts/data_files/driver_templates/psa_crypto_driver_wrappers.conf.
 (3) So while all driver wrapper templating support is yet to come in, the library user will need to patch into the template file as needed.
diff --git a/library/Makefile b/library/Makefile
index 9acb61aa1..31abed51f 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -319,11 +319,12 @@ version_features.c:
 	echo "  Gen   $@"
 	$(PERL) ../scripts/generate_features.pl
 
-psa_crypto_driver_wrappers.c: ../scripts/codegen_driverwrappers/generate_driver_wrappers.py
+psa_crypto_driver_wrappers.c: ../scripts/generate_driver_wrappers.py
+psa_crypto_driver_wrappers.c: ../scripts/data_files/driver_templates/psa_crypto_driver_wrappers.conf
 psa_crypto_driver_wrappers.c:
 	echo "  Gen   $@"
-	$(PYTHON) ../scripts/codegen_driverwrappers/generate_driver_wrappers.py \
-                  "../scripts/codegen_driverwrappers/psa_crypto_driver_wrappers.conf" \
+	$(PYTHON) ../scripts/generate_driver_wrappers.py \
+                  "../scripts/data_files/driver_templates/psa_crypto_driver_wrappers.conf" \
                   "psa_crypto_driver_wrappers.c"
 
 clean:
diff --git a/scripts/codegen_driverwrappers/psa_crypto_driver_wrappers.conf b/scripts/data_files/driver_templates/psa_crypto_driver_wrappers.conf
similarity index 100%
rename from scripts/codegen_driverwrappers/psa_crypto_driver_wrappers.conf
rename to scripts/data_files/driver_templates/psa_crypto_driver_wrappers.conf
diff --git a/scripts/codegen_driverwrappers/generate_driver_wrappers.py b/scripts/generate_driver_wrappers.py
similarity index 100%
rename from scripts/codegen_driverwrappers/generate_driver_wrappers.py
rename to scripts/generate_driver_wrappers.py
diff --git a/scripts/make_generated_files.bat b/scripts/make_generated_files.bat
index c30aba630..164a16edf 100644
--- a/scripts/make_generated_files.bat
+++ b/scripts/make_generated_files.bat
@@ -3,13 +3,13 @@
 @rem Perl and Python 3 must be on the PATH.
 @rem psa_crypto_driver_wrappers.c needs to be generated prior to
 @rem generate_visualc_files.pl being invoked.
-python scripts/codegen_driverwrappers/generate_driver_wrappers.py ^
-       "scripts/codegen_driverwrappers/psa_crypto_driver_wrappers.conf" ^
+python scripts/generate_driver_wrappers.py ^
+       "scripts/data_files/driver_templates/psa_crypto_driver_wrappers.conf" ^
        "library/psa_crypto_driver_wrappers.c" || exit /b 1
 perl scripts\generate_errors.pl || exit /b 1
 perl scripts\generate_query_config.pl || exit /b 1
 perl scripts\generate_features.pl || exit /b 1
-python scripts\generate_ssl_debug_helpers.py || exit /b 1
-perl scripts\generate_visualc_files.pl || exit /b 1
+python scripts\generate_ssl_debug_helpers.py || exit /b 1
+perl scripts\generate_visualc_files.pl || exit /b 1
 python scripts\generate_psa_constants.py || exit /b 1
 python tests\scripts\generate_psa_tests.py || exit /b 1