diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -2232,7 +2232,7 @@
     'PhabricatorBulkEngine' => 'applications/transactions/bulk/PhabricatorBulkEngine.php',
     'PhabricatorBulkManagementMakeSilentWorkflow' => 'applications/transactions/bulk/management/PhabricatorBulkManagementMakeSilentWorkflow.php',
     'PhabricatorBulkManagementWorkflow' => 'applications/transactions/bulk/management/PhabricatorBulkManagementWorkflow.php',
-    'PhabricatorCSVExportFormat' => 'infrastructure/export/PhabricatorCSVExportFormat.php',
+    'PhabricatorCSVExportFormat' => 'infrastructure/export/format/PhabricatorCSVExportFormat.php',
     'PhabricatorCacheDAO' => 'applications/cache/storage/PhabricatorCacheDAO.php',
     'PhabricatorCacheEngine' => 'applications/system/engine/PhabricatorCacheEngine.php',
     'PhabricatorCacheEngineExtension' => 'applications/system/engine/PhabricatorCacheEngineExtension.php',
@@ -2583,7 +2583,7 @@
     'PhabricatorCustomFieldEditEngineExtension' => 'infrastructure/customfield/engineextension/PhabricatorCustomFieldEditEngineExtension.php',
     'PhabricatorCustomFieldEditField' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditField.php',
     'PhabricatorCustomFieldEditType' => 'infrastructure/customfield/editor/PhabricatorCustomFieldEditType.php',
-    'PhabricatorCustomFieldExportEngineExtension' => 'infrastructure/export/PhabricatorCustomFieldExportEngineExtension.php',
+    'PhabricatorCustomFieldExportEngineExtension' => 'infrastructure/export/engine/PhabricatorCustomFieldExportEngineExtension.php',
     'PhabricatorCustomFieldFulltextEngineExtension' => 'infrastructure/customfield/engineextension/PhabricatorCustomFieldFulltextEngineExtension.php',
     'PhabricatorCustomFieldHeraldAction' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldAction.php',
     'PhabricatorCustomFieldHeraldActionGroup' => 'infrastructure/customfield/herald/PhabricatorCustomFieldHeraldActionGroup.php',
@@ -2841,17 +2841,17 @@
     'PhabricatorEnv' => 'infrastructure/env/PhabricatorEnv.php',
     'PhabricatorEnvTestCase' => 'infrastructure/env/__tests__/PhabricatorEnvTestCase.php',
     'PhabricatorEpochEditField' => 'applications/transactions/editfield/PhabricatorEpochEditField.php',
-    'PhabricatorEpochExportField' => 'infrastructure/export/PhabricatorEpochExportField.php',
+    'PhabricatorEpochExportField' => 'infrastructure/export/field/PhabricatorEpochExportField.php',
     'PhabricatorEvent' => 'infrastructure/events/PhabricatorEvent.php',
     'PhabricatorEventEngine' => 'infrastructure/events/PhabricatorEventEngine.php',
     'PhabricatorEventListener' => 'infrastructure/events/PhabricatorEventListener.php',
     'PhabricatorEventType' => 'infrastructure/events/constant/PhabricatorEventType.php',
     'PhabricatorExampleEventListener' => 'infrastructure/events/PhabricatorExampleEventListener.php',
-    'PhabricatorExcelExportFormat' => 'infrastructure/export/PhabricatorExcelExportFormat.php',
+    'PhabricatorExcelExportFormat' => 'infrastructure/export/format/PhabricatorExcelExportFormat.php',
     'PhabricatorExecFutureFileUploadSource' => 'applications/files/uploadsource/PhabricatorExecFutureFileUploadSource.php',
-    'PhabricatorExportEngineExtension' => 'infrastructure/export/PhabricatorExportEngineExtension.php',
-    'PhabricatorExportField' => 'infrastructure/export/PhabricatorExportField.php',
-    'PhabricatorExportFormat' => 'infrastructure/export/PhabricatorExportFormat.php',
+    'PhabricatorExportEngineExtension' => 'infrastructure/export/engine/PhabricatorExportEngineExtension.php',
+    'PhabricatorExportField' => 'infrastructure/export/field/PhabricatorExportField.php',
+    'PhabricatorExportFormat' => 'infrastructure/export/format/PhabricatorExportFormat.php',
     'PhabricatorExtendedPolicyInterface' => 'applications/policy/interface/PhabricatorExtendedPolicyInterface.php',
     'PhabricatorExtendingPhabricatorConfigOptions' => 'applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php',
     'PhabricatorExtensionsSetupCheck' => 'applications/config/check/PhabricatorExtensionsSetupCheck.php',
