diff --git a/phpBB/includes/template/extension_path_provider.php b/phpBB/includes/style/extension_path_provider.php
similarity index 100%
rename from phpBB/includes/template/extension_path_provider.php
rename to phpBB/includes/style/extension_path_provider.php
diff --git a/phpBB/includes/template/locator.php b/phpBB/includes/style/locator.php
similarity index 100%
rename from phpBB/includes/template/locator.php
rename to phpBB/includes/style/locator.php
diff --git a/phpBB/includes/template/path_provider.php b/phpBB/includes/style/path_provider.php
similarity index 100%
rename from phpBB/includes/template/path_provider.php
rename to phpBB/includes/style/path_provider.php
diff --git a/phpBB/includes/template/path_provider_interface.php b/phpBB/includes/style/path_provider_interface.php
similarity index 100%
rename from phpBB/includes/template/path_provider_interface.php
rename to phpBB/includes/style/path_provider_interface.php
diff --git a/phpBB/includes/template/template.php b/phpBB/includes/style/template.php
similarity index 100%
rename from phpBB/includes/template/template.php
rename to phpBB/includes/style/template.php
diff --git a/phpBB/includes/template/compile.php b/phpBB/includes/style/template_compile.php
similarity index 100%
rename from phpBB/includes/template/compile.php
rename to phpBB/includes/style/template_compile.php
diff --git a/phpBB/includes/template/context.php b/phpBB/includes/style/template_context.php
similarity index 100%
rename from phpBB/includes/template/context.php
rename to phpBB/includes/style/template_context.php
diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/style/template_filter.php
similarity index 100%
rename from phpBB/includes/template/filter.php
rename to phpBB/includes/style/template_filter.php
diff --git a/phpBB/includes/template/renderer.php b/phpBB/includes/style/template_renderer.php
similarity index 100%
rename from phpBB/includes/template/renderer.php
rename to phpBB/includes/style/template_renderer.php
diff --git a/phpBB/includes/template/renderer_eval.php b/phpBB/includes/style/template_renderer_eval.php
similarity index 100%
rename from phpBB/includes/template/renderer_eval.php
rename to phpBB/includes/style/template_renderer_eval.php
diff --git a/phpBB/includes/template/renderer_include.php b/phpBB/includes/style/template_renderer_include.php
similarity index 100%
rename from phpBB/includes/template/renderer_include.php
rename to phpBB/includes/style/template_renderer_include.php