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 c30aba6..164a16e 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