diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index e8a88298c7..f2b2a160cb 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -734,12 +734,12 @@ phutil_register_library_map(array(
     'PhabricatorMetaMTAWorker' => 'applications/metamta/PhabricatorMetaMTAWorker.php',
     'PhabricatorMustVerifyEmailController' => 'applications/auth/controller/PhabricatorMustVerifyEmailController.php',
     'PhabricatorMySQLFileStorageEngine' => 'applications/files/engine/PhabricatorMySQLFileStorageEngine.php',
-    'PhabricatorNotificationBuilder' => 'applications/notification/builder/notification/PhabricatorNotificationBuilder.php',
-    'PhabricatorNotificationController' => 'applications/notification/controller/base/PhabricatorNotificationController.php',
+    'PhabricatorNotificationBuilder' => 'applications/notification/builder/PhabricatorNotificationBuilder.php',
+    'PhabricatorNotificationController' => 'applications/notification/controller/PhabricatorNotificationController.php',
     'PhabricatorNotificationQuery' => 'applications/notification/PhabricatorNotificationQuery.php',
-    'PhabricatorNotificationStoryView' => 'applications/notification/view/story/PhabricatorNotificationStoryView.php',
-    'PhabricatorNotificationTestController' => 'applications/notification/controller/test/PhabricatorNotificationTestController.php',
-    'PhabricatorNotificationView' => 'applications/notification/view/base/PhabricatorNotificationView.php',
+    'PhabricatorNotificationStoryView' => 'applications/notification/view/PhabricatorNotificationStoryView.php',
+    'PhabricatorNotificationTestController' => 'applications/notification/controller/PhabricatorNotificationTestController.php',
+    'PhabricatorNotificationView' => 'applications/notification/view/PhabricatorNotificationView.php',
     'PhabricatorNotificationsController' => 'applications/notifications/controller/PhabricatorNotificationsController.php',
     'PhabricatorOAuthClientAuthorization' => 'applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php',
     'PhabricatorOAuthClientAuthorizationBaseController' => 'applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationBaseController.php',
diff --git a/src/applications/notification/builder/notification/PhabricatorNotificationBuilder.php b/src/applications/notification/builder/PhabricatorNotificationBuilder.php
similarity index 100%
rename from src/applications/notification/builder/notification/PhabricatorNotificationBuilder.php
rename to src/applications/notification/builder/PhabricatorNotificationBuilder.php
diff --git a/src/applications/notification/controller/base/PhabricatorNotificationController.php b/src/applications/notification/controller/PhabricatorNotificationController.php
similarity index 100%
rename from src/applications/notification/controller/base/PhabricatorNotificationController.php
rename to src/applications/notification/controller/PhabricatorNotificationController.php
diff --git a/src/applications/notification/controller/test/PhabricatorNotificationTestController.php b/src/applications/notification/controller/PhabricatorNotificationTestController.php
similarity index 100%
rename from src/applications/notification/controller/test/PhabricatorNotificationTestController.php
rename to src/applications/notification/controller/PhabricatorNotificationTestController.php
diff --git a/src/applications/notification/view/story/PhabricatorNotificationStoryView.php b/src/applications/notification/view/PhabricatorNotificationStoryView.php
similarity index 100%
rename from src/applications/notification/view/story/PhabricatorNotificationStoryView.php
rename to src/applications/notification/view/PhabricatorNotificationStoryView.php
diff --git a/src/applications/notification/view/base/PhabricatorNotificationView.php b/src/applications/notification/view/PhabricatorNotificationView.php
similarity index 100%
rename from src/applications/notification/view/base/PhabricatorNotificationView.php
rename to src/applications/notification/view/PhabricatorNotificationView.php