diff --git a/phpBB/includes/auth.php b/phpBB/includes/classes/acl.php
similarity index 100%
rename from phpBB/includes/auth.php
rename to phpBB/includes/classes/acl.php
diff --git a/phpBB/includes/cache.php b/phpBB/includes/classes/cache.php
similarity index 100%
rename from phpBB/includes/cache.php
rename to phpBB/includes/classes/cache.php
diff --git a/phpBB/includes/session.php b/phpBB/includes/classes/session.php
similarity index 100%
rename from phpBB/includes/session.php
rename to phpBB/includes/classes/session.php
diff --git a/phpBB/includes/template.php b/phpBB/includes/classes/template.php
similarity index 100%
rename from phpBB/includes/template.php
rename to phpBB/includes/classes/template.php
diff --git a/phpBB/includes/functions_template.php b/phpBB/includes/classes/template_compile.php
similarity index 100%
rename from phpBB/includes/functions_template.php
rename to phpBB/includes/classes/template_compile.php
diff --git a/phpBB/includes/hooks/index.php b/phpBB/plugins/bootstrap.php
similarity index 100%
rename from phpBB/includes/hooks/index.php
rename to phpBB/plugins/bootstrap.php