diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index f2f8ae90fb..ce28b6e9d0 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -15,7 +15,7 @@ phutil_register_library_map(array(
     'Aphront403Response' => 'aphront/response/Aphront403Response.php',
     'Aphront404Response' => 'aphront/response/Aphront404Response.php',
     'AphrontAjaxResponse' => 'aphront/response/AphrontAjaxResponse.php',
-    'AphrontApplicationConfiguration' => 'aphront/AphrontApplicationConfiguration.php',
+    'AphrontApplicationConfiguration' => 'aphront/configuration/AphrontApplicationConfiguration.php',
     'AphrontAttachedFileView' => 'view/control/AphrontAttachedFileView.php',
     'AphrontCSRFException' => 'aphront/exception/AphrontCSRFException.php',
     'AphrontCalendarEventView' => 'applications/calendar/view/AphrontCalendarEventView.php',
@@ -25,7 +25,7 @@ phutil_register_library_map(array(
     'AphrontCrumbsView' => 'view/layout/AphrontCrumbsView.php',
     'AphrontDatabaseConnection' => 'storage/connection/AphrontDatabaseConnection.php',
     'AphrontDatabaseTransactionState' => 'storage/AphrontDatabaseTransactionState.php',
-    'AphrontDefaultApplicationConfiguration' => 'aphront/default/AphrontDefaultApplicationConfiguration.php',
+    'AphrontDefaultApplicationConfiguration' => 'aphront/configuration/AphrontDefaultApplicationConfiguration.php',
     'AphrontDialogResponse' => 'aphront/response/AphrontDialogResponse.php',
     'AphrontDialogView' => 'view/AphrontDialogView.php',
     'AphrontErrorView' => 'view/form/AphrontErrorView.php',
@@ -107,7 +107,7 @@ phutil_register_library_map(array(
     'AphrontUsageException' => 'aphront/exception/AphrontUsageException.php',
     'AphrontView' => 'view/AphrontView.php',
     'AphrontWebpageResponse' => 'aphront/response/AphrontWebpageResponse.php',
-    'AphrontWriteGuard' => 'aphront/AphrontWriteGuard.php',
+    'AphrontWriteGuard' => 'aphront/writeguard/AphrontWriteGuard.php',
     'CelerityAPI' => 'infrastructure/celerity/CelerityAPI.php',
     'CelerityResourceController' => 'infrastructure/celerity/CelerityResourceController.php',
     'CelerityResourceGraph' => 'infrastructure/celerity/CelerityResourceGraph.php',
diff --git a/src/aphront/AphrontApplicationConfiguration.php b/src/aphront/configuration/AphrontApplicationConfiguration.php
similarity index 100%
rename from src/aphront/AphrontApplicationConfiguration.php
rename to src/aphront/configuration/AphrontApplicationConfiguration.php
diff --git a/src/aphront/default/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
similarity index 100%
rename from src/aphront/default/AphrontDefaultApplicationConfiguration.php
rename to src/aphront/configuration/AphrontDefaultApplicationConfiguration.php
diff --git a/src/aphront/AphrontWriteGuard.php b/src/aphront/writeguard/AphrontWriteGuard.php
similarity index 99%
rename from src/aphront/AphrontWriteGuard.php
rename to src/aphront/writeguard/AphrontWriteGuard.php
index b192f77270..38d6ce7ad2 100644
--- a/src/aphront/AphrontWriteGuard.php
+++ b/src/aphront/writeguard/AphrontWriteGuard.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.