diff --git a/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/admin-page.php b/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/admin-page.php
index 1fb05be383..346bb36d58 100644
--- a/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/admin-page.php
+++ b/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/admin-page.php
@@ -10,8 +10,8 @@
 use CampTix_Plugin;
 
 use function WordCamp\OrganizerSurvey\{get_feature_id};
-use function WordCamp\OrganizerSurvey\Email\{get_email_id};
-use function WordCamp\OrganizerSurvey\DebriefSurvey\{get_page_id};
+use function WordCamp\OrganizerSurvey\DebriefSurvey\Email\{get_email_id};
+use function WordCamp\OrganizerSurvey\DebriefSurvey\Page\{get_page_id};
 
 add_action( 'init', __NAMESPACE__ . '\init' );
 
diff --git a/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/cron.php b/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/debrief-survey/cron.php
similarity index 95%
rename from public_html/wp-content/plugins/wordcamp-organizer-survey/includes/cron.php
rename to public_html/wp-content/plugins/wordcamp-organizer-survey/includes/debrief-survey/cron.php
index d6e6146767..eb0c5aa742 100644
--- a/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/cron.php
+++ b/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/debrief-survey/cron.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace WordCamp\OrganizerSurvey\Cron;
+namespace WordCamp\OrganizerSurvey\DebriefSurvey\Cron;
 
 defined( 'WPINC' ) || die();
 
 use CampTix_Plugin;
 
-use function WordCamp\OrganizerSurvey\Email\{get_email_id, queue_survey_email};
-use function WordCamp\OrganizerSurvey\DebriefSurvey\{disable_page, publish_survey_page};
+use function WordCamp\OrganizerSurvey\DebriefSurvey\Email\{get_email_id, queue_survey_email};
+use function WordCamp\OrganizerSurvey\DebriefSurvey\Page\{disable_page, publish_survey_page};
 
 /**
  * Constants.
diff --git a/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/email.php b/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/debrief-survey/email.php
similarity index 95%
rename from public_html/wp-content/plugins/wordcamp-organizer-survey/includes/email.php
rename to public_html/wp-content/plugins/wordcamp-organizer-survey/includes/debrief-survey/email.php
index 266559bf1e..6969158c10 100644
--- a/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/email.php
+++ b/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/debrief-survey/email.php
@@ -3,11 +3,11 @@
  * Creates the Organizer Debrief Survey email in the Camptix email queue.
  */
 
-namespace WordCamp\OrganizerSurvey\Email;
+namespace WordCamp\OrganizerSurvey\DebriefSurvey\Email;
 
 defined( 'WPINC' ) || die();
 
-use function WordCamp\OrganizerSurvey\DebriefSurvey\{get_survey_page_url};
+use function WordCamp\OrganizerSurvey\DebriefSurvey\Page\{get_survey_page_url};
 
 /**
  * Constants.
diff --git a/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/pages/debrief-survey.php b/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/debrief-survey/page.php
similarity index 99%
rename from public_html/wp-content/plugins/wordcamp-organizer-survey/includes/pages/debrief-survey.php
rename to public_html/wp-content/plugins/wordcamp-organizer-survey/includes/debrief-survey/page.php
index 18ca5831e6..5363b20ba9 100644
--- a/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/pages/debrief-survey.php
+++ b/public_html/wp-content/plugins/wordcamp-organizer-survey/includes/debrief-survey/page.php
@@ -3,7 +3,7 @@
  * Adds a page which contains the debrief survey.
  */
 
-namespace WordCamp\OrganizerSurvey\DebriefSurvey;
+namespace WordCamp\OrganizerSurvey\DebriefSurvey\Page;
 
 defined( 'WPINC' ) || die();
 
diff --git a/public_html/wp-content/plugins/wordcamp-organizer-survey/wordcamp-organizer-survey.php b/public_html/wp-content/plugins/wordcamp-organizer-survey/wordcamp-organizer-survey.php
index c57ea2cff5..36952bad30 100644
--- a/public_html/wp-content/plugins/wordcamp-organizer-survey/wordcamp-organizer-survey.php
+++ b/public_html/wp-content/plugins/wordcamp-organizer-survey/wordcamp-organizer-survey.php
@@ -12,17 +12,17 @@
 
 namespace WordCamp\OrganizerSurvey;
 
-use function WordCamp\OrganizerSurvey\DebriefSurvey\{add_page, delete_page};
-use function WordCamp\OrganizerSurvey\Email\{add_email, delete_email};
-use function WordCamp\OrganizerSurvey\Cron\delete_temp_attendee;
+use function WordCamp\OrganizerSurvey\DebriefSurvey\Page\{add_page, delete_page};
+use function WordCamp\OrganizerSurvey\DebriefSurvey\Email\{add_email, delete_email};
+use function WordCamp\OrganizerSurvey\DebriefSurvey\Cron\delete_temp_attendee;
 
 defined( 'WPINC' ) || die();
 
 /**
  * Local dependencies.
  */
-require_once get_includes_path() . 'email.php';
-require_once get_includes_path() . 'pages/debrief-survey.php';
+require_once get_includes_path() . 'debrief-survey/email.php';
+require_once get_includes_path() . 'debrief-survey/page.php';
 
 /**
  * Plugin deactivation hook.