@@ -3072,7 +3072,7 @@
     'PhabricatorHomeProfileMenuItem' => 'applications/home/menuitem/PhabricatorHomeProfileMenuItem.php',
     'PhabricatorHovercardEngineExtension' => 'applications/search/engineextension/PhabricatorHovercardEngineExtension.php',
     'PhabricatorHovercardEngineExtensionModule' => 'applications/search/engineextension/PhabricatorHovercardEngineExtensionModule.php',
-    'PhabricatorIDExportField' => 'infrastructure/export/PhabricatorIDExportField.php',
+    'PhabricatorIDExportField' => 'infrastructure/export/field/PhabricatorIDExportField.php',
     'PhabricatorIDsSearchEngineExtension' => 'applications/search/engineextension/PhabricatorIDsSearchEngineExtension.php',
     'PhabricatorIDsSearchField' => 'applications/search/field/PhabricatorIDsSearchField.php',
     'PhabricatorIconDatasource' => 'applications/files/typeahead/PhabricatorIconDatasource.php',
@@ -3096,7 +3096,7 @@
     'PhabricatorInlineSummaryView' => 'infrastructure/diff/view/PhabricatorInlineSummaryView.php',
     'PhabricatorInstructionsEditField' => 'applications/transactions/editfield/PhabricatorInstructionsEditField.php',
     'PhabricatorIntConfigType' => 'applications/config/type/PhabricatorIntConfigType.php',
-    'PhabricatorIntExportField' => 'infrastructure/export/PhabricatorIntExportField.php',
+    'PhabricatorIntExportField' => 'infrastructure/export/field/PhabricatorIntExportField.php',
     'PhabricatorInternalSetting' => 'applications/settings/setting/PhabricatorInternalSetting.php',
     'PhabricatorInternationalizationManagementExtractWorkflow' => 'infrastructure/internationalization/management/PhabricatorInternationalizationManagementExtractWorkflow.php',
     'PhabricatorInternationalizationManagementWorkflow' => 'infrastructure/internationalization/management/PhabricatorInternationalizationManagementWorkflow.php',
@@ -3106,7 +3106,7 @@
     'PhabricatorIteratorFileUploadSource' => 'applications/files/uploadsource/PhabricatorIteratorFileUploadSource.php',
     'PhabricatorJIRAAuthProvider' => 'applications/auth/provider/PhabricatorJIRAAuthProvider.php',
     'PhabricatorJSONConfigType' => 'applications/config/type/PhabricatorJSONConfigType.php',
-    'PhabricatorJSONExportFormat' => 'infrastructure/export/PhabricatorJSONExportFormat.php',
+    'PhabricatorJSONExportFormat' => 'infrastructure/export/format/PhabricatorJSONExportFormat.php',
     'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/PhabricatorJavelinLinter.php',
     'PhabricatorJiraIssueHasObjectEdgeType' => 'applications/doorkeeper/edge/PhabricatorJiraIssueHasObjectEdgeType.php',
     'PhabricatorJumpNavHandler' => 'applications/search/engine/PhabricatorJumpNavHandler.php',
@@ -3426,7 +3426,7 @@
     'PhabricatorPHDConfigOptions' => 'applications/config/option/PhabricatorPHDConfigOptions.php',
     'PhabricatorPHID' => 'applications/phid/storage/PhabricatorPHID.php',
     'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php',
-    'PhabricatorPHIDExportField' => 'infrastructure/export/PhabricatorPHIDExportField.php',
+    'PhabricatorPHIDExportField' => 'infrastructure/export/field/PhabricatorPHIDExportField.php',
     'PhabricatorPHIDInterface' => 'applications/phid/interface/PhabricatorPHIDInterface.php',
     'PhabricatorPHIDListEditField' => 'applications/transactions/editfield/PhabricatorPHIDListEditField.php',
     'PhabricatorPHIDListEditType' => 'applications/transactions/edittype/PhabricatorPHIDListEditType.php',
@@ -4192,7 +4192,7 @@
     'PhabricatorStorageSchemaSpec' => 'infrastructure/storage/schema/PhabricatorStorageSchemaSpec.php',
     'PhabricatorStorageSetupCheck' => 'applications/config/check/PhabricatorStorageSetupCheck.php',
     'PhabricatorStringConfigType' => 'applications/config/type/PhabricatorStringConfigType.php',
-    'PhabricatorStringExportField' => 'infrastructure/export/PhabricatorStringExportField.php',
+    'PhabricatorStringExportField' => 'infrastructure/export/field/PhabricatorStringExportField.php',
     'PhabricatorStringListConfigType' => 'applications/config/type/PhabricatorStringListConfigType.php',
     'PhabricatorStringListEditField' => 'applications/transactions/editfield/PhabricatorStringListEditField.php',
     'PhabricatorStringSetting' => 'applications/settings/setting/PhabricatorStringSetting.php',
