diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/modules/acp/acp_attachments.php
similarity index 100%
rename from phpBB/includes/acp/acp_attachments.php
rename to phpBB/modules/acp/acp_attachments.php
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/modules/acp/acp_ban.php
similarity index 100%
rename from phpBB/includes/acp/acp_ban.php
rename to phpBB/modules/acp/acp_ban.php
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/modules/acp/acp_bbcodes.php
similarity index 100%
rename from phpBB/includes/acp/acp_bbcodes.php
rename to phpBB/modules/acp/acp_bbcodes.php
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/modules/acp/acp_board.php
similarity index 100%
rename from phpBB/includes/acp/acp_board.php
rename to phpBB/modules/acp/acp_board.php
diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/modules/acp/acp_bots.php
similarity index 100%
rename from phpBB/includes/acp/acp_bots.php
rename to phpBB/modules/acp/acp_bots.php
diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/modules/acp/acp_captcha.php
similarity index 100%
rename from phpBB/includes/acp/acp_captcha.php
rename to phpBB/modules/acp/acp_captcha.php
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/modules/acp/acp_database.php
similarity index 100%
rename from phpBB/includes/acp/acp_database.php
rename to phpBB/modules/acp/acp_database.php
diff --git a/phpBB/includes/acp/acp_disallow.php b/phpBB/modules/acp/acp_disallow.php
similarity index 100%
rename from phpBB/includes/acp/acp_disallow.php
rename to phpBB/modules/acp/acp_disallow.php
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/modules/acp/acp_email.php
similarity index 100%
rename from phpBB/includes/acp/acp_email.php
rename to phpBB/modules/acp/acp_email.php
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/modules/acp/acp_forums.php
similarity index 100%
rename from phpBB/includes/acp/acp_forums.php
rename to phpBB/modules/acp/acp_forums.php
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/modules/acp/acp_groups.php
similarity index 100%
rename from phpBB/includes/acp/acp_groups.php
rename to phpBB/modules/acp/acp_groups.php
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/modules/acp/acp_icons.php
similarity index 100%
rename from phpBB/includes/acp/acp_icons.php
rename to phpBB/modules/acp/acp_icons.php
diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/modules/acp/acp_inactive.php
similarity index 100%
rename from phpBB/includes/acp/acp_inactive.php
rename to phpBB/modules/acp/acp_inactive.php
diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/modules/acp/acp_jabber.php
similarity index 100%
rename from phpBB/includes/acp/acp_jabber.php
rename to phpBB/modules/acp/acp_jabber.php
diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/modules/acp/acp_language.php
similarity index 100%
rename from phpBB/includes/acp/acp_language.php
rename to phpBB/modules/acp/acp_language.php
diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/modules/acp/acp_logs.php
similarity index 100%
rename from phpBB/includes/acp/acp_logs.php
rename to phpBB/modules/acp/acp_logs.php
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/modules/acp/acp_main.php
similarity index 100%
rename from phpBB/includes/acp/acp_main.php
rename to phpBB/modules/acp/acp_main.php
diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/modules/acp/acp_modules.php
similarity index 100%
rename from phpBB/includes/acp/acp_modules.php
rename to phpBB/modules/acp/acp_modules.php
diff --git a/phpBB/includes/acp/acp_permission_roles.php b/phpBB/modules/acp/acp_permission_roles.php
similarity index 100%
rename from phpBB/includes/acp/acp_permission_roles.php
rename to phpBB/modules/acp/acp_permission_roles.php
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/modules/acp/acp_permissions.php
similarity index 100%
rename from phpBB/includes/acp/acp_permissions.php
rename to phpBB/modules/acp/acp_permissions.php
diff --git a/phpBB/includes/acp/acp_php_info.php b/phpBB/modules/acp/acp_php_info.php
similarity index 100%
rename from phpBB/includes/acp/acp_php_info.php
rename to phpBB/modules/acp/acp_php_info.php
diff --git a/phpBB/includes/acp/acp_profile.php b/phpBB/modules/acp/acp_profile.php
similarity index 100%
rename from phpBB/includes/acp/acp_profile.php
rename to phpBB/modules/acp/acp_profile.php
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/modules/acp/acp_prune.php
similarity index 100%
rename from phpBB/includes/acp/acp_prune.php
rename to phpBB/modules/acp/acp_prune.php
diff --git a/phpBB/includes/acp/acp_ranks.php b/phpBB/modules/acp/acp_ranks.php
similarity index 100%
rename from phpBB/includes/acp/acp_ranks.php
rename to phpBB/modules/acp/acp_ranks.php
diff --git a/phpBB/includes/acp/acp_reasons.php b/phpBB/modules/acp/acp_reasons.php
similarity index 100%
rename from phpBB/includes/acp/acp_reasons.php
rename to phpBB/modules/acp/acp_reasons.php
diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/modules/acp/acp_search.php
similarity index 100%
rename from phpBB/includes/acp/acp_search.php
rename to phpBB/modules/acp/acp_search.php
diff --git a/phpBB/includes/acp/acp_styles.php b/phpBB/modules/acp/acp_styles.php
similarity index 100%
rename from phpBB/includes/acp/acp_styles.php
rename to phpBB/modules/acp/acp_styles.php
diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/modules/acp/acp_update.php
similarity index 100%
rename from phpBB/includes/acp/acp_update.php
rename to phpBB/modules/acp/acp_update.php
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/modules/acp/acp_users.php
similarity index 100%
rename from phpBB/includes/acp/acp_users.php
rename to phpBB/modules/acp/acp_users.php
diff --git a/phpBB/includes/acp/acp_words.php b/phpBB/modules/acp/acp_words.php
similarity index 100%
rename from phpBB/includes/acp/acp_words.php
rename to phpBB/modules/acp/acp_words.php
diff --git a/phpBB/includes/acp/auth.php b/phpBB/modules/acp/auth.php
similarity index 100%
rename from phpBB/includes/acp/auth.php
rename to phpBB/modules/acp/auth.php
diff --git a/phpBB/includes/acp/info/acp_attachments.php b/phpBB/modules/acp/info/acp_attachments.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_attachments.php
rename to phpBB/modules/acp/info/acp_attachments.php
diff --git a/phpBB/includes/acp/info/acp_ban.php b/phpBB/modules/acp/info/acp_ban.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_ban.php
rename to phpBB/modules/acp/info/acp_ban.php
diff --git a/phpBB/includes/acp/info/acp_bbcodes.php b/phpBB/modules/acp/info/acp_bbcodes.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_bbcodes.php
rename to phpBB/modules/acp/info/acp_bbcodes.php
diff --git a/phpBB/includes/acp/info/acp_board.php b/phpBB/modules/acp/info/acp_board.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_board.php
rename to phpBB/modules/acp/info/acp_board.php
diff --git a/phpBB/includes/acp/info/acp_bots.php b/phpBB/modules/acp/info/acp_bots.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_bots.php
rename to phpBB/modules/acp/info/acp_bots.php
diff --git a/phpBB/includes/acp/info/acp_captcha.php b/phpBB/modules/acp/info/acp_captcha.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_captcha.php
rename to phpBB/modules/acp/info/acp_captcha.php
diff --git a/phpBB/includes/acp/info/acp_database.php b/phpBB/modules/acp/info/acp_database.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_database.php
rename to phpBB/modules/acp/info/acp_database.php
diff --git a/phpBB/includes/acp/info/acp_disallow.php b/phpBB/modules/acp/info/acp_disallow.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_disallow.php
rename to phpBB/modules/acp/info/acp_disallow.php
diff --git a/phpBB/includes/acp/info/acp_email.php b/phpBB/modules/acp/info/acp_email.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_email.php
rename to phpBB/modules/acp/info/acp_email.php
diff --git a/phpBB/includes/acp/info/acp_forums.php b/phpBB/modules/acp/info/acp_forums.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_forums.php
rename to phpBB/modules/acp/info/acp_forums.php
diff --git a/phpBB/includes/acp/info/acp_groups.php b/phpBB/modules/acp/info/acp_groups.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_groups.php
rename to phpBB/modules/acp/info/acp_groups.php
diff --git a/phpBB/includes/acp/info/acp_icons.php b/phpBB/modules/acp/info/acp_icons.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_icons.php
rename to phpBB/modules/acp/info/acp_icons.php
diff --git a/phpBB/includes/acp/info/acp_inactive.php b/phpBB/modules/acp/info/acp_inactive.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_inactive.php
rename to phpBB/modules/acp/info/acp_inactive.php
diff --git a/phpBB/includes/acp/info/acp_jabber.php b/phpBB/modules/acp/info/acp_jabber.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_jabber.php
rename to phpBB/modules/acp/info/acp_jabber.php
diff --git a/phpBB/includes/acp/info/acp_language.php b/phpBB/modules/acp/info/acp_language.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_language.php
rename to phpBB/modules/acp/info/acp_language.php
diff --git a/phpBB/includes/acp/info/acp_logs.php b/phpBB/modules/acp/info/acp_logs.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_logs.php
rename to phpBB/modules/acp/info/acp_logs.php
diff --git a/phpBB/includes/acp/info/acp_main.php b/phpBB/modules/acp/info/acp_main.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_main.php
rename to phpBB/modules/acp/info/acp_main.php
diff --git a/phpBB/includes/acp/info/acp_modules.php b/phpBB/modules/acp/info/acp_modules.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_modules.php
rename to phpBB/modules/acp/info/acp_modules.php
diff --git a/phpBB/includes/acp/info/acp_permission_roles.php b/phpBB/modules/acp/info/acp_permission_roles.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_permission_roles.php
rename to phpBB/modules/acp/info/acp_permission_roles.php
diff --git a/phpBB/includes/acp/info/acp_permissions.php b/phpBB/modules/acp/info/acp_permissions.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_permissions.php
rename to phpBB/modules/acp/info/acp_permissions.php
diff --git a/phpBB/includes/acp/info/acp_php_info.php b/phpBB/modules/acp/info/acp_php_info.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_php_info.php
rename to phpBB/modules/acp/info/acp_php_info.php
diff --git a/phpBB/includes/acp/info/acp_profile.php b/phpBB/modules/acp/info/acp_profile.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_profile.php
rename to phpBB/modules/acp/info/acp_profile.php
diff --git a/phpBB/includes/acp/info/acp_prune.php b/phpBB/modules/acp/info/acp_prune.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_prune.php
rename to phpBB/modules/acp/info/acp_prune.php
diff --git a/phpBB/includes/acp/info/acp_ranks.php b/phpBB/modules/acp/info/acp_ranks.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_ranks.php
rename to phpBB/modules/acp/info/acp_ranks.php
diff --git a/phpBB/includes/acp/info/acp_reasons.php b/phpBB/modules/acp/info/acp_reasons.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_reasons.php
rename to phpBB/modules/acp/info/acp_reasons.php
diff --git a/phpBB/includes/acp/info/acp_search.php b/phpBB/modules/acp/info/acp_search.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_search.php
rename to phpBB/modules/acp/info/acp_search.php
diff --git a/phpBB/includes/acp/info/acp_styles.php b/phpBB/modules/acp/info/acp_styles.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_styles.php
rename to phpBB/modules/acp/info/acp_styles.php
diff --git a/phpBB/includes/acp/info/acp_update.php b/phpBB/modules/acp/info/acp_update.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_update.php
rename to phpBB/modules/acp/info/acp_update.php
diff --git a/phpBB/includes/acp/info/acp_users.php b/phpBB/modules/acp/info/acp_users.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_users.php
rename to phpBB/modules/acp/info/acp_users.php
diff --git a/phpBB/includes/acp/info/acp_words.php b/phpBB/modules/acp/info/acp_words.php
similarity index 100%
rename from phpBB/includes/acp/info/acp_words.php
rename to phpBB/modules/acp/info/acp_words.php
diff --git a/phpBB/includes/mcp/info/mcp_ban.php b/phpBB/modules/mcp/info/mcp_ban.php
similarity index 100%
rename from phpBB/includes/mcp/info/mcp_ban.php
rename to phpBB/modules/mcp/info/mcp_ban.php
diff --git a/phpBB/includes/mcp/info/mcp_logs.php b/phpBB/modules/mcp/info/mcp_logs.php
similarity index 100%
rename from phpBB/includes/mcp/info/mcp_logs.php
rename to phpBB/modules/mcp/info/mcp_logs.php
diff --git a/phpBB/includes/mcp/info/mcp_main.php b/phpBB/modules/mcp/info/mcp_main.php
similarity index 100%
rename from phpBB/includes/mcp/info/mcp_main.php
rename to phpBB/modules/mcp/info/mcp_main.php
diff --git a/phpBB/includes/mcp/info/mcp_notes.php b/phpBB/modules/mcp/info/mcp_notes.php
similarity index 100%
rename from phpBB/includes/mcp/info/mcp_notes.php
rename to phpBB/modules/mcp/info/mcp_notes.php
diff --git a/phpBB/includes/mcp/info/mcp_queue.php b/phpBB/modules/mcp/info/mcp_queue.php
similarity index 100%
rename from phpBB/includes/mcp/info/mcp_queue.php
rename to phpBB/modules/mcp/info/mcp_queue.php
diff --git a/phpBB/includes/mcp/info/mcp_reports.php b/phpBB/modules/mcp/info/mcp_reports.php
similarity index 100%
rename from phpBB/includes/mcp/info/mcp_reports.php
rename to phpBB/modules/mcp/info/mcp_reports.php
diff --git a/phpBB/includes/mcp/info/mcp_warn.php b/phpBB/modules/mcp/info/mcp_warn.php
similarity index 100%
rename from phpBB/includes/mcp/info/mcp_warn.php
rename to phpBB/modules/mcp/info/mcp_warn.php
diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/modules/mcp/mcp_ban.php
similarity index 100%
rename from phpBB/includes/mcp/mcp_ban.php
rename to phpBB/modules/mcp/mcp_ban.php
diff --git a/phpBB/includes/mcp/mcp_forum.php b/phpBB/modules/mcp/mcp_forum.php
similarity index 100%
rename from phpBB/includes/mcp/mcp_forum.php
rename to phpBB/modules/mcp/mcp_forum.php
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/modules/mcp/mcp_front.php
similarity index 100%
rename from phpBB/includes/mcp/mcp_front.php
rename to phpBB/modules/mcp/mcp_front.php
diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/modules/mcp/mcp_logs.php
similarity index 100%
rename from phpBB/includes/mcp/mcp_logs.php
rename to phpBB/modules/mcp/mcp_logs.php
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/modules/mcp/mcp_main.php
similarity index 100%
rename from phpBB/includes/mcp/mcp_main.php
rename to phpBB/modules/mcp/mcp_main.php
diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/modules/mcp/mcp_notes.php
similarity index 100%
rename from phpBB/includes/mcp/mcp_notes.php
rename to phpBB/modules/mcp/mcp_notes.php
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/modules/mcp/mcp_post.php
similarity index 100%
rename from phpBB/includes/mcp/mcp_post.php
rename to phpBB/modules/mcp/mcp_post.php
diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/modules/mcp/mcp_queue.php
similarity index 100%
rename from phpBB/includes/mcp/mcp_queue.php
rename to phpBB/modules/mcp/mcp_queue.php
diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/modules/mcp/mcp_reports.php
similarity index 100%
rename from phpBB/includes/mcp/mcp_reports.php
rename to phpBB/modules/mcp/mcp_reports.php
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/modules/mcp/mcp_topic.php
similarity index 100%
rename from phpBB/includes/mcp/mcp_topic.php
rename to phpBB/modules/mcp/mcp_topic.php
diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/modules/mcp/mcp_warn.php
similarity index 100%
rename from phpBB/includes/mcp/mcp_warn.php
rename to phpBB/modules/mcp/mcp_warn.php
diff --git a/phpBB/includes/ucp/info/ucp_attachments.php b/phpBB/modules/ucp/info/ucp_attachments.php
similarity index 100%
rename from phpBB/includes/ucp/info/ucp_attachments.php
rename to phpBB/modules/ucp/info/ucp_attachments.php
diff --git a/phpBB/includes/ucp/info/ucp_groups.php b/phpBB/modules/ucp/info/ucp_groups.php
similarity index 100%
rename from phpBB/includes/ucp/info/ucp_groups.php
rename to phpBB/modules/ucp/info/ucp_groups.php
diff --git a/phpBB/includes/ucp/info/ucp_main.php b/phpBB/modules/ucp/info/ucp_main.php
similarity index 100%
rename from phpBB/includes/ucp/info/ucp_main.php
rename to phpBB/modules/ucp/info/ucp_main.php
diff --git a/phpBB/includes/ucp/info/ucp_pm.php b/phpBB/modules/ucp/info/ucp_pm.php
similarity index 100%
rename from phpBB/includes/ucp/info/ucp_pm.php
rename to phpBB/modules/ucp/info/ucp_pm.php
diff --git a/phpBB/includes/ucp/info/ucp_prefs.php b/phpBB/modules/ucp/info/ucp_prefs.php
similarity index 100%
rename from phpBB/includes/ucp/info/ucp_prefs.php
rename to phpBB/modules/ucp/info/ucp_prefs.php
diff --git a/phpBB/includes/ucp/info/ucp_profile.php b/phpBB/modules/ucp/info/ucp_profile.php
similarity index 100%
rename from phpBB/includes/ucp/info/ucp_profile.php
rename to phpBB/modules/ucp/info/ucp_profile.php
diff --git a/phpBB/includes/ucp/info/ucp_zebra.php b/phpBB/modules/ucp/info/ucp_zebra.php
similarity index 100%
rename from phpBB/includes/ucp/info/ucp_zebra.php
rename to phpBB/modules/ucp/info/ucp_zebra.php
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/modules/ucp/ucp_activate.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_activate.php
rename to phpBB/modules/ucp/ucp_activate.php
diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/modules/ucp/ucp_attachments.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_attachments.php
rename to phpBB/modules/ucp/ucp_attachments.php
diff --git a/phpBB/includes/ucp/ucp_confirm.php b/phpBB/modules/ucp/ucp_confirm.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_confirm.php
rename to phpBB/modules/ucp/ucp_confirm.php
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/modules/ucp/ucp_groups.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_groups.php
rename to phpBB/modules/ucp/ucp_groups.php
diff --git a/phpBB/includes/ucp/ucp_main.php b/phpBB/modules/ucp/ucp_main.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_main.php
rename to phpBB/modules/ucp/ucp_main.php
diff --git a/phpBB/includes/ucp/ucp_pm.php b/phpBB/modules/ucp/ucp_pm.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_pm.php
rename to phpBB/modules/ucp/ucp_pm.php
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/modules/ucp/ucp_pm_compose.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_pm_compose.php
rename to phpBB/modules/ucp/ucp_pm_compose.php
diff --git a/phpBB/includes/ucp/ucp_pm_options.php b/phpBB/modules/ucp/ucp_pm_options.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_pm_options.php
rename to phpBB/modules/ucp/ucp_pm_options.php
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/modules/ucp/ucp_pm_viewfolder.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_pm_viewfolder.php
rename to phpBB/modules/ucp/ucp_pm_viewfolder.php
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/modules/ucp/ucp_pm_viewmessage.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_pm_viewmessage.php
rename to phpBB/modules/ucp/ucp_pm_viewmessage.php
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/modules/ucp/ucp_prefs.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_prefs.php
rename to phpBB/modules/ucp/ucp_prefs.php
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/modules/ucp/ucp_profile.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_profile.php
rename to phpBB/modules/ucp/ucp_profile.php
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/modules/ucp/ucp_register.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_register.php
rename to phpBB/modules/ucp/ucp_register.php
diff --git a/phpBB/includes/ucp/ucp_remind.php b/phpBB/modules/ucp/ucp_remind.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_remind.php
rename to phpBB/modules/ucp/ucp_remind.php
diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/modules/ucp/ucp_resend.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_resend.php
rename to phpBB/modules/ucp/ucp_resend.php
diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/modules/ucp/ucp_zebra.php
similarity index 100%
rename from phpBB/includes/ucp/ucp_zebra.php
rename to phpBB/modules/ucp/ucp_zebra.php