diff --git a/scripts/generate_source.py b/scripts/generate_source.py
index 4afcdf9e1..d508ae7bd 100755
--- a/scripts/generate_source.py
+++ b/scripts/generate_source.py
@@ -63,9 +63,9 @@ def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targe
         sys.exit(1) # Return without call stack so easy to spot error
 
     from base_generator import BaseGeneratorOptions
-    from dispatch_table_helper_generator import DispatchTableHelperGenerator
-    from helper_file_generator import HelperFileGenerator
-    from loader_extension_generator import LoaderExtensionGenerator
+    from generators.dispatch_table_helper_generator import DispatchTableHelperGenerator
+    from generators.helper_file_generator import HelperFileGenerator
+    from generators.loader_extension_generator import LoaderExtensionGenerator
 
     # These set fields that are needed by both OutputGenerator and BaseGenerator,
     # but are uniform and don't need to be set at a per-generated file level
@@ -100,7 +100,7 @@ def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targe
         f'{dispatch_table_helper_filename}': {
             'generator' : DispatchTableHelperGenerator,
             'genCombined': False,
-            'directory' : 'tests/framework/layer',
+            'directory' : 'tests/framework/layer/generated',
         }
     })
 
@@ -167,13 +167,7 @@ def RunGenerators(api: str, registry: str, directory: str, styleFile: str, targe
 def main(argv):
 
     # files to exclude from --verify check
-    verify_exclude = ['layer_util.h',
-                      'export_definitions',
-                      'test_layer.h',
-                      'test_layer.cpp',
-                      'wrap_objects.cpp',
-                      'CMakeLists.txt',
-                      ]
+    verify_exclude = [] # None currently
 
 
     parser = argparse.ArgumentParser(description='Generate source code for this repository')
diff --git a/scripts/dispatch_table_helper_generator.py b/scripts/generators/dispatch_table_helper_generator.py
similarity index 100%
rename from scripts/dispatch_table_helper_generator.py
rename to scripts/generators/dispatch_table_helper_generator.py
diff --git a/scripts/helper_file_generator.py b/scripts/generators/helper_file_generator.py
similarity index 100%
rename from scripts/helper_file_generator.py
rename to scripts/generators/helper_file_generator.py
diff --git a/scripts/loader_extension_generator.py b/scripts/generators/loader_extension_generator.py
similarity index 100%
rename from scripts/loader_extension_generator.py
rename to scripts/generators/loader_extension_generator.py
diff --git a/tests/framework/layer/vk_dispatch_table_helper.h b/tests/framework/layer/generated/vk_dispatch_table_helper.h
similarity index 100%
rename from tests/framework/layer/vk_dispatch_table_helper.h
rename to tests/framework/layer/generated/vk_dispatch_table_helper.h
diff --git a/tests/framework/layer/test_layer.cpp b/tests/framework/layer/test_layer.cpp
index 93c27c73c..f891927ad 100644
--- a/tests/framework/layer/test_layer.cpp
+++ b/tests/framework/layer/test_layer.cpp
@@ -27,7 +27,7 @@
 
 #include "test_layer.h"
 
-#include "vk_dispatch_table_helper.h"
+#include "generated/vk_dispatch_table_helper.h"
 
 // export the enumeration functions instance|device+layer|extension
 #if !defined(TEST_LAYER_EXPORT_ENUMERATE_FUNCTIONS)
diff --git a/tests/framework/layer/wrap_objects.cpp b/tests/framework/layer/wrap_objects.cpp
index 514f904a7..c40b1a00f 100644
--- a/tests/framework/layer/wrap_objects.cpp
+++ b/tests/framework/layer/wrap_objects.cpp
@@ -28,7 +28,7 @@
 #include <vector>
 
 #include "vulkan/vk_layer.h"
-#include "vk_dispatch_table_helper.h"
+#include "generated/vk_dispatch_table_helper.h"
 #include "loader/vk_loader_layer.h"
 
 // Export full support of instance extension VK_EXT_direct_mode_display extension