@@ -4256,7 +4256,7 @@
     'PhabricatorTextAreaEditField' => 'applications/transactions/editfield/PhabricatorTextAreaEditField.php',
     'PhabricatorTextConfigType' => 'applications/config/type/PhabricatorTextConfigType.php',
     'PhabricatorTextEditField' => 'applications/transactions/editfield/PhabricatorTextEditField.php',
-    'PhabricatorTextExportFormat' => 'infrastructure/export/PhabricatorTextExportFormat.php',
+    'PhabricatorTextExportFormat' => 'infrastructure/export/format/PhabricatorTextExportFormat.php',
     'PhabricatorTextListConfigType' => 'applications/config/type/PhabricatorTextListConfigType.php',
     'PhabricatorTime' => 'infrastructure/time/PhabricatorTime.php',
     'PhabricatorTimeFormatSetting' => 'applications/settings/setting/PhabricatorTimeFormatSetting.php',
diff --git a/src/infrastructure/export/PhabricatorCustomFieldExportEngineExtension.php b/src/infrastructure/export/engine/PhabricatorCustomFieldExportEngineExtension.php
rename from src/infrastructure/export/PhabricatorCustomFieldExportEngineExtension.php
rename to src/infrastructure/export/engine/PhabricatorCustomFieldExportEngineExtension.php
diff --git a/src/infrastructure/export/PhabricatorExportEngineExtension.php b/src/infrastructure/export/engine/PhabricatorExportEngineExtension.php
rename from src/infrastructure/export/PhabricatorExportEngineExtension.php
rename to src/infrastructure/export/engine/PhabricatorExportEngineExtension.php
diff --git a/src/infrastructure/export/PhabricatorEpochExportField.php b/src/infrastructure/export/field/PhabricatorEpochExportField.php
rename from src/infrastructure/export/PhabricatorEpochExportField.php
rename to src/infrastructure/export/field/PhabricatorEpochExportField.php
diff --git a/src/infrastructure/export/PhabricatorExportField.php b/src/infrastructure/export/field/PhabricatorExportField.php
rename from src/infrastructure/export/PhabricatorExportField.php
rename to src/infrastructure/export/field/PhabricatorExportField.php
diff --git a/src/infrastructure/export/PhabricatorIDExportField.php b/src/infrastructure/export/field/PhabricatorIDExportField.php
rename from src/infrastructure/export/PhabricatorIDExportField.php
rename to src/infrastructure/export/field/PhabricatorIDExportField.php
diff --git a/src/infrastructure/export/PhabricatorIntExportField.php b/src/infrastructure/export/field/PhabricatorIntExportField.php
rename from src/infrastructure/export/PhabricatorIntExportField.php
rename to src/infrastructure/export/field/PhabricatorIntExportField.php
diff --git a/src/infrastructure/export/PhabricatorPHIDExportField.php b/src/infrastructure/export/field/PhabricatorPHIDExportField.php
rename from src/infrastructure/export/PhabricatorPHIDExportField.php
rename to src/infrastructure/export/field/PhabricatorPHIDExportField.php
diff --git a/src/infrastructure/export/PhabricatorStringExportField.php b/src/infrastructure/export/field/PhabricatorStringExportField.php
rename from src/infrastructure/export/PhabricatorStringExportField.php
rename to src/infrastructure/export/field/PhabricatorStringExportField.php
diff --git a/src/infrastructure/export/PhabricatorCSVExportFormat.php b/src/infrastructure/export/format/PhabricatorCSVExportFormat.php
rename from src/infrastructure/export/PhabricatorCSVExportFormat.php
rename to src/infrastructure/export/format/PhabricatorCSVExportFormat.php
diff --git a/src/infrastructure/export/PhabricatorExcelExportFormat.php b/src/infrastructure/export/format/PhabricatorExcelExportFormat.php
rename from src/infrastructure/export/PhabricatorExcelExportFormat.php
rename to src/infrastructure/export/format/PhabricatorExcelExportFormat.php
diff --git a/src/infrastructure/export/PhabricatorExportFormat.php b/src/infrastructure/export/format/PhabricatorExportFormat.php
rename from src/infrastructure/export/PhabricatorExportFormat.php
rename to src/infrastructure/export/format/PhabricatorExportFormat.php
diff --git a/src/infrastructure/export/PhabricatorJSONExportFormat.php b/src/infrastructure/export/format/PhabricatorJSONExportFormat.php
rename from src/infrastructure/export/PhabricatorJSONExportFormat.php
rename to src/infrastructure/export/format/PhabricatorJSONExportFormat.php
diff --git a/src/infrastructure/export/PhabricatorTextExportFormat.php b/src/infrastructure/export/format/PhabricatorTextExportFormat.php
rename from src/infrastructure/export/PhabricatorTextExportFormat.php
rename to src/infrastructure/export/format/PhabricatorTextExportFormat.php