From 6cc196a2e557ffe1e6eeeef063358553ccdd3481 Mon Sep 17 00:00:00 2001
From: vrana <jakubv@fb.com>
Date: Fri, 1 Jun 2012 12:10:26 -0700
Subject: [PATCH] Move files in Phabricator one level up

Summary:
- `kill_init.php` said "Moving 1000 files" - I hope that this is not some limit in `FileFinder`.
- [src/infrastructure/celerity] `git mv utils.php map.php; git mv api/utils.php api.php`
- Comment `phutil_libraries` in `.arcconfig` and run `arc liberate`.

NOTE: `arc diff` timed out so I'm pushing it without review.

Test Plan:
/D1234
Browsed around, especially in `applications/repository/worker/commitchangeparser` and `applications/` in general.

Auditors: epriestley

Maniphest Tasks: T1103
---
 src/__phutil_library_map__.php                | 2104 ++++++++---------
 .../AphrontApplicationConfiguration.php       |    0
 .../{controller => }/AphrontController.php    |    0
 src/aphront/{request => }/AphrontRequest.php  |    0
 src/aphront/{mapper => }/AphrontURIMapper.php |    0
 .../{writeguard => }/AphrontWriteGuard.php    |    0
 .../__tests__/AphrontRequestTestCase.php      |    0
 .../DarkConsoleController.php                 |    0
 .../console/{core => }/DarkConsoleCore.php    |    0
 .../{config => }/DarkConsoleConfigPlugin.php  |    0
 .../DarkConsoleErrorLogPlugin.php             |    0
 .../{event => }/DarkConsoleEventPlugin.php    |    0
 .../plugin/{base => }/DarkConsolePlugin.php   |    0
 .../DarkConsoleRequestPlugin.php              |    0
 .../DarkConsoleServicesPlugin.php             |    0
 .../{xhprof => }/DarkConsoleXHProfPlugin.php  |    0
 .../DarkConsoleErrorLogPluginAPI.php          |    0
 .../{api => }/DarkConsoleEventPluginAPI.php   |    0
 .../{api => }/DarkConsoleXHProfPluginAPI.php  |    0
 ...AphrontDefaultApplicationConfiguration.php |    0
 .../{csrf => }/AphrontCSRFException.php       |    0
 .../exception/{base => }/AphrontException.php |    0
 .../AphrontRedirectException.php              |    0
 .../{usage => }/AphrontUsageException.php     |    0
 .../response/{304 => }/Aphront304Response.php |    0
 .../response/{400 => }/Aphront400Response.php |    0
 .../response/{403 => }/Aphront403Response.php |    0
 .../response/{404 => }/Aphront404Response.php |    0
 .../{ajax => }/AphrontAjaxResponse.php        |    0
 .../{dialog => }/AphrontDialogResponse.php    |    0
 .../{file => }/AphrontFileResponse.php        |    0
 .../{json => }/AphrontJSONResponse.php        |    0
 .../AphrontPlainTextResponse.php              |    0
 .../{proxy => }/AphrontProxyResponse.php      |    0
 .../AphrontRedirectResponse.php               |    0
 .../{reload => }/AphrontReloadResponse.php    |    0
 .../response/{base => }/AphrontResponse.php   |    0
 .../{webpage => }/AphrontWebpageResponse.php  |    0
 .../sink/{base => }/AphrontHTTPSink.php       |    0
 .../{test => }/AphrontIsolatedHTTPSink.php    |    0
 .../sink/{php => }/AphrontPHPHTTPSink.php     |    0
 .../__tests__/AphrontHTTPSinkTestCase.php     |    0
 .../AphrontScopedUnguardedWriteCapability.php |    0
 .../__tests__/PhabricatorPolicyTestCase.php   |    0
 .../__tests__/PhabricatorPolicyTestObject.php |    0
 .../__tests__/PhabricatorPolicyTestQuery.php  |    0
 .../PhabricatorAuditReplyHandler.php          |    0
 .../PhabricatorAuditActionConstants.php       |    0
 .../PhabricatorAuditCommitStatusConstants.php |    0
 .../PhabricatorAuditStatusConstants.php       |    0
 .../PhabricatorAuditAddCommentController.php  |    0
 .../{base => }/PhabricatorAuditController.php |    0
 .../PhabricatorAuditListController.php        |    0
 .../PhabricatorAuditPreviewController.php     |    0
 .../PhabricatorAuditCommentEditor.php         |    0
 .../PhabricatorAuditCommitQuery.php           |    0
 .../{audit => }/PhabricatorAuditQuery.php     |    0
 .../PhabricatorAuditComment.php               |    0
 .../{base => }/PhabricatorAuditDAO.php        |    0
 .../PhabricatorAuditInlineComment.php         |    0
 .../PhabricatorAuditCommitListView.php        |    0
 .../{list => }/PhabricatorAuditListView.php   |    0
 .../{base => }/PhabricatorAuthController.php  |    0
 .../PhabricatorDisabledUserController.php     |    0
 .../PhabricatorEmailLoginController.php       |    0
 .../PhabricatorEmailTokenController.php       |    0
 .../PhabricatorLoginController.php            |    0
 .../PhabricatorLoginValidateController.php    |    0
 .../PhabricatorLogoutController.php           |    0
 .../PhabricatorMustVerifyEmailController.php  |    0
 .../PhabricatorOAuthDiagnosticsController.php |    0
 .../PhabricatorOAuthLoginController.php       |    0
 .../PhabricatorOAuthUnlinkController.php      |    0
 .../PhabricatorRefreshCSRFController.php      |    0
 ...atorOAuthDefaultRegistrationController.php |    0
 ...PhabricatorOAuthRegistrationController.php |    0
 .../{base => }/PhabricatorOAuthProvider.php   |    0
 .../PhabricatorOAuthProviderDisqus.php        |    0
 .../PhabricatorOAuthProviderException.php     |    0
 .../PhabricatorOAuthProviderFacebook.php      |    0
 .../PhabricatorOAuthProviderGitHub.php        |    0
 .../PhabricatorOAuthProviderGoogle.php        |    0
 .../PhabricatorOAuthProviderPhabricator.php   |    0
 .../PhabricatorOAuthFailureView.php           |    0
 .../{404 => }/Phabricator404Controller.php    |    0
 .../{base => }/PhabricatorController.php      |    0
 .../PhabricatorRedirectController.php         |    0
 .../storage/{lisk => }/PhabricatorLiskDAO.php |    0
 .../DatabaseConfigurationProvider.php         |    0
 .../DefaultDatabaseConfigurationProvider.php  |    0
 .../PhabricatorCalendarBrowseController.php   |    0
 .../PhabricatorCalendarController.php         |    0
 .../{base => }/PhabricatorCalendarDAO.php     |    0
 .../PhabricatorCalendarHoliday.php            |    0
 .../PhabricatorCalendarHolidayTestCase.php    |    0
 .../{event => }/AphrontCalendarEventView.php  |    0
 .../{month => }/AphrontCalendarMonthView.php  |    0
 .../{query => }/PhabricatorChatLogQuery.php   |    0
 .../PhabricatorChatLogConstants.php           |    0
 .../PhabricatorChatLogEventType.php           |    0
 ...habricatorChatLogChannelListController.php |    0
 ...PhabricatorChatLogChannelLogController.php |    0
 .../PhabricatorChatLogController.php          |    0
 .../{base => }/PhabricatorChatLogDAO.php      |    0
 .../{event => }/PhabricatorChatLogEvent.php   |    0
 .../PhabricatorConduitAPIController.php       |    0
 .../PhabricatorConduitConsoleController.php   |    0
 .../PhabricatorConduitController.php          |    0
 .../PhabricatorConduitListController.php      |    0
 .../PhabricatorConduitLogController.php       |    0
 .../PhabricatorConduitTokenController.php     |    0
 .../method/{base => }/ConduitAPIMethod.php    |    0
 .../{base => }/ConduitAPI_arcanist_Method.php |    0
 ...ConduitAPI_arcanist_projectinfo_Method.php |    0
 .../{base => }/ConduitAPI_audit_Method.php    |    0
 .../ConduitAPI_audit_query_Method.php         |    0
 .../{base => }/ConduitAPI_chatlog_Method.php  |    0
 .../ConduitAPI_chatlog_query_Method.php       |    0
 .../ConduitAPI_chatlog_record_Method.php      |    0
 .../ConduitAPI_conduit_connect_Method.php     |    0
 ...nduitAPI_conduit_getcertificate_Method.php |    0
 .../ConduitAPI_conduit_ping_Method.php        |    0
 .../ConduitAPI_daemon_launched_Method.php     |    0
 .../ConduitAPI_daemon_log_Method.php          |    0
 .../ConduitAPI_differential_close_Method.php  |    0
 ...tAPI_differential_createcomment_Method.php |    0
 ...duitAPI_differential_creatediff_Method.php |    0
 ...API_differential_createrevision_Method.php |    0
 .../ConduitAPI_differential_find_Method.php   |    0
 ...uitAPI_differential_getalldiffs_Method.php |    0
 ...I_differential_getcommitmessage_Method.php |    0
 ...API_differential_getcommitpaths_Method.php |    0
 ...ConduitAPI_differential_getdiff_Method.php |    0
 ...uitAPI_differential_getrevision_Method.php |    0
 ...ifferential_getrevisioncomments_Method.php |    0
 ...ifferential_getrevisionfeedback_Method.php |    0
 ...tAPI_differential_markcommitted_Method.php |    0
 ...differential_parsecommitmessage_Method.php |    0
 .../ConduitAPI_differential_query_Method.php  |    0
 ...PI_differential_setdiffproperty_Method.php |    0
 ...API_differential_updaterevision_Method.php |    0
 ...rential_updatetaskrevisionassoc_Method.php |    0
 ..._differential_updateunitresults_Method.php |    0
 ...onduitAPI_diffusion_findsymbols_Method.php |    0
 ...ConduitAPI_diffusion_getcommits_Method.php |    0
 ...iffusion_getrecentcommitsbypath_Method.php |    0
 .../ConduitAPI_feed_publish_Method.php        |    0
 .../ConduitAPI_feed_query_Method.php          |    0
 .../ConduitAPI_file_download_Method.php       |    0
 .../ConduitAPI_file_info_Method.php           |    0
 .../ConduitAPI_file_upload_Method.php         |    0
 .../{base => }/ConduitAPI_flag_Method.php     |    0
 .../ConduitAPI_flag_query_Method.php          |    0
 .../{base => }/ConduitAPI_macro_Method.php    |    0
 .../ConduitAPI_macro_query_Method.php         |    0
 .../ConduitAPI_maniphest_Method.php           |    0
 ...ConduitAPI_maniphest_createtask_Method.php |    0
 .../ConduitAPI_maniphest_find_Method.php      |    0
 ...I_maniphest_gettasktransactions_Method.php |    0
 .../ConduitAPI_maniphest_info_Method.php      |    0
 .../ConduitAPI_maniphest_update_Method.php    |    0
 .../ConduitAPI_owners_query_Method.php        |    0
 .../{base => }/ConduitAPI_paste_Method.php    |    0
 .../ConduitAPI_paste_create_Method.php        |    0
 .../ConduitAPI_paste_info_Method.php          |    0
 .../ConduitAPI_path_getowners_Method.php      |    0
 .../{base => }/ConduitAPI_phid_Method.php     |    0
 .../ConduitAPI_phid_info_Method.php           |    0
 .../ConduitAPI_phid_query_Method.php          |    0
 .../ConduitAPI_phriction_Method.php           |    0
 .../ConduitAPI_phriction_edit_Method.php      |    0
 .../ConduitAPI_phriction_history_Method.php   |    0
 .../ConduitAPI_phriction_info_Method.php      |    0
 .../{base => }/ConduitAPI_project_Method.php  |    0
 .../ConduitAPI_project_query_Method.php       |    0
 .../ConduitAPI_remarkup_process_Method.php    |    0
 .../ConduitAPI_repository_Method.php          |    0
 .../ConduitAPI_repository_create_Method.php   |    0
 .../ConduitAPI_repository_query_Method.php    |    0
 .../ConduitAPI_slowvote_info_Method.php       |    0
 .../{base => }/ConduitAPI_user_Method.php     |    0
 .../ConduitAPI_user_addstatus_Method.php      |    0
 .../ConduitAPI_user_disable_Method.php        |    0
 .../ConduitAPI_user_find_Method.php           |    0
 .../ConduitAPI_user_info_Method.php           |    0
 .../ConduitAPI_user_query_Method.php          |    0
 .../ConduitAPI_user_removestatus_Method.php   |    0
 .../ConduitAPI_user_whoami_Method.php         |    0
 .../{request => }/ConduitAPIRequest.php       |    0
 .../{response => }/ConduitAPIResponse.php     |    0
 .../{exception => }/ConduitException.php      |    0
 .../PhabricatorConduitCertificateToken.php    |    0
 .../PhabricatorConduitConnectionLog.php       |    0
 .../{base => }/PhabricatorConduitDAO.php      |    0
 .../PhabricatorConduitMethodCallLog.php       |    0
 .../PhabricatorCountdownController.php        |    0
 .../PhabricatorCountdownDeleteController.php  |    0
 .../PhabricatorCountdownEditController.php    |    0
 .../PhabricatorCountdownListController.php    |    0
 .../PhabricatorCountdownViewController.php    |    0
 .../{base => }/PhabricatorCountdownDAO.php    |    0
 .../storage/{timer => }/PhabricatorTimer.php  |    0
 ...PhabricatorDaemonCombinedLogController.php |    0
 .../PhabricatorDaemonConsoleController.php    |    0
 .../PhabricatorDaemonController.php           |    0
 .../PhabricatorDaemonLogListController.php    |    0
 .../PhabricatorDaemonLogViewController.php    |    0
 ...ricatorDaemonTimelineConsoleController.php |    0
 ...abricatorDaemonTimelineEventController.php |    0
 .../PhabricatorWorkerTaskDetailController.php |    0
 .../PhabricatorWorkerTaskUpdateController.php |    0
 .../PhabricatorDaemonLogEventsView.php        |    0
 .../PhabricatorDaemonLogListView.php          |    0
 .../DifferentialReplyHandler.php              |    0
 .../{tasks => }/DifferentialTasksAttacher.php |    0
 .../{action => }/DifferentialAction.php       |    0
 .../DifferentialChangeType.php                |    0
 .../DifferentialLintStatus.php                |    0
 .../DifferentialRevisionControlSystem.php     |    0
 .../DifferentialUnitStatus.php                |    0
 .../DifferentialUnitTestResult.php            |    0
 .../DifferentialChangesetViewController.php   |    0
 .../DifferentialCommentPreviewController.php  |    0
 .../DifferentialCommentSaveController.php     |    0
 .../{base => }/DifferentialController.php     |    0
 .../DifferentialDiffCreateController.php      |    0
 .../DifferentialDiffViewController.php        |    0
 ...ifferentialInlineCommentEditController.php |    0
 ...erentialInlineCommentPreviewController.php |    0
 .../DifferentialRevisionDetailRenderer.php    |    0
 .../DifferentialRevisionEditController.php    |    0
 .../DifferentialRevisionListController.php    |    0
 .../DifferentialRevisionStatsController.php   |    0
 .../DifferentialRevisionViewController.php    |    0
 .../DifferentialSubscribeController.php       |    0
 .../DifferentialRevisionListData.php          |    0
 .../DifferentialCommentEditor.php             |    0
 .../DifferentialRevisionEditor.php            |    0
 ...DifferentialActionHasNoEffectException.php |    0
 .../{base => }/DifferentialException.php      |    0
 ...erentialFieldDataNotAvailableException.php |    0
 .../DifferentialFieldParseException.php       |    0
 ...lFieldSpecificationIncompleteException.php |    0
 .../DifferentialFieldValidationException.php  |    0
 .../DifferentialDefaultFieldSelector.php      |    0
 .../{base => }/DifferentialFieldSelector.php  |    0
 ...fferentialApplyPatchFieldSpecification.php |    0
 ...ntialArcanistProjectFieldSpecification.php |    0
 ...DifferentialAuditorsFieldSpecification.php |    0
 .../DifferentialAuthorFieldSpecification.php  |    0
 ...rentialBlameRevisionFieldSpecification.php |    0
 .../DifferentialBranchFieldSpecification.php  |    0
 .../DifferentialCCsFieldSpecification.php     |    0
 .../DifferentialCommitsFieldSpecification.php |    0
 ...ferentialDateCreatedFieldSpecification.php |    0
 ...erentialDateModifiedFieldSpecification.php |    0
 ...erentialDependenciesFieldSpecification.php |    0
 ...ferentialExportPatchFieldSpecification.php |    0
 .../DifferentialFieldSpecification.php        |    0
 ...DifferentialGitSVNIDFieldSpecification.php |    0
 .../DifferentialHostFieldSpecification.php    |    0
 .../DifferentialLinesFieldSpecification.php   |    0
 .../DifferentialLintFieldSpecification.php    |    0
 ...entialManiphestTasksFieldSpecification.php |    0
 .../DifferentialPathFieldSpecification.php    |    0
 ...fferentialRevertPlanFieldSpecification.php |    0
 ...fferentialReviewedByFieldSpecification.php |    0
 ...ifferentialReviewersFieldSpecification.php |    0
 ...fferentialRevisionIDFieldSpecification.php |    0
 ...entialRevisionStatusFieldSpecification.php |    0
 .../DifferentialSummaryFieldSpecification.php |    0
 ...DifferentialTestPlanFieldSpecification.php |    0
 .../DifferentialTitleFieldSpecification.php   |    0
 .../DifferentialUnitFieldSpecification.php    |    0
 ...ferentialRevisionIDFieldParserTestCase.php |    0
 .../DifferentialCCWelcomeMail.php             |    0
 .../{comment => }/DifferentialCommentMail.php |    0
 .../DifferentialDiffContentMail.php           |    0
 .../DifferentialExceptionMail.php             |    0
 .../mail/{base => }/DifferentialMail.php      |    0
 .../{newdiff => }/DifferentialNewDiffMail.php |    0
 .../DifferentialReviewRequestMail.php         |    0
 .../DifferentialChangesetParser.php           |    0
 .../DifferentialRevisionQuery.php             |    0
 .../DifferentialAffectedPath.php              |    0
 .../DifferentialAuxiliaryField.php            |    0
 .../{changeset => }/DifferentialChangeset.php |    0
 .../{comment => }/DifferentialComment.php     |    0
 .../storage/{base => }/DifferentialDAO.php    |    0
 .../storage/{diff => }/DifferentialDiff.php   |    0
 .../DifferentialDiffProperty.php              |    0
 .../storage/{hunk => }/DifferentialHunk.php   |    0
 .../DifferentialInlineComment.php             |    0
 .../{revision => }/DifferentialRevision.php   |    0
 .../DifferentialAddCommentView.php            |    0
 .../DifferentialChangesetDetailView.php       |    0
 .../DifferentialChangesetListView.php         |    0
 .../DifferentialDiffTableOfContentsView.php   |    0
 .../DifferentialInlineCommentEditView.php     |    0
 .../DifferentialInlineCommentView.php         |    0
 .../DifferentialLocalCommitsView.php          |    0
 .../DifferentialPrimaryPaneView.php           |    0
 .../DifferentialResultsTableView.php          |    0
 .../DifferentialRevisionCommentListView.php   |    0
 .../DifferentialRevisionCommentView.php       |    0
 .../DifferentialRevisionDetailView.php        |    0
 .../DifferentialRevisionListView.php          |    0
 .../DifferentialRevisionStatsView.php         |    0
 .../DifferentialRevisionUpdateHistoryView.php |    0
 .../{tag => }/DiffusionRepositoryTag.php      |    0
 .../DiffusionBranchTableController.php        |    0
 .../DiffusionBrowseController.php             |    0
 .../DiffusionBrowseFileController.php         |    0
 .../DiffusionChangeController.php             |    0
 .../DiffusionCommitController.php             |    0
 .../{base => }/DiffusionController.php        |    0
 .../{diff => }/DiffusionDiffController.php    |    0
 .../DiffusionExternalController.php           |    0
 .../DiffusionHistoryController.php            |    0
 .../{home => }/DiffusionHomeController.php    |    0
 .../DiffusionInlineCommentController.php      |    0
 .../DiffusionLastModifiedController.php       |    0
 .../DiffusionPathCompleteController.php       |    0
 .../DiffusionPathValidateController.php       |    0
 .../DiffusionRepositoryController.php         |    0
 .../DiffusionSymbolController.php             |    0
 .../DiffusionTagListController.php            |    0
 .../DiffusionBranchInformation.php            |    0
 .../DiffusionFileContent.php                  |    0
 .../{pathchange => }/DiffusionPathChange.php  |    0
 .../DiffusionRepositoryPath.php               |    0
 .../{setup => }/DiffusionSetupException.php   |    0
 .../query/{path => }/DiffusionPathQuery.php   |    0
 .../query/{base => }/DiffusionQuery.php       |    0
 .../{symbol => }/DiffusionSymbolQuery.php     |    0
 .../{base => }/DiffusionBranchQuery.php       |    0
 .../{git => }/DiffusionGitBranchQuery.php     |    0
 .../DiffusionMercurialBranchQuery.php         |    0
 .../DiffusionGitBranchQueryTestCase.php       |    0
 .../{base => }/DiffusionBrowseQuery.php       |    0
 .../{git => }/DiffusionGitBrowseQuery.php     |    0
 .../DiffusionMercurialBrowseQuery.php         |    0
 .../{svn => }/DiffusionSvnBrowseQuery.php     |    0
 .../{base => }/DiffusionCommitTagsQuery.php   |    0
 .../{git => }/DiffusionGitCommitTagsQuery.php |    0
 .../DiffusionMercurialCommitTagsQuery.php     |    0
 .../{svn => }/DiffusionSvnCommitTagsQuery.php |    0
 .../{base => }/DiffusionContainsQuery.php     |    0
 .../{git => }/DiffusionGitContainsQuery.php   |    0
 .../DiffusionMercurialContainsQuery.php       |    0
 .../{svn => }/DiffusionSvnContainsQuery.php   |    0
 .../diff/{base => }/DiffusionDiffQuery.php    |    0
 .../diff/{git => }/DiffusionGitDiffQuery.php  |    0
 .../DiffusionMercurialDiffQuery.php           |    0
 .../diff/{svn => }/DiffusionSvnDiffQuery.php  |    0
 .../{base => }/DiffusionFileContentQuery.php  |    0
 .../DiffusionGitFileContentQuery.php          |    0
 .../DiffusionMercurialFileContentQuery.php    |    0
 .../DiffusionSvnFileContentQuery.php          |    0
 .../{git => }/DiffusionGitHistoryQuery.php    |    0
 .../{base => }/DiffusionHistoryQuery.php      |    0
 .../DiffusionMercurialHistoryQuery.php        |    0
 .../{svn => }/DiffusionSvnHistoryQuery.php    |    0
 .../DiffusionGitLastModifiedQuery.php         |    0
 .../{base => }/DiffusionLastModifiedQuery.php |    0
 .../DiffusionMercurialLastModifiedQuery.php   |    0
 .../DiffusionSvnLastModifiedQuery.php         |    0
 .../DiffusionGitMergedCommitsQuery.php        |    0
 .../DiffusionMercurialMergedCommitsQuery.php  |    0
 .../DiffusionMergedCommitsQuery.php           |    0
 .../DiffusionSvnMergedCommitsQuery.php        |    0
 .../DiffusionCommitParentsQuery.php           |    0
 .../DiffusionGitCommitParentsQuery.php        |    0
 .../DiffusionMercurialCommitParentsQuery.php  |    0
 .../DiffusionSvnCommitParentsQuery.php        |    0
 .../{base => }/DiffusionPathChangeQuery.php   |    0
 .../{base => }/DiffusionPathIDQuery.php       |    0
 .../__tests__/DiffusionPathQueryTestCase.php  |    0
 .../{git => }/DiffusionGitRawDiffQuery.php    |    0
 .../DiffusionMercurialRawDiffQuery.php        |    0
 .../{base => }/DiffusionRawDiffQuery.php      |    0
 .../{svn => }/DiffusionSvnRawDiffQuery.php    |    0
 .../DiffusionGitRenameHistoryQuery.php        |    0
 .../DiffusionMercurialRenameHistoryQuery.php  |    0
 .../DiffusionRenameHistoryQuery.php           |    0
 .../DiffusionSvnRenameHistoryQuery.php        |    0
 .../{git => }/DiffusionGitTagListQuery.php    |    0
 .../DiffusionMercurialTagListQuery.php        |    0
 .../{svn => }/DiffusionSvnTagListQuery.php    |    0
 .../{base => }/DiffusionTagListQuery.php      |    0
 .../request/{git => }/DiffusionGitRequest.php |    0
 .../DiffusionMercurialRequest.php             |    0
 .../request/{base => }/DiffusionRequest.php   |    0
 .../request/{svn => }/DiffusionSvnRequest.php |    0
 .../__tests__/DiffusionURITestCase.php        |    0
 .../DiffusionBranchTableView.php              |    0
 .../DiffusionBrowseTableView.php              |    0
 .../DiffusionCommentListView.php              |    0
 .../{comment => }/DiffusionCommentView.php    |    0
 .../DiffusionCommitChangeTableView.php        |    0
 .../DiffusionEmptyResultView.php              |    0
 .../DiffusionHistoryTableView.php             |    0
 .../{taglist => }/DiffusionTagListView.php    |    0
 .../view/{base => }/DiffusionView.php         |    0
 .../PhabricatorDirectoryController.php        |    0
 .../PhabricatorDirectoryMainController.php    |    0
 .../storage/{draft => }/PhabricatorDraft.php  |    0
 .../{base => }/PhabricatorDraftDAO.php        |    0
 .../{resource => }/DrydockAllocator.php       |    0
 .../{worker => }/DrydockAllocatorWorker.php   |    0
 .../blueprint/{base => }/DrydockBlueprint.php |    0
 .../{ec2host => }/DrydockEC2HostBlueprint.php |    0
 .../DrydockLocalHostBlueprint.php             |    0
 .../DrydockRemoteHostBlueprint.php            |    0
 ...DrydockPhabricatorApplicationBlueprint.php |    0
 .../DrydockApacheWebrootBlueprint.php         |    0
 .../constants/{base => }/DrydockConstants.php |    0
 .../{leasestatus => }/DrydockLeaseStatus.php  |    0
 .../DrydockResourceStatus.php                 |    0
 .../{base => }/DrydockController.php          |    0
 .../DrydockLeaseListController.php            |    0
 .../{log => }/DrydockLogController.php        |    0
 .../DrydockResourceAllocateController.php     |    0
 .../DrydockResourceListController.php         |    0
 .../interface/{base => }/DrydockInterface.php |    0
 .../{base => }/DrydockCommandInterface.php    |    0
 .../DrydockLocalCommandInterface.php          |    0
 .../{ssh => }/DrydockSSHCommandInterface.php  |    0
 .../DrydockApacheWebrootInterface.php         |    0
 .../{base => }/DrydockWebrootInterface.php    |    0
 .../query/{log => }/DrydockLogQuery.php       |    0
 .../drydock/storage/{base => }/DrydockDAO.php |    0
 .../storage/{lease => }/DrydockLease.php      |    0
 .../drydock/storage/{log => }/DrydockLog.php  |    0
 .../{resource => }/DrydockResource.php        |    0
 .../feed/{query => }/PhabricatorFeedQuery.php |    0
 .../PhabricatorFeedStoryPublisher.php         |    0
 .../{feed => }/PhabricatorFeedBuilder.php     |    0
 .../{base => }/PhabricatorFeedConstants.php   |    0
 .../PhabricatorFeedStoryTypeConstants.php     |    0
 .../{base => }/PhabricatorFeedController.php  |    0
 .../PhabricatorFeedPublicStreamController.php |    0
 .../storage/{base => }/PhabricatorFeedDAO.php |    0
 .../{story => }/PhabricatorFeedStoryData.php  |    0
 .../PhabricatorFeedStoryReference.php         |    0
 .../story/{base => }/PhabricatorFeedStory.php |    0
 .../{audit => }/PhabricatorFeedStoryAudit.php |    0
 .../PhabricatorFeedStoryDifferential.php      |    0
 .../PhabricatorFeedStoryManiphest.php         |    0
 .../PhabricatorFeedStoryPhriction.php         |    0
 .../PhabricatorFeedStoryProject.php           |    0
 .../PhabricatorFeedStoryStatus.php            |    0
 .../PhabricatorFeedStoryUnknown.php           |    0
 .../{story => }/PhabricatorFeedStoryView.php  |    0
 .../view/{base => }/PhabricatorFeedView.php   |    0
 .../PhabricatorImageTransformer.php           |    0
 .../{base => }/PhabricatorFileController.php  |    0
 .../PhabricatorFileDataController.php         |    0
 .../PhabricatorFileDeleteController.php       |    0
 .../PhabricatorFileDropUploadController.php   |    0
 .../PhabricatorFileInfoController.php         |    0
 .../PhabricatorFileListController.php         |    0
 .../PhabricatorFileMacroDeleteController.php  |    0
 .../PhabricatorFileMacroEditController.php    |    0
 .../PhabricatorFileMacroListController.php    |    0
 .../PhabricatorFileProxyController.php        |    0
 .../PhabricatorFileShortcutController.php     |    0
 .../PhabricatorFileTransformController.php    |    0
 .../PhabricatorFileUploadController.php       |    0
 .../PhabricatorFileStorageEngine.php          |    0
 .../PhabricatorLocalDiskFileStorageEngine.php |    0
 .../PhabricatorMySQLFileStorageEngine.php     |    0
 .../PhabricatorS3FileStorageEngine.php        |    0
 ...icatorDefaultFileStorageEngineSelector.php |    0
 .../PhabricatorFileStorageEngineSelector.php  |    0
 ...catorFileStorageConfigurationException.php |    0
 .../PhabricatorFileUploadException.php        |    0
 .../storage/{file => }/PhabricatorFile.php    |    0
 .../storage/{base => }/PhabricatorFileDAO.php |    0
 .../PhabricatorFileImageMacro.php             |    0
 .../PhabricatorFileProxyImage.php             |    0
 .../PhabricatorFileStorageBlob.php            |    0
 .../PhabricatorTransformedFile.php            |    0
 .../PhabricatorFileSideNavView.php            |    0
 .../PhabricatorFileUploadView.php             |    0
 .../{color => }/PhabricatorFlagColor.php      |    0
 .../{base => }/PhabricatorFlagConstants.php   |    0
 .../{base => }/PhabricatorFlagController.php  |    0
 .../PhabricatorFlagDeleteController.php       |    0
 .../PhabricatorFlagEditController.php         |    0
 .../PhabricatorFlagListController.php         |    0
 .../query/{flag => }/PhabricatorFlagQuery.php |    0
 .../storage/{flag => }/PhabricatorFlag.php    |    0
 .../storage/{base => }/PhabricatorFlagDAO.php |    0
 .../{list => }/PhabricatorFlagListView.php    |    0
 .../storage/{base => }/HarbormasterDAO.php    |    0
 .../HarbormasterScratchTable.php              |    0
 .../{base => }/PhabricatorHelpController.php  |    0
 ...bricatorHelpKeyboardShortcutController.php |    0
 .../{commit => }/HeraldCommitAdapter.php      |    0
 .../HeraldDifferentialRevisionAdapter.php     |    0
 .../{dryrun => }/HeraldDryRunAdapter.php      |    0
 .../{base => }/HeraldObjectAdapter.php        |    0
 .../{action => }/HeraldActionConfig.php       |    0
 .../{condition => }/HeraldConditionConfig.php |    0
 .../HeraldContentTypeConfig.php               |    0
 .../config/{field => }/HeraldFieldConfig.php  |    0
 .../HeraldRepetitionPolicyConfig.php          |    0
 .../{ruletype => }/HeraldRuleTypeConfig.php   |    0
 .../{valuetype => }/HeraldValueTypeConfig.php |    0
 .../{base => }/HeraldController.php           |    0
 .../{delete => }/HeraldDeleteController.php   |    0
 .../{home => }/HeraldHomeController.php       |    0
 .../{new => }/HeraldNewController.php         |    0
 .../{rule => }/HeraldRuleController.php       |    0
 .../HeraldRuleEditHistoryController.php       |    0
 .../HeraldTestConsoleController.php           |    0
 .../HeraldTranscriptController.php            |    0
 .../HeraldTranscriptListController.php        |    0
 .../engine/{effect => }/HeraldEffect.php      |    0
 .../engine/{engine => }/HeraldEngine.php      |    0
 .../HeraldInvalidConditionException.php       |    0
 .../HeraldInvalidFieldException.php           |    0
 .../HeraldRecursiveConditionsException.php    |    0
 .../query/{log => }/HeraldEditLogQuery.php    |    0
 .../query/{rule => }/HeraldRuleQuery.php      |    0
 .../storage/{action => }/HeraldAction.php     |    0
 .../{condition => }/HeraldCondition.php       |    0
 .../herald/storage/{base => }/HeraldDAO.php   |    0
 .../herald/storage/{rule => }/HeraldRule.php  |    0
 .../{edithistory => }/HeraldRuleEdit.php      |    0
 .../{apply => }/HeraldApplyTranscript.php     |    0
 .../HeraldConditionTranscript.php             |    0
 .../{object => }/HeraldObjectTranscript.php   |    0
 .../{rule => }/HeraldRuleTranscript.php       |    0
 .../{base => }/HeraldTranscript.php           |    0
 .../HeraldRuleEditHistoryView.php             |    0
 .../{rulelist => }/HeraldRuleListView.php     |    0
 .../ManiphestReplyHandler.php                 |    0
 .../{query => }/ManiphestTaskQuery.php        |    0
 ...hestAuxiliaryFieldDefaultSpecification.php |    0
 .../ManiphestAuxiliaryFieldSpecification.php  |    0
 .../ManiphestAuxiliaryFieldTypeException.php  |    0
 ...phestAuxiliaryFieldValidationException.php |    0
 .../{action => }/ManiphestAction.php          |    0
 .../{base => }/ManiphestConstants.php         |    0
 .../{owner => }/ManiphestTaskOwner.php        |    0
 .../{priority => }/ManiphestTaskPriority.php  |    0
 .../{status => }/ManiphestTaskStatus.php      |    0
 .../ManiphestTransactionType.php              |    0
 .../ManiphestBatchEditController.php          |    0
 .../{base => }/ManiphestController.php        |    0
 .../ManiphestExportController.php             |    0
 .../ManiphestReportController.php             |    0
 .../ManiphestSavedQueryDeleteController.php   |    0
 .../ManiphestSavedQueryEditController.php     |    0
 .../ManiphestSavedQueryListController.php     |    0
 .../ManiphestSubpriorityController.php        |    0
 ...niphestTaskDescriptionChangeController.php |    0
 ...iphestTaskDescriptionPreviewController.php |    0
 .../ManiphestTaskDetailController.php         |    0
 .../ManiphestTaskEditController.php           |    0
 .../ManiphestTaskListController.php           |    0
 .../ManiphestTransactionPreviewController.php |    0
 .../ManiphestTransactionSaveController.php    |    0
 .../ManiphestTransactionEditor.php            |    0
 .../ManiphestDefaultTaskExtensions.php        |    0
 .../{base => }/ManiphestTaskExtensions.php    |    0
 .../storage/{base => }/ManiphestDAO.php       |    0
 .../{savedquery => }/ManiphestSavedQuery.php  |    0
 .../storage/{task => }/ManiphestTask.php      |    0
 .../ManiphestTaskAuxiliaryStorage.php         |    0
 .../ManiphestTaskProject.php                  |    0
 .../ManiphestTaskSubscriber.php               |    0
 .../ManiphestTransaction.php                  |    0
 .../{tasklist => }/ManiphestTaskListView.php  |    0
 .../ManiphestTaskProjectsView.php             |    0
 .../ManiphestTaskSummaryView.php              |    0
 .../ManiphestTransactionDetailView.php        |    0
 .../ManiphestTransactionListView.php          |    0
 .../view/{base => }/ManiphestView.php         |    0
 .../{engine => }/PhabricatorMarkupEngine.php  |    0
 .../PhabricatorSyntaxHighlighter.php          |    0
 .../PhabricatorMetaMTAEmailBodyParser.php     |    0
 .../{worker => }/PhabricatorMetaMTAWorker.php |    0
 ...bricatorMetaMTAEmailBodyParserTestCase.php |    0
 .../PhabricatorMailImplementationAdapter.php  |    0
 ...atorMailImplementationAmazonSESAdapter.php |    0
 ...MailImplementationPHPMailerLiteAdapter.php |    0
 ...catorMailImplementationSendGridAdapter.php |    0
 ...abricatorMailImplementationTestAdapter.php |    0
 .../constants/{base => }/MetaMTAConstants.php |    0
 .../MetaMTANotificationType.php               |    0
 .../{source => }/PhabricatorContentSource.php |    0
 .../PhabricatorContentSourceView.php          |    0
 .../PhabricatorMetaMTAController.php          |    0
 .../PhabricatorMetaMTAListController.php      |    0
 ...icatorMetaMTAMailingListEditController.php |    0
 ...abricatorMetaMTAMailingListsController.php |    0
 .../PhabricatorMetaMTAReceiveController.php   |    0
 ...abricatorMetaMTAReceivedListController.php |    0
 .../PhabricatorMetaMTASendController.php      |    0
 ...icatorMetaMTASendGridReceiveController.php |    0
 .../PhabricatorMetaMTAViewController.php      |    0
 .../PhabricatorMailReplyHandler.php           |    0
 .../PhabricatorMetaMTAAttachment.php          |    0
 .../{base => }/PhabricatorMetaMTADAO.php      |    0
 .../{mail => }/PhabricatorMetaMTAMail.php     |    0
 .../PhabricatorMetaMTAMailingList.php         |    0
 .../PhabricatorMetaMTAReceivedMail.php        |    0
 .../PhabricatorMetaMTAMailTestCase.php        |    0
 .../PhabricatorAphlictTestPageController.php  |    0
 .../PhabricatorNotificationsController.php    |    0
 .../PhabricatorOAuthResponse.php              |    0
 .../{server => }/PhabricatorOAuthServer.php   |    0
 .../PhabricatorOAuthServerScope.php           |    0
 .../PhabricatorOAuthServerTestCase.php        |    0
 .../PhabricatorOAuthServerAuthController.php  |    0
 .../PhabricatorOAuthServerController.php      |    0
 .../PhabricatorOAuthServerTestController.php  |    0
 .../PhabricatorOAuthServerTokenController.php |    0
 .../PhabricatorOAuthClientBaseController.php  |    0
 ...PhabricatorOAuthClientDeleteController.php |    0
 .../PhabricatorOAuthClientEditController.php  |    0
 .../PhabricatorOAuthClientListController.php  |    0
 .../PhabricatorOAuthClientViewController.php  |    0
 ...OAuthClientAuthorizationBaseController.php |    0
 ...uthClientAuthorizationDeleteController.php |    0
 ...OAuthClientAuthorizationEditController.php |    0
 ...OAuthClientAuthorizationListController.php |    0
 ...abricatorOAuthClientAuthorizationQuery.php |    0
 .../PhabricatorOAuthServerClientQuery.php     |    0
 .../PhabricatorOAuthClientAuthorization.php   |    0
 .../PhabricatorOAuthServerAccessToken.php     |    0
 ...habricatorOAuthServerAuthorizationCode.php |    0
 .../PhabricatorOAuthServerClient.php          |    0
 .../{base => }/PhabricatorOAuthServerDAO.php  |    0
 .../OwnersPackageReplyHandler.php             |    0
 .../PhabricatorOwnersController.php           |    0
 .../PhabricatorOwnersDeleteController.php     |    0
 .../PhabricatorOwnersDetailController.php     |    0
 .../PhabricatorOwnersEditController.php       |    0
 .../PhabricatorOwnersListController.php       |    0
 .../mail/{create => }/PackageCreateMail.php   |    0
 .../mail/{delete => }/PackageDeleteMail.php   |    0
 .../owners/mail/{base => }/PackageMail.php    |    0
 .../mail/{modify => }/PackageModifyMail.php   |    0
 .../{path => }/PhabricatorOwnerPathQuery.php  |    0
 .../{base => }/PhabricatorOwnersDAO.php       |    0
 .../{owner => }/PhabricatorOwnersOwner.php    |    0
 .../PhabricatorOwnersPackage.php              |    0
 .../{path => }/PhabricatorOwnersPath.php      |    0
 .../{base => }/PhabricatorPasteController.php |    0
 .../PhabricatorPasteListController.php        |    0
 .../PhabricatorPasteViewController.php        |    0
 .../{paste => }/PhabricatorPasteQuery.php     |    0
 .../storage/{paste => }/PhabricatorPaste.php  |    0
 .../{base => }/PhabricatorPasteDAO.php        |    0
 .../{query => }/PhabricatorPeopleQuery.php    |    0
 .../{editor => }/PhabricatorUserEditor.php    |    0
 ...PhabricatorEmailVerificationController.php |    0
 .../PhabricatorPeopleController.php           |    0
 .../PhabricatorPeopleEditController.php       |    0
 .../PhabricatorPeopleListController.php       |    0
 .../PhabricatorPeopleLogsController.php       |    0
 .../PhabricatorPeopleProfileController.php    |    0
 .../PhabricatorUserSettingsController.php     |    0
 ...atorUserAccountSettingsPanelController.php |    0
 ...atorUserConduitSettingsPanelController.php |    0
 ...EmailPreferenceSettingsPanelController.php |    0
 ...icatorUserEmailSettingsPanelController.php |    0
 ...icatorUserOAuthSettingsPanelController.php |    0
 ...torUserPasswordSettingsPanelController.php |    0
 ...rUserPreferenceSettingsPanelController.php |    0
 ...atorUserProfileSettingsPanelController.php |    0
 ...atorUserSSHKeysSettingsPanelController.php |    0
 ...catorUserSearchSettingsPanelController.php |    0
 ...PhabricatorUserSettingsPanelController.php |    0
 .../storage/{user => }/PhabricatorUser.php    |    0
 .../storage/{base => }/PhabricatorUserDAO.php |    0
 .../{email => }/PhabricatorUserEmail.php      |    0
 .../storage/{log => }/PhabricatorUserLog.php  |    0
 .../PhabricatorUserOAuthInfo.php              |    0
 .../PhabricatorUserPreferences.php            |    0
 .../{profile => }/PhabricatorUserProfile.php  |    0
 .../PhabricatorUserSSHKey.php                 |    0
 .../PhabricatorUserStatus.php                 |    0
 .../__tests__/PhabricatorUserTestCase.php     |    0
 .../controller/{base => }/PhameController.php |    0
 .../PhamePostDeleteController.php             |    0
 .../{edit => }/PhamePostEditController.php    |    0
 .../PhamePostPreviewController.php            |    0
 .../{view => }/PhamePostViewController.php    |    0
 .../{drafts => }/PhameDraftListController.php |    0
 .../PhamePostListBaseController.php           |    0
 .../{posts => }/PhamePostListController.php   |    0
 .../phame/query/{post => }/PhamePostQuery.php |    0
 .../phame/storage/{base => }/PhameDAO.php     |    0
 .../phame/storage/{post => }/PhamePost.php    |    0
 .../{postdetail => }/PhamePostDetailView.php  |    0
 .../view/{postlist => }/PhamePostListView.php |    0
 .../{graph => }/PhabricatorObjectGraph.php    |    0
 .../{handle => }/PhabricatorObjectHandle.php  |    0
 .../PhabricatorPHIDConstants.php              |    0
 .../{base => }/PhabricatorPHIDController.php  |    0
 .../PhabricatorPHIDLookupController.php       |    0
 .../PhabricatorObjectHandleData.php           |    0
 .../PhabricatorObjectHandleConstants.php      |    0
 .../PhabricatorObjectHandleStatus.php         |    0
 ...habricatorHandleObjectSelectorDataView.php |    0
 .../storage/{phid => }/PhabricatorPHID.php    |    0
 src/applications/phid/{utils => }/utils.php   |    0
 .../PhortuneMonthYearExpiryControl.php        |    0
 .../PhortuneStripeBaseController.php          |    0
 ...hortuneStripeTestPaymentFormController.php |    0
 .../PhortuneStripePaymentFormView.php         |    0
 .../{action => }/PhrictionActionConstants.php |    0
 .../{changetype => }/PhrictionChangeType.php  |    0
 .../{base => }/PhrictionConstants.php         |    0
 .../PhrictionDocumentStatus.php               |    0
 .../{base => }/PhrictionController.php        |    0
 .../PhrictionDeleteController.php             |    0
 .../{diff => }/PhrictionDiffController.php    |    0
 .../PhrictionDocumentController.php           |    0
 .../PhrictionDocumentPreviewController.php    |    0
 .../{edit => }/PhrictionEditController.php    |    0
 .../PhrictionHistoryController.php            |    0
 .../{list => }/PhrictionListController.php    |    0
 .../PhrictionDocumentEditor.php               |    0
 .../{content => }/PhrictionContent.php        |    0
 .../storage/{base => }/PhrictionDAO.php       |    0
 .../{document => }/PhrictionDocument.php      |    0
 .../__tests__/PhrictionDocumentTestCase.php   |    0
 .../{policy => }/PhabricatorPolicies.php      |    0
 .../PhabricatorPolicyCapability.php           |    0
 .../{base => }/PhabricatorPolicyConstants.php |    0
 .../{base => }/PhabricatorPolicyException.php |    0
 .../{policy => }/PhabricatorPolicyFilter.php  |    0
 .../PhabricatorPolicyInterface.php            |    0
 .../PhabricatorProjectConstants.php           |    0
 .../{status => }/PhabricatorProjectStatus.php |    0
 .../PhabricatorProjectTransactionType.php     |    0
 .../PhabricatorProjectController.php          |    0
 .../PhabricatorProjectCreateController.php    |    0
 .../PhabricatorProjectListController.php      |    0
 .../PhabricatorProjectProfileController.php   |    0
 ...habricatorProjectProfileEditController.php |    0
 .../PhabricatorProjectUpdateController.php    |    0
 .../PhabricatorProjectEditor.php              |    0
 ...abricatorProjectNameCollisionException.php |    0
 .../{project => }/PhabricatorProjectQuery.php |    0
 .../{project => }/PhabricatorProject.php      |    0
 .../PhabricatorProjectAffiliation.php         |    0
 .../{base => }/PhabricatorProjectDAO.php      |    0
 .../PhabricatorProjectProfile.php             |    0
 .../PhabricatorProjectSubproject.php          |    0
 .../PhabricatorProjectTransaction.php         |    0
 .../PhabricatorRepositoryType.php             |    0
 ...epositoryArcanistProjectEditController.php |    0
 .../PhabricatorRepositoryController.php       |    0
 .../PhabricatorRepositoryCreateController.php |    0
 .../PhabricatorRepositoryDeleteController.php |    0
 .../PhabricatorRepositoryEditController.php   |    0
 .../PhabricatorRepositoryListController.php   |    0
 .../PhabricatorMercurialGraphStream.php       |    0
 .../PhabricatorRepositoryPullLocalDaemon.php  |    0
 ...catorRepositoryPullLocalDaemonTestCase.php |    0
 ...torRepositoryCommitMessageDetailParser.php |    0
 ...sitoryDefaultCommitMessageDetailParser.php |    0
 .../PhabricatorRepository.php                 |    0
 .../PhabricatorRepositoryArcanistProject.php  |    0
 .../PhabricatorRepositoryAuditRequest.php     |    0
 .../PhabricatorRepositoryCommit.php           |    0
 .../PhabricatorRepositoryCommitData.php       |    0
 .../{base => }/PhabricatorRepositoryDAO.php   |    0
 .../PhabricatorRepositoryShortcut.php         |    0
 .../PhabricatorRepositorySymbol.php           |    0
 .../PhabricatorRepositoryTestCase.php         |    0
 ...habricatorRepositoryCommitHeraldWorker.php |    0
 ...habricatorRepositoryCommitOwnersWorker.php |    0
 ...habricatorRepositoryCommitParserWorker.php |    0
 ...atorRepositoryCommitChangeParserWorker.php |    0
 ...rRepositoryGitCommitChangeParserWorker.php |    0
 ...itoryMercurialCommitChangeParserWorker.php |    0
 ...rRepositorySvnCommitChangeParserWorker.php |    0
 ...torRepositoryCommitMessageParserWorker.php |    0
 ...RepositoryGitCommitMessageParserWorker.php |    0
 ...toryMercurialCommitMessageParserWorker.php |    0
 ...RepositorySvnCommitMessageParserWorker.php |    0
 .../{field => }/PhabricatorSearchField.php    |    0
 .../PhabricatorSearchRelationship.php         |    0
 .../{scope => }/PhabricatorSearchScope.php    |    0
 .../PhabricatorSearchAttachController.php     |    0
 .../PhabricatorSearchBaseController.php       |    0
 .../PhabricatorSearchController.php           |    0
 .../PhabricatorSearchIndexController.php      |    0
 .../PhabricatorSearchSelectController.php     |    0
 .../PhabricatorObjectAttachmentEditor.php     |    0
 .../PhabricatorJumpNavHandler.php             |    0
 .../{base => }/PhabricatorSearchEngine.php    |    0
 .../PhabricatorSearchEngineElastic.php        |    0
 .../PhabricatorSearchEngineMySQL.php          |    0
 .../PhabricatorSearchAbstractDocument.php     |    0
 .../PhabricatorSearchCommitIndexer.php        |    0
 .../PhabricatorSearchDifferentialIndexer.php  |    0
 .../PhabricatorSearchDocumentIndexer.php      |    0
 .../PhabricatorSearchManiphestIndexer.php     |    0
 .../PhabricatorSearchPhrictionIndexer.php     |    0
 .../PhabricatorSearchUserIndexer.php          |    0
 ...PhabricatorDefaultSearchEngineSelector.php |    0
 .../PhabricatorSearchEngineSelector.php       |    0
 .../{base => }/PhabricatorSearchDAO.php       |    0
 .../{query => }/PhabricatorSearchQuery.php    |    0
 .../PhabricatorSearchDocument.php             |    0
 .../PhabricatorSearchDocumentField.php        |    0
 .../PhabricatorSearchDocumentRelationship.php |    0
 .../PhabricatorSearchResultView.php           |    0
 .../PhabricatorSlowvoteController.php         |    0
 .../PhabricatorSlowvoteCreateController.php   |    0
 .../PhabricatorSlowvoteListController.php     |    0
 .../PhabricatorSlowvotePollController.php     |    0
 .../PhabricatorSlowvoteChoice.php             |    0
 .../PhabricatorSlowvoteComment.php            |    0
 .../{base => }/PhabricatorSlowvoteDAO.php     |    0
 .../PhabricatorSlowvoteOption.php             |    0
 .../{poll => }/PhabricatorSlowvotePoll.php    |    0
 .../PhabricatorStatusController.php           |    0
 ...torTypeaheadCommonDatasourceController.php |    0
 ...abricatorTypeaheadDatasourceController.php |    0
 .../PhabricatorUIExampleController.php        |    0
 .../PhabricatorUIExampleRenderController.php  |    0
 .../{reactor => }/JavelinReactorExample.php   |    0
 .../{client => }/JavelinViewExample.php       |    0
 .../JavelinViewExampleServerView.php          |    0
 .../{error => }/PhabricatorErrorExample.php   |    0
 .../{form => }/PhabricatorFormExample.php     |    0
 .../PhabricatorSortTableExample.php           |    0
 .../{base => }/PhabricatorUIExample.php       |    0
 .../PhabricatorUIListFilterExample.php        |    0
 .../{pager => }/PhabricatorUIPagerExample.php |    0
 .../PhabricatorUITooltipExample.php           |    0
 .../PhabricatorXHPASTViewController.php       |    0
 .../PhabricatorXHPASTViewFrameController.php  |    0
 ...habricatorXHPASTViewFramesetController.php |    0
 .../PhabricatorXHPASTViewInputController.php  |    0
 .../PhabricatorXHPASTViewPanelController.php  |    0
 .../PhabricatorXHPASTViewRunController.php    |    0
 .../PhabricatorXHPASTViewStreamController.php |    0
 .../PhabricatorXHPASTViewTreeController.php   |    0
 .../{base => }/PhabricatorXHPASTViewDAO.php   |    0
 .../PhabricatorXHPASTViewParseTree.php        |    0
 .../PhabricatorXHProfController.php           |    0
 .../PhabricatorXHProfProfileController.php    |    0
 .../PhabricatorXHProfProfileSymbolView.php    |    0
 .../PhabricatorXHProfProfileTopLevelView.php  |    0
 .../PhabricatorXHProfProfileView.php          |    0
 .../{accesslog => }/PhabricatorAccessLog.php  |    0
 .../{env => }/PhabricatorEnv.php              |    0
 .../{env => }/PhabricatorScopedEnv.php        |    0
 .../{setup => }/PhabricatorSetup.php          |    0
 .../__tests__/PhabricatorEnvTestCase.php      |    0
 .../celerity/{api => }/CelerityAPI.php        |    0
 .../CelerityResourceController.php            |    0
 .../{graph => }/CelerityResourceGraph.php     |    0
 .../{map => }/CelerityResourceMap.php         |    0
 .../CelerityResourceTransformer.php           |    0
 .../CelerityStaticResourceResponse.php        |    0
 .../CelerityResourceTransformerTestCase.php   |    2 +-
 .../data => __tests__/transformer}/min.css    |    0
 .../data => __tests__/transformer}/xform.css  |    0
 .../celerity/{api/utils.php => api.php}       |    0
 .../celerity/{map/utils.php => map.php}       |    0
 .../daemon/{base => }/PhabricatorDaemon.php   |    0
 .../PhabricatorDaemonControl.php              |    0
 .../PhabricatorGarbageCollectorDaemon.php     |    0
 .../PhabricatorDaemonReference.php            |    0
 .../irc/{bot => }/PhabricatorIRCBot.php       |    0
 .../{message => }/PhabricatorIRCMessage.php   |    0
 ...atorIRCDifferentialNotificationHandler.php |    0
 .../{base => }/PhabricatorIRCHandler.php      |    0
 .../{log => }/PhabricatorIRCLogHandler.php    |    0
 .../PhabricatorIRCMacroHandler.php            |    0
 .../PhabricatorIRCObjectNameHandler.php       |    0
 .../PhabricatorIRCProtocolHandler.php         |    0
 .../PhabricatorIRCWhatsNewHandler.php         |    0
 .../{base => }/PhabricatorDaemonDAO.php       |    0
 .../{log => }/PhabricatorDaemonLog.php        |    0
 .../{event => }/PhabricatorDaemonLogEvent.php |    0
 .../PhabricatorTimelineIterator.php           |    0
 .../PhabricatorTimelineCursor.php             |    0
 .../{base => }/PhabricatorTimelineDAO.php     |    0
 .../{event => }/PhabricatorTimelineEvent.php  |    0
 .../PhabricatorTimelineEventData.php          |    0
 .../PhabricatorTaskmasterDaemon.php           |    0
 .../{worker => }/PhabricatorWorker.php        |    0
 .../{base => }/PhabricatorWorkerDAO.php       |    0
 .../{task => }/PhabricatorWorkerTask.php      |    0
 .../PhabricatorWorkerTaskData.php             |    0
 .../PhabricatorGoodForNothingWorker.php       |    0
 .../PhabricatorChangesetResponse.php          |    0
 .../PhabricatorDifferenceEngine.php           |    0
 .../PhabricatorInlineCommentController.php    |    0
 .../PhabricatorInlineCommentInterface.php     |    0
 .../PhabricatorInlineSummaryView.php          |    0
 .../{config => }/PhabricatorEdgeConfig.php    |    0
 .../{base => }/PhabricatorEdgeConstants.php   |    0
 .../{edge => }/PhabricatorEdgeEditor.php      |    0
 .../query/{edge => }/PhabricatorEdgeQuery.php |    0
 .../events/{event => }/PhabricatorEvent.php   |    0
 .../{engine => }/PhabricatorEventEngine.php   |    0
 .../{type => }/PhabricatorEventType.php       |    0
 .../javelin/{api => }/Javelin.php             |    0
 .../javelin/{markup => }/markup.php           |    0
 .../{engine => }/PhabricatorLintEngine.php    |    0
 .../PhabricatorSymbolNameLinter.php           |    0
 .../PhabricatorJavelinLinter.php              |    0
 .../PhabricatorRemarkupRuleDifferential.php   |    0
 .../PhabricatorRemarkupRuleDiffusion.php      |    0
 .../PhabricatorRemarkupRuleEmbedFile.php      |    0
 .../PhabricatorRemarkupRuleImageMacro.php     |    0
 .../PhabricatorRemarkupRuleManiphest.php      |    0
 .../PhabricatorRemarkupRuleMention.php        |    0
 .../PhabricatorRemarkupRuleObjectHandle.php   |    0
 .../PhabricatorRemarkupRuleObjectName.php     |    0
 .../PhabricatorRemarkupRulePaste.php          |    0
 .../PhabricatorRemarkupRulePhriction.php      |    0
 .../PhabricatorRemarkupRuleProxyImage.php     |    0
 .../PhabricatorRemarkupRuleYoutube.php        |    0
 ...bricatorRemarkupRuleDifferentialHandle.php |    0
 ...PhabricatorRemarkupRuleManiphestHandle.php |    0
 .../PhabricatorOffsetPagedQuery.php           |    0
 .../query/{base => }/PhabricatorQuery.php     |    0
 .../PhabricatorIDPagedPolicyQuery.php         |    0
 .../{base => }/PhabricatorPolicyQuery.php     |    0
 .../PhabricatorBuiltinPatchList.php           |    0
 .../{base => }/PhabricatorSQLPatchList.php    |    0
 .../PhabricatorStorageManagementAPI.php       |    0
 .../{patch => }/PhabricatorStoragePatch.php   |    0
 ...atorStorageManagementDatabasesWorkflow.php |    0
 ...icatorStorageManagementDestroyWorkflow.php |    0
 ...abricatorStorageManagementDumpWorkflow.php |    0
 ...ricatorStorageManagementStatusWorkflow.php |    0
 ...icatorStorageManagementUpgradeWorkflow.php |    0
 .../PhabricatorStorageManagementWorkflow.php  |    0
 .../{testcase => }/PhabricatorTestCase.php    |    0
 .../__tests__/PhabricatorTrivialTestCase.php  |    0
 .../PhabricatorStorageFixtureScopeGuard.php   |    0
 .../util/{hash => }/PhabricatorHash.php       |    0
 .../util/{slug => }/PhabricatorSlug.php       |    0
 .../__tests__/PhabricatorSlugTestCase.php     |    0
 .../AphrontDatabaseTransactionState.php       |    0
 .../__tests__/QueryFormattingTestCase.php     |    0
 .../{base => }/AphrontDatabaseConnection.php  |    0
 .../AphrontIsolatedDatabaseConnection.php     |    0
 ...rontIsolatedDatabaseConnectionTestCase.php |    0
 ...AphrontMySQLDatabaseConnectionTestCase.php |    0
 .../AphrontMySQLDatabaseConnection.php        |    0
 .../AphrontMySQLDatabaseConnectionBase.php    |    0
 .../AphrontMySQLiDatabaseConnection.php       |    0
 .../AphrontQueryAccessDeniedException.php     |    0
 .../AphrontQueryConnectionException.php       |    0
 .../AphrontQueryConnectionLostException.php   |    0
 .../AphrontQueryCountException.php            |    0
 .../AphrontQueryDeadlockException.php         |    0
 .../AphrontQueryDuplicateKeyException.php     |    0
 .../{base => }/AphrontQueryException.php      |    0
 .../AphrontQueryObjectMissingException.php    |    0
 .../AphrontQueryParameterException.php        |    0
 .../AphrontQueryRecoverableException.php      |    0
 .../AphrontQuerySchemaException.php           |    0
 src/storage/lisk/{dao => }/LiskDAO.php        |    0
 src/storage/lisk/{dao => }/LiskDAOSet.php     |    0
 .../LiskEphemeralObjectException.php          |    0
 .../__tests__/LiskFixtureTestCase.php         |    0
 .../__tests__/LiskIsolationTestCase.php       |    0
 .../__tests__/LiskIsolationTestDAO.php        |    0
 .../LiskIsolationTestDAOException.php         |    0
 src/storage/{qsprintf => }/qsprintf.php       |    0
 src/storage/{queryfx => }/queryfx.php         |    0
 src/view/{dialog => }/AphrontDialogView.php   |    0
 .../{javelin-view => }/AphrontJavelinView.php |    0
 src/view/{null => }/AphrontNullView.php       |    0
 src/view/{base => }/AphrontView.php           |    0
 .../PhabricatorLocalTimeTestCase.php          |    0
 .../__tests__/PhabricatorUnitsTestCase.php    |    0
 .../AphrontAttachedFileView.php               |    0
 .../{idpager => }/AphrontIDPagerView.php      |    0
 .../control/{pager => }/AphrontPagerView.php  |    0
 .../control/{table => }/AphrontTableView.php  |    0
 .../AphrontTokenizerTemplateView.php          |    0
 .../AphrontTypeaheadTemplateView.php          |    0
 .../PhabricatorObjectSelectorDialog.php       |    0
 .../form/{error => }/AphrontErrorView.php     |    0
 .../form/{inset => }/AphrontFormInsetView.php |    0
 .../{layout => }/AphrontFormLayoutView.php    |    0
 src/view/form/{base => }/AphrontFormView.php  |    0
 .../AphrontFormCheckboxControl.php            |    0
 .../control/{base => }/AphrontFormControl.php |    0
 .../{date => }/AphrontFormDateControl.php     |    0
 .../AphrontFormDividerControl.php             |    0
 .../AphrontFormDragAndDropUploadControl.php   |    0
 .../{file => }/AphrontFormFileControl.php     |    0
 .../{markup => }/AphrontFormMarkupControl.php |    0
 .../AphrontFormPasswordControl.php            |    0
 .../{policy => }/AphrontFormPolicyControl.php |    0
 .../AphrontFormRadioButtonControl.php         |    0
 .../AphrontFormRecaptchaControl.php           |    0
 .../{select => }/AphrontFormSelectControl.php |    0
 .../{static => }/AphrontFormStaticControl.php |    0
 .../{submit => }/AphrontFormSubmitControl.php |    0
 .../AphrontFormTextAreaControl.php            |    0
 .../{text => }/AphrontFormTextControl.php     |    0
 .../AphrontFormToggleButtonsControl.php       |    0
 .../AphrontFormTokenizerControl.php           |    0
 .../AphrontContextBarView.php                 |    0
 .../layout/{crumbs => }/AphrontCrumbsView.php |    0
 .../AphrontFilePreviewView.php                |    0
 .../AphrontListFilterView.php                 |    0
 .../{minipanel => }/AphrontMiniPanelView.php  |    0
 .../layout/{more => }/AphrontMoreView.php     |    0
 .../layout/{panel => }/AphrontPanelView.php   |    0
 .../AphrontSideNavFilterView.php              |    0
 .../{sidenav => }/AphrontSideNavView.php      |    0
 .../PhabricatorProfileHeaderView.php          |    0
 .../PhabricatorTransactionView.php            |    0
 .../AphrontHeadsupActionListView.php          |    0
 .../{action => }/AphrontHeadsupActionView.php |    0
 .../{panel => }/AphrontHeadsupView.php        |    0
 src/view/page/{base => }/AphrontPageView.php  |    0
 .../AphrontRequestFailureView.php             |    0
 .../PhabricatorStandardPageView.php           |    0
 src/view/{utils => }/viewutils.php            |    0
 .../AphrontKeyboardShortcutsAvailableView.php |    0
 1033 files changed, 1053 insertions(+), 1053 deletions(-)
 rename src/aphront/{applicationconfiguration => }/AphrontApplicationConfiguration.php (100%)
 rename src/aphront/{controller => }/AphrontController.php (100%)
 rename src/aphront/{request => }/AphrontRequest.php (100%)
 rename src/aphront/{mapper => }/AphrontURIMapper.php (100%)
 rename src/aphront/{writeguard => }/AphrontWriteGuard.php (100%)
 rename src/aphront/{request => }/__tests__/AphrontRequestTestCase.php (100%)
 rename src/aphront/console/{controller => }/DarkConsoleController.php (100%)
 rename src/aphront/console/{core => }/DarkConsoleCore.php (100%)
 rename src/aphront/console/plugin/{config => }/DarkConsoleConfigPlugin.php (100%)
 rename src/aphront/console/plugin/{errorlog => }/DarkConsoleErrorLogPlugin.php (100%)
 rename src/aphront/console/plugin/{event => }/DarkConsoleEventPlugin.php (100%)
 rename src/aphront/console/plugin/{base => }/DarkConsolePlugin.php (100%)
 rename src/aphront/console/plugin/{request => }/DarkConsoleRequestPlugin.php (100%)
 rename src/aphront/console/plugin/{services => }/DarkConsoleServicesPlugin.php (100%)
 rename src/aphront/console/plugin/{xhprof => }/DarkConsoleXHProfPlugin.php (100%)
 rename src/aphront/console/plugin/errorlog/{api => }/DarkConsoleErrorLogPluginAPI.php (100%)
 rename src/aphront/console/plugin/event/{api => }/DarkConsoleEventPluginAPI.php (100%)
 rename src/aphront/console/plugin/xhprof/{api => }/DarkConsoleXHProfPluginAPI.php (100%)
 rename src/aphront/default/{configuration => }/AphrontDefaultApplicationConfiguration.php (100%)
 rename src/aphront/exception/{csrf => }/AphrontCSRFException.php (100%)
 rename src/aphront/exception/{base => }/AphrontException.php (100%)
 rename src/aphront/exception/{redirect => }/AphrontRedirectException.php (100%)
 rename src/aphront/exception/{usage => }/AphrontUsageException.php (100%)
 rename src/aphront/response/{304 => }/Aphront304Response.php (100%)
 rename src/aphront/response/{400 => }/Aphront400Response.php (100%)
 rename src/aphront/response/{403 => }/Aphront403Response.php (100%)
 rename src/aphront/response/{404 => }/Aphront404Response.php (100%)
 rename src/aphront/response/{ajax => }/AphrontAjaxResponse.php (100%)
 rename src/aphront/response/{dialog => }/AphrontDialogResponse.php (100%)
 rename src/aphront/response/{file => }/AphrontFileResponse.php (100%)
 rename src/aphront/response/{json => }/AphrontJSONResponse.php (100%)
 rename src/aphront/response/{plaintext => }/AphrontPlainTextResponse.php (100%)
 rename src/aphront/response/{proxy => }/AphrontProxyResponse.php (100%)
 rename src/aphront/response/{redirect => }/AphrontRedirectResponse.php (100%)
 rename src/aphront/response/{reload => }/AphrontReloadResponse.php (100%)
 rename src/aphront/response/{base => }/AphrontResponse.php (100%)
 rename src/aphront/response/{webpage => }/AphrontWebpageResponse.php (100%)
 rename src/aphront/sink/{base => }/AphrontHTTPSink.php (100%)
 rename src/aphront/sink/{test => }/AphrontIsolatedHTTPSink.php (100%)
 rename src/aphront/sink/{php => }/AphrontPHPHTTPSink.php (100%)
 rename src/aphront/sink/{base => }/__tests__/AphrontHTTPSinkTestCase.php (100%)
 rename src/aphront/writeguard/{scopeguard => }/AphrontScopedUnguardedWriteCapability.php (100%)
 rename src/applications/{policy => }/__tests__/PhabricatorPolicyTestCase.php (100%)
 rename src/applications/{policy => }/__tests__/PhabricatorPolicyTestObject.php (100%)
 rename src/applications/{policy => }/__tests__/PhabricatorPolicyTestQuery.php (100%)
 rename src/applications/audit/{replyhandler => }/PhabricatorAuditReplyHandler.php (100%)
 rename src/applications/audit/constants/{action => }/PhabricatorAuditActionConstants.php (100%)
 rename src/applications/audit/constants/{commitstatus => }/PhabricatorAuditCommitStatusConstants.php (100%)
 rename src/applications/audit/constants/{status => }/PhabricatorAuditStatusConstants.php (100%)
 rename src/applications/audit/controller/{addcomment => }/PhabricatorAuditAddCommentController.php (100%)
 rename src/applications/audit/controller/{base => }/PhabricatorAuditController.php (100%)
 rename src/applications/audit/controller/{list => }/PhabricatorAuditListController.php (100%)
 rename src/applications/audit/controller/{preview => }/PhabricatorAuditPreviewController.php (100%)
 rename src/applications/audit/editor/{comment => }/PhabricatorAuditCommentEditor.php (100%)
 rename src/applications/audit/query/{commit => }/PhabricatorAuditCommitQuery.php (100%)
 rename src/applications/audit/query/{audit => }/PhabricatorAuditQuery.php (100%)
 rename src/applications/audit/storage/{auditcomment => }/PhabricatorAuditComment.php (100%)
 rename src/applications/audit/storage/{base => }/PhabricatorAuditDAO.php (100%)
 rename src/applications/audit/storage/{inlinecommment => }/PhabricatorAuditInlineComment.php (100%)
 rename src/applications/audit/view/{commitlist => }/PhabricatorAuditCommitListView.php (100%)
 rename src/applications/audit/view/{list => }/PhabricatorAuditListView.php (100%)
 rename src/applications/auth/controller/{base => }/PhabricatorAuthController.php (100%)
 rename src/applications/auth/controller/{disabled => }/PhabricatorDisabledUserController.php (100%)
 rename src/applications/auth/controller/{email => }/PhabricatorEmailLoginController.php (100%)
 rename src/applications/auth/controller/{emailtoken => }/PhabricatorEmailTokenController.php (100%)
 rename src/applications/auth/controller/{login => }/PhabricatorLoginController.php (100%)
 rename src/applications/auth/controller/{validate => }/PhabricatorLoginValidateController.php (100%)
 rename src/applications/auth/controller/{logout => }/PhabricatorLogoutController.php (100%)
 rename src/applications/auth/controller/{mustverify => }/PhabricatorMustVerifyEmailController.php (100%)
 rename src/applications/auth/controller/{oauthdiagnostics => }/PhabricatorOAuthDiagnosticsController.php (100%)
 rename src/applications/auth/controller/{oauth => }/PhabricatorOAuthLoginController.php (100%)
 rename src/applications/auth/controller/{unlink => }/PhabricatorOAuthUnlinkController.php (100%)
 rename src/applications/auth/controller/{refresh => }/PhabricatorRefreshCSRFController.php (100%)
 rename src/applications/auth/controller/oauthregistration/{default => }/PhabricatorOAuthDefaultRegistrationController.php (100%)
 rename src/applications/auth/controller/oauthregistration/{base => }/PhabricatorOAuthRegistrationController.php (100%)
 rename src/applications/auth/oauth/provider/{base => }/PhabricatorOAuthProvider.php (100%)
 rename src/applications/auth/oauth/provider/{disqus => }/PhabricatorOAuthProviderDisqus.php (100%)
 rename src/applications/auth/oauth/provider/{exception => }/PhabricatorOAuthProviderException.php (100%)
 rename src/applications/auth/oauth/provider/{facebook => }/PhabricatorOAuthProviderFacebook.php (100%)
 rename src/applications/auth/oauth/provider/{github => }/PhabricatorOAuthProviderGitHub.php (100%)
 rename src/applications/auth/oauth/provider/{google => }/PhabricatorOAuthProviderGoogle.php (100%)
 rename src/applications/auth/oauth/provider/{phabricator => }/PhabricatorOAuthProviderPhabricator.php (100%)
 rename src/applications/auth/view/{oauthfailure => }/PhabricatorOAuthFailureView.php (100%)
 rename src/applications/base/controller/{404 => }/Phabricator404Controller.php (100%)
 rename src/applications/base/controller/{base => }/PhabricatorController.php (100%)
 rename src/applications/base/controller/{redirect => }/PhabricatorRedirectController.php (100%)
 rename src/applications/base/storage/{lisk => }/PhabricatorLiskDAO.php (100%)
 rename src/applications/base/storage/configuration/{base => }/DatabaseConfigurationProvider.php (100%)
 rename src/applications/base/storage/configuration/{default => }/DefaultDatabaseConfigurationProvider.php (100%)
 rename src/applications/calendar/controller/{browse => }/PhabricatorCalendarBrowseController.php (100%)
 rename src/applications/calendar/controller/{base => }/PhabricatorCalendarController.php (100%)
 rename src/applications/calendar/storage/{base => }/PhabricatorCalendarDAO.php (100%)
 rename src/applications/calendar/storage/{holiday => }/PhabricatorCalendarHoliday.php (100%)
 rename src/applications/calendar/storage/{holiday => }/__tests__/PhabricatorCalendarHolidayTestCase.php (100%)
 rename src/applications/calendar/view/{event => }/AphrontCalendarEventView.php (100%)
 rename src/applications/calendar/view/{month => }/AphrontCalendarMonthView.php (100%)
 rename src/applications/chatlog/{query => }/PhabricatorChatLogQuery.php (100%)
 rename src/applications/chatlog/constants/{base => }/PhabricatorChatLogConstants.php (100%)
 rename src/applications/chatlog/constants/{eventtype => }/PhabricatorChatLogEventType.php (100%)
 rename src/applications/chatlog/controller/{channellist => }/PhabricatorChatLogChannelListController.php (100%)
 rename src/applications/chatlog/controller/{channellog => }/PhabricatorChatLogChannelLogController.php (100%)
 rename src/applications/chatlog/controller/{base => }/PhabricatorChatLogController.php (100%)
 rename src/applications/chatlog/storage/{base => }/PhabricatorChatLogDAO.php (100%)
 rename src/applications/chatlog/storage/{event => }/PhabricatorChatLogEvent.php (100%)
 rename src/applications/conduit/controller/{api => }/PhabricatorConduitAPIController.php (100%)
 rename src/applications/conduit/controller/{console => }/PhabricatorConduitConsoleController.php (100%)
 rename src/applications/conduit/controller/{base => }/PhabricatorConduitController.php (100%)
 rename src/applications/conduit/controller/{list => }/PhabricatorConduitListController.php (100%)
 rename src/applications/conduit/controller/{log => }/PhabricatorConduitLogController.php (100%)
 rename src/applications/conduit/controller/{token => }/PhabricatorConduitTokenController.php (100%)
 rename src/applications/conduit/method/{base => }/ConduitAPIMethod.php (100%)
 rename src/applications/conduit/method/arcanist/{base => }/ConduitAPI_arcanist_Method.php (100%)
 rename src/applications/conduit/method/arcanist/{projectinfo => }/ConduitAPI_arcanist_projectinfo_Method.php (100%)
 rename src/applications/conduit/method/audit/{base => }/ConduitAPI_audit_Method.php (100%)
 rename src/applications/conduit/method/audit/{query => }/ConduitAPI_audit_query_Method.php (100%)
 rename src/applications/conduit/method/chatlog/{base => }/ConduitAPI_chatlog_Method.php (100%)
 rename src/applications/conduit/method/chatlog/{query => }/ConduitAPI_chatlog_query_Method.php (100%)
 rename src/applications/conduit/method/chatlog/{record => }/ConduitAPI_chatlog_record_Method.php (100%)
 rename src/applications/conduit/method/conduit/{connect => }/ConduitAPI_conduit_connect_Method.php (100%)
 rename src/applications/conduit/method/conduit/{getcertificate => }/ConduitAPI_conduit_getcertificate_Method.php (100%)
 rename src/applications/conduit/method/conduit/{ping => }/ConduitAPI_conduit_ping_Method.php (100%)
 rename src/applications/conduit/method/daemon/{launched => }/ConduitAPI_daemon_launched_Method.php (100%)
 rename src/applications/conduit/method/daemon/{log => }/ConduitAPI_daemon_log_Method.php (100%)
 rename src/applications/conduit/method/differential/{close => }/ConduitAPI_differential_close_Method.php (100%)
 rename src/applications/conduit/method/differential/{createcomment => }/ConduitAPI_differential_createcomment_Method.php (100%)
 rename src/applications/conduit/method/differential/{creatediff => }/ConduitAPI_differential_creatediff_Method.php (100%)
 rename src/applications/conduit/method/differential/{createrevision => }/ConduitAPI_differential_createrevision_Method.php (100%)
 rename src/applications/conduit/method/differential/{find => }/ConduitAPI_differential_find_Method.php (100%)
 rename src/applications/conduit/method/differential/{getalldiffs => }/ConduitAPI_differential_getalldiffs_Method.php (100%)
 rename src/applications/conduit/method/differential/{getcommitmessage => }/ConduitAPI_differential_getcommitmessage_Method.php (100%)
 rename src/applications/conduit/method/differential/{getcommitpaths => }/ConduitAPI_differential_getcommitpaths_Method.php (100%)
 rename src/applications/conduit/method/differential/{getdiff => }/ConduitAPI_differential_getdiff_Method.php (100%)
 rename src/applications/conduit/method/differential/{getrevision => }/ConduitAPI_differential_getrevision_Method.php (100%)
 rename src/applications/conduit/method/differential/{getrevisioncomments => }/ConduitAPI_differential_getrevisioncomments_Method.php (100%)
 rename src/applications/conduit/method/differential/{getrevisionfeedback => }/ConduitAPI_differential_getrevisionfeedback_Method.php (100%)
 rename src/applications/conduit/method/differential/{markcommitted => }/ConduitAPI_differential_markcommitted_Method.php (100%)
 rename src/applications/conduit/method/differential/{parsecommitmessage => }/ConduitAPI_differential_parsecommitmessage_Method.php (100%)
 rename src/applications/conduit/method/differential/{query => }/ConduitAPI_differential_query_Method.php (100%)
 rename src/applications/conduit/method/differential/{setdiffproperty => }/ConduitAPI_differential_setdiffproperty_Method.php (100%)
 rename src/applications/conduit/method/differential/{updaterevision => }/ConduitAPI_differential_updaterevision_Method.php (100%)
 rename src/applications/conduit/method/differential/{updatetaskrevisionassoc => }/ConduitAPI_differential_updatetaskrevisionassoc_Method.php (100%)
 rename src/applications/conduit/method/differential/{updateunitresults => }/ConduitAPI_differential_updateunitresults_Method.php (100%)
 rename src/applications/conduit/method/diffusion/{findsymbols => }/ConduitAPI_diffusion_findsymbols_Method.php (100%)
 rename src/applications/conduit/method/diffusion/{getcommits => }/ConduitAPI_diffusion_getcommits_Method.php (100%)
 rename src/applications/conduit/method/diffusion/{getrecentcommitsbypath => }/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php (100%)
 rename src/applications/conduit/method/feed/{publish => }/ConduitAPI_feed_publish_Method.php (100%)
 rename src/applications/conduit/method/feed/{query => }/ConduitAPI_feed_query_Method.php (100%)
 rename src/applications/conduit/method/file/{download => }/ConduitAPI_file_download_Method.php (100%)
 rename src/applications/conduit/method/file/{info => }/ConduitAPI_file_info_Method.php (100%)
 rename src/applications/conduit/method/file/{upload => }/ConduitAPI_file_upload_Method.php (100%)
 rename src/applications/conduit/method/flag/{base => }/ConduitAPI_flag_Method.php (100%)
 rename src/applications/conduit/method/flag/{query => }/ConduitAPI_flag_query_Method.php (100%)
 rename src/applications/conduit/method/macro/{base => }/ConduitAPI_macro_Method.php (100%)
 rename src/applications/conduit/method/macro/{query => }/ConduitAPI_macro_query_Method.php (100%)
 rename src/applications/conduit/method/maniphest/{base => }/ConduitAPI_maniphest_Method.php (100%)
 rename src/applications/conduit/method/maniphest/{createtask => }/ConduitAPI_maniphest_createtask_Method.php (100%)
 rename src/applications/conduit/method/maniphest/{find => }/ConduitAPI_maniphest_find_Method.php (100%)
 rename src/applications/conduit/method/maniphest/{gettasktransactions => }/ConduitAPI_maniphest_gettasktransactions_Method.php (100%)
 rename src/applications/conduit/method/maniphest/{info => }/ConduitAPI_maniphest_info_Method.php (100%)
 rename src/applications/conduit/method/maniphest/{update => }/ConduitAPI_maniphest_update_Method.php (100%)
 rename src/applications/conduit/method/owners/{query => }/ConduitAPI_owners_query_Method.php (100%)
 rename src/applications/conduit/method/paste/{base => }/ConduitAPI_paste_Method.php (100%)
 rename src/applications/conduit/method/paste/{create => }/ConduitAPI_paste_create_Method.php (100%)
 rename src/applications/conduit/method/paste/{info => }/ConduitAPI_paste_info_Method.php (100%)
 rename src/applications/conduit/method/path/{getowners => }/ConduitAPI_path_getowners_Method.php (100%)
 rename src/applications/conduit/method/phid/{base => }/ConduitAPI_phid_Method.php (100%)
 rename src/applications/conduit/method/phid/{info => }/ConduitAPI_phid_info_Method.php (100%)
 rename src/applications/conduit/method/phid/{query => }/ConduitAPI_phid_query_Method.php (100%)
 rename src/applications/conduit/method/phriction/{base => }/ConduitAPI_phriction_Method.php (100%)
 rename src/applications/conduit/method/phriction/{edit => }/ConduitAPI_phriction_edit_Method.php (100%)
 rename src/applications/conduit/method/phriction/{history => }/ConduitAPI_phriction_history_Method.php (100%)
 rename src/applications/conduit/method/phriction/{info => }/ConduitAPI_phriction_info_Method.php (100%)
 rename src/applications/conduit/method/project/{base => }/ConduitAPI_project_Method.php (100%)
 rename src/applications/conduit/method/project/{query => }/ConduitAPI_project_query_Method.php (100%)
 rename src/applications/conduit/method/remarkup/{process => }/ConduitAPI_remarkup_process_Method.php (100%)
 rename src/applications/conduit/method/repository/{base => }/ConduitAPI_repository_Method.php (100%)
 rename src/applications/conduit/method/repository/{create => }/ConduitAPI_repository_create_Method.php (100%)
 rename src/applications/conduit/method/repository/{query => }/ConduitAPI_repository_query_Method.php (100%)
 rename src/applications/conduit/method/slowvote/{info => }/ConduitAPI_slowvote_info_Method.php (100%)
 rename src/applications/conduit/method/user/{base => }/ConduitAPI_user_Method.php (100%)
 rename src/applications/conduit/method/user/{addstatus => }/ConduitAPI_user_addstatus_Method.php (100%)
 rename src/applications/conduit/method/user/{disable => }/ConduitAPI_user_disable_Method.php (100%)
 rename src/applications/conduit/method/user/{find => }/ConduitAPI_user_find_Method.php (100%)
 rename src/applications/conduit/method/user/{info => }/ConduitAPI_user_info_Method.php (100%)
 rename src/applications/conduit/method/user/{query => }/ConduitAPI_user_query_Method.php (100%)
 rename src/applications/conduit/method/user/{removestatus => }/ConduitAPI_user_removestatus_Method.php (100%)
 rename src/applications/conduit/method/user/{whoami => }/ConduitAPI_user_whoami_Method.php (100%)
 rename src/applications/conduit/protocol/{request => }/ConduitAPIRequest.php (100%)
 rename src/applications/conduit/protocol/{response => }/ConduitAPIResponse.php (100%)
 rename src/applications/conduit/protocol/{exception => }/ConduitException.php (100%)
 rename src/applications/conduit/storage/{token => }/PhabricatorConduitCertificateToken.php (100%)
 rename src/applications/conduit/storage/{connectionlog => }/PhabricatorConduitConnectionLog.php (100%)
 rename src/applications/conduit/storage/{base => }/PhabricatorConduitDAO.php (100%)
 rename src/applications/conduit/storage/{methodcalllog => }/PhabricatorConduitMethodCallLog.php (100%)
 rename src/applications/countdown/controller/{base => }/PhabricatorCountdownController.php (100%)
 rename src/applications/countdown/controller/{delete => }/PhabricatorCountdownDeleteController.php (100%)
 rename src/applications/countdown/controller/{edit => }/PhabricatorCountdownEditController.php (100%)
 rename src/applications/countdown/controller/{list => }/PhabricatorCountdownListController.php (100%)
 rename src/applications/countdown/controller/{view => }/PhabricatorCountdownViewController.php (100%)
 rename src/applications/countdown/storage/{base => }/PhabricatorCountdownDAO.php (100%)
 rename src/applications/countdown/storage/{timer => }/PhabricatorTimer.php (100%)
 rename src/applications/daemon/controller/{combined => }/PhabricatorDaemonCombinedLogController.php (100%)
 rename src/applications/daemon/controller/{console => }/PhabricatorDaemonConsoleController.php (100%)
 rename src/applications/daemon/controller/{base => }/PhabricatorDaemonController.php (100%)
 rename src/applications/daemon/controller/{loglist => }/PhabricatorDaemonLogListController.php (100%)
 rename src/applications/daemon/controller/{logview => }/PhabricatorDaemonLogViewController.php (100%)
 rename src/applications/daemon/controller/{timeline => }/PhabricatorDaemonTimelineConsoleController.php (100%)
 rename src/applications/daemon/controller/{timelineevent => }/PhabricatorDaemonTimelineEventController.php (100%)
 rename src/applications/daemon/controller/{workertaskdetail => }/PhabricatorWorkerTaskDetailController.php (100%)
 rename src/applications/daemon/controller/{workertaskupdate => }/PhabricatorWorkerTaskUpdateController.php (100%)
 rename src/applications/daemon/view/{daemonlogevents => }/PhabricatorDaemonLogEventsView.php (100%)
 rename src/applications/daemon/view/{daemonloglist => }/PhabricatorDaemonLogListView.php (100%)
 rename src/applications/differential/{replyhandler => }/DifferentialReplyHandler.php (100%)
 rename src/applications/differential/{tasks => }/DifferentialTasksAttacher.php (100%)
 rename src/applications/differential/constants/{action => }/DifferentialAction.php (100%)
 rename src/applications/differential/constants/{changetype => }/DifferentialChangeType.php (100%)
 rename src/applications/differential/constants/{lintstatus => }/DifferentialLintStatus.php (100%)
 rename src/applications/differential/constants/{revisioncontrolsystem => }/DifferentialRevisionControlSystem.php (100%)
 rename src/applications/differential/constants/{unitstatus => }/DifferentialUnitStatus.php (100%)
 rename src/applications/differential/constants/{unittestresult => }/DifferentialUnitTestResult.php (100%)
 rename src/applications/differential/controller/{changesetview => }/DifferentialChangesetViewController.php (100%)
 rename src/applications/differential/controller/{commentpreview => }/DifferentialCommentPreviewController.php (100%)
 rename src/applications/differential/controller/{commentsave => }/DifferentialCommentSaveController.php (100%)
 rename src/applications/differential/controller/{base => }/DifferentialController.php (100%)
 rename src/applications/differential/controller/{diffcreate => }/DifferentialDiffCreateController.php (100%)
 rename src/applications/differential/controller/{diffview => }/DifferentialDiffViewController.php (100%)
 rename src/applications/differential/controller/{inlinecommentedit => }/DifferentialInlineCommentEditController.php (100%)
 rename src/applications/differential/controller/{inlinecommentpreview => }/DifferentialInlineCommentPreviewController.php (100%)
 rename src/applications/differential/controller/{customrenderer => }/DifferentialRevisionDetailRenderer.php (100%)
 rename src/applications/differential/controller/{revisionedit => }/DifferentialRevisionEditController.php (100%)
 rename src/applications/differential/controller/{revisionlist => }/DifferentialRevisionListController.php (100%)
 rename src/applications/differential/controller/{revisionstats => }/DifferentialRevisionStatsController.php (100%)
 rename src/applications/differential/controller/{revisionview => }/DifferentialRevisionViewController.php (100%)
 rename src/applications/differential/controller/{subscribe => }/DifferentialSubscribeController.php (100%)
 rename src/applications/differential/data/{revisionlist => }/DifferentialRevisionListData.php (100%)
 rename src/applications/differential/editor/{comment => }/DifferentialCommentEditor.php (100%)
 rename src/applications/differential/editor/{revision => }/DifferentialRevisionEditor.php (100%)
 rename src/applications/differential/exception/{noeffect => }/DifferentialActionHasNoEffectException.php (100%)
 rename src/applications/differential/exception/{base => }/DifferentialException.php (100%)
 rename src/applications/differential/field/exception/{notavailable => }/DifferentialFieldDataNotAvailableException.php (100%)
 rename src/applications/differential/field/exception/{parse => }/DifferentialFieldParseException.php (100%)
 rename src/applications/differential/field/exception/{incomplete => }/DifferentialFieldSpecificationIncompleteException.php (100%)
 rename src/applications/differential/field/exception/{validation => }/DifferentialFieldValidationException.php (100%)
 rename src/applications/differential/field/selector/{default => }/DifferentialDefaultFieldSelector.php (100%)
 rename src/applications/differential/field/selector/{base => }/DifferentialFieldSelector.php (100%)
 rename src/applications/differential/field/specification/{applypatch => }/DifferentialApplyPatchFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{arcanistproject => }/DifferentialArcanistProjectFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{auditors => }/DifferentialAuditorsFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{author => }/DifferentialAuthorFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{blamerev => }/DifferentialBlameRevisionFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{branch => }/DifferentialBranchFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{ccs => }/DifferentialCCsFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{commits => }/DifferentialCommitsFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{datecreated => }/DifferentialDateCreatedFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{datemodified => }/DifferentialDateModifiedFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{dependencies => }/DifferentialDependenciesFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{exportpatch => }/DifferentialExportPatchFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{base => }/DifferentialFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{gitsvnid => }/DifferentialGitSVNIDFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{host => }/DifferentialHostFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{lines => }/DifferentialLinesFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{lint => }/DifferentialLintFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{maniphesttasks => }/DifferentialManiphestTasksFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{path => }/DifferentialPathFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{revertplan => }/DifferentialRevertPlanFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{reviewedby => }/DifferentialReviewedByFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{reviewers => }/DifferentialReviewersFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{revisionid => }/DifferentialRevisionIDFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{revisionstatus => }/DifferentialRevisionStatusFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{summary => }/DifferentialSummaryFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{testplan => }/DifferentialTestPlanFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{title => }/DifferentialTitleFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{unit => }/DifferentialUnitFieldSpecification.php (100%)
 rename src/applications/differential/field/specification/{revisionid => }/__tests__/DifferentialRevisionIDFieldParserTestCase.php (100%)
 rename src/applications/differential/mail/{ccwelcome => }/DifferentialCCWelcomeMail.php (100%)
 rename src/applications/differential/mail/{comment => }/DifferentialCommentMail.php (100%)
 rename src/applications/differential/mail/{diffcontent => }/DifferentialDiffContentMail.php (100%)
 rename src/applications/differential/mail/{exception => }/DifferentialExceptionMail.php (100%)
 rename src/applications/differential/mail/{base => }/DifferentialMail.php (100%)
 rename src/applications/differential/mail/{newdiff => }/DifferentialNewDiffMail.php (100%)
 rename src/applications/differential/mail/{reviewrequest => }/DifferentialReviewRequestMail.php (100%)
 rename src/applications/differential/parser/{changeset => }/DifferentialChangesetParser.php (100%)
 rename src/applications/differential/query/{revision => }/DifferentialRevisionQuery.php (100%)
 rename src/applications/differential/storage/{affectedpath => }/DifferentialAffectedPath.php (100%)
 rename src/applications/differential/storage/{auxiliaryfield => }/DifferentialAuxiliaryField.php (100%)
 rename src/applications/differential/storage/{changeset => }/DifferentialChangeset.php (100%)
 rename src/applications/differential/storage/{comment => }/DifferentialComment.php (100%)
 rename src/applications/differential/storage/{base => }/DifferentialDAO.php (100%)
 rename src/applications/differential/storage/{diff => }/DifferentialDiff.php (100%)
 rename src/applications/differential/storage/{diffproperty => }/DifferentialDiffProperty.php (100%)
 rename src/applications/differential/storage/{hunk => }/DifferentialHunk.php (100%)
 rename src/applications/differential/storage/{inlinecomment => }/DifferentialInlineComment.php (100%)
 rename src/applications/differential/storage/{revision => }/DifferentialRevision.php (100%)
 rename src/applications/differential/view/{addcomment => }/DifferentialAddCommentView.php (100%)
 rename src/applications/differential/view/{changesetdetailview => }/DifferentialChangesetDetailView.php (100%)
 rename src/applications/differential/view/{changesetlistview => }/DifferentialChangesetListView.php (100%)
 rename src/applications/differential/view/{difftableofcontents => }/DifferentialDiffTableOfContentsView.php (100%)
 rename src/applications/differential/view/{inlinecommentedit => }/DifferentialInlineCommentEditView.php (100%)
 rename src/applications/differential/view/{inlinecomment => }/DifferentialInlineCommentView.php (100%)
 rename src/applications/differential/view/{localcommits => }/DifferentialLocalCommitsView.php (100%)
 rename src/applications/differential/view/{primarypane => }/DifferentialPrimaryPaneView.php (100%)
 rename src/applications/differential/view/{resultstableview => }/DifferentialResultsTableView.php (100%)
 rename src/applications/differential/view/{revisioncommentlist => }/DifferentialRevisionCommentListView.php (100%)
 rename src/applications/differential/view/{revisioncomment => }/DifferentialRevisionCommentView.php (100%)
 rename src/applications/differential/view/{revisiondetail => }/DifferentialRevisionDetailView.php (100%)
 rename src/applications/differential/view/{revisionlist => }/DifferentialRevisionListView.php (100%)
 rename src/applications/differential/view/{revisionstats => }/DifferentialRevisionStatsView.php (100%)
 rename src/applications/differential/view/{revisionupdatehistory => }/DifferentialRevisionUpdateHistoryView.php (100%)
 rename src/applications/diffusion/{tag => }/DiffusionRepositoryTag.php (100%)
 rename src/applications/diffusion/controller/{branchtable => }/DiffusionBranchTableController.php (100%)
 rename src/applications/diffusion/controller/{browse => }/DiffusionBrowseController.php (100%)
 rename src/applications/diffusion/controller/{file => }/DiffusionBrowseFileController.php (100%)
 rename src/applications/diffusion/controller/{change => }/DiffusionChangeController.php (100%)
 rename src/applications/diffusion/controller/{commit => }/DiffusionCommitController.php (100%)
 rename src/applications/diffusion/controller/{base => }/DiffusionController.php (100%)
 rename src/applications/diffusion/controller/{diff => }/DiffusionDiffController.php (100%)
 rename src/applications/diffusion/controller/{external => }/DiffusionExternalController.php (100%)
 rename src/applications/diffusion/controller/{history => }/DiffusionHistoryController.php (100%)
 rename src/applications/diffusion/controller/{home => }/DiffusionHomeController.php (100%)
 rename src/applications/diffusion/controller/{inline => }/DiffusionInlineCommentController.php (100%)
 rename src/applications/diffusion/controller/{lastmodified => }/DiffusionLastModifiedController.php (100%)
 rename src/applications/diffusion/controller/{pathcomplete => }/DiffusionPathCompleteController.php (100%)
 rename src/applications/diffusion/controller/{pathvalidate => }/DiffusionPathValidateController.php (100%)
 rename src/applications/diffusion/controller/{repository => }/DiffusionRepositoryController.php (100%)
 rename src/applications/diffusion/controller/{symbol => }/DiffusionSymbolController.php (100%)
 rename src/applications/diffusion/controller/{taglist => }/DiffusionTagListController.php (100%)
 rename src/applications/diffusion/data/{branch => }/DiffusionBranchInformation.php (100%)
 rename src/applications/diffusion/data/{filecontent => }/DiffusionFileContent.php (100%)
 rename src/applications/diffusion/data/{pathchange => }/DiffusionPathChange.php (100%)
 rename src/applications/diffusion/data/{repositorypath => }/DiffusionRepositoryPath.php (100%)
 rename src/applications/diffusion/exception/{setup => }/DiffusionSetupException.php (100%)
 rename src/applications/diffusion/query/{path => }/DiffusionPathQuery.php (100%)
 rename src/applications/diffusion/query/{base => }/DiffusionQuery.php (100%)
 rename src/applications/diffusion/query/{symbol => }/DiffusionSymbolQuery.php (100%)
 rename src/applications/diffusion/query/branch/{base => }/DiffusionBranchQuery.php (100%)
 rename src/applications/diffusion/query/branch/{git => }/DiffusionGitBranchQuery.php (100%)
 rename src/applications/diffusion/query/branch/{mercurial => }/DiffusionMercurialBranchQuery.php (100%)
 rename src/applications/diffusion/query/branch/{git => }/__tests__/DiffusionGitBranchQueryTestCase.php (100%)
 rename src/applications/diffusion/query/browse/{base => }/DiffusionBrowseQuery.php (100%)
 rename src/applications/diffusion/query/browse/{git => }/DiffusionGitBrowseQuery.php (100%)
 rename src/applications/diffusion/query/browse/{mercurial => }/DiffusionMercurialBrowseQuery.php (100%)
 rename src/applications/diffusion/query/browse/{svn => }/DiffusionSvnBrowseQuery.php (100%)
 rename src/applications/diffusion/query/committags/{base => }/DiffusionCommitTagsQuery.php (100%)
 rename src/applications/diffusion/query/committags/{git => }/DiffusionGitCommitTagsQuery.php (100%)
 rename src/applications/diffusion/query/committags/{mercurial => }/DiffusionMercurialCommitTagsQuery.php (100%)
 rename src/applications/diffusion/query/committags/{svn => }/DiffusionSvnCommitTagsQuery.php (100%)
 rename src/applications/diffusion/query/contains/{base => }/DiffusionContainsQuery.php (100%)
 rename src/applications/diffusion/query/contains/{git => }/DiffusionGitContainsQuery.php (100%)
 rename src/applications/diffusion/query/contains/{mercurial => }/DiffusionMercurialContainsQuery.php (100%)
 rename src/applications/diffusion/query/contains/{svn => }/DiffusionSvnContainsQuery.php (100%)
 rename src/applications/diffusion/query/diff/{base => }/DiffusionDiffQuery.php (100%)
 rename src/applications/diffusion/query/diff/{git => }/DiffusionGitDiffQuery.php (100%)
 rename src/applications/diffusion/query/diff/{mercurial => }/DiffusionMercurialDiffQuery.php (100%)
 rename src/applications/diffusion/query/diff/{svn => }/DiffusionSvnDiffQuery.php (100%)
 rename src/applications/diffusion/query/filecontent/{base => }/DiffusionFileContentQuery.php (100%)
 rename src/applications/diffusion/query/filecontent/{git => }/DiffusionGitFileContentQuery.php (100%)
 rename src/applications/diffusion/query/filecontent/{mercurial => }/DiffusionMercurialFileContentQuery.php (100%)
 rename src/applications/diffusion/query/filecontent/{svn => }/DiffusionSvnFileContentQuery.php (100%)
 rename src/applications/diffusion/query/history/{git => }/DiffusionGitHistoryQuery.php (100%)
 rename src/applications/diffusion/query/history/{base => }/DiffusionHistoryQuery.php (100%)
 rename src/applications/diffusion/query/history/{mercurial => }/DiffusionMercurialHistoryQuery.php (100%)
 rename src/applications/diffusion/query/history/{svn => }/DiffusionSvnHistoryQuery.php (100%)
 rename src/applications/diffusion/query/lastmodified/{git => }/DiffusionGitLastModifiedQuery.php (100%)
 rename src/applications/diffusion/query/lastmodified/{base => }/DiffusionLastModifiedQuery.php (100%)
 rename src/applications/diffusion/query/lastmodified/{mercurial => }/DiffusionMercurialLastModifiedQuery.php (100%)
 rename src/applications/diffusion/query/lastmodified/{svn => }/DiffusionSvnLastModifiedQuery.php (100%)
 rename src/applications/diffusion/query/mergedcommits/{git => }/DiffusionGitMergedCommitsQuery.php (100%)
 rename src/applications/diffusion/query/mergedcommits/{mercurial => }/DiffusionMercurialMergedCommitsQuery.php (100%)
 rename src/applications/diffusion/query/mergedcommits/{base => }/DiffusionMergedCommitsQuery.php (100%)
 rename src/applications/diffusion/query/mergedcommits/{svn => }/DiffusionSvnMergedCommitsQuery.php (100%)
 rename src/applications/diffusion/query/parents/{base => }/DiffusionCommitParentsQuery.php (100%)
 rename src/applications/diffusion/query/parents/{git => }/DiffusionGitCommitParentsQuery.php (100%)
 rename src/applications/diffusion/query/parents/{mercurial => }/DiffusionMercurialCommitParentsQuery.php (100%)
 rename src/applications/diffusion/query/parents/{svn => }/DiffusionSvnCommitParentsQuery.php (100%)
 rename src/applications/diffusion/query/pathchange/{base => }/DiffusionPathChangeQuery.php (100%)
 rename src/applications/diffusion/query/pathid/{base => }/DiffusionPathIDQuery.php (100%)
 rename src/applications/diffusion/query/pathid/{base => }/__tests__/DiffusionPathQueryTestCase.php (100%)
 rename src/applications/diffusion/query/rawdiff/{git => }/DiffusionGitRawDiffQuery.php (100%)
 rename src/applications/diffusion/query/rawdiff/{mercurial => }/DiffusionMercurialRawDiffQuery.php (100%)
 rename src/applications/diffusion/query/rawdiff/{base => }/DiffusionRawDiffQuery.php (100%)
 rename src/applications/diffusion/query/rawdiff/{svn => }/DiffusionSvnRawDiffQuery.php (100%)
 rename src/applications/diffusion/query/renamehistory/{git => }/DiffusionGitRenameHistoryQuery.php (100%)
 rename src/applications/diffusion/query/renamehistory/{mercurial => }/DiffusionMercurialRenameHistoryQuery.php (100%)
 rename src/applications/diffusion/query/renamehistory/{base => }/DiffusionRenameHistoryQuery.php (100%)
 rename src/applications/diffusion/query/renamehistory/{svn => }/DiffusionSvnRenameHistoryQuery.php (100%)
 rename src/applications/diffusion/query/taglist/{git => }/DiffusionGitTagListQuery.php (100%)
 rename src/applications/diffusion/query/taglist/{mercurial => }/DiffusionMercurialTagListQuery.php (100%)
 rename src/applications/diffusion/query/taglist/{svn => }/DiffusionSvnTagListQuery.php (100%)
 rename src/applications/diffusion/query/taglist/{base => }/DiffusionTagListQuery.php (100%)
 rename src/applications/diffusion/request/{git => }/DiffusionGitRequest.php (100%)
 rename src/applications/diffusion/request/{mercurial => }/DiffusionMercurialRequest.php (100%)
 rename src/applications/diffusion/request/{base => }/DiffusionRequest.php (100%)
 rename src/applications/diffusion/request/{svn => }/DiffusionSvnRequest.php (100%)
 rename src/applications/diffusion/request/{base => }/__tests__/DiffusionURITestCase.php (100%)
 rename src/applications/diffusion/view/{branchtable => }/DiffusionBranchTableView.php (100%)
 rename src/applications/diffusion/view/{browsetable => }/DiffusionBrowseTableView.php (100%)
 rename src/applications/diffusion/view/{commentlist => }/DiffusionCommentListView.php (100%)
 rename src/applications/diffusion/view/{comment => }/DiffusionCommentView.php (100%)
 rename src/applications/diffusion/view/{commitchangetable => }/DiffusionCommitChangeTableView.php (100%)
 rename src/applications/diffusion/view/{emptyresult => }/DiffusionEmptyResultView.php (100%)
 rename src/applications/diffusion/view/{historytable => }/DiffusionHistoryTableView.php (100%)
 rename src/applications/diffusion/view/{taglist => }/DiffusionTagListView.php (100%)
 rename src/applications/diffusion/view/{base => }/DiffusionView.php (100%)
 rename src/applications/directory/controller/{base => }/PhabricatorDirectoryController.php (100%)
 rename src/applications/directory/controller/{main => }/PhabricatorDirectoryMainController.php (100%)
 rename src/applications/draft/storage/{draft => }/PhabricatorDraft.php (100%)
 rename src/applications/draft/storage/{base => }/PhabricatorDraftDAO.php (100%)
 rename src/applications/drydock/allocator/{resource => }/DrydockAllocator.php (100%)
 rename src/applications/drydock/allocator/{worker => }/DrydockAllocatorWorker.php (100%)
 rename src/applications/drydock/blueprint/{base => }/DrydockBlueprint.php (100%)
 rename src/applications/drydock/blueprint/{ec2host => }/DrydockEC2HostBlueprint.php (100%)
 rename src/applications/drydock/blueprint/{localhost => }/DrydockLocalHostBlueprint.php (100%)
 rename src/applications/drydock/blueprint/{remotehost => }/DrydockRemoteHostBlueprint.php (100%)
 rename src/applications/drydock/blueprint/application/{phabricator => }/DrydockPhabricatorApplicationBlueprint.php (100%)
 rename src/applications/drydock/blueprint/webroot/{apache => }/DrydockApacheWebrootBlueprint.php (100%)
 rename src/applications/drydock/constants/{base => }/DrydockConstants.php (100%)
 rename src/applications/drydock/constants/{leasestatus => }/DrydockLeaseStatus.php (100%)
 rename src/applications/drydock/constants/{resourcestatus => }/DrydockResourceStatus.php (100%)
 rename src/applications/drydock/controller/{base => }/DrydockController.php (100%)
 rename src/applications/drydock/controller/{leaselist => }/DrydockLeaseListController.php (100%)
 rename src/applications/drydock/controller/{log => }/DrydockLogController.php (100%)
 rename src/applications/drydock/controller/{resourceallocate => }/DrydockResourceAllocateController.php (100%)
 rename src/applications/drydock/controller/{resourcelist => }/DrydockResourceListController.php (100%)
 rename src/applications/drydock/interface/{base => }/DrydockInterface.php (100%)
 rename src/applications/drydock/interface/command/{base => }/DrydockCommandInterface.php (100%)
 rename src/applications/drydock/interface/command/{local => }/DrydockLocalCommandInterface.php (100%)
 rename src/applications/drydock/interface/command/{ssh => }/DrydockSSHCommandInterface.php (100%)
 rename src/applications/drydock/interface/webroot/{apache => }/DrydockApacheWebrootInterface.php (100%)
 rename src/applications/drydock/interface/webroot/{base => }/DrydockWebrootInterface.php (100%)
 rename src/applications/drydock/query/{log => }/DrydockLogQuery.php (100%)
 rename src/applications/drydock/storage/{base => }/DrydockDAO.php (100%)
 rename src/applications/drydock/storage/{lease => }/DrydockLease.php (100%)
 rename src/applications/drydock/storage/{log => }/DrydockLog.php (100%)
 rename src/applications/drydock/storage/{resource => }/DrydockResource.php (100%)
 rename src/applications/feed/{query => }/PhabricatorFeedQuery.php (100%)
 rename src/applications/feed/{publisher => }/PhabricatorFeedStoryPublisher.php (100%)
 rename src/applications/feed/builder/{feed => }/PhabricatorFeedBuilder.php (100%)
 rename src/applications/feed/constants/{base => }/PhabricatorFeedConstants.php (100%)
 rename src/applications/feed/constants/{story => }/PhabricatorFeedStoryTypeConstants.php (100%)
 rename src/applications/feed/controller/{base => }/PhabricatorFeedController.php (100%)
 rename src/applications/feed/controller/{publicstream => }/PhabricatorFeedPublicStreamController.php (100%)
 rename src/applications/feed/storage/{base => }/PhabricatorFeedDAO.php (100%)
 rename src/applications/feed/storage/{story => }/PhabricatorFeedStoryData.php (100%)
 rename src/applications/feed/storage/{storyreference => }/PhabricatorFeedStoryReference.php (100%)
 rename src/applications/feed/story/{base => }/PhabricatorFeedStory.php (100%)
 rename src/applications/feed/story/{audit => }/PhabricatorFeedStoryAudit.php (100%)
 rename src/applications/feed/story/{differential => }/PhabricatorFeedStoryDifferential.php (100%)
 rename src/applications/feed/story/{maniphest => }/PhabricatorFeedStoryManiphest.php (100%)
 rename src/applications/feed/story/{phriction => }/PhabricatorFeedStoryPhriction.php (100%)
 rename src/applications/feed/story/{project => }/PhabricatorFeedStoryProject.php (100%)
 rename src/applications/feed/story/{status => }/PhabricatorFeedStoryStatus.php (100%)
 rename src/applications/feed/story/{unknown => }/PhabricatorFeedStoryUnknown.php (100%)
 rename src/applications/feed/view/{story => }/PhabricatorFeedStoryView.php (100%)
 rename src/applications/feed/view/{base => }/PhabricatorFeedView.php (100%)
 rename src/applications/files/{transform => }/PhabricatorImageTransformer.php (100%)
 rename src/applications/files/controller/{base => }/PhabricatorFileController.php (100%)
 rename src/applications/files/controller/{data => }/PhabricatorFileDataController.php (100%)
 rename src/applications/files/controller/{delete => }/PhabricatorFileDeleteController.php (100%)
 rename src/applications/files/controller/{dropupload => }/PhabricatorFileDropUploadController.php (100%)
 rename src/applications/files/controller/{info => }/PhabricatorFileInfoController.php (100%)
 rename src/applications/files/controller/{list => }/PhabricatorFileListController.php (100%)
 rename src/applications/files/controller/{macrodelete => }/PhabricatorFileMacroDeleteController.php (100%)
 rename src/applications/files/controller/{macroedit => }/PhabricatorFileMacroEditController.php (100%)
 rename src/applications/files/controller/{macrolist => }/PhabricatorFileMacroListController.php (100%)
 rename src/applications/files/controller/{proxy => }/PhabricatorFileProxyController.php (100%)
 rename src/applications/files/controller/{shortcut => }/PhabricatorFileShortcutController.php (100%)
 rename src/applications/files/controller/{transform => }/PhabricatorFileTransformController.php (100%)
 rename src/applications/files/controller/{upload => }/PhabricatorFileUploadController.php (100%)
 rename src/applications/files/engine/{base => }/PhabricatorFileStorageEngine.php (100%)
 rename src/applications/files/engine/{localdisk => }/PhabricatorLocalDiskFileStorageEngine.php (100%)
 rename src/applications/files/engine/{mysql => }/PhabricatorMySQLFileStorageEngine.php (100%)
 rename src/applications/files/engine/{s3 => }/PhabricatorS3FileStorageEngine.php (100%)
 rename src/applications/files/engineselector/{default => }/PhabricatorDefaultFileStorageEngineSelector.php (100%)
 rename src/applications/files/engineselector/{base => }/PhabricatorFileStorageEngineSelector.php (100%)
 rename src/applications/files/exception/{configuration => }/PhabricatorFileStorageConfigurationException.php (100%)
 rename src/applications/files/exception/{upload => }/PhabricatorFileUploadException.php (100%)
 rename src/applications/files/storage/{file => }/PhabricatorFile.php (100%)
 rename src/applications/files/storage/{base => }/PhabricatorFileDAO.php (100%)
 rename src/applications/files/storage/{imagemacro => }/PhabricatorFileImageMacro.php (100%)
 rename src/applications/files/storage/{proxyimage => }/PhabricatorFileProxyImage.php (100%)
 rename src/applications/files/storage/{storageblob => }/PhabricatorFileStorageBlob.php (100%)
 rename src/applications/files/storage/{transformed => }/PhabricatorTransformedFile.php (100%)
 rename src/applications/files/view/{sidenav => }/PhabricatorFileSideNavView.php (100%)
 rename src/applications/files/view/{upload => }/PhabricatorFileUploadView.php (100%)
 rename src/applications/flag/constants/{color => }/PhabricatorFlagColor.php (100%)
 rename src/applications/flag/constants/{base => }/PhabricatorFlagConstants.php (100%)
 rename src/applications/flag/controller/{base => }/PhabricatorFlagController.php (100%)
 rename src/applications/flag/controller/{delete => }/PhabricatorFlagDeleteController.php (100%)
 rename src/applications/flag/controller/{edit => }/PhabricatorFlagEditController.php (100%)
 rename src/applications/flag/controller/{list => }/PhabricatorFlagListController.php (100%)
 rename src/applications/flag/query/{flag => }/PhabricatorFlagQuery.php (100%)
 rename src/applications/flag/storage/{flag => }/PhabricatorFlag.php (100%)
 rename src/applications/flag/storage/{base => }/PhabricatorFlagDAO.php (100%)
 rename src/applications/flag/view/{list => }/PhabricatorFlagListView.php (100%)
 rename src/applications/harbormaster/storage/{base => }/HarbormasterDAO.php (100%)
 rename src/applications/harbormaster/storage/{scratchtable => }/HarbormasterScratchTable.php (100%)
 rename src/applications/help/controller/{base => }/PhabricatorHelpController.php (100%)
 rename src/applications/help/controller/{keyboardshortcut => }/PhabricatorHelpKeyboardShortcutController.php (100%)
 rename src/applications/herald/adapter/{commit => }/HeraldCommitAdapter.php (100%)
 rename src/applications/herald/adapter/{differential => }/HeraldDifferentialRevisionAdapter.php (100%)
 rename src/applications/herald/adapter/{dryrun => }/HeraldDryRunAdapter.php (100%)
 rename src/applications/herald/adapter/{base => }/HeraldObjectAdapter.php (100%)
 rename src/applications/herald/config/{action => }/HeraldActionConfig.php (100%)
 rename src/applications/herald/config/{condition => }/HeraldConditionConfig.php (100%)
 rename src/applications/herald/config/{contenttype => }/HeraldContentTypeConfig.php (100%)
 rename src/applications/herald/config/{field => }/HeraldFieldConfig.php (100%)
 rename src/applications/herald/config/{repetitionpolicy => }/HeraldRepetitionPolicyConfig.php (100%)
 rename src/applications/herald/config/{ruletype => }/HeraldRuleTypeConfig.php (100%)
 rename src/applications/herald/config/{valuetype => }/HeraldValueTypeConfig.php (100%)
 rename src/applications/herald/controller/{base => }/HeraldController.php (100%)
 rename src/applications/herald/controller/{delete => }/HeraldDeleteController.php (100%)
 rename src/applications/herald/controller/{home => }/HeraldHomeController.php (100%)
 rename src/applications/herald/controller/{new => }/HeraldNewController.php (100%)
 rename src/applications/herald/controller/{rule => }/HeraldRuleController.php (100%)
 rename src/applications/herald/controller/{edithistory => }/HeraldRuleEditHistoryController.php (100%)
 rename src/applications/herald/controller/{test => }/HeraldTestConsoleController.php (100%)
 rename src/applications/herald/controller/{transcript => }/HeraldTranscriptController.php (100%)
 rename src/applications/herald/controller/{transcriptlist => }/HeraldTranscriptListController.php (100%)
 rename src/applications/herald/engine/{effect => }/HeraldEffect.php (100%)
 rename src/applications/herald/engine/{engine => }/HeraldEngine.php (100%)
 rename src/applications/herald/engine/engine/{exception => }/HeraldInvalidConditionException.php (100%)
 rename src/applications/herald/engine/engine/{exception => }/HeraldInvalidFieldException.php (100%)
 rename src/applications/herald/engine/engine/{exception => }/HeraldRecursiveConditionsException.php (100%)
 rename src/applications/herald/query/{log => }/HeraldEditLogQuery.php (100%)
 rename src/applications/herald/query/{rule => }/HeraldRuleQuery.php (100%)
 rename src/applications/herald/storage/{action => }/HeraldAction.php (100%)
 rename src/applications/herald/storage/{condition => }/HeraldCondition.php (100%)
 rename src/applications/herald/storage/{base => }/HeraldDAO.php (100%)
 rename src/applications/herald/storage/{rule => }/HeraldRule.php (100%)
 rename src/applications/herald/storage/{edithistory => }/HeraldRuleEdit.php (100%)
 rename src/applications/herald/storage/transcript/{apply => }/HeraldApplyTranscript.php (100%)
 rename src/applications/herald/storage/transcript/{condition => }/HeraldConditionTranscript.php (100%)
 rename src/applications/herald/storage/transcript/{object => }/HeraldObjectTranscript.php (100%)
 rename src/applications/herald/storage/transcript/{rule => }/HeraldRuleTranscript.php (100%)
 rename src/applications/herald/storage/transcript/{base => }/HeraldTranscript.php (100%)
 rename src/applications/herald/view/{edithistory => }/HeraldRuleEditHistoryView.php (100%)
 rename src/applications/herald/view/{rulelist => }/HeraldRuleListView.php (100%)
 rename src/applications/maniphest/{replyhandler => }/ManiphestReplyHandler.php (100%)
 rename src/applications/maniphest/{query => }/ManiphestTaskQuery.php (100%)
 rename src/applications/maniphest/auxiliaryfield/{default => }/ManiphestAuxiliaryFieldDefaultSpecification.php (100%)
 rename src/applications/maniphest/auxiliaryfield/{base => }/ManiphestAuxiliaryFieldSpecification.php (100%)
 rename src/applications/maniphest/auxiliaryfield/{typeexception => }/ManiphestAuxiliaryFieldTypeException.php (100%)
 rename src/applications/maniphest/auxiliaryfield/{validationexception => }/ManiphestAuxiliaryFieldValidationException.php (100%)
 rename src/applications/maniphest/constants/{action => }/ManiphestAction.php (100%)
 rename src/applications/maniphest/constants/{base => }/ManiphestConstants.php (100%)
 rename src/applications/maniphest/constants/{owner => }/ManiphestTaskOwner.php (100%)
 rename src/applications/maniphest/constants/{priority => }/ManiphestTaskPriority.php (100%)
 rename src/applications/maniphest/constants/{status => }/ManiphestTaskStatus.php (100%)
 rename src/applications/maniphest/constants/{transactiontype => }/ManiphestTransactionType.php (100%)
 rename src/applications/maniphest/controller/{batch => }/ManiphestBatchEditController.php (100%)
 rename src/applications/maniphest/controller/{base => }/ManiphestController.php (100%)
 rename src/applications/maniphest/controller/{export => }/ManiphestExportController.php (100%)
 rename src/applications/maniphest/controller/{report => }/ManiphestReportController.php (100%)
 rename src/applications/maniphest/controller/{savedquerydelete => }/ManiphestSavedQueryDeleteController.php (100%)
 rename src/applications/maniphest/controller/{savedqueryedit => }/ManiphestSavedQueryEditController.php (100%)
 rename src/applications/maniphest/controller/{savedquerylist => }/ManiphestSavedQueryListController.php (100%)
 rename src/applications/maniphest/controller/{subpriority => }/ManiphestSubpriorityController.php (100%)
 rename src/applications/maniphest/controller/{descriptionchange => }/ManiphestTaskDescriptionChangeController.php (100%)
 rename src/applications/maniphest/controller/{descriptionpreview => }/ManiphestTaskDescriptionPreviewController.php (100%)
 rename src/applications/maniphest/controller/{taskdetail => }/ManiphestTaskDetailController.php (100%)
 rename src/applications/maniphest/controller/{taskedit => }/ManiphestTaskEditController.php (100%)
 rename src/applications/maniphest/controller/{tasklist => }/ManiphestTaskListController.php (100%)
 rename src/applications/maniphest/controller/{transactionpreview => }/ManiphestTransactionPreviewController.php (100%)
 rename src/applications/maniphest/controller/{transactionsave => }/ManiphestTransactionSaveController.php (100%)
 rename src/applications/maniphest/editor/{transaction => }/ManiphestTransactionEditor.php (100%)
 rename src/applications/maniphest/extensions/{task => }/ManiphestDefaultTaskExtensions.php (100%)
 rename src/applications/maniphest/extensions/{base => }/ManiphestTaskExtensions.php (100%)
 rename src/applications/maniphest/storage/{base => }/ManiphestDAO.php (100%)
 rename src/applications/maniphest/storage/{savedquery => }/ManiphestSavedQuery.php (100%)
 rename src/applications/maniphest/storage/{task => }/ManiphestTask.php (100%)
 rename src/applications/maniphest/storage/{auxiliary => }/ManiphestTaskAuxiliaryStorage.php (100%)
 rename src/applications/maniphest/storage/{taskproject => }/ManiphestTaskProject.php (100%)
 rename src/applications/maniphest/storage/{subscriber => }/ManiphestTaskSubscriber.php (100%)
 rename src/applications/maniphest/storage/{transaction => }/ManiphestTransaction.php (100%)
 rename src/applications/maniphest/view/{tasklist => }/ManiphestTaskListView.php (100%)
 rename src/applications/maniphest/view/{taskprojects => }/ManiphestTaskProjectsView.php (100%)
 rename src/applications/maniphest/view/{tasksummary => }/ManiphestTaskSummaryView.php (100%)
 rename src/applications/maniphest/view/{transactiondetail => }/ManiphestTransactionDetailView.php (100%)
 rename src/applications/maniphest/view/{transactionlist => }/ManiphestTransactionListView.php (100%)
 rename src/applications/maniphest/view/{base => }/ManiphestView.php (100%)
 rename src/applications/markup/{engine => }/PhabricatorMarkupEngine.php (100%)
 rename src/applications/markup/{syntax => }/PhabricatorSyntaxHighlighter.php (100%)
 rename src/applications/metamta/{parser => }/PhabricatorMetaMTAEmailBodyParser.php (100%)
 rename src/applications/metamta/{worker => }/PhabricatorMetaMTAWorker.php (100%)
 rename src/applications/metamta/{parser => }/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php (100%)
 rename src/applications/metamta/adapter/{base => }/PhabricatorMailImplementationAdapter.php (100%)
 rename src/applications/metamta/adapter/{amazonses => }/PhabricatorMailImplementationAmazonSESAdapter.php (100%)
 rename src/applications/metamta/adapter/{phpmailerlite => }/PhabricatorMailImplementationPHPMailerLiteAdapter.php (100%)
 rename src/applications/metamta/adapter/{sendgrid => }/PhabricatorMailImplementationSendGridAdapter.php (100%)
 rename src/applications/metamta/adapter/{test => }/PhabricatorMailImplementationTestAdapter.php (100%)
 rename src/applications/metamta/constants/{base => }/MetaMTAConstants.php (100%)
 rename src/applications/metamta/constants/{notificationtype => }/MetaMTANotificationType.php (100%)
 rename src/applications/metamta/contentsource/{source => }/PhabricatorContentSource.php (100%)
 rename src/applications/metamta/contentsource/{view => }/PhabricatorContentSourceView.php (100%)
 rename src/applications/metamta/controller/{base => }/PhabricatorMetaMTAController.php (100%)
 rename src/applications/metamta/controller/{list => }/PhabricatorMetaMTAListController.php (100%)
 rename src/applications/metamta/controller/{mailinglistedit => }/PhabricatorMetaMTAMailingListEditController.php (100%)
 rename src/applications/metamta/controller/{mailinglists => }/PhabricatorMetaMTAMailingListsController.php (100%)
 rename src/applications/metamta/controller/{receive => }/PhabricatorMetaMTAReceiveController.php (100%)
 rename src/applications/metamta/controller/{receivedlist => }/PhabricatorMetaMTAReceivedListController.php (100%)
 rename src/applications/metamta/controller/{send => }/PhabricatorMetaMTASendController.php (100%)
 rename src/applications/metamta/controller/{sendgridreceive => }/PhabricatorMetaMTASendGridReceiveController.php (100%)
 rename src/applications/metamta/controller/{view => }/PhabricatorMetaMTAViewController.php (100%)
 rename src/applications/metamta/replyhandler/{base => }/PhabricatorMailReplyHandler.php (100%)
 rename src/applications/metamta/storage/{mail => }/PhabricatorMetaMTAAttachment.php (100%)
 rename src/applications/metamta/storage/{base => }/PhabricatorMetaMTADAO.php (100%)
 rename src/applications/metamta/storage/{mail => }/PhabricatorMetaMTAMail.php (100%)
 rename src/applications/metamta/storage/{mailinglist => }/PhabricatorMetaMTAMailingList.php (100%)
 rename src/applications/metamta/storage/{receivedmail => }/PhabricatorMetaMTAReceivedMail.php (100%)
 rename src/applications/metamta/storage/{mail => }/__tests__/PhabricatorMetaMTAMailTestCase.php (100%)
 rename src/applications/notifications/controller/{test => }/PhabricatorAphlictTestPageController.php (100%)
 rename src/applications/notifications/controller/{base => }/PhabricatorNotificationsController.php (100%)
 rename src/applications/oauthserver/{response => }/PhabricatorOAuthResponse.php (100%)
 rename src/applications/oauthserver/{server => }/PhabricatorOAuthServer.php (100%)
 rename src/applications/oauthserver/{scope => }/PhabricatorOAuthServerScope.php (100%)
 rename src/applications/oauthserver/{server => }/__tests__/PhabricatorOAuthServerTestCase.php (100%)
 rename src/applications/oauthserver/controller/{auth => }/PhabricatorOAuthServerAuthController.php (100%)
 rename src/applications/oauthserver/controller/{base => }/PhabricatorOAuthServerController.php (100%)
 rename src/applications/oauthserver/controller/{test => }/PhabricatorOAuthServerTestController.php (100%)
 rename src/applications/oauthserver/controller/{token => }/PhabricatorOAuthServerTokenController.php (100%)
 rename src/applications/oauthserver/controller/client/{base => }/PhabricatorOAuthClientBaseController.php (100%)
 rename src/applications/oauthserver/controller/client/{delete => }/PhabricatorOAuthClientDeleteController.php (100%)
 rename src/applications/oauthserver/controller/client/{edit => }/PhabricatorOAuthClientEditController.php (100%)
 rename src/applications/oauthserver/controller/client/{list => }/PhabricatorOAuthClientListController.php (100%)
 rename src/applications/oauthserver/controller/client/{view => }/PhabricatorOAuthClientViewController.php (100%)
 rename src/applications/oauthserver/controller/clientauthorization/{base => }/PhabricatorOAuthClientAuthorizationBaseController.php (100%)
 rename src/applications/oauthserver/controller/clientauthorization/{delete => }/PhabricatorOAuthClientAuthorizationDeleteController.php (100%)
 rename src/applications/oauthserver/controller/clientauthorization/{edit => }/PhabricatorOAuthClientAuthorizationEditController.php (100%)
 rename src/applications/oauthserver/controller/clientauthorization/{list => }/PhabricatorOAuthClientAuthorizationListController.php (100%)
 rename src/applications/oauthserver/query/{clientauthorization => }/PhabricatorOAuthClientAuthorizationQuery.php (100%)
 rename src/applications/oauthserver/query/{client => }/PhabricatorOAuthServerClientQuery.php (100%)
 rename src/applications/oauthserver/storage/{clientauthorization => }/PhabricatorOAuthClientAuthorization.php (100%)
 rename src/applications/oauthserver/storage/{accesstoken => }/PhabricatorOAuthServerAccessToken.php (100%)
 rename src/applications/oauthserver/storage/{authorizationcode => }/PhabricatorOAuthServerAuthorizationCode.php (100%)
 rename src/applications/oauthserver/storage/{client => }/PhabricatorOAuthServerClient.php (100%)
 rename src/applications/oauthserver/storage/{base => }/PhabricatorOAuthServerDAO.php (100%)
 rename src/applications/owners/{replyhandler => }/OwnersPackageReplyHandler.php (100%)
 rename src/applications/owners/controller/{base => }/PhabricatorOwnersController.php (100%)
 rename src/applications/owners/controller/{delete => }/PhabricatorOwnersDeleteController.php (100%)
 rename src/applications/owners/controller/{detail => }/PhabricatorOwnersDetailController.php (100%)
 rename src/applications/owners/controller/{edit => }/PhabricatorOwnersEditController.php (100%)
 rename src/applications/owners/controller/{list => }/PhabricatorOwnersListController.php (100%)
 rename src/applications/owners/mail/{create => }/PackageCreateMail.php (100%)
 rename src/applications/owners/mail/{delete => }/PackageDeleteMail.php (100%)
 rename src/applications/owners/mail/{base => }/PackageMail.php (100%)
 rename src/applications/owners/mail/{modify => }/PackageModifyMail.php (100%)
 rename src/applications/owners/query/{path => }/PhabricatorOwnerPathQuery.php (100%)
 rename src/applications/owners/storage/{base => }/PhabricatorOwnersDAO.php (100%)
 rename src/applications/owners/storage/{owner => }/PhabricatorOwnersOwner.php (100%)
 rename src/applications/owners/storage/{package => }/PhabricatorOwnersPackage.php (100%)
 rename src/applications/owners/storage/{path => }/PhabricatorOwnersPath.php (100%)
 rename src/applications/paste/controller/{base => }/PhabricatorPasteController.php (100%)
 rename src/applications/paste/controller/{list => }/PhabricatorPasteListController.php (100%)
 rename src/applications/paste/controller/{view => }/PhabricatorPasteViewController.php (100%)
 rename src/applications/paste/query/{paste => }/PhabricatorPasteQuery.php (100%)
 rename src/applications/paste/storage/{paste => }/PhabricatorPaste.php (100%)
 rename src/applications/paste/storage/{base => }/PhabricatorPasteDAO.php (100%)
 rename src/applications/people/{query => }/PhabricatorPeopleQuery.php (100%)
 rename src/applications/people/{editor => }/PhabricatorUserEditor.php (100%)
 rename src/applications/people/controller/{emailverification => }/PhabricatorEmailVerificationController.php (100%)
 rename src/applications/people/controller/{base => }/PhabricatorPeopleController.php (100%)
 rename src/applications/people/controller/{edit => }/PhabricatorPeopleEditController.php (100%)
 rename src/applications/people/controller/{list => }/PhabricatorPeopleListController.php (100%)
 rename src/applications/people/controller/{logs => }/PhabricatorPeopleLogsController.php (100%)
 rename src/applications/people/controller/{profile => }/PhabricatorPeopleProfileController.php (100%)
 rename src/applications/people/controller/{settings => }/PhabricatorUserSettingsController.php (100%)
 rename src/applications/people/controller/settings/panels/{account => }/PhabricatorUserAccountSettingsPanelController.php (100%)
 rename src/applications/people/controller/settings/panels/{conduit => }/PhabricatorUserConduitSettingsPanelController.php (100%)
 rename src/applications/people/controller/settings/panels/{emailpref => }/PhabricatorUserEmailPreferenceSettingsPanelController.php (100%)
 rename src/applications/people/controller/settings/panels/{email => }/PhabricatorUserEmailSettingsPanelController.php (100%)
 rename src/applications/people/controller/settings/panels/{oauth => }/PhabricatorUserOAuthSettingsPanelController.php (100%)
 rename src/applications/people/controller/settings/panels/{password => }/PhabricatorUserPasswordSettingsPanelController.php (100%)
 rename src/applications/people/controller/settings/panels/{preferences => }/PhabricatorUserPreferenceSettingsPanelController.php (100%)
 rename src/applications/people/controller/settings/panels/{profile => }/PhabricatorUserProfileSettingsPanelController.php (100%)
 rename src/applications/people/controller/settings/panels/{sshkeys => }/PhabricatorUserSSHKeysSettingsPanelController.php (100%)
 rename src/applications/people/controller/settings/panels/{search => }/PhabricatorUserSearchSettingsPanelController.php (100%)
 rename src/applications/people/controller/settings/panels/{base => }/PhabricatorUserSettingsPanelController.php (100%)
 rename src/applications/people/storage/{user => }/PhabricatorUser.php (100%)
 rename src/applications/people/storage/{base => }/PhabricatorUserDAO.php (100%)
 rename src/applications/people/storage/{email => }/PhabricatorUserEmail.php (100%)
 rename src/applications/people/storage/{log => }/PhabricatorUserLog.php (100%)
 rename src/applications/people/storage/{useroauthinfo => }/PhabricatorUserOAuthInfo.php (100%)
 rename src/applications/people/storage/{preferences => }/PhabricatorUserPreferences.php (100%)
 rename src/applications/people/storage/{profile => }/PhabricatorUserProfile.php (100%)
 rename src/applications/people/storage/{usersshkey => }/PhabricatorUserSSHKey.php (100%)
 rename src/applications/people/storage/{userstatus => }/PhabricatorUserStatus.php (100%)
 rename src/applications/people/storage/{user => }/__tests__/PhabricatorUserTestCase.php (100%)
 rename src/applications/phame/controller/{base => }/PhameController.php (100%)
 rename src/applications/phame/controller/post/{delete => }/PhamePostDeleteController.php (100%)
 rename src/applications/phame/controller/post/{edit => }/PhamePostEditController.php (100%)
 rename src/applications/phame/controller/post/{preview => }/PhamePostPreviewController.php (100%)
 rename src/applications/phame/controller/post/{view => }/PhamePostViewController.php (100%)
 rename src/applications/phame/controller/post/list/{drafts => }/PhameDraftListController.php (100%)
 rename src/applications/phame/controller/post/list/{base => }/PhamePostListBaseController.php (100%)
 rename src/applications/phame/controller/post/list/{posts => }/PhamePostListController.php (100%)
 rename src/applications/phame/query/{post => }/PhamePostQuery.php (100%)
 rename src/applications/phame/storage/{base => }/PhameDAO.php (100%)
 rename src/applications/phame/storage/{post => }/PhamePost.php (100%)
 rename src/applications/phame/view/{postdetail => }/PhamePostDetailView.php (100%)
 rename src/applications/phame/view/{postlist => }/PhamePostListView.php (100%)
 rename src/applications/phid/{graph => }/PhabricatorObjectGraph.php (100%)
 rename src/applications/phid/{handle => }/PhabricatorObjectHandle.php (100%)
 rename src/applications/phid/{constants => }/PhabricatorPHIDConstants.php (100%)
 rename src/applications/phid/controller/{base => }/PhabricatorPHIDController.php (100%)
 rename src/applications/phid/controller/{lookup => }/PhabricatorPHIDLookupController.php (100%)
 rename src/applications/phid/handle/{data => }/PhabricatorObjectHandleData.php (100%)
 rename src/applications/phid/handle/const/{base => }/PhabricatorObjectHandleConstants.php (100%)
 rename src/applications/phid/handle/const/{status => }/PhabricatorObjectHandleStatus.php (100%)
 rename src/applications/phid/handle/view/{selector => }/PhabricatorHandleObjectSelectorDataView.php (100%)
 rename src/applications/phid/storage/{phid => }/PhabricatorPHID.php (100%)
 rename src/applications/phid/{utils => }/utils.php (100%)
 rename src/applications/phortune/control/{monthyearexpiry => }/PhortuneMonthYearExpiryControl.php (100%)
 rename src/applications/phortune/stripe/controller/{base => }/PhortuneStripeBaseController.php (100%)
 rename src/applications/phortune/stripe/controller/{testpaymentform => }/PhortuneStripeTestPaymentFormController.php (100%)
 rename src/applications/phortune/stripe/view/{paymentform => }/PhortuneStripePaymentFormView.php (100%)
 rename src/applications/phriction/constants/{action => }/PhrictionActionConstants.php (100%)
 rename src/applications/phriction/constants/{changetype => }/PhrictionChangeType.php (100%)
 rename src/applications/phriction/constants/{base => }/PhrictionConstants.php (100%)
 rename src/applications/phriction/constants/{documentstatus => }/PhrictionDocumentStatus.php (100%)
 rename src/applications/phriction/controller/{base => }/PhrictionController.php (100%)
 rename src/applications/phriction/controller/{delete => }/PhrictionDeleteController.php (100%)
 rename src/applications/phriction/controller/{diff => }/PhrictionDiffController.php (100%)
 rename src/applications/phriction/controller/{document => }/PhrictionDocumentController.php (100%)
 rename src/applications/phriction/controller/{documentpreview => }/PhrictionDocumentPreviewController.php (100%)
 rename src/applications/phriction/controller/{edit => }/PhrictionEditController.php (100%)
 rename src/applications/phriction/controller/{history => }/PhrictionHistoryController.php (100%)
 rename src/applications/phriction/controller/{list => }/PhrictionListController.php (100%)
 rename src/applications/phriction/editor/{document => }/PhrictionDocumentEditor.php (100%)
 rename src/applications/phriction/storage/{content => }/PhrictionContent.php (100%)
 rename src/applications/phriction/storage/{base => }/PhrictionDAO.php (100%)
 rename src/applications/phriction/storage/{document => }/PhrictionDocument.php (100%)
 rename src/applications/phriction/storage/{document => }/__tests__/PhrictionDocumentTestCase.php (100%)
 rename src/applications/policy/constants/{policy => }/PhabricatorPolicies.php (100%)
 rename src/applications/policy/constants/{capability => }/PhabricatorPolicyCapability.php (100%)
 rename src/applications/policy/constants/{base => }/PhabricatorPolicyConstants.php (100%)
 rename src/applications/policy/exception/{base => }/PhabricatorPolicyException.php (100%)
 rename src/applications/policy/filter/{policy => }/PhabricatorPolicyFilter.php (100%)
 rename src/applications/policy/interface/{policy => }/PhabricatorPolicyInterface.php (100%)
 rename src/applications/project/constants/{base => }/PhabricatorProjectConstants.php (100%)
 rename src/applications/project/constants/{status => }/PhabricatorProjectStatus.php (100%)
 rename src/applications/project/constants/{transaction => }/PhabricatorProjectTransactionType.php (100%)
 rename src/applications/project/controller/{base => }/PhabricatorProjectController.php (100%)
 rename src/applications/project/controller/{create => }/PhabricatorProjectCreateController.php (100%)
 rename src/applications/project/controller/{list => }/PhabricatorProjectListController.php (100%)
 rename src/applications/project/controller/{profile => }/PhabricatorProjectProfileController.php (100%)
 rename src/applications/project/controller/{profileedit => }/PhabricatorProjectProfileEditController.php (100%)
 rename src/applications/project/controller/{update => }/PhabricatorProjectUpdateController.php (100%)
 rename src/applications/project/editor/{project => }/PhabricatorProjectEditor.php (100%)
 rename src/applications/project/exception/{namecollison => }/PhabricatorProjectNameCollisionException.php (100%)
 rename src/applications/project/query/{project => }/PhabricatorProjectQuery.php (100%)
 rename src/applications/project/storage/{project => }/PhabricatorProject.php (100%)
 rename src/applications/project/storage/{affiliation => }/PhabricatorProjectAffiliation.php (100%)
 rename src/applications/project/storage/{base => }/PhabricatorProjectDAO.php (100%)
 rename src/applications/project/storage/{profile => }/PhabricatorProjectProfile.php (100%)
 rename src/applications/project/storage/{subproject => }/PhabricatorProjectSubproject.php (100%)
 rename src/applications/project/storage/{transaction => }/PhabricatorProjectTransaction.php (100%)
 rename src/applications/repository/constants/{repositorytype => }/PhabricatorRepositoryType.php (100%)
 rename src/applications/repository/controller/{arcansistprojectedit => }/PhabricatorRepositoryArcanistProjectEditController.php (100%)
 rename src/applications/repository/controller/{base => }/PhabricatorRepositoryController.php (100%)
 rename src/applications/repository/controller/{create => }/PhabricatorRepositoryCreateController.php (100%)
 rename src/applications/repository/controller/{delete => }/PhabricatorRepositoryDeleteController.php (100%)
 rename src/applications/repository/controller/{edit => }/PhabricatorRepositoryEditController.php (100%)
 rename src/applications/repository/controller/{list => }/PhabricatorRepositoryListController.php (100%)
 rename src/applications/repository/daemon/{pulllocal => }/PhabricatorMercurialGraphStream.php (100%)
 rename src/applications/repository/daemon/{pulllocal => }/PhabricatorRepositoryPullLocalDaemon.php (100%)
 rename src/applications/repository/daemon/{pulllocal => }/__tests__/PhabricatorRepositoryPullLocalDaemonTestCase.php (100%)
 rename src/applications/repository/parser/{base => }/PhabricatorRepositoryCommitMessageDetailParser.php (100%)
 rename src/applications/repository/parser/{default => }/PhabricatorRepositoryDefaultCommitMessageDetailParser.php (100%)
 rename src/applications/repository/storage/{repository => }/PhabricatorRepository.php (100%)
 rename src/applications/repository/storage/{arcanistproject => }/PhabricatorRepositoryArcanistProject.php (100%)
 rename src/applications/repository/storage/{auditrequest => }/PhabricatorRepositoryAuditRequest.php (100%)
 rename src/applications/repository/storage/{commit => }/PhabricatorRepositoryCommit.php (100%)
 rename src/applications/repository/storage/{commitdata => }/PhabricatorRepositoryCommitData.php (100%)
 rename src/applications/repository/storage/{base => }/PhabricatorRepositoryDAO.php (100%)
 rename src/applications/repository/storage/{shortcut => }/PhabricatorRepositoryShortcut.php (100%)
 rename src/applications/repository/storage/{symbol => }/PhabricatorRepositorySymbol.php (100%)
 rename src/applications/repository/storage/{repository => }/__tests__/PhabricatorRepositoryTestCase.php (100%)
 rename src/applications/repository/worker/{herald => }/PhabricatorRepositoryCommitHeraldWorker.php (100%)
 rename src/applications/repository/worker/{owner => }/PhabricatorRepositoryCommitOwnersWorker.php (100%)
 rename src/applications/repository/worker/{base => }/PhabricatorRepositoryCommitParserWorker.php (100%)
 rename src/applications/repository/worker/commitchangeparser/{base => }/PhabricatorRepositoryCommitChangeParserWorker.php (100%)
 rename src/applications/repository/worker/commitchangeparser/{git => }/PhabricatorRepositoryGitCommitChangeParserWorker.php (100%)
 rename src/applications/repository/worker/commitchangeparser/{mercurial => }/PhabricatorRepositoryMercurialCommitChangeParserWorker.php (100%)
 rename src/applications/repository/worker/commitchangeparser/{svn => }/PhabricatorRepositorySvnCommitChangeParserWorker.php (100%)
 rename src/applications/repository/worker/commitmessageparser/{base => }/PhabricatorRepositoryCommitMessageParserWorker.php (100%)
 rename src/applications/repository/worker/commitmessageparser/{git => }/PhabricatorRepositoryGitCommitMessageParserWorker.php (100%)
 rename src/applications/repository/worker/commitmessageparser/{mercurial => }/PhabricatorRepositoryMercurialCommitMessageParserWorker.php (100%)
 rename src/applications/repository/worker/commitmessageparser/{svn => }/PhabricatorRepositorySvnCommitMessageParserWorker.php (100%)
 rename src/applications/search/constants/{field => }/PhabricatorSearchField.php (100%)
 rename src/applications/search/constants/{relationship => }/PhabricatorSearchRelationship.php (100%)
 rename src/applications/search/constants/{scope => }/PhabricatorSearchScope.php (100%)
 rename src/applications/search/controller/{attach => }/PhabricatorSearchAttachController.php (100%)
 rename src/applications/search/controller/{base => }/PhabricatorSearchBaseController.php (100%)
 rename src/applications/search/controller/{search => }/PhabricatorSearchController.php (100%)
 rename src/applications/search/controller/{index => }/PhabricatorSearchIndexController.php (100%)
 rename src/applications/search/controller/{select => }/PhabricatorSearchSelectController.php (100%)
 rename src/applications/search/editor/{attach => }/PhabricatorObjectAttachmentEditor.php (100%)
 rename src/applications/search/engine/{jumpnav => }/PhabricatorJumpNavHandler.php (100%)
 rename src/applications/search/engine/{base => }/PhabricatorSearchEngine.php (100%)
 rename src/applications/search/engine/{elastic => }/PhabricatorSearchEngineElastic.php (100%)
 rename src/applications/search/engine/{mysql => }/PhabricatorSearchEngineMySQL.php (100%)
 rename src/applications/search/index/{abstractdocument => }/PhabricatorSearchAbstractDocument.php (100%)
 rename src/applications/search/index/indexer/{repository => }/PhabricatorSearchCommitIndexer.php (100%)
 rename src/applications/search/index/indexer/{differential => }/PhabricatorSearchDifferentialIndexer.php (100%)
 rename src/applications/search/index/indexer/{base => }/PhabricatorSearchDocumentIndexer.php (100%)
 rename src/applications/search/index/indexer/{maniphest => }/PhabricatorSearchManiphestIndexer.php (100%)
 rename src/applications/search/index/indexer/{phriction => }/PhabricatorSearchPhrictionIndexer.php (100%)
 rename src/applications/search/index/indexer/{user => }/PhabricatorSearchUserIndexer.php (100%)
 rename src/applications/search/selector/{default => }/PhabricatorDefaultSearchEngineSelector.php (100%)
 rename src/applications/search/selector/{base => }/PhabricatorSearchEngineSelector.php (100%)
 rename src/applications/search/storage/{base => }/PhabricatorSearchDAO.php (100%)
 rename src/applications/search/storage/{query => }/PhabricatorSearchQuery.php (100%)
 rename src/applications/search/storage/document/{document => }/PhabricatorSearchDocument.php (100%)
 rename src/applications/search/storage/document/{field => }/PhabricatorSearchDocumentField.php (100%)
 rename src/applications/search/storage/document/{relationship => }/PhabricatorSearchDocumentRelationship.php (100%)
 rename src/applications/search/view/{searchresult => }/PhabricatorSearchResultView.php (100%)
 rename src/applications/slowvote/controller/{base => }/PhabricatorSlowvoteController.php (100%)
 rename src/applications/slowvote/controller/{create => }/PhabricatorSlowvoteCreateController.php (100%)
 rename src/applications/slowvote/controller/{list => }/PhabricatorSlowvoteListController.php (100%)
 rename src/applications/slowvote/controller/{poll => }/PhabricatorSlowvotePollController.php (100%)
 rename src/applications/slowvote/storage/{choice => }/PhabricatorSlowvoteChoice.php (100%)
 rename src/applications/slowvote/storage/{comment => }/PhabricatorSlowvoteComment.php (100%)
 rename src/applications/slowvote/storage/{base => }/PhabricatorSlowvoteDAO.php (100%)
 rename src/applications/slowvote/storage/{option => }/PhabricatorSlowvoteOption.php (100%)
 rename src/applications/slowvote/storage/{poll => }/PhabricatorSlowvotePoll.php (100%)
 rename src/applications/status/{base => }/PhabricatorStatusController.php (100%)
 rename src/applications/typeahead/controller/{common => }/PhabricatorTypeaheadCommonDatasourceController.php (100%)
 rename src/applications/typeahead/controller/{base => }/PhabricatorTypeaheadDatasourceController.php (100%)
 rename src/applications/uiexample/controller/{base => }/PhabricatorUIExampleController.php (100%)
 rename src/applications/uiexample/controller/{render => }/PhabricatorUIExampleRenderController.php (100%)
 rename src/applications/uiexample/examples/{reactor => }/JavelinReactorExample.php (100%)
 rename src/applications/uiexample/examples/{client => }/JavelinViewExample.php (100%)
 rename src/applications/uiexample/examples/{client => }/JavelinViewExampleServerView.php (100%)
 rename src/applications/uiexample/examples/{error => }/PhabricatorErrorExample.php (100%)
 rename src/applications/uiexample/examples/{form => }/PhabricatorFormExample.php (100%)
 rename src/applications/uiexample/examples/{sorttable => }/PhabricatorSortTableExample.php (100%)
 rename src/applications/uiexample/examples/{base => }/PhabricatorUIExample.php (100%)
 rename src/applications/uiexample/examples/{listfilter => }/PhabricatorUIListFilterExample.php (100%)
 rename src/applications/uiexample/examples/{pager => }/PhabricatorUIPagerExample.php (100%)
 rename src/applications/uiexample/examples/{tooltip => }/PhabricatorUITooltipExample.php (100%)
 rename src/applications/xhpastview/controller/{base => }/PhabricatorXHPASTViewController.php (100%)
 rename src/applications/xhpastview/controller/{viewframe => }/PhabricatorXHPASTViewFrameController.php (100%)
 rename src/applications/xhpastview/controller/{viewframeset => }/PhabricatorXHPASTViewFramesetController.php (100%)
 rename src/applications/xhpastview/controller/{viewinput => }/PhabricatorXHPASTViewInputController.php (100%)
 rename src/applications/xhpastview/controller/{viewpanel => }/PhabricatorXHPASTViewPanelController.php (100%)
 rename src/applications/xhpastview/controller/{run => }/PhabricatorXHPASTViewRunController.php (100%)
 rename src/applications/xhpastview/controller/{viewstream => }/PhabricatorXHPASTViewStreamController.php (100%)
 rename src/applications/xhpastview/controller/{viewtree => }/PhabricatorXHPASTViewTreeController.php (100%)
 rename src/applications/xhpastview/storage/{base => }/PhabricatorXHPASTViewDAO.php (100%)
 rename src/applications/xhpastview/storage/{parsetree => }/PhabricatorXHPASTViewParseTree.php (100%)
 rename src/applications/xhprof/controller/{base => }/PhabricatorXHProfController.php (100%)
 rename src/applications/xhprof/controller/{profile => }/PhabricatorXHProfProfileController.php (100%)
 rename src/applications/xhprof/view/{symbol => }/PhabricatorXHProfProfileSymbolView.php (100%)
 rename src/applications/xhprof/view/{toplevel => }/PhabricatorXHProfProfileTopLevelView.php (100%)
 rename src/applications/xhprof/view/{base => }/PhabricatorXHProfProfileView.php (100%)
 rename src/infrastructure/{accesslog => }/PhabricatorAccessLog.php (100%)
 rename src/infrastructure/{env => }/PhabricatorEnv.php (100%)
 rename src/infrastructure/{env => }/PhabricatorScopedEnv.php (100%)
 rename src/infrastructure/{setup => }/PhabricatorSetup.php (100%)
 rename src/infrastructure/{env => }/__tests__/PhabricatorEnvTestCase.php (100%)
 rename src/infrastructure/celerity/{api => }/CelerityAPI.php (100%)
 rename src/infrastructure/celerity/{controller => }/CelerityResourceController.php (100%)
 rename src/infrastructure/celerity/{graph => }/CelerityResourceGraph.php (100%)
 rename src/infrastructure/celerity/{map => }/CelerityResourceMap.php (100%)
 rename src/infrastructure/celerity/{transformer => }/CelerityResourceTransformer.php (100%)
 rename src/infrastructure/celerity/{response => }/CelerityStaticResourceResponse.php (100%)
 rename src/infrastructure/celerity/{transformer => }/__tests__/CelerityResourceTransformerTestCase.php (97%)
 rename src/infrastructure/celerity/{transformer/__tests__/data => __tests__/transformer}/min.css (100%)
 rename src/infrastructure/celerity/{transformer/__tests__/data => __tests__/transformer}/xform.css (100%)
 rename src/infrastructure/celerity/{api/utils.php => api.php} (100%)
 rename src/infrastructure/celerity/{map/utils.php => map.php} (100%)
 rename src/infrastructure/daemon/{base => }/PhabricatorDaemon.php (100%)
 rename src/infrastructure/daemon/{control => }/PhabricatorDaemonControl.php (100%)
 rename src/infrastructure/daemon/{garbagecollector => }/PhabricatorGarbageCollectorDaemon.php (100%)
 rename src/infrastructure/daemon/control/{reference => }/PhabricatorDaemonReference.php (100%)
 rename src/infrastructure/daemon/irc/{bot => }/PhabricatorIRCBot.php (100%)
 rename src/infrastructure/daemon/irc/{message => }/PhabricatorIRCMessage.php (100%)
 rename src/infrastructure/daemon/irc/handler/{differentialnotification => }/PhabricatorIRCDifferentialNotificationHandler.php (100%)
 rename src/infrastructure/daemon/irc/handler/{base => }/PhabricatorIRCHandler.php (100%)
 rename src/infrastructure/daemon/irc/handler/{log => }/PhabricatorIRCLogHandler.php (100%)
 rename src/infrastructure/daemon/irc/handler/{macro => }/PhabricatorIRCMacroHandler.php (100%)
 rename src/infrastructure/daemon/irc/handler/{objectname => }/PhabricatorIRCObjectNameHandler.php (100%)
 rename src/infrastructure/daemon/irc/handler/{protocol => }/PhabricatorIRCProtocolHandler.php (100%)
 rename src/infrastructure/daemon/irc/handler/{whatsnew => }/PhabricatorIRCWhatsNewHandler.php (100%)
 rename src/infrastructure/daemon/storage/{base => }/PhabricatorDaemonDAO.php (100%)
 rename src/infrastructure/daemon/storage/{log => }/PhabricatorDaemonLog.php (100%)
 rename src/infrastructure/daemon/storage/{event => }/PhabricatorDaemonLogEvent.php (100%)
 rename src/infrastructure/daemon/timeline/cursor/{iterator => }/PhabricatorTimelineIterator.php (100%)
 rename src/infrastructure/daemon/timeline/storage/{cursor => }/PhabricatorTimelineCursor.php (100%)
 rename src/infrastructure/daemon/timeline/storage/{base => }/PhabricatorTimelineDAO.php (100%)
 rename src/infrastructure/daemon/timeline/storage/{event => }/PhabricatorTimelineEvent.php (100%)
 rename src/infrastructure/daemon/timeline/storage/{eventdata => }/PhabricatorTimelineEventData.php (100%)
 rename src/infrastructure/daemon/workers/{taskmaster => }/PhabricatorTaskmasterDaemon.php (100%)
 rename src/infrastructure/daemon/workers/{worker => }/PhabricatorWorker.php (100%)
 rename src/infrastructure/daemon/workers/storage/{base => }/PhabricatorWorkerDAO.php (100%)
 rename src/infrastructure/daemon/workers/storage/{task => }/PhabricatorWorkerTask.php (100%)
 rename src/infrastructure/daemon/workers/storage/{taskdata => }/PhabricatorWorkerTaskData.php (100%)
 rename src/infrastructure/daemon/workers/worker/{goodfornothing => }/PhabricatorGoodForNothingWorker.php (100%)
 rename src/infrastructure/diff/{response => }/PhabricatorChangesetResponse.php (100%)
 rename src/infrastructure/diff/{engine => }/PhabricatorDifferenceEngine.php (100%)
 rename src/infrastructure/diff/{controller => }/PhabricatorInlineCommentController.php (100%)
 rename src/infrastructure/diff/interface/{inline => }/PhabricatorInlineCommentInterface.php (100%)
 rename src/infrastructure/diff/view/{inline => }/PhabricatorInlineSummaryView.php (100%)
 rename src/infrastructure/edges/constants/{config => }/PhabricatorEdgeConfig.php (100%)
 rename src/infrastructure/edges/constants/{base => }/PhabricatorEdgeConstants.php (100%)
 rename src/infrastructure/edges/editor/{edge => }/PhabricatorEdgeEditor.php (100%)
 rename src/infrastructure/edges/query/{edge => }/PhabricatorEdgeQuery.php (100%)
 rename src/infrastructure/events/{event => }/PhabricatorEvent.php (100%)
 rename src/infrastructure/events/{engine => }/PhabricatorEventEngine.php (100%)
 rename src/infrastructure/events/constant/{type => }/PhabricatorEventType.php (100%)
 rename src/infrastructure/javelin/{api => }/Javelin.php (100%)
 rename src/infrastructure/javelin/{markup => }/markup.php (100%)
 rename src/infrastructure/lint/{engine => }/PhabricatorLintEngine.php (100%)
 rename src/infrastructure/lint/hook/{xhpastsymbolname => }/PhabricatorSymbolNameLinter.php (100%)
 rename src/infrastructure/lint/linter/{javelin => }/PhabricatorJavelinLinter.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/{differential => }/PhabricatorRemarkupRuleDifferential.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/{diffusion => }/PhabricatorRemarkupRuleDiffusion.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/{embedobject => }/PhabricatorRemarkupRuleEmbedFile.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/{imagemacro => }/PhabricatorRemarkupRuleImageMacro.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/{maniphest => }/PhabricatorRemarkupRuleManiphest.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/{mention => }/PhabricatorRemarkupRuleMention.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/{handle => }/PhabricatorRemarkupRuleObjectHandle.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/{objectname => }/PhabricatorRemarkupRuleObjectName.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/{paste => }/PhabricatorRemarkupRulePaste.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/{phriction => }/PhabricatorRemarkupRulePhriction.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/{proxyimage => }/PhabricatorRemarkupRuleProxyImage.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/{youtube => }/PhabricatorRemarkupRuleYoutube.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/handle/{differential => }/PhabricatorRemarkupRuleDifferentialHandle.php (100%)
 rename src/infrastructure/markup/remarkup/markuprule/handle/{maniphest => }/PhabricatorRemarkupRuleManiphestHandle.php (100%)
 rename src/infrastructure/query/{offsetpaged => }/PhabricatorOffsetPagedQuery.php (100%)
 rename src/infrastructure/query/{base => }/PhabricatorQuery.php (100%)
 rename src/infrastructure/query/policy/{idpaged => }/PhabricatorIDPagedPolicyQuery.php (100%)
 rename src/infrastructure/query/policy/{base => }/PhabricatorPolicyQuery.php (100%)
 rename src/infrastructure/setup/sql/{phabricator => }/PhabricatorBuiltinPatchList.php (100%)
 rename src/infrastructure/setup/sql/{base => }/PhabricatorSQLPatchList.php (100%)
 rename src/infrastructure/setup/storage/{management => }/PhabricatorStorageManagementAPI.php (100%)
 rename src/infrastructure/setup/storage/{patch => }/PhabricatorStoragePatch.php (100%)
 rename src/infrastructure/setup/storage/workflow/{databases => }/PhabricatorStorageManagementDatabasesWorkflow.php (100%)
 rename src/infrastructure/setup/storage/workflow/{destroy => }/PhabricatorStorageManagementDestroyWorkflow.php (100%)
 rename src/infrastructure/setup/storage/workflow/{dump => }/PhabricatorStorageManagementDumpWorkflow.php (100%)
 rename src/infrastructure/setup/storage/workflow/{status => }/PhabricatorStorageManagementStatusWorkflow.php (100%)
 rename src/infrastructure/setup/storage/workflow/{upgrade => }/PhabricatorStorageManagementUpgradeWorkflow.php (100%)
 rename src/infrastructure/setup/storage/workflow/{base => }/PhabricatorStorageManagementWorkflow.php (100%)
 rename src/infrastructure/testing/{testcase => }/PhabricatorTestCase.php (100%)
 rename src/infrastructure/testing/{testcase => }/__tests__/PhabricatorTrivialTestCase.php (100%)
 rename src/infrastructure/testing/fixture/{storage => }/PhabricatorStorageFixtureScopeGuard.php (100%)
 rename src/infrastructure/util/{hash => }/PhabricatorHash.php (100%)
 rename src/infrastructure/util/{slug => }/PhabricatorSlug.php (100%)
 rename src/infrastructure/util/{slug => }/__tests__/PhabricatorSlugTestCase.php (100%)
 rename src/storage/{transaction => }/AphrontDatabaseTransactionState.php (100%)
 rename src/storage/{qsprintf => }/__tests__/QueryFormattingTestCase.php (100%)
 rename src/storage/connection/{base => }/AphrontDatabaseConnection.php (100%)
 rename src/storage/connection/{isolated => }/AphrontIsolatedDatabaseConnection.php (100%)
 rename src/storage/connection/{isolated => }/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php (100%)
 rename src/storage/connection/{mysql => }/__tests__/AphrontMySQLDatabaseConnectionTestCase.php (100%)
 rename src/storage/connection/mysql/{mysql => }/AphrontMySQLDatabaseConnection.php (100%)
 rename src/storage/connection/mysql/{base => }/AphrontMySQLDatabaseConnectionBase.php (100%)
 rename src/storage/connection/mysql/{mysqli => }/AphrontMySQLiDatabaseConnection.php (100%)
 rename src/storage/exception/{accessdenied => }/AphrontQueryAccessDeniedException.php (100%)
 rename src/storage/exception/{connection => }/AphrontQueryConnectionException.php (100%)
 rename src/storage/exception/{connectionlost => }/AphrontQueryConnectionLostException.php (100%)
 rename src/storage/exception/{count => }/AphrontQueryCountException.php (100%)
 rename src/storage/exception/{deadlock => }/AphrontQueryDeadlockException.php (100%)
 rename src/storage/exception/{duplicatekey => }/AphrontQueryDuplicateKeyException.php (100%)
 rename src/storage/exception/{base => }/AphrontQueryException.php (100%)
 rename src/storage/exception/{objectmissing => }/AphrontQueryObjectMissingException.php (100%)
 rename src/storage/exception/{parameter => }/AphrontQueryParameterException.php (100%)
 rename src/storage/exception/{recoverable => }/AphrontQueryRecoverableException.php (100%)
 rename src/storage/exception/{schema => }/AphrontQuerySchemaException.php (100%)
 rename src/storage/lisk/{dao => }/LiskDAO.php (100%)
 rename src/storage/lisk/{dao => }/LiskDAOSet.php (100%)
 rename src/storage/lisk/{dao => }/LiskEphemeralObjectException.php (100%)
 rename src/storage/lisk/{dao => }/__tests__/LiskFixtureTestCase.php (100%)
 rename src/storage/lisk/{dao => }/__tests__/LiskIsolationTestCase.php (100%)
 rename src/storage/lisk/{dao => }/__tests__/LiskIsolationTestDAO.php (100%)
 rename src/storage/lisk/{dao => }/__tests__/LiskIsolationTestDAOException.php (100%)
 rename src/storage/{qsprintf => }/qsprintf.php (100%)
 rename src/storage/{queryfx => }/queryfx.php (100%)
 rename src/view/{dialog => }/AphrontDialogView.php (100%)
 rename src/view/{javelin-view => }/AphrontJavelinView.php (100%)
 rename src/view/{null => }/AphrontNullView.php (100%)
 rename src/view/{base => }/AphrontView.php (100%)
 rename src/view/{utils => }/__tests__/PhabricatorLocalTimeTestCase.php (100%)
 rename src/view/{utils => }/__tests__/PhabricatorUnitsTestCase.php (100%)
 rename src/view/control/{attachedfile => }/AphrontAttachedFileView.php (100%)
 rename src/view/control/{idpager => }/AphrontIDPagerView.php (100%)
 rename src/view/control/{pager => }/AphrontPagerView.php (100%)
 rename src/view/control/{table => }/AphrontTableView.php (100%)
 rename src/view/control/{tokenizer => }/AphrontTokenizerTemplateView.php (100%)
 rename src/view/control/{typeahead => }/AphrontTypeaheadTemplateView.php (100%)
 rename src/view/control/{objectselector => }/PhabricatorObjectSelectorDialog.php (100%)
 rename src/view/form/{error => }/AphrontErrorView.php (100%)
 rename src/view/form/{inset => }/AphrontFormInsetView.php (100%)
 rename src/view/form/{layout => }/AphrontFormLayoutView.php (100%)
 rename src/view/form/{base => }/AphrontFormView.php (100%)
 rename src/view/form/control/{checkbox => }/AphrontFormCheckboxControl.php (100%)
 rename src/view/form/control/{base => }/AphrontFormControl.php (100%)
 rename src/view/form/control/{date => }/AphrontFormDateControl.php (100%)
 rename src/view/form/control/{divider => }/AphrontFormDividerControl.php (100%)
 rename src/view/form/control/{draganddropupload => }/AphrontFormDragAndDropUploadControl.php (100%)
 rename src/view/form/control/{file => }/AphrontFormFileControl.php (100%)
 rename src/view/form/control/{markup => }/AphrontFormMarkupControl.php (100%)
 rename src/view/form/control/{password => }/AphrontFormPasswordControl.php (100%)
 rename src/view/form/control/{policy => }/AphrontFormPolicyControl.php (100%)
 rename src/view/form/control/{radio => }/AphrontFormRadioButtonControl.php (100%)
 rename src/view/form/control/{recaptcha => }/AphrontFormRecaptchaControl.php (100%)
 rename src/view/form/control/{select => }/AphrontFormSelectControl.php (100%)
 rename src/view/form/control/{static => }/AphrontFormStaticControl.php (100%)
 rename src/view/form/control/{submit => }/AphrontFormSubmitControl.php (100%)
 rename src/view/form/control/{textarea => }/AphrontFormTextAreaControl.php (100%)
 rename src/view/form/control/{text => }/AphrontFormTextControl.php (100%)
 rename src/view/form/control/{togglebuttons => }/AphrontFormToggleButtonsControl.php (100%)
 rename src/view/form/control/{tokenizer => }/AphrontFormTokenizerControl.php (100%)
 rename src/view/layout/{contextbar => }/AphrontContextBarView.php (100%)
 rename src/view/layout/{crumbs => }/AphrontCrumbsView.php (100%)
 rename src/view/layout/{filepreview => }/AphrontFilePreviewView.php (100%)
 rename src/view/layout/{listfilter => }/AphrontListFilterView.php (100%)
 rename src/view/layout/{minipanel => }/AphrontMiniPanelView.php (100%)
 rename src/view/layout/{more => }/AphrontMoreView.php (100%)
 rename src/view/layout/{panel => }/AphrontPanelView.php (100%)
 rename src/view/layout/{sidenavfilter => }/AphrontSideNavFilterView.php (100%)
 rename src/view/layout/{sidenav => }/AphrontSideNavView.php (100%)
 rename src/view/layout/{profileheader => }/PhabricatorProfileHeaderView.php (100%)
 rename src/view/layout/{transaction => }/PhabricatorTransactionView.php (100%)
 rename src/view/layout/headsup/{actionlist => }/AphrontHeadsupActionListView.php (100%)
 rename src/view/layout/headsup/{action => }/AphrontHeadsupActionView.php (100%)
 rename src/view/layout/headsup/{panel => }/AphrontHeadsupView.php (100%)
 rename src/view/page/{base => }/AphrontPageView.php (100%)
 rename src/view/page/{failure => }/AphrontRequestFailureView.php (100%)
 rename src/view/page/{standard => }/PhabricatorStandardPageView.php (100%)
 rename src/view/{utils => }/viewutils.php (100%)
 rename src/view/widget/{keyboardshortcuts => }/AphrontKeyboardShortcutsAvailableView.php (100%)

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index a62d7749a0..556054e357 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -10,1062 +10,1062 @@ phutil_register_library_map(array(
   '__library_version__' => 2,
   'class' =>
   array(
-    'Aphront304Response' => 'aphront/response/304/Aphront304Response.php',
-    'Aphront400Response' => 'aphront/response/400/Aphront400Response.php',
-    'Aphront403Response' => 'aphront/response/403/Aphront403Response.php',
-    'Aphront404Response' => 'aphront/response/404/Aphront404Response.php',
-    'AphrontAjaxResponse' => 'aphront/response/ajax/AphrontAjaxResponse.php',
-    'AphrontApplicationConfiguration' => 'aphront/applicationconfiguration/AphrontApplicationConfiguration.php',
-    'AphrontAttachedFileView' => 'view/control/attachedfile/AphrontAttachedFileView.php',
-    'AphrontCSRFException' => 'aphront/exception/csrf/AphrontCSRFException.php',
-    'AphrontCalendarEventView' => 'applications/calendar/view/event/AphrontCalendarEventView.php',
-    'AphrontCalendarMonthView' => 'applications/calendar/view/month/AphrontCalendarMonthView.php',
-    'AphrontContextBarView' => 'view/layout/contextbar/AphrontContextBarView.php',
-    'AphrontController' => 'aphront/controller/AphrontController.php',
-    'AphrontCrumbsView' => 'view/layout/crumbs/AphrontCrumbsView.php',
-    'AphrontDatabaseConnection' => 'storage/connection/base/AphrontDatabaseConnection.php',
-    'AphrontDatabaseTransactionState' => 'storage/transaction/AphrontDatabaseTransactionState.php',
-    'AphrontDefaultApplicationConfiguration' => 'aphront/default/configuration/AphrontDefaultApplicationConfiguration.php',
-    'AphrontDialogResponse' => 'aphront/response/dialog/AphrontDialogResponse.php',
-    'AphrontDialogView' => 'view/dialog/AphrontDialogView.php',
-    'AphrontErrorView' => 'view/form/error/AphrontErrorView.php',
-    'AphrontException' => 'aphront/exception/base/AphrontException.php',
-    'AphrontFilePreviewView' => 'view/layout/filepreview/AphrontFilePreviewView.php',
-    'AphrontFileResponse' => 'aphront/response/file/AphrontFileResponse.php',
-    'AphrontFormCheckboxControl' => 'view/form/control/checkbox/AphrontFormCheckboxControl.php',
-    'AphrontFormControl' => 'view/form/control/base/AphrontFormControl.php',
-    'AphrontFormDateControl' => 'view/form/control/date/AphrontFormDateControl.php',
-    'AphrontFormDividerControl' => 'view/form/control/divider/AphrontFormDividerControl.php',
-    'AphrontFormDragAndDropUploadControl' => 'view/form/control/draganddropupload/AphrontFormDragAndDropUploadControl.php',
-    'AphrontFormFileControl' => 'view/form/control/file/AphrontFormFileControl.php',
-    'AphrontFormInsetView' => 'view/form/inset/AphrontFormInsetView.php',
-    'AphrontFormLayoutView' => 'view/form/layout/AphrontFormLayoutView.php',
-    'AphrontFormMarkupControl' => 'view/form/control/markup/AphrontFormMarkupControl.php',
-    'AphrontFormPasswordControl' => 'view/form/control/password/AphrontFormPasswordControl.php',
-    'AphrontFormPolicyControl' => 'view/form/control/policy/AphrontFormPolicyControl.php',
-    'AphrontFormRadioButtonControl' => 'view/form/control/radio/AphrontFormRadioButtonControl.php',
-    'AphrontFormRecaptchaControl' => 'view/form/control/recaptcha/AphrontFormRecaptchaControl.php',
-    'AphrontFormSelectControl' => 'view/form/control/select/AphrontFormSelectControl.php',
-    'AphrontFormStaticControl' => 'view/form/control/static/AphrontFormStaticControl.php',
-    'AphrontFormSubmitControl' => 'view/form/control/submit/AphrontFormSubmitControl.php',
-    'AphrontFormTextAreaControl' => 'view/form/control/textarea/AphrontFormTextAreaControl.php',
-    'AphrontFormTextControl' => 'view/form/control/text/AphrontFormTextControl.php',
-    'AphrontFormToggleButtonsControl' => 'view/form/control/togglebuttons/AphrontFormToggleButtonsControl.php',
-    'AphrontFormTokenizerControl' => 'view/form/control/tokenizer/AphrontFormTokenizerControl.php',
-    'AphrontFormView' => 'view/form/base/AphrontFormView.php',
-    'AphrontHTTPSink' => 'aphront/sink/base/AphrontHTTPSink.php',
-    'AphrontHTTPSinkTestCase' => 'aphront/sink/base/__tests__/AphrontHTTPSinkTestCase.php',
-    'AphrontHeadsupActionListView' => 'view/layout/headsup/actionlist/AphrontHeadsupActionListView.php',
-    'AphrontHeadsupActionView' => 'view/layout/headsup/action/AphrontHeadsupActionView.php',
-    'AphrontHeadsupView' => 'view/layout/headsup/panel/AphrontHeadsupView.php',
-    'AphrontIDPagerView' => 'view/control/idpager/AphrontIDPagerView.php',
-    'AphrontIsolatedDatabaseConnection' => 'storage/connection/isolated/AphrontIsolatedDatabaseConnection.php',
-    'AphrontIsolatedDatabaseConnectionTestCase' => 'storage/connection/isolated/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php',
-    'AphrontIsolatedHTTPSink' => 'aphront/sink/test/AphrontIsolatedHTTPSink.php',
-    'AphrontJSONResponse' => 'aphront/response/json/AphrontJSONResponse.php',
-    'AphrontJavelinView' => 'view/javelin-view/AphrontJavelinView.php',
-    'AphrontKeyboardShortcutsAvailableView' => 'view/widget/keyboardshortcuts/AphrontKeyboardShortcutsAvailableView.php',
-    'AphrontListFilterView' => 'view/layout/listfilter/AphrontListFilterView.php',
-    'AphrontMiniPanelView' => 'view/layout/minipanel/AphrontMiniPanelView.php',
-    'AphrontMoreView' => 'view/layout/more/AphrontMoreView.php',
-    'AphrontMySQLDatabaseConnection' => 'storage/connection/mysql/mysql/AphrontMySQLDatabaseConnection.php',
-    'AphrontMySQLDatabaseConnectionBase' => 'storage/connection/mysql/base/AphrontMySQLDatabaseConnectionBase.php',
-    'AphrontMySQLDatabaseConnectionTestCase' => 'storage/connection/mysql/__tests__/AphrontMySQLDatabaseConnectionTestCase.php',
-    'AphrontMySQLiDatabaseConnection' => 'storage/connection/mysql/mysqli/AphrontMySQLiDatabaseConnection.php',
-    'AphrontNullView' => 'view/null/AphrontNullView.php',
-    'AphrontPHPHTTPSink' => 'aphront/sink/php/AphrontPHPHTTPSink.php',
-    'AphrontPageView' => 'view/page/base/AphrontPageView.php',
-    'AphrontPagerView' => 'view/control/pager/AphrontPagerView.php',
-    'AphrontPanelView' => 'view/layout/panel/AphrontPanelView.php',
-    'AphrontPlainTextResponse' => 'aphront/response/plaintext/AphrontPlainTextResponse.php',
-    'AphrontProxyResponse' => 'aphront/response/proxy/AphrontProxyResponse.php',
-    'AphrontQueryAccessDeniedException' => 'storage/exception/accessdenied/AphrontQueryAccessDeniedException.php',
-    'AphrontQueryConnectionException' => 'storage/exception/connection/AphrontQueryConnectionException.php',
-    'AphrontQueryConnectionLostException' => 'storage/exception/connectionlost/AphrontQueryConnectionLostException.php',
-    'AphrontQueryCountException' => 'storage/exception/count/AphrontQueryCountException.php',
-    'AphrontQueryDeadlockException' => 'storage/exception/deadlock/AphrontQueryDeadlockException.php',
-    'AphrontQueryDuplicateKeyException' => 'storage/exception/duplicatekey/AphrontQueryDuplicateKeyException.php',
-    'AphrontQueryException' => 'storage/exception/base/AphrontQueryException.php',
-    'AphrontQueryObjectMissingException' => 'storage/exception/objectmissing/AphrontQueryObjectMissingException.php',
-    'AphrontQueryParameterException' => 'storage/exception/parameter/AphrontQueryParameterException.php',
-    'AphrontQueryRecoverableException' => 'storage/exception/recoverable/AphrontQueryRecoverableException.php',
-    'AphrontQuerySchemaException' => 'storage/exception/schema/AphrontQuerySchemaException.php',
-    'AphrontRedirectException' => 'aphront/exception/redirect/AphrontRedirectException.php',
-    'AphrontRedirectResponse' => 'aphront/response/redirect/AphrontRedirectResponse.php',
-    'AphrontReloadResponse' => 'aphront/response/reload/AphrontReloadResponse.php',
-    'AphrontRequest' => 'aphront/request/AphrontRequest.php',
-    'AphrontRequestFailureView' => 'view/page/failure/AphrontRequestFailureView.php',
-    'AphrontRequestTestCase' => 'aphront/request/__tests__/AphrontRequestTestCase.php',
-    'AphrontResponse' => 'aphront/response/base/AphrontResponse.php',
-    'AphrontScopedUnguardedWriteCapability' => 'aphront/writeguard/scopeguard/AphrontScopedUnguardedWriteCapability.php',
-    'AphrontSideNavFilterView' => 'view/layout/sidenavfilter/AphrontSideNavFilterView.php',
-    'AphrontSideNavView' => 'view/layout/sidenav/AphrontSideNavView.php',
-    'AphrontTableView' => 'view/control/table/AphrontTableView.php',
-    'AphrontTokenizerTemplateView' => 'view/control/tokenizer/AphrontTokenizerTemplateView.php',
-    'AphrontTypeaheadTemplateView' => 'view/control/typeahead/AphrontTypeaheadTemplateView.php',
-    'AphrontURIMapper' => 'aphront/mapper/AphrontURIMapper.php',
-    'AphrontUsageException' => 'aphront/exception/usage/AphrontUsageException.php',
-    'AphrontView' => 'view/base/AphrontView.php',
-    'AphrontWebpageResponse' => 'aphront/response/webpage/AphrontWebpageResponse.php',
-    'AphrontWriteGuard' => 'aphront/writeguard/AphrontWriteGuard.php',
-    'CelerityAPI' => 'infrastructure/celerity/api/CelerityAPI.php',
-    'CelerityResourceController' => 'infrastructure/celerity/controller/CelerityResourceController.php',
-    'CelerityResourceGraph' => 'infrastructure/celerity/graph/CelerityResourceGraph.php',
-    'CelerityResourceMap' => 'infrastructure/celerity/map/CelerityResourceMap.php',
-    'CelerityResourceTransformer' => 'infrastructure/celerity/transformer/CelerityResourceTransformer.php',
-    'CelerityResourceTransformerTestCase' => 'infrastructure/celerity/transformer/__tests__/CelerityResourceTransformerTestCase.php',
-    'CelerityStaticResourceResponse' => 'infrastructure/celerity/response/CelerityStaticResourceResponse.php',
-    'ConduitAPIMethod' => 'applications/conduit/method/base/ConduitAPIMethod.php',
-    'ConduitAPIRequest' => 'applications/conduit/protocol/request/ConduitAPIRequest.php',
-    'ConduitAPIResponse' => 'applications/conduit/protocol/response/ConduitAPIResponse.php',
-    'ConduitAPI_arcanist_Method' => 'applications/conduit/method/arcanist/base/ConduitAPI_arcanist_Method.php',
-    'ConduitAPI_arcanist_projectinfo_Method' => 'applications/conduit/method/arcanist/projectinfo/ConduitAPI_arcanist_projectinfo_Method.php',
-    'ConduitAPI_audit_Method' => 'applications/conduit/method/audit/base/ConduitAPI_audit_Method.php',
-    'ConduitAPI_audit_query_Method' => 'applications/conduit/method/audit/query/ConduitAPI_audit_query_Method.php',
-    'ConduitAPI_chatlog_Method' => 'applications/conduit/method/chatlog/base/ConduitAPI_chatlog_Method.php',
-    'ConduitAPI_chatlog_query_Method' => 'applications/conduit/method/chatlog/query/ConduitAPI_chatlog_query_Method.php',
-    'ConduitAPI_chatlog_record_Method' => 'applications/conduit/method/chatlog/record/ConduitAPI_chatlog_record_Method.php',
-    'ConduitAPI_conduit_connect_Method' => 'applications/conduit/method/conduit/connect/ConduitAPI_conduit_connect_Method.php',
-    'ConduitAPI_conduit_getcertificate_Method' => 'applications/conduit/method/conduit/getcertificate/ConduitAPI_conduit_getcertificate_Method.php',
-    'ConduitAPI_conduit_ping_Method' => 'applications/conduit/method/conduit/ping/ConduitAPI_conduit_ping_Method.php',
-    'ConduitAPI_daemon_launched_Method' => 'applications/conduit/method/daemon/launched/ConduitAPI_daemon_launched_Method.php',
-    'ConduitAPI_daemon_log_Method' => 'applications/conduit/method/daemon/log/ConduitAPI_daemon_log_Method.php',
-    'ConduitAPI_differential_close_Method' => 'applications/conduit/method/differential/close/ConduitAPI_differential_close_Method.php',
-    'ConduitAPI_differential_createcomment_Method' => 'applications/conduit/method/differential/createcomment/ConduitAPI_differential_createcomment_Method.php',
-    'ConduitAPI_differential_creatediff_Method' => 'applications/conduit/method/differential/creatediff/ConduitAPI_differential_creatediff_Method.php',
-    'ConduitAPI_differential_createrevision_Method' => 'applications/conduit/method/differential/createrevision/ConduitAPI_differential_createrevision_Method.php',
-    'ConduitAPI_differential_find_Method' => 'applications/conduit/method/differential/find/ConduitAPI_differential_find_Method.php',
-    'ConduitAPI_differential_getalldiffs_Method' => 'applications/conduit/method/differential/getalldiffs/ConduitAPI_differential_getalldiffs_Method.php',
-    'ConduitAPI_differential_getcommitmessage_Method' => 'applications/conduit/method/differential/getcommitmessage/ConduitAPI_differential_getcommitmessage_Method.php',
-    'ConduitAPI_differential_getcommitpaths_Method' => 'applications/conduit/method/differential/getcommitpaths/ConduitAPI_differential_getcommitpaths_Method.php',
-    'ConduitAPI_differential_getdiff_Method' => 'applications/conduit/method/differential/getdiff/ConduitAPI_differential_getdiff_Method.php',
-    'ConduitAPI_differential_getrevision_Method' => 'applications/conduit/method/differential/getrevision/ConduitAPI_differential_getrevision_Method.php',
-    'ConduitAPI_differential_getrevisioncomments_Method' => 'applications/conduit/method/differential/getrevisioncomments/ConduitAPI_differential_getrevisioncomments_Method.php',
-    'ConduitAPI_differential_getrevisionfeedback_Method' => 'applications/conduit/method/differential/getrevisionfeedback/ConduitAPI_differential_getrevisionfeedback_Method.php',
-    'ConduitAPI_differential_markcommitted_Method' => 'applications/conduit/method/differential/markcommitted/ConduitAPI_differential_markcommitted_Method.php',
-    'ConduitAPI_differential_parsecommitmessage_Method' => 'applications/conduit/method/differential/parsecommitmessage/ConduitAPI_differential_parsecommitmessage_Method.php',
-    'ConduitAPI_differential_query_Method' => 'applications/conduit/method/differential/query/ConduitAPI_differential_query_Method.php',
-    'ConduitAPI_differential_setdiffproperty_Method' => 'applications/conduit/method/differential/setdiffproperty/ConduitAPI_differential_setdiffproperty_Method.php',
-    'ConduitAPI_differential_updaterevision_Method' => 'applications/conduit/method/differential/updaterevision/ConduitAPI_differential_updaterevision_Method.php',
-    'ConduitAPI_differential_updatetaskrevisionassoc_Method' => 'applications/conduit/method/differential/updatetaskrevisionassoc/ConduitAPI_differential_updatetaskrevisionassoc_Method.php',
-    'ConduitAPI_differential_updateunitresults_Method' => 'applications/conduit/method/differential/updateunitresults/ConduitAPI_differential_updateunitresults_Method.php',
-    'ConduitAPI_diffusion_findsymbols_Method' => 'applications/conduit/method/diffusion/findsymbols/ConduitAPI_diffusion_findsymbols_Method.php',
-    'ConduitAPI_diffusion_getcommits_Method' => 'applications/conduit/method/diffusion/getcommits/ConduitAPI_diffusion_getcommits_Method.php',
-    'ConduitAPI_diffusion_getrecentcommitsbypath_Method' => 'applications/conduit/method/diffusion/getrecentcommitsbypath/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php',
-    'ConduitAPI_feed_publish_Method' => 'applications/conduit/method/feed/publish/ConduitAPI_feed_publish_Method.php',
-    'ConduitAPI_feed_query_Method' => 'applications/conduit/method/feed/query/ConduitAPI_feed_query_Method.php',
-    'ConduitAPI_file_download_Method' => 'applications/conduit/method/file/download/ConduitAPI_file_download_Method.php',
-    'ConduitAPI_file_info_Method' => 'applications/conduit/method/file/info/ConduitAPI_file_info_Method.php',
-    'ConduitAPI_file_upload_Method' => 'applications/conduit/method/file/upload/ConduitAPI_file_upload_Method.php',
-    'ConduitAPI_flag_Method' => 'applications/conduit/method/flag/base/ConduitAPI_flag_Method.php',
-    'ConduitAPI_flag_query_Method' => 'applications/conduit/method/flag/query/ConduitAPI_flag_query_Method.php',
-    'ConduitAPI_macro_Method' => 'applications/conduit/method/macro/base/ConduitAPI_macro_Method.php',
-    'ConduitAPI_macro_query_Method' => 'applications/conduit/method/macro/query/ConduitAPI_macro_query_Method.php',
-    'ConduitAPI_maniphest_Method' => 'applications/conduit/method/maniphest/base/ConduitAPI_maniphest_Method.php',
-    'ConduitAPI_maniphest_createtask_Method' => 'applications/conduit/method/maniphest/createtask/ConduitAPI_maniphest_createtask_Method.php',
-    'ConduitAPI_maniphest_find_Method' => 'applications/conduit/method/maniphest/find/ConduitAPI_maniphest_find_Method.php',
-    'ConduitAPI_maniphest_gettasktransactions_Method' => 'applications/conduit/method/maniphest/gettasktransactions/ConduitAPI_maniphest_gettasktransactions_Method.php',
-    'ConduitAPI_maniphest_info_Method' => 'applications/conduit/method/maniphest/info/ConduitAPI_maniphest_info_Method.php',
-    'ConduitAPI_maniphest_update_Method' => 'applications/conduit/method/maniphest/update/ConduitAPI_maniphest_update_Method.php',
-    'ConduitAPI_owners_query_Method' => 'applications/conduit/method/owners/query/ConduitAPI_owners_query_Method.php',
-    'ConduitAPI_paste_Method' => 'applications/conduit/method/paste/base/ConduitAPI_paste_Method.php',
-    'ConduitAPI_paste_create_Method' => 'applications/conduit/method/paste/create/ConduitAPI_paste_create_Method.php',
-    'ConduitAPI_paste_info_Method' => 'applications/conduit/method/paste/info/ConduitAPI_paste_info_Method.php',
-    'ConduitAPI_path_getowners_Method' => 'applications/conduit/method/path/getowners/ConduitAPI_path_getowners_Method.php',
-    'ConduitAPI_phid_Method' => 'applications/conduit/method/phid/base/ConduitAPI_phid_Method.php',
-    'ConduitAPI_phid_info_Method' => 'applications/conduit/method/phid/info/ConduitAPI_phid_info_Method.php',
-    'ConduitAPI_phid_query_Method' => 'applications/conduit/method/phid/query/ConduitAPI_phid_query_Method.php',
-    'ConduitAPI_phriction_Method' => 'applications/conduit/method/phriction/base/ConduitAPI_phriction_Method.php',
-    'ConduitAPI_phriction_edit_Method' => 'applications/conduit/method/phriction/edit/ConduitAPI_phriction_edit_Method.php',
-    'ConduitAPI_phriction_history_Method' => 'applications/conduit/method/phriction/history/ConduitAPI_phriction_history_Method.php',
-    'ConduitAPI_phriction_info_Method' => 'applications/conduit/method/phriction/info/ConduitAPI_phriction_info_Method.php',
-    'ConduitAPI_project_Method' => 'applications/conduit/method/project/base/ConduitAPI_project_Method.php',
-    'ConduitAPI_project_query_Method' => 'applications/conduit/method/project/query/ConduitAPI_project_query_Method.php',
-    'ConduitAPI_remarkup_process_Method' => 'applications/conduit/method/remarkup/process/ConduitAPI_remarkup_process_Method.php',
-    'ConduitAPI_repository_Method' => 'applications/conduit/method/repository/base/ConduitAPI_repository_Method.php',
-    'ConduitAPI_repository_create_Method' => 'applications/conduit/method/repository/create/ConduitAPI_repository_create_Method.php',
-    'ConduitAPI_repository_query_Method' => 'applications/conduit/method/repository/query/ConduitAPI_repository_query_Method.php',
-    'ConduitAPI_slowvote_info_Method' => 'applications/conduit/method/slowvote/info/ConduitAPI_slowvote_info_Method.php',
-    'ConduitAPI_user_Method' => 'applications/conduit/method/user/base/ConduitAPI_user_Method.php',
-    'ConduitAPI_user_addstatus_Method' => 'applications/conduit/method/user/addstatus/ConduitAPI_user_addstatus_Method.php',
-    'ConduitAPI_user_disable_Method' => 'applications/conduit/method/user/disable/ConduitAPI_user_disable_Method.php',
-    'ConduitAPI_user_find_Method' => 'applications/conduit/method/user/find/ConduitAPI_user_find_Method.php',
-    'ConduitAPI_user_info_Method' => 'applications/conduit/method/user/info/ConduitAPI_user_info_Method.php',
-    'ConduitAPI_user_query_Method' => 'applications/conduit/method/user/query/ConduitAPI_user_query_Method.php',
-    'ConduitAPI_user_removestatus_Method' => 'applications/conduit/method/user/removestatus/ConduitAPI_user_removestatus_Method.php',
-    'ConduitAPI_user_whoami_Method' => 'applications/conduit/method/user/whoami/ConduitAPI_user_whoami_Method.php',
-    'ConduitException' => 'applications/conduit/protocol/exception/ConduitException.php',
-    'DarkConsoleConfigPlugin' => 'aphront/console/plugin/config/DarkConsoleConfigPlugin.php',
-    'DarkConsoleController' => 'aphront/console/controller/DarkConsoleController.php',
-    'DarkConsoleCore' => 'aphront/console/core/DarkConsoleCore.php',
-    'DarkConsoleErrorLogPlugin' => 'aphront/console/plugin/errorlog/DarkConsoleErrorLogPlugin.php',
-    'DarkConsoleErrorLogPluginAPI' => 'aphront/console/plugin/errorlog/api/DarkConsoleErrorLogPluginAPI.php',
-    'DarkConsoleEventPlugin' => 'aphront/console/plugin/event/DarkConsoleEventPlugin.php',
-    'DarkConsoleEventPluginAPI' => 'aphront/console/plugin/event/api/DarkConsoleEventPluginAPI.php',
-    'DarkConsolePlugin' => 'aphront/console/plugin/base/DarkConsolePlugin.php',
-    'DarkConsoleRequestPlugin' => 'aphront/console/plugin/request/DarkConsoleRequestPlugin.php',
-    'DarkConsoleServicesPlugin' => 'aphront/console/plugin/services/DarkConsoleServicesPlugin.php',
-    'DarkConsoleXHProfPlugin' => 'aphront/console/plugin/xhprof/DarkConsoleXHProfPlugin.php',
-    'DarkConsoleXHProfPluginAPI' => 'aphront/console/plugin/xhprof/api/DarkConsoleXHProfPluginAPI.php',
-    'DatabaseConfigurationProvider' => 'applications/base/storage/configuration/base/DatabaseConfigurationProvider.php',
-    'DefaultDatabaseConfigurationProvider' => 'applications/base/storage/configuration/default/DefaultDatabaseConfigurationProvider.php',
-    'DifferentialAction' => 'applications/differential/constants/action/DifferentialAction.php',
-    'DifferentialActionHasNoEffectException' => 'applications/differential/exception/noeffect/DifferentialActionHasNoEffectException.php',
-    'DifferentialAddCommentView' => 'applications/differential/view/addcomment/DifferentialAddCommentView.php',
-    'DifferentialAffectedPath' => 'applications/differential/storage/affectedpath/DifferentialAffectedPath.php',
-    'DifferentialApplyPatchFieldSpecification' => 'applications/differential/field/specification/applypatch/DifferentialApplyPatchFieldSpecification.php',
-    'DifferentialArcanistProjectFieldSpecification' => 'applications/differential/field/specification/arcanistproject/DifferentialArcanistProjectFieldSpecification.php',
-    'DifferentialAuditorsFieldSpecification' => 'applications/differential/field/specification/auditors/DifferentialAuditorsFieldSpecification.php',
-    'DifferentialAuthorFieldSpecification' => 'applications/differential/field/specification/author/DifferentialAuthorFieldSpecification.php',
-    'DifferentialAuxiliaryField' => 'applications/differential/storage/auxiliaryfield/DifferentialAuxiliaryField.php',
-    'DifferentialBlameRevisionFieldSpecification' => 'applications/differential/field/specification/blamerev/DifferentialBlameRevisionFieldSpecification.php',
-    'DifferentialBranchFieldSpecification' => 'applications/differential/field/specification/branch/DifferentialBranchFieldSpecification.php',
-    'DifferentialCCWelcomeMail' => 'applications/differential/mail/ccwelcome/DifferentialCCWelcomeMail.php',
-    'DifferentialCCsFieldSpecification' => 'applications/differential/field/specification/ccs/DifferentialCCsFieldSpecification.php',
-    'DifferentialChangeType' => 'applications/differential/constants/changetype/DifferentialChangeType.php',
-    'DifferentialChangeset' => 'applications/differential/storage/changeset/DifferentialChangeset.php',
-    'DifferentialChangesetDetailView' => 'applications/differential/view/changesetdetailview/DifferentialChangesetDetailView.php',
-    'DifferentialChangesetListView' => 'applications/differential/view/changesetlistview/DifferentialChangesetListView.php',
-    'DifferentialChangesetParser' => 'applications/differential/parser/changeset/DifferentialChangesetParser.php',
-    'DifferentialChangesetViewController' => 'applications/differential/controller/changesetview/DifferentialChangesetViewController.php',
-    'DifferentialComment' => 'applications/differential/storage/comment/DifferentialComment.php',
-    'DifferentialCommentEditor' => 'applications/differential/editor/comment/DifferentialCommentEditor.php',
-    'DifferentialCommentMail' => 'applications/differential/mail/comment/DifferentialCommentMail.php',
-    'DifferentialCommentPreviewController' => 'applications/differential/controller/commentpreview/DifferentialCommentPreviewController.php',
-    'DifferentialCommentSaveController' => 'applications/differential/controller/commentsave/DifferentialCommentSaveController.php',
-    'DifferentialCommitsFieldSpecification' => 'applications/differential/field/specification/commits/DifferentialCommitsFieldSpecification.php',
-    'DifferentialController' => 'applications/differential/controller/base/DifferentialController.php',
-    'DifferentialDAO' => 'applications/differential/storage/base/DifferentialDAO.php',
-    'DifferentialDateCreatedFieldSpecification' => 'applications/differential/field/specification/datecreated/DifferentialDateCreatedFieldSpecification.php',
-    'DifferentialDateModifiedFieldSpecification' => 'applications/differential/field/specification/datemodified/DifferentialDateModifiedFieldSpecification.php',
-    'DifferentialDefaultFieldSelector' => 'applications/differential/field/selector/default/DifferentialDefaultFieldSelector.php',
-    'DifferentialDependenciesFieldSpecification' => 'applications/differential/field/specification/dependencies/DifferentialDependenciesFieldSpecification.php',
-    'DifferentialDiff' => 'applications/differential/storage/diff/DifferentialDiff.php',
-    'DifferentialDiffContentMail' => 'applications/differential/mail/diffcontent/DifferentialDiffContentMail.php',
-    'DifferentialDiffCreateController' => 'applications/differential/controller/diffcreate/DifferentialDiffCreateController.php',
-    'DifferentialDiffProperty' => 'applications/differential/storage/diffproperty/DifferentialDiffProperty.php',
-    'DifferentialDiffTableOfContentsView' => 'applications/differential/view/difftableofcontents/DifferentialDiffTableOfContentsView.php',
-    'DifferentialDiffViewController' => 'applications/differential/controller/diffview/DifferentialDiffViewController.php',
-    'DifferentialException' => 'applications/differential/exception/base/DifferentialException.php',
-    'DifferentialExceptionMail' => 'applications/differential/mail/exception/DifferentialExceptionMail.php',
-    'DifferentialExportPatchFieldSpecification' => 'applications/differential/field/specification/exportpatch/DifferentialExportPatchFieldSpecification.php',
-    'DifferentialFieldDataNotAvailableException' => 'applications/differential/field/exception/notavailable/DifferentialFieldDataNotAvailableException.php',
-    'DifferentialFieldParseException' => 'applications/differential/field/exception/parse/DifferentialFieldParseException.php',
-    'DifferentialFieldSelector' => 'applications/differential/field/selector/base/DifferentialFieldSelector.php',
-    'DifferentialFieldSpecification' => 'applications/differential/field/specification/base/DifferentialFieldSpecification.php',
-    'DifferentialFieldSpecificationIncompleteException' => 'applications/differential/field/exception/incomplete/DifferentialFieldSpecificationIncompleteException.php',
-    'DifferentialFieldValidationException' => 'applications/differential/field/exception/validation/DifferentialFieldValidationException.php',
-    'DifferentialGitSVNIDFieldSpecification' => 'applications/differential/field/specification/gitsvnid/DifferentialGitSVNIDFieldSpecification.php',
-    'DifferentialHostFieldSpecification' => 'applications/differential/field/specification/host/DifferentialHostFieldSpecification.php',
-    'DifferentialHunk' => 'applications/differential/storage/hunk/DifferentialHunk.php',
-    'DifferentialInlineComment' => 'applications/differential/storage/inlinecomment/DifferentialInlineComment.php',
-    'DifferentialInlineCommentEditController' => 'applications/differential/controller/inlinecommentedit/DifferentialInlineCommentEditController.php',
-    'DifferentialInlineCommentEditView' => 'applications/differential/view/inlinecommentedit/DifferentialInlineCommentEditView.php',
-    'DifferentialInlineCommentPreviewController' => 'applications/differential/controller/inlinecommentpreview/DifferentialInlineCommentPreviewController.php',
-    'DifferentialInlineCommentView' => 'applications/differential/view/inlinecomment/DifferentialInlineCommentView.php',
-    'DifferentialLinesFieldSpecification' => 'applications/differential/field/specification/lines/DifferentialLinesFieldSpecification.php',
-    'DifferentialLintFieldSpecification' => 'applications/differential/field/specification/lint/DifferentialLintFieldSpecification.php',
-    'DifferentialLintStatus' => 'applications/differential/constants/lintstatus/DifferentialLintStatus.php',
-    'DifferentialLocalCommitsView' => 'applications/differential/view/localcommits/DifferentialLocalCommitsView.php',
-    'DifferentialMail' => 'applications/differential/mail/base/DifferentialMail.php',
-    'DifferentialManiphestTasksFieldSpecification' => 'applications/differential/field/specification/maniphesttasks/DifferentialManiphestTasksFieldSpecification.php',
-    'DifferentialNewDiffMail' => 'applications/differential/mail/newdiff/DifferentialNewDiffMail.php',
-    'DifferentialPathFieldSpecification' => 'applications/differential/field/specification/path/DifferentialPathFieldSpecification.php',
-    'DifferentialPrimaryPaneView' => 'applications/differential/view/primarypane/DifferentialPrimaryPaneView.php',
-    'DifferentialReplyHandler' => 'applications/differential/replyhandler/DifferentialReplyHandler.php',
-    'DifferentialResultsTableView' => 'applications/differential/view/resultstableview/DifferentialResultsTableView.php',
-    'DifferentialRevertPlanFieldSpecification' => 'applications/differential/field/specification/revertplan/DifferentialRevertPlanFieldSpecification.php',
-    'DifferentialReviewRequestMail' => 'applications/differential/mail/reviewrequest/DifferentialReviewRequestMail.php',
-    'DifferentialReviewedByFieldSpecification' => 'applications/differential/field/specification/reviewedby/DifferentialReviewedByFieldSpecification.php',
-    'DifferentialReviewersFieldSpecification' => 'applications/differential/field/specification/reviewers/DifferentialReviewersFieldSpecification.php',
-    'DifferentialRevision' => 'applications/differential/storage/revision/DifferentialRevision.php',
-    'DifferentialRevisionCommentListView' => 'applications/differential/view/revisioncommentlist/DifferentialRevisionCommentListView.php',
-    'DifferentialRevisionCommentView' => 'applications/differential/view/revisioncomment/DifferentialRevisionCommentView.php',
-    'DifferentialRevisionControlSystem' => 'applications/differential/constants/revisioncontrolsystem/DifferentialRevisionControlSystem.php',
-    'DifferentialRevisionDetailRenderer' => 'applications/differential/controller/customrenderer/DifferentialRevisionDetailRenderer.php',
-    'DifferentialRevisionDetailView' => 'applications/differential/view/revisiondetail/DifferentialRevisionDetailView.php',
-    'DifferentialRevisionEditController' => 'applications/differential/controller/revisionedit/DifferentialRevisionEditController.php',
-    'DifferentialRevisionEditor' => 'applications/differential/editor/revision/DifferentialRevisionEditor.php',
-    'DifferentialRevisionIDFieldParserTestCase' => 'applications/differential/field/specification/revisionid/__tests__/DifferentialRevisionIDFieldParserTestCase.php',
-    'DifferentialRevisionIDFieldSpecification' => 'applications/differential/field/specification/revisionid/DifferentialRevisionIDFieldSpecification.php',
-    'DifferentialRevisionListController' => 'applications/differential/controller/revisionlist/DifferentialRevisionListController.php',
-    'DifferentialRevisionListData' => 'applications/differential/data/revisionlist/DifferentialRevisionListData.php',
-    'DifferentialRevisionListView' => 'applications/differential/view/revisionlist/DifferentialRevisionListView.php',
-    'DifferentialRevisionQuery' => 'applications/differential/query/revision/DifferentialRevisionQuery.php',
-    'DifferentialRevisionStatsController' => 'applications/differential/controller/revisionstats/DifferentialRevisionStatsController.php',
-    'DifferentialRevisionStatsView' => 'applications/differential/view/revisionstats/DifferentialRevisionStatsView.php',
-    'DifferentialRevisionStatusFieldSpecification' => 'applications/differential/field/specification/revisionstatus/DifferentialRevisionStatusFieldSpecification.php',
-    'DifferentialRevisionUpdateHistoryView' => 'applications/differential/view/revisionupdatehistory/DifferentialRevisionUpdateHistoryView.php',
-    'DifferentialRevisionViewController' => 'applications/differential/controller/revisionview/DifferentialRevisionViewController.php',
-    'DifferentialSubscribeController' => 'applications/differential/controller/subscribe/DifferentialSubscribeController.php',
-    'DifferentialSummaryFieldSpecification' => 'applications/differential/field/specification/summary/DifferentialSummaryFieldSpecification.php',
-    'DifferentialTasksAttacher' => 'applications/differential/tasks/DifferentialTasksAttacher.php',
-    'DifferentialTestPlanFieldSpecification' => 'applications/differential/field/specification/testplan/DifferentialTestPlanFieldSpecification.php',
-    'DifferentialTitleFieldSpecification' => 'applications/differential/field/specification/title/DifferentialTitleFieldSpecification.php',
-    'DifferentialUnitFieldSpecification' => 'applications/differential/field/specification/unit/DifferentialUnitFieldSpecification.php',
-    'DifferentialUnitStatus' => 'applications/differential/constants/unitstatus/DifferentialUnitStatus.php',
-    'DifferentialUnitTestResult' => 'applications/differential/constants/unittestresult/DifferentialUnitTestResult.php',
-    'DiffusionBranchInformation' => 'applications/diffusion/data/branch/DiffusionBranchInformation.php',
-    'DiffusionBranchQuery' => 'applications/diffusion/query/branch/base/DiffusionBranchQuery.php',
-    'DiffusionBranchTableController' => 'applications/diffusion/controller/branchtable/DiffusionBranchTableController.php',
-    'DiffusionBranchTableView' => 'applications/diffusion/view/branchtable/DiffusionBranchTableView.php',
-    'DiffusionBrowseController' => 'applications/diffusion/controller/browse/DiffusionBrowseController.php',
-    'DiffusionBrowseFileController' => 'applications/diffusion/controller/file/DiffusionBrowseFileController.php',
-    'DiffusionBrowseQuery' => 'applications/diffusion/query/browse/base/DiffusionBrowseQuery.php',
-    'DiffusionBrowseTableView' => 'applications/diffusion/view/browsetable/DiffusionBrowseTableView.php',
-    'DiffusionChangeController' => 'applications/diffusion/controller/change/DiffusionChangeController.php',
-    'DiffusionCommentListView' => 'applications/diffusion/view/commentlist/DiffusionCommentListView.php',
-    'DiffusionCommentView' => 'applications/diffusion/view/comment/DiffusionCommentView.php',
-    'DiffusionCommitChangeTableView' => 'applications/diffusion/view/commitchangetable/DiffusionCommitChangeTableView.php',
-    'DiffusionCommitController' => 'applications/diffusion/controller/commit/DiffusionCommitController.php',
-    'DiffusionCommitParentsQuery' => 'applications/diffusion/query/parents/base/DiffusionCommitParentsQuery.php',
-    'DiffusionCommitTagsQuery' => 'applications/diffusion/query/committags/base/DiffusionCommitTagsQuery.php',
-    'DiffusionContainsQuery' => 'applications/diffusion/query/contains/base/DiffusionContainsQuery.php',
-    'DiffusionController' => 'applications/diffusion/controller/base/DiffusionController.php',
-    'DiffusionDiffController' => 'applications/diffusion/controller/diff/DiffusionDiffController.php',
-    'DiffusionDiffQuery' => 'applications/diffusion/query/diff/base/DiffusionDiffQuery.php',
-    'DiffusionEmptyResultView' => 'applications/diffusion/view/emptyresult/DiffusionEmptyResultView.php',
-    'DiffusionExternalController' => 'applications/diffusion/controller/external/DiffusionExternalController.php',
-    'DiffusionFileContent' => 'applications/diffusion/data/filecontent/DiffusionFileContent.php',
-    'DiffusionFileContentQuery' => 'applications/diffusion/query/filecontent/base/DiffusionFileContentQuery.php',
-    'DiffusionGitBranchQuery' => 'applications/diffusion/query/branch/git/DiffusionGitBranchQuery.php',
-    'DiffusionGitBranchQueryTestCase' => 'applications/diffusion/query/branch/git/__tests__/DiffusionGitBranchQueryTestCase.php',
-    'DiffusionGitBrowseQuery' => 'applications/diffusion/query/browse/git/DiffusionGitBrowseQuery.php',
-    'DiffusionGitCommitParentsQuery' => 'applications/diffusion/query/parents/git/DiffusionGitCommitParentsQuery.php',
-    'DiffusionGitCommitTagsQuery' => 'applications/diffusion/query/committags/git/DiffusionGitCommitTagsQuery.php',
-    'DiffusionGitContainsQuery' => 'applications/diffusion/query/contains/git/DiffusionGitContainsQuery.php',
-    'DiffusionGitDiffQuery' => 'applications/diffusion/query/diff/git/DiffusionGitDiffQuery.php',
-    'DiffusionGitFileContentQuery' => 'applications/diffusion/query/filecontent/git/DiffusionGitFileContentQuery.php',
-    'DiffusionGitHistoryQuery' => 'applications/diffusion/query/history/git/DiffusionGitHistoryQuery.php',
-    'DiffusionGitLastModifiedQuery' => 'applications/diffusion/query/lastmodified/git/DiffusionGitLastModifiedQuery.php',
-    'DiffusionGitMergedCommitsQuery' => 'applications/diffusion/query/mergedcommits/git/DiffusionGitMergedCommitsQuery.php',
-    'DiffusionGitRawDiffQuery' => 'applications/diffusion/query/rawdiff/git/DiffusionGitRawDiffQuery.php',
-    'DiffusionGitRenameHistoryQuery' => 'applications/diffusion/query/renamehistory/git/DiffusionGitRenameHistoryQuery.php',
-    'DiffusionGitRequest' => 'applications/diffusion/request/git/DiffusionGitRequest.php',
-    'DiffusionGitTagListQuery' => 'applications/diffusion/query/taglist/git/DiffusionGitTagListQuery.php',
-    'DiffusionHistoryController' => 'applications/diffusion/controller/history/DiffusionHistoryController.php',
-    'DiffusionHistoryQuery' => 'applications/diffusion/query/history/base/DiffusionHistoryQuery.php',
-    'DiffusionHistoryTableView' => 'applications/diffusion/view/historytable/DiffusionHistoryTableView.php',
-    'DiffusionHomeController' => 'applications/diffusion/controller/home/DiffusionHomeController.php',
-    'DiffusionInlineCommentController' => 'applications/diffusion/controller/inline/DiffusionInlineCommentController.php',
-    'DiffusionLastModifiedController' => 'applications/diffusion/controller/lastmodified/DiffusionLastModifiedController.php',
-    'DiffusionLastModifiedQuery' => 'applications/diffusion/query/lastmodified/base/DiffusionLastModifiedQuery.php',
-    'DiffusionMercurialBranchQuery' => 'applications/diffusion/query/branch/mercurial/DiffusionMercurialBranchQuery.php',
-    'DiffusionMercurialBrowseQuery' => 'applications/diffusion/query/browse/mercurial/DiffusionMercurialBrowseQuery.php',
-    'DiffusionMercurialCommitParentsQuery' => 'applications/diffusion/query/parents/mercurial/DiffusionMercurialCommitParentsQuery.php',
-    'DiffusionMercurialCommitTagsQuery' => 'applications/diffusion/query/committags/mercurial/DiffusionMercurialCommitTagsQuery.php',
-    'DiffusionMercurialContainsQuery' => 'applications/diffusion/query/contains/mercurial/DiffusionMercurialContainsQuery.php',
-    'DiffusionMercurialDiffQuery' => 'applications/diffusion/query/diff/mercurial/DiffusionMercurialDiffQuery.php',
-    'DiffusionMercurialFileContentQuery' => 'applications/diffusion/query/filecontent/mercurial/DiffusionMercurialFileContentQuery.php',
-    'DiffusionMercurialHistoryQuery' => 'applications/diffusion/query/history/mercurial/DiffusionMercurialHistoryQuery.php',
-    'DiffusionMercurialLastModifiedQuery' => 'applications/diffusion/query/lastmodified/mercurial/DiffusionMercurialLastModifiedQuery.php',
-    'DiffusionMercurialMergedCommitsQuery' => 'applications/diffusion/query/mergedcommits/mercurial/DiffusionMercurialMergedCommitsQuery.php',
-    'DiffusionMercurialRawDiffQuery' => 'applications/diffusion/query/rawdiff/mercurial/DiffusionMercurialRawDiffQuery.php',
-    'DiffusionMercurialRenameHistoryQuery' => 'applications/diffusion/query/renamehistory/mercurial/DiffusionMercurialRenameHistoryQuery.php',
-    'DiffusionMercurialRequest' => 'applications/diffusion/request/mercurial/DiffusionMercurialRequest.php',
-    'DiffusionMercurialTagListQuery' => 'applications/diffusion/query/taglist/mercurial/DiffusionMercurialTagListQuery.php',
-    'DiffusionMergedCommitsQuery' => 'applications/diffusion/query/mergedcommits/base/DiffusionMergedCommitsQuery.php',
-    'DiffusionPathChange' => 'applications/diffusion/data/pathchange/DiffusionPathChange.php',
-    'DiffusionPathChangeQuery' => 'applications/diffusion/query/pathchange/base/DiffusionPathChangeQuery.php',
-    'DiffusionPathCompleteController' => 'applications/diffusion/controller/pathcomplete/DiffusionPathCompleteController.php',
-    'DiffusionPathIDQuery' => 'applications/diffusion/query/pathid/base/DiffusionPathIDQuery.php',
-    'DiffusionPathQuery' => 'applications/diffusion/query/path/DiffusionPathQuery.php',
-    'DiffusionPathQueryTestCase' => 'applications/diffusion/query/pathid/base/__tests__/DiffusionPathQueryTestCase.php',
-    'DiffusionPathValidateController' => 'applications/diffusion/controller/pathvalidate/DiffusionPathValidateController.php',
-    'DiffusionQuery' => 'applications/diffusion/query/base/DiffusionQuery.php',
-    'DiffusionRawDiffQuery' => 'applications/diffusion/query/rawdiff/base/DiffusionRawDiffQuery.php',
-    'DiffusionRenameHistoryQuery' => 'applications/diffusion/query/renamehistory/base/DiffusionRenameHistoryQuery.php',
-    'DiffusionRepositoryController' => 'applications/diffusion/controller/repository/DiffusionRepositoryController.php',
-    'DiffusionRepositoryPath' => 'applications/diffusion/data/repositorypath/DiffusionRepositoryPath.php',
-    'DiffusionRepositoryTag' => 'applications/diffusion/tag/DiffusionRepositoryTag.php',
-    'DiffusionRequest' => 'applications/diffusion/request/base/DiffusionRequest.php',
-    'DiffusionSetupException' => 'applications/diffusion/exception/setup/DiffusionSetupException.php',
-    'DiffusionSvnBrowseQuery' => 'applications/diffusion/query/browse/svn/DiffusionSvnBrowseQuery.php',
-    'DiffusionSvnCommitParentsQuery' => 'applications/diffusion/query/parents/svn/DiffusionSvnCommitParentsQuery.php',
-    'DiffusionSvnCommitTagsQuery' => 'applications/diffusion/query/committags/svn/DiffusionSvnCommitTagsQuery.php',
-    'DiffusionSvnContainsQuery' => 'applications/diffusion/query/contains/svn/DiffusionSvnContainsQuery.php',
-    'DiffusionSvnDiffQuery' => 'applications/diffusion/query/diff/svn/DiffusionSvnDiffQuery.php',
-    'DiffusionSvnFileContentQuery' => 'applications/diffusion/query/filecontent/svn/DiffusionSvnFileContentQuery.php',
-    'DiffusionSvnHistoryQuery' => 'applications/diffusion/query/history/svn/DiffusionSvnHistoryQuery.php',
-    'DiffusionSvnLastModifiedQuery' => 'applications/diffusion/query/lastmodified/svn/DiffusionSvnLastModifiedQuery.php',
-    'DiffusionSvnMergedCommitsQuery' => 'applications/diffusion/query/mergedcommits/svn/DiffusionSvnMergedCommitsQuery.php',
-    'DiffusionSvnRawDiffQuery' => 'applications/diffusion/query/rawdiff/svn/DiffusionSvnRawDiffQuery.php',
-    'DiffusionSvnRenameHistoryQuery' => 'applications/diffusion/query/renamehistory/svn/DiffusionSvnRenameHistoryQuery.php',
-    'DiffusionSvnRequest' => 'applications/diffusion/request/svn/DiffusionSvnRequest.php',
-    'DiffusionSvnTagListQuery' => 'applications/diffusion/query/taglist/svn/DiffusionSvnTagListQuery.php',
-    'DiffusionSymbolController' => 'applications/diffusion/controller/symbol/DiffusionSymbolController.php',
-    'DiffusionSymbolQuery' => 'applications/diffusion/query/symbol/DiffusionSymbolQuery.php',
-    'DiffusionTagListController' => 'applications/diffusion/controller/taglist/DiffusionTagListController.php',
-    'DiffusionTagListQuery' => 'applications/diffusion/query/taglist/base/DiffusionTagListQuery.php',
-    'DiffusionTagListView' => 'applications/diffusion/view/taglist/DiffusionTagListView.php',
-    'DiffusionURITestCase' => 'applications/diffusion/request/base/__tests__/DiffusionURITestCase.php',
-    'DiffusionView' => 'applications/diffusion/view/base/DiffusionView.php',
-    'DrydockAllocator' => 'applications/drydock/allocator/resource/DrydockAllocator.php',
-    'DrydockAllocatorWorker' => 'applications/drydock/allocator/worker/DrydockAllocatorWorker.php',
-    'DrydockApacheWebrootBlueprint' => 'applications/drydock/blueprint/webroot/apache/DrydockApacheWebrootBlueprint.php',
-    'DrydockApacheWebrootInterface' => 'applications/drydock/interface/webroot/apache/DrydockApacheWebrootInterface.php',
-    'DrydockBlueprint' => 'applications/drydock/blueprint/base/DrydockBlueprint.php',
-    'DrydockCommandInterface' => 'applications/drydock/interface/command/base/DrydockCommandInterface.php',
-    'DrydockConstants' => 'applications/drydock/constants/base/DrydockConstants.php',
-    'DrydockController' => 'applications/drydock/controller/base/DrydockController.php',
-    'DrydockDAO' => 'applications/drydock/storage/base/DrydockDAO.php',
-    'DrydockEC2HostBlueprint' => 'applications/drydock/blueprint/ec2host/DrydockEC2HostBlueprint.php',
-    'DrydockInterface' => 'applications/drydock/interface/base/DrydockInterface.php',
-    'DrydockLease' => 'applications/drydock/storage/lease/DrydockLease.php',
-    'DrydockLeaseListController' => 'applications/drydock/controller/leaselist/DrydockLeaseListController.php',
-    'DrydockLeaseStatus' => 'applications/drydock/constants/leasestatus/DrydockLeaseStatus.php',
-    'DrydockLocalCommandInterface' => 'applications/drydock/interface/command/local/DrydockLocalCommandInterface.php',
-    'DrydockLocalHostBlueprint' => 'applications/drydock/blueprint/localhost/DrydockLocalHostBlueprint.php',
-    'DrydockLog' => 'applications/drydock/storage/log/DrydockLog.php',
-    'DrydockLogController' => 'applications/drydock/controller/log/DrydockLogController.php',
-    'DrydockLogQuery' => 'applications/drydock/query/log/DrydockLogQuery.php',
-    'DrydockPhabricatorApplicationBlueprint' => 'applications/drydock/blueprint/application/phabricator/DrydockPhabricatorApplicationBlueprint.php',
-    'DrydockRemoteHostBlueprint' => 'applications/drydock/blueprint/remotehost/DrydockRemoteHostBlueprint.php',
-    'DrydockResource' => 'applications/drydock/storage/resource/DrydockResource.php',
-    'DrydockResourceAllocateController' => 'applications/drydock/controller/resourceallocate/DrydockResourceAllocateController.php',
-    'DrydockResourceListController' => 'applications/drydock/controller/resourcelist/DrydockResourceListController.php',
-    'DrydockResourceStatus' => 'applications/drydock/constants/resourcestatus/DrydockResourceStatus.php',
-    'DrydockSSHCommandInterface' => 'applications/drydock/interface/command/ssh/DrydockSSHCommandInterface.php',
-    'DrydockWebrootInterface' => 'applications/drydock/interface/webroot/base/DrydockWebrootInterface.php',
-    'HarbormasterDAO' => 'applications/harbormaster/storage/base/HarbormasterDAO.php',
-    'HarbormasterScratchTable' => 'applications/harbormaster/storage/scratchtable/HarbormasterScratchTable.php',
-    'HeraldAction' => 'applications/herald/storage/action/HeraldAction.php',
-    'HeraldActionConfig' => 'applications/herald/config/action/HeraldActionConfig.php',
-    'HeraldApplyTranscript' => 'applications/herald/storage/transcript/apply/HeraldApplyTranscript.php',
-    'HeraldCommitAdapter' => 'applications/herald/adapter/commit/HeraldCommitAdapter.php',
-    'HeraldCondition' => 'applications/herald/storage/condition/HeraldCondition.php',
-    'HeraldConditionConfig' => 'applications/herald/config/condition/HeraldConditionConfig.php',
-    'HeraldConditionTranscript' => 'applications/herald/storage/transcript/condition/HeraldConditionTranscript.php',
-    'HeraldContentTypeConfig' => 'applications/herald/config/contenttype/HeraldContentTypeConfig.php',
-    'HeraldController' => 'applications/herald/controller/base/HeraldController.php',
-    'HeraldDAO' => 'applications/herald/storage/base/HeraldDAO.php',
-    'HeraldDeleteController' => 'applications/herald/controller/delete/HeraldDeleteController.php',
-    'HeraldDifferentialRevisionAdapter' => 'applications/herald/adapter/differential/HeraldDifferentialRevisionAdapter.php',
-    'HeraldDryRunAdapter' => 'applications/herald/adapter/dryrun/HeraldDryRunAdapter.php',
-    'HeraldEditLogQuery' => 'applications/herald/query/log/HeraldEditLogQuery.php',
-    'HeraldEffect' => 'applications/herald/engine/effect/HeraldEffect.php',
-    'HeraldEngine' => 'applications/herald/engine/engine/HeraldEngine.php',
-    'HeraldFieldConfig' => 'applications/herald/config/field/HeraldFieldConfig.php',
-    'HeraldHomeController' => 'applications/herald/controller/home/HeraldHomeController.php',
-    'HeraldInvalidConditionException' => 'applications/herald/engine/engine/exception/HeraldInvalidConditionException.php',
-    'HeraldInvalidFieldException' => 'applications/herald/engine/engine/exception/HeraldInvalidFieldException.php',
-    'HeraldNewController' => 'applications/herald/controller/new/HeraldNewController.php',
-    'HeraldObjectAdapter' => 'applications/herald/adapter/base/HeraldObjectAdapter.php',
-    'HeraldObjectTranscript' => 'applications/herald/storage/transcript/object/HeraldObjectTranscript.php',
-    'HeraldRecursiveConditionsException' => 'applications/herald/engine/engine/exception/HeraldRecursiveConditionsException.php',
-    'HeraldRepetitionPolicyConfig' => 'applications/herald/config/repetitionpolicy/HeraldRepetitionPolicyConfig.php',
-    'HeraldRule' => 'applications/herald/storage/rule/HeraldRule.php',
-    'HeraldRuleController' => 'applications/herald/controller/rule/HeraldRuleController.php',
-    'HeraldRuleEdit' => 'applications/herald/storage/edithistory/HeraldRuleEdit.php',
-    'HeraldRuleEditHistoryController' => 'applications/herald/controller/edithistory/HeraldRuleEditHistoryController.php',
-    'HeraldRuleEditHistoryView' => 'applications/herald/view/edithistory/HeraldRuleEditHistoryView.php',
-    'HeraldRuleListView' => 'applications/herald/view/rulelist/HeraldRuleListView.php',
-    'HeraldRuleQuery' => 'applications/herald/query/rule/HeraldRuleQuery.php',
-    'HeraldRuleTranscript' => 'applications/herald/storage/transcript/rule/HeraldRuleTranscript.php',
-    'HeraldRuleTypeConfig' => 'applications/herald/config/ruletype/HeraldRuleTypeConfig.php',
-    'HeraldTestConsoleController' => 'applications/herald/controller/test/HeraldTestConsoleController.php',
-    'HeraldTranscript' => 'applications/herald/storage/transcript/base/HeraldTranscript.php',
-    'HeraldTranscriptController' => 'applications/herald/controller/transcript/HeraldTranscriptController.php',
-    'HeraldTranscriptListController' => 'applications/herald/controller/transcriptlist/HeraldTranscriptListController.php',
-    'HeraldValueTypeConfig' => 'applications/herald/config/valuetype/HeraldValueTypeConfig.php',
-    'Javelin' => 'infrastructure/javelin/api/Javelin.php',
-    'JavelinReactorExample' => 'applications/uiexample/examples/reactor/JavelinReactorExample.php',
-    'JavelinViewExample' => 'applications/uiexample/examples/client/JavelinViewExample.php',
-    'JavelinViewExampleServerView' => 'applications/uiexample/examples/client/JavelinViewExampleServerView.php',
-    'LiskDAO' => 'storage/lisk/dao/LiskDAO.php',
-    'LiskDAOSet' => 'storage/lisk/dao/LiskDAOSet.php',
-    'LiskEphemeralObjectException' => 'storage/lisk/dao/LiskEphemeralObjectException.php',
-    'LiskFixtureTestCase' => 'storage/lisk/dao/__tests__/LiskFixtureTestCase.php',
-    'LiskIsolationTestCase' => 'storage/lisk/dao/__tests__/LiskIsolationTestCase.php',
-    'LiskIsolationTestDAO' => 'storage/lisk/dao/__tests__/LiskIsolationTestDAO.php',
-    'LiskIsolationTestDAOException' => 'storage/lisk/dao/__tests__/LiskIsolationTestDAOException.php',
-    'ManiphestAction' => 'applications/maniphest/constants/action/ManiphestAction.php',
-    'ManiphestAuxiliaryFieldDefaultSpecification' => 'applications/maniphest/auxiliaryfield/default/ManiphestAuxiliaryFieldDefaultSpecification.php',
-    'ManiphestAuxiliaryFieldSpecification' => 'applications/maniphest/auxiliaryfield/base/ManiphestAuxiliaryFieldSpecification.php',
-    'ManiphestAuxiliaryFieldTypeException' => 'applications/maniphest/auxiliaryfield/typeexception/ManiphestAuxiliaryFieldTypeException.php',
-    'ManiphestAuxiliaryFieldValidationException' => 'applications/maniphest/auxiliaryfield/validationexception/ManiphestAuxiliaryFieldValidationException.php',
-    'ManiphestBatchEditController' => 'applications/maniphest/controller/batch/ManiphestBatchEditController.php',
-    'ManiphestConstants' => 'applications/maniphest/constants/base/ManiphestConstants.php',
-    'ManiphestController' => 'applications/maniphest/controller/base/ManiphestController.php',
-    'ManiphestDAO' => 'applications/maniphest/storage/base/ManiphestDAO.php',
-    'ManiphestDefaultTaskExtensions' => 'applications/maniphest/extensions/task/ManiphestDefaultTaskExtensions.php',
-    'ManiphestExportController' => 'applications/maniphest/controller/export/ManiphestExportController.php',
-    'ManiphestReplyHandler' => 'applications/maniphest/replyhandler/ManiphestReplyHandler.php',
-    'ManiphestReportController' => 'applications/maniphest/controller/report/ManiphestReportController.php',
-    'ManiphestSavedQuery' => 'applications/maniphest/storage/savedquery/ManiphestSavedQuery.php',
-    'ManiphestSavedQueryDeleteController' => 'applications/maniphest/controller/savedquerydelete/ManiphestSavedQueryDeleteController.php',
-    'ManiphestSavedQueryEditController' => 'applications/maniphest/controller/savedqueryedit/ManiphestSavedQueryEditController.php',
-    'ManiphestSavedQueryListController' => 'applications/maniphest/controller/savedquerylist/ManiphestSavedQueryListController.php',
-    'ManiphestSubpriorityController' => 'applications/maniphest/controller/subpriority/ManiphestSubpriorityController.php',
-    'ManiphestTask' => 'applications/maniphest/storage/task/ManiphestTask.php',
-    'ManiphestTaskAuxiliaryStorage' => 'applications/maniphest/storage/auxiliary/ManiphestTaskAuxiliaryStorage.php',
-    'ManiphestTaskDescriptionChangeController' => 'applications/maniphest/controller/descriptionchange/ManiphestTaskDescriptionChangeController.php',
-    'ManiphestTaskDescriptionPreviewController' => 'applications/maniphest/controller/descriptionpreview/ManiphestTaskDescriptionPreviewController.php',
-    'ManiphestTaskDetailController' => 'applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php',
-    'ManiphestTaskEditController' => 'applications/maniphest/controller/taskedit/ManiphestTaskEditController.php',
-    'ManiphestTaskExtensions' => 'applications/maniphest/extensions/base/ManiphestTaskExtensions.php',
-    'ManiphestTaskListController' => 'applications/maniphest/controller/tasklist/ManiphestTaskListController.php',
-    'ManiphestTaskListView' => 'applications/maniphest/view/tasklist/ManiphestTaskListView.php',
-    'ManiphestTaskOwner' => 'applications/maniphest/constants/owner/ManiphestTaskOwner.php',
-    'ManiphestTaskPriority' => 'applications/maniphest/constants/priority/ManiphestTaskPriority.php',
-    'ManiphestTaskProject' => 'applications/maniphest/storage/taskproject/ManiphestTaskProject.php',
-    'ManiphestTaskProjectsView' => 'applications/maniphest/view/taskprojects/ManiphestTaskProjectsView.php',
-    'ManiphestTaskQuery' => 'applications/maniphest/query/ManiphestTaskQuery.php',
-    'ManiphestTaskStatus' => 'applications/maniphest/constants/status/ManiphestTaskStatus.php',
-    'ManiphestTaskSubscriber' => 'applications/maniphest/storage/subscriber/ManiphestTaskSubscriber.php',
-    'ManiphestTaskSummaryView' => 'applications/maniphest/view/tasksummary/ManiphestTaskSummaryView.php',
-    'ManiphestTransaction' => 'applications/maniphest/storage/transaction/ManiphestTransaction.php',
-    'ManiphestTransactionDetailView' => 'applications/maniphest/view/transactiondetail/ManiphestTransactionDetailView.php',
-    'ManiphestTransactionEditor' => 'applications/maniphest/editor/transaction/ManiphestTransactionEditor.php',
-    'ManiphestTransactionListView' => 'applications/maniphest/view/transactionlist/ManiphestTransactionListView.php',
-    'ManiphestTransactionPreviewController' => 'applications/maniphest/controller/transactionpreview/ManiphestTransactionPreviewController.php',
-    'ManiphestTransactionSaveController' => 'applications/maniphest/controller/transactionsave/ManiphestTransactionSaveController.php',
-    'ManiphestTransactionType' => 'applications/maniphest/constants/transactiontype/ManiphestTransactionType.php',
-    'ManiphestView' => 'applications/maniphest/view/base/ManiphestView.php',
-    'MetaMTAConstants' => 'applications/metamta/constants/base/MetaMTAConstants.php',
-    'MetaMTANotificationType' => 'applications/metamta/constants/notificationtype/MetaMTANotificationType.php',
-    'OwnersPackageReplyHandler' => 'applications/owners/replyhandler/OwnersPackageReplyHandler.php',
-    'PackageCreateMail' => 'applications/owners/mail/create/PackageCreateMail.php',
-    'PackageDeleteMail' => 'applications/owners/mail/delete/PackageDeleteMail.php',
-    'PackageMail' => 'applications/owners/mail/base/PackageMail.php',
-    'PackageModifyMail' => 'applications/owners/mail/modify/PackageModifyMail.php',
-    'Phabricator404Controller' => 'applications/base/controller/404/Phabricator404Controller.php',
-    'PhabricatorAccessLog' => 'infrastructure/accesslog/PhabricatorAccessLog.php',
-    'PhabricatorAphlictTestPageController' => 'applications/notifications/controller/test/PhabricatorAphlictTestPageController.php',
-    'PhabricatorAuditActionConstants' => 'applications/audit/constants/action/PhabricatorAuditActionConstants.php',
-    'PhabricatorAuditAddCommentController' => 'applications/audit/controller/addcomment/PhabricatorAuditAddCommentController.php',
-    'PhabricatorAuditComment' => 'applications/audit/storage/auditcomment/PhabricatorAuditComment.php',
-    'PhabricatorAuditCommentEditor' => 'applications/audit/editor/comment/PhabricatorAuditCommentEditor.php',
-    'PhabricatorAuditCommitListView' => 'applications/audit/view/commitlist/PhabricatorAuditCommitListView.php',
-    'PhabricatorAuditCommitQuery' => 'applications/audit/query/commit/PhabricatorAuditCommitQuery.php',
-    'PhabricatorAuditCommitStatusConstants' => 'applications/audit/constants/commitstatus/PhabricatorAuditCommitStatusConstants.php',
-    'PhabricatorAuditController' => 'applications/audit/controller/base/PhabricatorAuditController.php',
-    'PhabricatorAuditDAO' => 'applications/audit/storage/base/PhabricatorAuditDAO.php',
-    'PhabricatorAuditInlineComment' => 'applications/audit/storage/inlinecommment/PhabricatorAuditInlineComment.php',
-    'PhabricatorAuditListController' => 'applications/audit/controller/list/PhabricatorAuditListController.php',
-    'PhabricatorAuditListView' => 'applications/audit/view/list/PhabricatorAuditListView.php',
-    'PhabricatorAuditPreviewController' => 'applications/audit/controller/preview/PhabricatorAuditPreviewController.php',
-    'PhabricatorAuditQuery' => 'applications/audit/query/audit/PhabricatorAuditQuery.php',
-    'PhabricatorAuditReplyHandler' => 'applications/audit/replyhandler/PhabricatorAuditReplyHandler.php',
-    'PhabricatorAuditStatusConstants' => 'applications/audit/constants/status/PhabricatorAuditStatusConstants.php',
-    'PhabricatorAuthController' => 'applications/auth/controller/base/PhabricatorAuthController.php',
-    'PhabricatorBuiltinPatchList' => 'infrastructure/setup/sql/phabricator/PhabricatorBuiltinPatchList.php',
-    'PhabricatorCalendarBrowseController' => 'applications/calendar/controller/browse/PhabricatorCalendarBrowseController.php',
-    'PhabricatorCalendarController' => 'applications/calendar/controller/base/PhabricatorCalendarController.php',
-    'PhabricatorCalendarDAO' => 'applications/calendar/storage/base/PhabricatorCalendarDAO.php',
-    'PhabricatorCalendarHoliday' => 'applications/calendar/storage/holiday/PhabricatorCalendarHoliday.php',
-    'PhabricatorCalendarHolidayTestCase' => 'applications/calendar/storage/holiday/__tests__/PhabricatorCalendarHolidayTestCase.php',
-    'PhabricatorChangesetResponse' => 'infrastructure/diff/response/PhabricatorChangesetResponse.php',
-    'PhabricatorChatLogChannelListController' => 'applications/chatlog/controller/channellist/PhabricatorChatLogChannelListController.php',
-    'PhabricatorChatLogChannelLogController' => 'applications/chatlog/controller/channellog/PhabricatorChatLogChannelLogController.php',
-    'PhabricatorChatLogConstants' => 'applications/chatlog/constants/base/PhabricatorChatLogConstants.php',
-    'PhabricatorChatLogController' => 'applications/chatlog/controller/base/PhabricatorChatLogController.php',
-    'PhabricatorChatLogDAO' => 'applications/chatlog/storage/base/PhabricatorChatLogDAO.php',
-    'PhabricatorChatLogEvent' => 'applications/chatlog/storage/event/PhabricatorChatLogEvent.php',
-    'PhabricatorChatLogEventType' => 'applications/chatlog/constants/eventtype/PhabricatorChatLogEventType.php',
-    'PhabricatorChatLogQuery' => 'applications/chatlog/query/PhabricatorChatLogQuery.php',
-    'PhabricatorConduitAPIController' => 'applications/conduit/controller/api/PhabricatorConduitAPIController.php',
-    'PhabricatorConduitCertificateToken' => 'applications/conduit/storage/token/PhabricatorConduitCertificateToken.php',
-    'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/connectionlog/PhabricatorConduitConnectionLog.php',
-    'PhabricatorConduitConsoleController' => 'applications/conduit/controller/console/PhabricatorConduitConsoleController.php',
-    'PhabricatorConduitController' => 'applications/conduit/controller/base/PhabricatorConduitController.php',
-    'PhabricatorConduitDAO' => 'applications/conduit/storage/base/PhabricatorConduitDAO.php',
-    'PhabricatorConduitListController' => 'applications/conduit/controller/list/PhabricatorConduitListController.php',
-    'PhabricatorConduitLogController' => 'applications/conduit/controller/log/PhabricatorConduitLogController.php',
-    'PhabricatorConduitMethodCallLog' => 'applications/conduit/storage/methodcalllog/PhabricatorConduitMethodCallLog.php',
-    'PhabricatorConduitTokenController' => 'applications/conduit/controller/token/PhabricatorConduitTokenController.php',
-    'PhabricatorContentSource' => 'applications/metamta/contentsource/source/PhabricatorContentSource.php',
-    'PhabricatorContentSourceView' => 'applications/metamta/contentsource/view/PhabricatorContentSourceView.php',
-    'PhabricatorController' => 'applications/base/controller/base/PhabricatorController.php',
-    'PhabricatorCountdownController' => 'applications/countdown/controller/base/PhabricatorCountdownController.php',
-    'PhabricatorCountdownDAO' => 'applications/countdown/storage/base/PhabricatorCountdownDAO.php',
-    'PhabricatorCountdownDeleteController' => 'applications/countdown/controller/delete/PhabricatorCountdownDeleteController.php',
-    'PhabricatorCountdownEditController' => 'applications/countdown/controller/edit/PhabricatorCountdownEditController.php',
-    'PhabricatorCountdownListController' => 'applications/countdown/controller/list/PhabricatorCountdownListController.php',
-    'PhabricatorCountdownViewController' => 'applications/countdown/controller/view/PhabricatorCountdownViewController.php',
-    'PhabricatorDaemon' => 'infrastructure/daemon/base/PhabricatorDaemon.php',
-    'PhabricatorDaemonCombinedLogController' => 'applications/daemon/controller/combined/PhabricatorDaemonCombinedLogController.php',
-    'PhabricatorDaemonConsoleController' => 'applications/daemon/controller/console/PhabricatorDaemonConsoleController.php',
-    'PhabricatorDaemonControl' => 'infrastructure/daemon/control/PhabricatorDaemonControl.php',
-    'PhabricatorDaemonController' => 'applications/daemon/controller/base/PhabricatorDaemonController.php',
-    'PhabricatorDaemonDAO' => 'infrastructure/daemon/storage/base/PhabricatorDaemonDAO.php',
-    'PhabricatorDaemonLog' => 'infrastructure/daemon/storage/log/PhabricatorDaemonLog.php',
-    'PhabricatorDaemonLogEvent' => 'infrastructure/daemon/storage/event/PhabricatorDaemonLogEvent.php',
-    'PhabricatorDaemonLogEventsView' => 'applications/daemon/view/daemonlogevents/PhabricatorDaemonLogEventsView.php',
-    'PhabricatorDaemonLogListController' => 'applications/daemon/controller/loglist/PhabricatorDaemonLogListController.php',
-    'PhabricatorDaemonLogListView' => 'applications/daemon/view/daemonloglist/PhabricatorDaemonLogListView.php',
-    'PhabricatorDaemonLogViewController' => 'applications/daemon/controller/logview/PhabricatorDaemonLogViewController.php',
-    'PhabricatorDaemonReference' => 'infrastructure/daemon/control/reference/PhabricatorDaemonReference.php',
-    'PhabricatorDaemonTimelineConsoleController' => 'applications/daemon/controller/timeline/PhabricatorDaemonTimelineConsoleController.php',
-    'PhabricatorDaemonTimelineEventController' => 'applications/daemon/controller/timelineevent/PhabricatorDaemonTimelineEventController.php',
-    'PhabricatorDefaultFileStorageEngineSelector' => 'applications/files/engineselector/default/PhabricatorDefaultFileStorageEngineSelector.php',
-    'PhabricatorDefaultSearchEngineSelector' => 'applications/search/selector/default/PhabricatorDefaultSearchEngineSelector.php',
-    'PhabricatorDifferenceEngine' => 'infrastructure/diff/engine/PhabricatorDifferenceEngine.php',
-    'PhabricatorDirectoryController' => 'applications/directory/controller/base/PhabricatorDirectoryController.php',
-    'PhabricatorDirectoryMainController' => 'applications/directory/controller/main/PhabricatorDirectoryMainController.php',
-    'PhabricatorDisabledUserController' => 'applications/auth/controller/disabled/PhabricatorDisabledUserController.php',
-    'PhabricatorDraft' => 'applications/draft/storage/draft/PhabricatorDraft.php',
-    'PhabricatorDraftDAO' => 'applications/draft/storage/base/PhabricatorDraftDAO.php',
-    'PhabricatorEdgeConfig' => 'infrastructure/edges/constants/config/PhabricatorEdgeConfig.php',
-    'PhabricatorEdgeConstants' => 'infrastructure/edges/constants/base/PhabricatorEdgeConstants.php',
-    'PhabricatorEdgeEditor' => 'infrastructure/edges/editor/edge/PhabricatorEdgeEditor.php',
-    'PhabricatorEdgeQuery' => 'infrastructure/edges/query/edge/PhabricatorEdgeQuery.php',
-    'PhabricatorEmailLoginController' => 'applications/auth/controller/email/PhabricatorEmailLoginController.php',
-    'PhabricatorEmailTokenController' => 'applications/auth/controller/emailtoken/PhabricatorEmailTokenController.php',
-    'PhabricatorEmailVerificationController' => 'applications/people/controller/emailverification/PhabricatorEmailVerificationController.php',
-    'PhabricatorEnv' => 'infrastructure/env/PhabricatorEnv.php',
-    'PhabricatorEnvTestCase' => 'infrastructure/env/__tests__/PhabricatorEnvTestCase.php',
-    'PhabricatorErrorExample' => 'applications/uiexample/examples/error/PhabricatorErrorExample.php',
-    'PhabricatorEvent' => 'infrastructure/events/event/PhabricatorEvent.php',
-    'PhabricatorEventEngine' => 'infrastructure/events/engine/PhabricatorEventEngine.php',
-    'PhabricatorEventType' => 'infrastructure/events/constant/type/PhabricatorEventType.php',
-    'PhabricatorFeedBuilder' => 'applications/feed/builder/feed/PhabricatorFeedBuilder.php',
-    'PhabricatorFeedConstants' => 'applications/feed/constants/base/PhabricatorFeedConstants.php',
-    'PhabricatorFeedController' => 'applications/feed/controller/base/PhabricatorFeedController.php',
-    'PhabricatorFeedDAO' => 'applications/feed/storage/base/PhabricatorFeedDAO.php',
-    'PhabricatorFeedPublicStreamController' => 'applications/feed/controller/publicstream/PhabricatorFeedPublicStreamController.php',
-    'PhabricatorFeedQuery' => 'applications/feed/query/PhabricatorFeedQuery.php',
-    'PhabricatorFeedStory' => 'applications/feed/story/base/PhabricatorFeedStory.php',
-    'PhabricatorFeedStoryAudit' => 'applications/feed/story/audit/PhabricatorFeedStoryAudit.php',
-    'PhabricatorFeedStoryData' => 'applications/feed/storage/story/PhabricatorFeedStoryData.php',
-    'PhabricatorFeedStoryDifferential' => 'applications/feed/story/differential/PhabricatorFeedStoryDifferential.php',
-    'PhabricatorFeedStoryManiphest' => 'applications/feed/story/maniphest/PhabricatorFeedStoryManiphest.php',
-    'PhabricatorFeedStoryPhriction' => 'applications/feed/story/phriction/PhabricatorFeedStoryPhriction.php',
-    'PhabricatorFeedStoryProject' => 'applications/feed/story/project/PhabricatorFeedStoryProject.php',
-    'PhabricatorFeedStoryPublisher' => 'applications/feed/publisher/PhabricatorFeedStoryPublisher.php',
-    'PhabricatorFeedStoryReference' => 'applications/feed/storage/storyreference/PhabricatorFeedStoryReference.php',
-    'PhabricatorFeedStoryStatus' => 'applications/feed/story/status/PhabricatorFeedStoryStatus.php',
-    'PhabricatorFeedStoryTypeConstants' => 'applications/feed/constants/story/PhabricatorFeedStoryTypeConstants.php',
-    'PhabricatorFeedStoryUnknown' => 'applications/feed/story/unknown/PhabricatorFeedStoryUnknown.php',
-    'PhabricatorFeedStoryView' => 'applications/feed/view/story/PhabricatorFeedStoryView.php',
-    'PhabricatorFeedView' => 'applications/feed/view/base/PhabricatorFeedView.php',
-    'PhabricatorFile' => 'applications/files/storage/file/PhabricatorFile.php',
-    'PhabricatorFileController' => 'applications/files/controller/base/PhabricatorFileController.php',
-    'PhabricatorFileDAO' => 'applications/files/storage/base/PhabricatorFileDAO.php',
-    'PhabricatorFileDataController' => 'applications/files/controller/data/PhabricatorFileDataController.php',
-    'PhabricatorFileDeleteController' => 'applications/files/controller/delete/PhabricatorFileDeleteController.php',
-    'PhabricatorFileDropUploadController' => 'applications/files/controller/dropupload/PhabricatorFileDropUploadController.php',
-    'PhabricatorFileImageMacro' => 'applications/files/storage/imagemacro/PhabricatorFileImageMacro.php',
-    'PhabricatorFileInfoController' => 'applications/files/controller/info/PhabricatorFileInfoController.php',
-    'PhabricatorFileListController' => 'applications/files/controller/list/PhabricatorFileListController.php',
-    'PhabricatorFileMacroDeleteController' => 'applications/files/controller/macrodelete/PhabricatorFileMacroDeleteController.php',
-    'PhabricatorFileMacroEditController' => 'applications/files/controller/macroedit/PhabricatorFileMacroEditController.php',
-    'PhabricatorFileMacroListController' => 'applications/files/controller/macrolist/PhabricatorFileMacroListController.php',
-    'PhabricatorFileProxyController' => 'applications/files/controller/proxy/PhabricatorFileProxyController.php',
-    'PhabricatorFileProxyImage' => 'applications/files/storage/proxyimage/PhabricatorFileProxyImage.php',
-    'PhabricatorFileShortcutController' => 'applications/files/controller/shortcut/PhabricatorFileShortcutController.php',
-    'PhabricatorFileSideNavView' => 'applications/files/view/sidenav/PhabricatorFileSideNavView.php',
-    'PhabricatorFileStorageBlob' => 'applications/files/storage/storageblob/PhabricatorFileStorageBlob.php',
-    'PhabricatorFileStorageConfigurationException' => 'applications/files/exception/configuration/PhabricatorFileStorageConfigurationException.php',
-    'PhabricatorFileStorageEngine' => 'applications/files/engine/base/PhabricatorFileStorageEngine.php',
-    'PhabricatorFileStorageEngineSelector' => 'applications/files/engineselector/base/PhabricatorFileStorageEngineSelector.php',
-    'PhabricatorFileTransformController' => 'applications/files/controller/transform/PhabricatorFileTransformController.php',
-    'PhabricatorFileUploadController' => 'applications/files/controller/upload/PhabricatorFileUploadController.php',
-    'PhabricatorFileUploadException' => 'applications/files/exception/upload/PhabricatorFileUploadException.php',
-    'PhabricatorFileUploadView' => 'applications/files/view/upload/PhabricatorFileUploadView.php',
-    'PhabricatorFlag' => 'applications/flag/storage/flag/PhabricatorFlag.php',
-    'PhabricatorFlagColor' => 'applications/flag/constants/color/PhabricatorFlagColor.php',
-    'PhabricatorFlagConstants' => 'applications/flag/constants/base/PhabricatorFlagConstants.php',
-    'PhabricatorFlagController' => 'applications/flag/controller/base/PhabricatorFlagController.php',
-    'PhabricatorFlagDAO' => 'applications/flag/storage/base/PhabricatorFlagDAO.php',
-    'PhabricatorFlagDeleteController' => 'applications/flag/controller/delete/PhabricatorFlagDeleteController.php',
-    'PhabricatorFlagEditController' => 'applications/flag/controller/edit/PhabricatorFlagEditController.php',
-    'PhabricatorFlagListController' => 'applications/flag/controller/list/PhabricatorFlagListController.php',
-    'PhabricatorFlagListView' => 'applications/flag/view/list/PhabricatorFlagListView.php',
-    'PhabricatorFlagQuery' => 'applications/flag/query/flag/PhabricatorFlagQuery.php',
-    'PhabricatorFormExample' => 'applications/uiexample/examples/form/PhabricatorFormExample.php',
-    'PhabricatorGarbageCollectorDaemon' => 'infrastructure/daemon/garbagecollector/PhabricatorGarbageCollectorDaemon.php',
-    'PhabricatorGoodForNothingWorker' => 'infrastructure/daemon/workers/worker/goodfornothing/PhabricatorGoodForNothingWorker.php',
-    'PhabricatorHandleObjectSelectorDataView' => 'applications/phid/handle/view/selector/PhabricatorHandleObjectSelectorDataView.php',
-    'PhabricatorHash' => 'infrastructure/util/hash/PhabricatorHash.php',
-    'PhabricatorHelpController' => 'applications/help/controller/base/PhabricatorHelpController.php',
-    'PhabricatorHelpKeyboardShortcutController' => 'applications/help/controller/keyboardshortcut/PhabricatorHelpKeyboardShortcutController.php',
-    'PhabricatorIDPagedPolicyQuery' => 'infrastructure/query/policy/idpaged/PhabricatorIDPagedPolicyQuery.php',
-    'PhabricatorIRCBot' => 'infrastructure/daemon/irc/bot/PhabricatorIRCBot.php',
-    'PhabricatorIRCDifferentialNotificationHandler' => 'infrastructure/daemon/irc/handler/differentialnotification/PhabricatorIRCDifferentialNotificationHandler.php',
-    'PhabricatorIRCHandler' => 'infrastructure/daemon/irc/handler/base/PhabricatorIRCHandler.php',
-    'PhabricatorIRCLogHandler' => 'infrastructure/daemon/irc/handler/log/PhabricatorIRCLogHandler.php',
-    'PhabricatorIRCMacroHandler' => 'infrastructure/daemon/irc/handler/macro/PhabricatorIRCMacroHandler.php',
-    'PhabricatorIRCMessage' => 'infrastructure/daemon/irc/message/PhabricatorIRCMessage.php',
-    'PhabricatorIRCObjectNameHandler' => 'infrastructure/daemon/irc/handler/objectname/PhabricatorIRCObjectNameHandler.php',
-    'PhabricatorIRCProtocolHandler' => 'infrastructure/daemon/irc/handler/protocol/PhabricatorIRCProtocolHandler.php',
-    'PhabricatorIRCWhatsNewHandler' => 'infrastructure/daemon/irc/handler/whatsnew/PhabricatorIRCWhatsNewHandler.php',
-    'PhabricatorImageTransformer' => 'applications/files/transform/PhabricatorImageTransformer.php',
+    'Aphront304Response' => 'aphront/response/Aphront304Response.php',
+    'Aphront400Response' => 'aphront/response/Aphront400Response.php',
+    'Aphront403Response' => 'aphront/response/Aphront403Response.php',
+    'Aphront404Response' => 'aphront/response/Aphront404Response.php',
+    'AphrontAjaxResponse' => 'aphront/response/AphrontAjaxResponse.php',
+    'AphrontApplicationConfiguration' => 'aphront/AphrontApplicationConfiguration.php',
+    'AphrontAttachedFileView' => 'view/control/AphrontAttachedFileView.php',
+    'AphrontCSRFException' => 'aphront/exception/AphrontCSRFException.php',
+    'AphrontCalendarEventView' => 'applications/calendar/view/AphrontCalendarEventView.php',
+    'AphrontCalendarMonthView' => 'applications/calendar/view/AphrontCalendarMonthView.php',
+    'AphrontContextBarView' => 'view/layout/AphrontContextBarView.php',
+    'AphrontController' => 'aphront/AphrontController.php',
+    'AphrontCrumbsView' => 'view/layout/AphrontCrumbsView.php',
+    'AphrontDatabaseConnection' => 'storage/connection/AphrontDatabaseConnection.php',
+    'AphrontDatabaseTransactionState' => 'storage/AphrontDatabaseTransactionState.php',
+    'AphrontDefaultApplicationConfiguration' => 'aphront/default/AphrontDefaultApplicationConfiguration.php',
+    'AphrontDialogResponse' => 'aphront/response/AphrontDialogResponse.php',
+    'AphrontDialogView' => 'view/AphrontDialogView.php',
+    'AphrontErrorView' => 'view/form/AphrontErrorView.php',
+    'AphrontException' => 'aphront/exception/AphrontException.php',
+    'AphrontFilePreviewView' => 'view/layout/AphrontFilePreviewView.php',
+    'AphrontFileResponse' => 'aphront/response/AphrontFileResponse.php',
+    'AphrontFormCheckboxControl' => 'view/form/control/AphrontFormCheckboxControl.php',
+    'AphrontFormControl' => 'view/form/control/AphrontFormControl.php',
+    'AphrontFormDateControl' => 'view/form/control/AphrontFormDateControl.php',
+    'AphrontFormDividerControl' => 'view/form/control/AphrontFormDividerControl.php',
+    'AphrontFormDragAndDropUploadControl' => 'view/form/control/AphrontFormDragAndDropUploadControl.php',
+    'AphrontFormFileControl' => 'view/form/control/AphrontFormFileControl.php',
+    'AphrontFormInsetView' => 'view/form/AphrontFormInsetView.php',
+    'AphrontFormLayoutView' => 'view/form/AphrontFormLayoutView.php',
+    'AphrontFormMarkupControl' => 'view/form/control/AphrontFormMarkupControl.php',
+    'AphrontFormPasswordControl' => 'view/form/control/AphrontFormPasswordControl.php',
+    'AphrontFormPolicyControl' => 'view/form/control/AphrontFormPolicyControl.php',
+    'AphrontFormRadioButtonControl' => 'view/form/control/AphrontFormRadioButtonControl.php',
+    'AphrontFormRecaptchaControl' => 'view/form/control/AphrontFormRecaptchaControl.php',
+    'AphrontFormSelectControl' => 'view/form/control/AphrontFormSelectControl.php',
+    'AphrontFormStaticControl' => 'view/form/control/AphrontFormStaticControl.php',
+    'AphrontFormSubmitControl' => 'view/form/control/AphrontFormSubmitControl.php',
+    'AphrontFormTextAreaControl' => 'view/form/control/AphrontFormTextAreaControl.php',
+    'AphrontFormTextControl' => 'view/form/control/AphrontFormTextControl.php',
+    'AphrontFormToggleButtonsControl' => 'view/form/control/AphrontFormToggleButtonsControl.php',
+    'AphrontFormTokenizerControl' => 'view/form/control/AphrontFormTokenizerControl.php',
+    'AphrontFormView' => 'view/form/AphrontFormView.php',
+    'AphrontHTTPSink' => 'aphront/sink/AphrontHTTPSink.php',
+    'AphrontHTTPSinkTestCase' => 'aphront/sink/__tests__/AphrontHTTPSinkTestCase.php',
+    'AphrontHeadsupActionListView' => 'view/layout/headsup/AphrontHeadsupActionListView.php',
+    'AphrontHeadsupActionView' => 'view/layout/headsup/AphrontHeadsupActionView.php',
+    'AphrontHeadsupView' => 'view/layout/headsup/AphrontHeadsupView.php',
+    'AphrontIDPagerView' => 'view/control/AphrontIDPagerView.php',
+    'AphrontIsolatedDatabaseConnection' => 'storage/connection/AphrontIsolatedDatabaseConnection.php',
+    'AphrontIsolatedDatabaseConnectionTestCase' => 'storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php',
+    'AphrontIsolatedHTTPSink' => 'aphront/sink/AphrontIsolatedHTTPSink.php',
+    'AphrontJSONResponse' => 'aphront/response/AphrontJSONResponse.php',
+    'AphrontJavelinView' => 'view/AphrontJavelinView.php',
+    'AphrontKeyboardShortcutsAvailableView' => 'view/widget/AphrontKeyboardShortcutsAvailableView.php',
+    'AphrontListFilterView' => 'view/layout/AphrontListFilterView.php',
+    'AphrontMiniPanelView' => 'view/layout/AphrontMiniPanelView.php',
+    'AphrontMoreView' => 'view/layout/AphrontMoreView.php',
+    'AphrontMySQLDatabaseConnection' => 'storage/connection/mysql/AphrontMySQLDatabaseConnection.php',
+    'AphrontMySQLDatabaseConnectionBase' => 'storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php',
+    'AphrontMySQLDatabaseConnectionTestCase' => 'storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php',
+    'AphrontMySQLiDatabaseConnection' => 'storage/connection/mysql/AphrontMySQLiDatabaseConnection.php',
+    'AphrontNullView' => 'view/AphrontNullView.php',
+    'AphrontPHPHTTPSink' => 'aphront/sink/AphrontPHPHTTPSink.php',
+    'AphrontPageView' => 'view/page/AphrontPageView.php',
+    'AphrontPagerView' => 'view/control/AphrontPagerView.php',
+    'AphrontPanelView' => 'view/layout/AphrontPanelView.php',
+    'AphrontPlainTextResponse' => 'aphront/response/AphrontPlainTextResponse.php',
+    'AphrontProxyResponse' => 'aphront/response/AphrontProxyResponse.php',
+    'AphrontQueryAccessDeniedException' => 'storage/exception/AphrontQueryAccessDeniedException.php',
+    'AphrontQueryConnectionException' => 'storage/exception/AphrontQueryConnectionException.php',
+    'AphrontQueryConnectionLostException' => 'storage/exception/AphrontQueryConnectionLostException.php',
+    'AphrontQueryCountException' => 'storage/exception/AphrontQueryCountException.php',
+    'AphrontQueryDeadlockException' => 'storage/exception/AphrontQueryDeadlockException.php',
+    'AphrontQueryDuplicateKeyException' => 'storage/exception/AphrontQueryDuplicateKeyException.php',
+    'AphrontQueryException' => 'storage/exception/AphrontQueryException.php',
+    'AphrontQueryObjectMissingException' => 'storage/exception/AphrontQueryObjectMissingException.php',
+    'AphrontQueryParameterException' => 'storage/exception/AphrontQueryParameterException.php',
+    'AphrontQueryRecoverableException' => 'storage/exception/AphrontQueryRecoverableException.php',
+    'AphrontQuerySchemaException' => 'storage/exception/AphrontQuerySchemaException.php',
+    'AphrontRedirectException' => 'aphront/exception/AphrontRedirectException.php',
+    'AphrontRedirectResponse' => 'aphront/response/AphrontRedirectResponse.php',
+    'AphrontReloadResponse' => 'aphront/response/AphrontReloadResponse.php',
+    'AphrontRequest' => 'aphront/AphrontRequest.php',
+    'AphrontRequestFailureView' => 'view/page/AphrontRequestFailureView.php',
+    'AphrontRequestTestCase' => 'aphront/__tests__/AphrontRequestTestCase.php',
+    'AphrontResponse' => 'aphront/response/AphrontResponse.php',
+    'AphrontScopedUnguardedWriteCapability' => 'aphront/writeguard/AphrontScopedUnguardedWriteCapability.php',
+    'AphrontSideNavFilterView' => 'view/layout/AphrontSideNavFilterView.php',
+    'AphrontSideNavView' => 'view/layout/AphrontSideNavView.php',
+    'AphrontTableView' => 'view/control/AphrontTableView.php',
+    'AphrontTokenizerTemplateView' => 'view/control/AphrontTokenizerTemplateView.php',
+    'AphrontTypeaheadTemplateView' => 'view/control/AphrontTypeaheadTemplateView.php',
+    'AphrontURIMapper' => 'aphront/AphrontURIMapper.php',
+    'AphrontUsageException' => 'aphront/exception/AphrontUsageException.php',
+    'AphrontView' => 'view/AphrontView.php',
+    'AphrontWebpageResponse' => 'aphront/response/AphrontWebpageResponse.php',
+    'AphrontWriteGuard' => 'aphront/AphrontWriteGuard.php',
+    'CelerityAPI' => 'infrastructure/celerity/CelerityAPI.php',
+    'CelerityResourceController' => 'infrastructure/celerity/CelerityResourceController.php',
+    'CelerityResourceGraph' => 'infrastructure/celerity/CelerityResourceGraph.php',
+    'CelerityResourceMap' => 'infrastructure/celerity/CelerityResourceMap.php',
+    'CelerityResourceTransformer' => 'infrastructure/celerity/CelerityResourceTransformer.php',
+    'CelerityResourceTransformerTestCase' => 'infrastructure/celerity/__tests__/CelerityResourceTransformerTestCase.php',
+    'CelerityStaticResourceResponse' => 'infrastructure/celerity/CelerityStaticResourceResponse.php',
+    'ConduitAPIMethod' => 'applications/conduit/method/ConduitAPIMethod.php',
+    'ConduitAPIRequest' => 'applications/conduit/protocol/ConduitAPIRequest.php',
+    'ConduitAPIResponse' => 'applications/conduit/protocol/ConduitAPIResponse.php',
+    'ConduitAPI_arcanist_Method' => 'applications/conduit/method/arcanist/ConduitAPI_arcanist_Method.php',
+    'ConduitAPI_arcanist_projectinfo_Method' => 'applications/conduit/method/arcanist/ConduitAPI_arcanist_projectinfo_Method.php',
+    'ConduitAPI_audit_Method' => 'applications/conduit/method/audit/ConduitAPI_audit_Method.php',
+    'ConduitAPI_audit_query_Method' => 'applications/conduit/method/audit/ConduitAPI_audit_query_Method.php',
+    'ConduitAPI_chatlog_Method' => 'applications/conduit/method/chatlog/ConduitAPI_chatlog_Method.php',
+    'ConduitAPI_chatlog_query_Method' => 'applications/conduit/method/chatlog/ConduitAPI_chatlog_query_Method.php',
+    'ConduitAPI_chatlog_record_Method' => 'applications/conduit/method/chatlog/ConduitAPI_chatlog_record_Method.php',
+    'ConduitAPI_conduit_connect_Method' => 'applications/conduit/method/conduit/ConduitAPI_conduit_connect_Method.php',
+    'ConduitAPI_conduit_getcertificate_Method' => 'applications/conduit/method/conduit/ConduitAPI_conduit_getcertificate_Method.php',
+    'ConduitAPI_conduit_ping_Method' => 'applications/conduit/method/conduit/ConduitAPI_conduit_ping_Method.php',
+    'ConduitAPI_daemon_launched_Method' => 'applications/conduit/method/daemon/ConduitAPI_daemon_launched_Method.php',
+    'ConduitAPI_daemon_log_Method' => 'applications/conduit/method/daemon/ConduitAPI_daemon_log_Method.php',
+    'ConduitAPI_differential_close_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_close_Method.php',
+    'ConduitAPI_differential_createcomment_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_createcomment_Method.php',
+    'ConduitAPI_differential_creatediff_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_creatediff_Method.php',
+    'ConduitAPI_differential_createrevision_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_createrevision_Method.php',
+    'ConduitAPI_differential_find_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_find_Method.php',
+    'ConduitAPI_differential_getalldiffs_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getalldiffs_Method.php',
+    'ConduitAPI_differential_getcommitmessage_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getcommitmessage_Method.php',
+    'ConduitAPI_differential_getcommitpaths_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getcommitpaths_Method.php',
+    'ConduitAPI_differential_getdiff_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getdiff_Method.php',
+    'ConduitAPI_differential_getrevision_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getrevision_Method.php',
+    'ConduitAPI_differential_getrevisioncomments_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getrevisioncomments_Method.php',
+    'ConduitAPI_differential_getrevisionfeedback_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_getrevisionfeedback_Method.php',
+    'ConduitAPI_differential_markcommitted_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_markcommitted_Method.php',
+    'ConduitAPI_differential_parsecommitmessage_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_parsecommitmessage_Method.php',
+    'ConduitAPI_differential_query_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_query_Method.php',
+    'ConduitAPI_differential_setdiffproperty_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_setdiffproperty_Method.php',
+    'ConduitAPI_differential_updaterevision_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_updaterevision_Method.php',
+    'ConduitAPI_differential_updatetaskrevisionassoc_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_updatetaskrevisionassoc_Method.php',
+    'ConduitAPI_differential_updateunitresults_Method' => 'applications/conduit/method/differential/ConduitAPI_differential_updateunitresults_Method.php',
+    'ConduitAPI_diffusion_findsymbols_Method' => 'applications/conduit/method/diffusion/ConduitAPI_diffusion_findsymbols_Method.php',
+    'ConduitAPI_diffusion_getcommits_Method' => 'applications/conduit/method/diffusion/ConduitAPI_diffusion_getcommits_Method.php',
+    'ConduitAPI_diffusion_getrecentcommitsbypath_Method' => 'applications/conduit/method/diffusion/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php',
+    'ConduitAPI_feed_publish_Method' => 'applications/conduit/method/feed/ConduitAPI_feed_publish_Method.php',
+    'ConduitAPI_feed_query_Method' => 'applications/conduit/method/feed/ConduitAPI_feed_query_Method.php',
+    'ConduitAPI_file_download_Method' => 'applications/conduit/method/file/ConduitAPI_file_download_Method.php',
+    'ConduitAPI_file_info_Method' => 'applications/conduit/method/file/ConduitAPI_file_info_Method.php',
+    'ConduitAPI_file_upload_Method' => 'applications/conduit/method/file/ConduitAPI_file_upload_Method.php',
+    'ConduitAPI_flag_Method' => 'applications/conduit/method/flag/ConduitAPI_flag_Method.php',
+    'ConduitAPI_flag_query_Method' => 'applications/conduit/method/flag/ConduitAPI_flag_query_Method.php',
+    'ConduitAPI_macro_Method' => 'applications/conduit/method/macro/ConduitAPI_macro_Method.php',
+    'ConduitAPI_macro_query_Method' => 'applications/conduit/method/macro/ConduitAPI_macro_query_Method.php',
+    'ConduitAPI_maniphest_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_Method.php',
+    'ConduitAPI_maniphest_createtask_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_createtask_Method.php',
+    'ConduitAPI_maniphest_find_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_find_Method.php',
+    'ConduitAPI_maniphest_gettasktransactions_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_gettasktransactions_Method.php',
+    'ConduitAPI_maniphest_info_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_info_Method.php',
+    'ConduitAPI_maniphest_update_Method' => 'applications/conduit/method/maniphest/ConduitAPI_maniphest_update_Method.php',
+    'ConduitAPI_owners_query_Method' => 'applications/conduit/method/owners/ConduitAPI_owners_query_Method.php',
+    'ConduitAPI_paste_Method' => 'applications/conduit/method/paste/ConduitAPI_paste_Method.php',
+    'ConduitAPI_paste_create_Method' => 'applications/conduit/method/paste/ConduitAPI_paste_create_Method.php',
+    'ConduitAPI_paste_info_Method' => 'applications/conduit/method/paste/ConduitAPI_paste_info_Method.php',
+    'ConduitAPI_path_getowners_Method' => 'applications/conduit/method/path/ConduitAPI_path_getowners_Method.php',
+    'ConduitAPI_phid_Method' => 'applications/conduit/method/phid/ConduitAPI_phid_Method.php',
+    'ConduitAPI_phid_info_Method' => 'applications/conduit/method/phid/ConduitAPI_phid_info_Method.php',
+    'ConduitAPI_phid_query_Method' => 'applications/conduit/method/phid/ConduitAPI_phid_query_Method.php',
+    'ConduitAPI_phriction_Method' => 'applications/conduit/method/phriction/ConduitAPI_phriction_Method.php',
+    'ConduitAPI_phriction_edit_Method' => 'applications/conduit/method/phriction/ConduitAPI_phriction_edit_Method.php',
+    'ConduitAPI_phriction_history_Method' => 'applications/conduit/method/phriction/ConduitAPI_phriction_history_Method.php',
+    'ConduitAPI_phriction_info_Method' => 'applications/conduit/method/phriction/ConduitAPI_phriction_info_Method.php',
+    'ConduitAPI_project_Method' => 'applications/conduit/method/project/ConduitAPI_project_Method.php',
+    'ConduitAPI_project_query_Method' => 'applications/conduit/method/project/ConduitAPI_project_query_Method.php',
+    'ConduitAPI_remarkup_process_Method' => 'applications/conduit/method/remarkup/ConduitAPI_remarkup_process_Method.php',
+    'ConduitAPI_repository_Method' => 'applications/conduit/method/repository/ConduitAPI_repository_Method.php',
+    'ConduitAPI_repository_create_Method' => 'applications/conduit/method/repository/ConduitAPI_repository_create_Method.php',
+    'ConduitAPI_repository_query_Method' => 'applications/conduit/method/repository/ConduitAPI_repository_query_Method.php',
+    'ConduitAPI_slowvote_info_Method' => 'applications/conduit/method/slowvote/ConduitAPI_slowvote_info_Method.php',
+    'ConduitAPI_user_Method' => 'applications/conduit/method/user/ConduitAPI_user_Method.php',
+    'ConduitAPI_user_addstatus_Method' => 'applications/conduit/method/user/ConduitAPI_user_addstatus_Method.php',
+    'ConduitAPI_user_disable_Method' => 'applications/conduit/method/user/ConduitAPI_user_disable_Method.php',
+    'ConduitAPI_user_find_Method' => 'applications/conduit/method/user/ConduitAPI_user_find_Method.php',
+    'ConduitAPI_user_info_Method' => 'applications/conduit/method/user/ConduitAPI_user_info_Method.php',
+    'ConduitAPI_user_query_Method' => 'applications/conduit/method/user/ConduitAPI_user_query_Method.php',
+    'ConduitAPI_user_removestatus_Method' => 'applications/conduit/method/user/ConduitAPI_user_removestatus_Method.php',
+    'ConduitAPI_user_whoami_Method' => 'applications/conduit/method/user/ConduitAPI_user_whoami_Method.php',
+    'ConduitException' => 'applications/conduit/protocol/ConduitException.php',
+    'DarkConsoleConfigPlugin' => 'aphront/console/plugin/DarkConsoleConfigPlugin.php',
+    'DarkConsoleController' => 'aphront/console/DarkConsoleController.php',
+    'DarkConsoleCore' => 'aphront/console/DarkConsoleCore.php',
+    'DarkConsoleErrorLogPlugin' => 'aphront/console/plugin/DarkConsoleErrorLogPlugin.php',
+    'DarkConsoleErrorLogPluginAPI' => 'aphront/console/plugin/errorlog/DarkConsoleErrorLogPluginAPI.php',
+    'DarkConsoleEventPlugin' => 'aphront/console/plugin/DarkConsoleEventPlugin.php',
+    'DarkConsoleEventPluginAPI' => 'aphront/console/plugin/event/DarkConsoleEventPluginAPI.php',
+    'DarkConsolePlugin' => 'aphront/console/plugin/DarkConsolePlugin.php',
+    'DarkConsoleRequestPlugin' => 'aphront/console/plugin/DarkConsoleRequestPlugin.php',
+    'DarkConsoleServicesPlugin' => 'aphront/console/plugin/DarkConsoleServicesPlugin.php',
+    'DarkConsoleXHProfPlugin' => 'aphront/console/plugin/DarkConsoleXHProfPlugin.php',
+    'DarkConsoleXHProfPluginAPI' => 'aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php',
+    'DatabaseConfigurationProvider' => 'applications/base/storage/configuration/DatabaseConfigurationProvider.php',
+    'DefaultDatabaseConfigurationProvider' => 'applications/base/storage/configuration/DefaultDatabaseConfigurationProvider.php',
+    'DifferentialAction' => 'applications/differential/constants/DifferentialAction.php',
+    'DifferentialActionHasNoEffectException' => 'applications/differential/exception/DifferentialActionHasNoEffectException.php',
+    'DifferentialAddCommentView' => 'applications/differential/view/DifferentialAddCommentView.php',
+    'DifferentialAffectedPath' => 'applications/differential/storage/DifferentialAffectedPath.php',
+    'DifferentialApplyPatchFieldSpecification' => 'applications/differential/field/specification/DifferentialApplyPatchFieldSpecification.php',
+    'DifferentialArcanistProjectFieldSpecification' => 'applications/differential/field/specification/DifferentialArcanistProjectFieldSpecification.php',
+    'DifferentialAuditorsFieldSpecification' => 'applications/differential/field/specification/DifferentialAuditorsFieldSpecification.php',
+    'DifferentialAuthorFieldSpecification' => 'applications/differential/field/specification/DifferentialAuthorFieldSpecification.php',
+    'DifferentialAuxiliaryField' => 'applications/differential/storage/DifferentialAuxiliaryField.php',
+    'DifferentialBlameRevisionFieldSpecification' => 'applications/differential/field/specification/DifferentialBlameRevisionFieldSpecification.php',
+    'DifferentialBranchFieldSpecification' => 'applications/differential/field/specification/DifferentialBranchFieldSpecification.php',
+    'DifferentialCCWelcomeMail' => 'applications/differential/mail/DifferentialCCWelcomeMail.php',
+    'DifferentialCCsFieldSpecification' => 'applications/differential/field/specification/DifferentialCCsFieldSpecification.php',
+    'DifferentialChangeType' => 'applications/differential/constants/DifferentialChangeType.php',
+    'DifferentialChangeset' => 'applications/differential/storage/DifferentialChangeset.php',
+    'DifferentialChangesetDetailView' => 'applications/differential/view/DifferentialChangesetDetailView.php',
+    'DifferentialChangesetListView' => 'applications/differential/view/DifferentialChangesetListView.php',
+    'DifferentialChangesetParser' => 'applications/differential/parser/DifferentialChangesetParser.php',
+    'DifferentialChangesetViewController' => 'applications/differential/controller/DifferentialChangesetViewController.php',
+    'DifferentialComment' => 'applications/differential/storage/DifferentialComment.php',
+    'DifferentialCommentEditor' => 'applications/differential/editor/DifferentialCommentEditor.php',
+    'DifferentialCommentMail' => 'applications/differential/mail/DifferentialCommentMail.php',
+    'DifferentialCommentPreviewController' => 'applications/differential/controller/DifferentialCommentPreviewController.php',
+    'DifferentialCommentSaveController' => 'applications/differential/controller/DifferentialCommentSaveController.php',
+    'DifferentialCommitsFieldSpecification' => 'applications/differential/field/specification/DifferentialCommitsFieldSpecification.php',
+    'DifferentialController' => 'applications/differential/controller/DifferentialController.php',
+    'DifferentialDAO' => 'applications/differential/storage/DifferentialDAO.php',
+    'DifferentialDateCreatedFieldSpecification' => 'applications/differential/field/specification/DifferentialDateCreatedFieldSpecification.php',
+    'DifferentialDateModifiedFieldSpecification' => 'applications/differential/field/specification/DifferentialDateModifiedFieldSpecification.php',
+    'DifferentialDefaultFieldSelector' => 'applications/differential/field/selector/DifferentialDefaultFieldSelector.php',
+    'DifferentialDependenciesFieldSpecification' => 'applications/differential/field/specification/DifferentialDependenciesFieldSpecification.php',
+    'DifferentialDiff' => 'applications/differential/storage/DifferentialDiff.php',
+    'DifferentialDiffContentMail' => 'applications/differential/mail/DifferentialDiffContentMail.php',
+    'DifferentialDiffCreateController' => 'applications/differential/controller/DifferentialDiffCreateController.php',
+    'DifferentialDiffProperty' => 'applications/differential/storage/DifferentialDiffProperty.php',
+    'DifferentialDiffTableOfContentsView' => 'applications/differential/view/DifferentialDiffTableOfContentsView.php',
+    'DifferentialDiffViewController' => 'applications/differential/controller/DifferentialDiffViewController.php',
+    'DifferentialException' => 'applications/differential/exception/DifferentialException.php',
+    'DifferentialExceptionMail' => 'applications/differential/mail/DifferentialExceptionMail.php',
+    'DifferentialExportPatchFieldSpecification' => 'applications/differential/field/specification/DifferentialExportPatchFieldSpecification.php',
+    'DifferentialFieldDataNotAvailableException' => 'applications/differential/field/exception/DifferentialFieldDataNotAvailableException.php',
+    'DifferentialFieldParseException' => 'applications/differential/field/exception/DifferentialFieldParseException.php',
+    'DifferentialFieldSelector' => 'applications/differential/field/selector/DifferentialFieldSelector.php',
+    'DifferentialFieldSpecification' => 'applications/differential/field/specification/DifferentialFieldSpecification.php',
+    'DifferentialFieldSpecificationIncompleteException' => 'applications/differential/field/exception/DifferentialFieldSpecificationIncompleteException.php',
+    'DifferentialFieldValidationException' => 'applications/differential/field/exception/DifferentialFieldValidationException.php',
+    'DifferentialGitSVNIDFieldSpecification' => 'applications/differential/field/specification/DifferentialGitSVNIDFieldSpecification.php',
+    'DifferentialHostFieldSpecification' => 'applications/differential/field/specification/DifferentialHostFieldSpecification.php',
+    'DifferentialHunk' => 'applications/differential/storage/DifferentialHunk.php',
+    'DifferentialInlineComment' => 'applications/differential/storage/DifferentialInlineComment.php',
+    'DifferentialInlineCommentEditController' => 'applications/differential/controller/DifferentialInlineCommentEditController.php',
+    'DifferentialInlineCommentEditView' => 'applications/differential/view/DifferentialInlineCommentEditView.php',
+    'DifferentialInlineCommentPreviewController' => 'applications/differential/controller/DifferentialInlineCommentPreviewController.php',
+    'DifferentialInlineCommentView' => 'applications/differential/view/DifferentialInlineCommentView.php',
+    'DifferentialLinesFieldSpecification' => 'applications/differential/field/specification/DifferentialLinesFieldSpecification.php',
+    'DifferentialLintFieldSpecification' => 'applications/differential/field/specification/DifferentialLintFieldSpecification.php',
+    'DifferentialLintStatus' => 'applications/differential/constants/DifferentialLintStatus.php',
+    'DifferentialLocalCommitsView' => 'applications/differential/view/DifferentialLocalCommitsView.php',
+    'DifferentialMail' => 'applications/differential/mail/DifferentialMail.php',
+    'DifferentialManiphestTasksFieldSpecification' => 'applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php',
+    'DifferentialNewDiffMail' => 'applications/differential/mail/DifferentialNewDiffMail.php',
+    'DifferentialPathFieldSpecification' => 'applications/differential/field/specification/DifferentialPathFieldSpecification.php',
+    'DifferentialPrimaryPaneView' => 'applications/differential/view/DifferentialPrimaryPaneView.php',
+    'DifferentialReplyHandler' => 'applications/differential/DifferentialReplyHandler.php',
+    'DifferentialResultsTableView' => 'applications/differential/view/DifferentialResultsTableView.php',
+    'DifferentialRevertPlanFieldSpecification' => 'applications/differential/field/specification/DifferentialRevertPlanFieldSpecification.php',
+    'DifferentialReviewRequestMail' => 'applications/differential/mail/DifferentialReviewRequestMail.php',
+    'DifferentialReviewedByFieldSpecification' => 'applications/differential/field/specification/DifferentialReviewedByFieldSpecification.php',
+    'DifferentialReviewersFieldSpecification' => 'applications/differential/field/specification/DifferentialReviewersFieldSpecification.php',
+    'DifferentialRevision' => 'applications/differential/storage/DifferentialRevision.php',
+    'DifferentialRevisionCommentListView' => 'applications/differential/view/DifferentialRevisionCommentListView.php',
+    'DifferentialRevisionCommentView' => 'applications/differential/view/DifferentialRevisionCommentView.php',
+    'DifferentialRevisionControlSystem' => 'applications/differential/constants/DifferentialRevisionControlSystem.php',
+    'DifferentialRevisionDetailRenderer' => 'applications/differential/controller/DifferentialRevisionDetailRenderer.php',
+    'DifferentialRevisionDetailView' => 'applications/differential/view/DifferentialRevisionDetailView.php',
+    'DifferentialRevisionEditController' => 'applications/differential/controller/DifferentialRevisionEditController.php',
+    'DifferentialRevisionEditor' => 'applications/differential/editor/DifferentialRevisionEditor.php',
+    'DifferentialRevisionIDFieldParserTestCase' => 'applications/differential/field/specification/__tests__/DifferentialRevisionIDFieldParserTestCase.php',
+    'DifferentialRevisionIDFieldSpecification' => 'applications/differential/field/specification/DifferentialRevisionIDFieldSpecification.php',
+    'DifferentialRevisionListController' => 'applications/differential/controller/DifferentialRevisionListController.php',
+    'DifferentialRevisionListData' => 'applications/differential/data/DifferentialRevisionListData.php',
+    'DifferentialRevisionListView' => 'applications/differential/view/DifferentialRevisionListView.php',
+    'DifferentialRevisionQuery' => 'applications/differential/query/DifferentialRevisionQuery.php',
+    'DifferentialRevisionStatsController' => 'applications/differential/controller/DifferentialRevisionStatsController.php',
+    'DifferentialRevisionStatsView' => 'applications/differential/view/DifferentialRevisionStatsView.php',
+    'DifferentialRevisionStatusFieldSpecification' => 'applications/differential/field/specification/DifferentialRevisionStatusFieldSpecification.php',
+    'DifferentialRevisionUpdateHistoryView' => 'applications/differential/view/DifferentialRevisionUpdateHistoryView.php',
+    'DifferentialRevisionViewController' => 'applications/differential/controller/DifferentialRevisionViewController.php',
+    'DifferentialSubscribeController' => 'applications/differential/controller/DifferentialSubscribeController.php',
+    'DifferentialSummaryFieldSpecification' => 'applications/differential/field/specification/DifferentialSummaryFieldSpecification.php',
+    'DifferentialTasksAttacher' => 'applications/differential/DifferentialTasksAttacher.php',
+    'DifferentialTestPlanFieldSpecification' => 'applications/differential/field/specification/DifferentialTestPlanFieldSpecification.php',
+    'DifferentialTitleFieldSpecification' => 'applications/differential/field/specification/DifferentialTitleFieldSpecification.php',
+    'DifferentialUnitFieldSpecification' => 'applications/differential/field/specification/DifferentialUnitFieldSpecification.php',
+    'DifferentialUnitStatus' => 'applications/differential/constants/DifferentialUnitStatus.php',
+    'DifferentialUnitTestResult' => 'applications/differential/constants/DifferentialUnitTestResult.php',
+    'DiffusionBranchInformation' => 'applications/diffusion/data/DiffusionBranchInformation.php',
+    'DiffusionBranchQuery' => 'applications/diffusion/query/branch/DiffusionBranchQuery.php',
+    'DiffusionBranchTableController' => 'applications/diffusion/controller/DiffusionBranchTableController.php',
+    'DiffusionBranchTableView' => 'applications/diffusion/view/DiffusionBranchTableView.php',
+    'DiffusionBrowseController' => 'applications/diffusion/controller/DiffusionBrowseController.php',
+    'DiffusionBrowseFileController' => 'applications/diffusion/controller/DiffusionBrowseFileController.php',
+    'DiffusionBrowseQuery' => 'applications/diffusion/query/browse/DiffusionBrowseQuery.php',
+    'DiffusionBrowseTableView' => 'applications/diffusion/view/DiffusionBrowseTableView.php',
+    'DiffusionChangeController' => 'applications/diffusion/controller/DiffusionChangeController.php',
+    'DiffusionCommentListView' => 'applications/diffusion/view/DiffusionCommentListView.php',
+    'DiffusionCommentView' => 'applications/diffusion/view/DiffusionCommentView.php',
+    'DiffusionCommitChangeTableView' => 'applications/diffusion/view/DiffusionCommitChangeTableView.php',
+    'DiffusionCommitController' => 'applications/diffusion/controller/DiffusionCommitController.php',
+    'DiffusionCommitParentsQuery' => 'applications/diffusion/query/parents/DiffusionCommitParentsQuery.php',
+    'DiffusionCommitTagsQuery' => 'applications/diffusion/query/committags/DiffusionCommitTagsQuery.php',
+    'DiffusionContainsQuery' => 'applications/diffusion/query/contains/DiffusionContainsQuery.php',
+    'DiffusionController' => 'applications/diffusion/controller/DiffusionController.php',
+    'DiffusionDiffController' => 'applications/diffusion/controller/DiffusionDiffController.php',
+    'DiffusionDiffQuery' => 'applications/diffusion/query/diff/DiffusionDiffQuery.php',
+    'DiffusionEmptyResultView' => 'applications/diffusion/view/DiffusionEmptyResultView.php',
+    'DiffusionExternalController' => 'applications/diffusion/controller/DiffusionExternalController.php',
+    'DiffusionFileContent' => 'applications/diffusion/data/DiffusionFileContent.php',
+    'DiffusionFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionFileContentQuery.php',
+    'DiffusionGitBranchQuery' => 'applications/diffusion/query/branch/DiffusionGitBranchQuery.php',
+    'DiffusionGitBranchQueryTestCase' => 'applications/diffusion/query/branch/__tests__/DiffusionGitBranchQueryTestCase.php',
+    'DiffusionGitBrowseQuery' => 'applications/diffusion/query/browse/DiffusionGitBrowseQuery.php',
+    'DiffusionGitCommitParentsQuery' => 'applications/diffusion/query/parents/DiffusionGitCommitParentsQuery.php',
+    'DiffusionGitCommitTagsQuery' => 'applications/diffusion/query/committags/DiffusionGitCommitTagsQuery.php',
+    'DiffusionGitContainsQuery' => 'applications/diffusion/query/contains/DiffusionGitContainsQuery.php',
+    'DiffusionGitDiffQuery' => 'applications/diffusion/query/diff/DiffusionGitDiffQuery.php',
+    'DiffusionGitFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php',
+    'DiffusionGitHistoryQuery' => 'applications/diffusion/query/history/DiffusionGitHistoryQuery.php',
+    'DiffusionGitLastModifiedQuery' => 'applications/diffusion/query/lastmodified/DiffusionGitLastModifiedQuery.php',
+    'DiffusionGitMergedCommitsQuery' => 'applications/diffusion/query/mergedcommits/DiffusionGitMergedCommitsQuery.php',
+    'DiffusionGitRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php',
+    'DiffusionGitRenameHistoryQuery' => 'applications/diffusion/query/renamehistory/DiffusionGitRenameHistoryQuery.php',
+    'DiffusionGitRequest' => 'applications/diffusion/request/DiffusionGitRequest.php',
+    'DiffusionGitTagListQuery' => 'applications/diffusion/query/taglist/DiffusionGitTagListQuery.php',
+    'DiffusionHistoryController' => 'applications/diffusion/controller/DiffusionHistoryController.php',
+    'DiffusionHistoryQuery' => 'applications/diffusion/query/history/DiffusionHistoryQuery.php',
+    'DiffusionHistoryTableView' => 'applications/diffusion/view/DiffusionHistoryTableView.php',
+    'DiffusionHomeController' => 'applications/diffusion/controller/DiffusionHomeController.php',
+    'DiffusionInlineCommentController' => 'applications/diffusion/controller/DiffusionInlineCommentController.php',
+    'DiffusionLastModifiedController' => 'applications/diffusion/controller/DiffusionLastModifiedController.php',
+    'DiffusionLastModifiedQuery' => 'applications/diffusion/query/lastmodified/DiffusionLastModifiedQuery.php',
+    'DiffusionMercurialBranchQuery' => 'applications/diffusion/query/branch/DiffusionMercurialBranchQuery.php',
+    'DiffusionMercurialBrowseQuery' => 'applications/diffusion/query/browse/DiffusionMercurialBrowseQuery.php',
+    'DiffusionMercurialCommitParentsQuery' => 'applications/diffusion/query/parents/DiffusionMercurialCommitParentsQuery.php',
+    'DiffusionMercurialCommitTagsQuery' => 'applications/diffusion/query/committags/DiffusionMercurialCommitTagsQuery.php',
+    'DiffusionMercurialContainsQuery' => 'applications/diffusion/query/contains/DiffusionMercurialContainsQuery.php',
+    'DiffusionMercurialDiffQuery' => 'applications/diffusion/query/diff/DiffusionMercurialDiffQuery.php',
+    'DiffusionMercurialFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionMercurialFileContentQuery.php',
+    'DiffusionMercurialHistoryQuery' => 'applications/diffusion/query/history/DiffusionMercurialHistoryQuery.php',
+    'DiffusionMercurialLastModifiedQuery' => 'applications/diffusion/query/lastmodified/DiffusionMercurialLastModifiedQuery.php',
+    'DiffusionMercurialMergedCommitsQuery' => 'applications/diffusion/query/mergedcommits/DiffusionMercurialMergedCommitsQuery.php',
+    'DiffusionMercurialRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php',
+    'DiffusionMercurialRenameHistoryQuery' => 'applications/diffusion/query/renamehistory/DiffusionMercurialRenameHistoryQuery.php',
+    'DiffusionMercurialRequest' => 'applications/diffusion/request/DiffusionMercurialRequest.php',
+    'DiffusionMercurialTagListQuery' => 'applications/diffusion/query/taglist/DiffusionMercurialTagListQuery.php',
+    'DiffusionMergedCommitsQuery' => 'applications/diffusion/query/mergedcommits/DiffusionMergedCommitsQuery.php',
+    'DiffusionPathChange' => 'applications/diffusion/data/DiffusionPathChange.php',
+    'DiffusionPathChangeQuery' => 'applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php',
+    'DiffusionPathCompleteController' => 'applications/diffusion/controller/DiffusionPathCompleteController.php',
+    'DiffusionPathIDQuery' => 'applications/diffusion/query/pathid/DiffusionPathIDQuery.php',
+    'DiffusionPathQuery' => 'applications/diffusion/query/DiffusionPathQuery.php',
+    'DiffusionPathQueryTestCase' => 'applications/diffusion/query/pathid/__tests__/DiffusionPathQueryTestCase.php',
+    'DiffusionPathValidateController' => 'applications/diffusion/controller/DiffusionPathValidateController.php',
+    'DiffusionQuery' => 'applications/diffusion/query/DiffusionQuery.php',
+    'DiffusionRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionRawDiffQuery.php',
+    'DiffusionRenameHistoryQuery' => 'applications/diffusion/query/renamehistory/DiffusionRenameHistoryQuery.php',
+    'DiffusionRepositoryController' => 'applications/diffusion/controller/DiffusionRepositoryController.php',
+    'DiffusionRepositoryPath' => 'applications/diffusion/data/DiffusionRepositoryPath.php',
+    'DiffusionRepositoryTag' => 'applications/diffusion/DiffusionRepositoryTag.php',
+    'DiffusionRequest' => 'applications/diffusion/request/DiffusionRequest.php',
+    'DiffusionSetupException' => 'applications/diffusion/exception/DiffusionSetupException.php',
+    'DiffusionSvnBrowseQuery' => 'applications/diffusion/query/browse/DiffusionSvnBrowseQuery.php',
+    'DiffusionSvnCommitParentsQuery' => 'applications/diffusion/query/parents/DiffusionSvnCommitParentsQuery.php',
+    'DiffusionSvnCommitTagsQuery' => 'applications/diffusion/query/committags/DiffusionSvnCommitTagsQuery.php',
+    'DiffusionSvnContainsQuery' => 'applications/diffusion/query/contains/DiffusionSvnContainsQuery.php',
+    'DiffusionSvnDiffQuery' => 'applications/diffusion/query/diff/DiffusionSvnDiffQuery.php',
+    'DiffusionSvnFileContentQuery' => 'applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php',
+    'DiffusionSvnHistoryQuery' => 'applications/diffusion/query/history/DiffusionSvnHistoryQuery.php',
+    'DiffusionSvnLastModifiedQuery' => 'applications/diffusion/query/lastmodified/DiffusionSvnLastModifiedQuery.php',
+    'DiffusionSvnMergedCommitsQuery' => 'applications/diffusion/query/mergedcommits/DiffusionSvnMergedCommitsQuery.php',
+    'DiffusionSvnRawDiffQuery' => 'applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php',
+    'DiffusionSvnRenameHistoryQuery' => 'applications/diffusion/query/renamehistory/DiffusionSvnRenameHistoryQuery.php',
+    'DiffusionSvnRequest' => 'applications/diffusion/request/DiffusionSvnRequest.php',
+    'DiffusionSvnTagListQuery' => 'applications/diffusion/query/taglist/DiffusionSvnTagListQuery.php',
+    'DiffusionSymbolController' => 'applications/diffusion/controller/DiffusionSymbolController.php',
+    'DiffusionSymbolQuery' => 'applications/diffusion/query/DiffusionSymbolQuery.php',
+    'DiffusionTagListController' => 'applications/diffusion/controller/DiffusionTagListController.php',
+    'DiffusionTagListQuery' => 'applications/diffusion/query/taglist/DiffusionTagListQuery.php',
+    'DiffusionTagListView' => 'applications/diffusion/view/DiffusionTagListView.php',
+    'DiffusionURITestCase' => 'applications/diffusion/request/__tests__/DiffusionURITestCase.php',
+    'DiffusionView' => 'applications/diffusion/view/DiffusionView.php',
+    'DrydockAllocator' => 'applications/drydock/allocator/DrydockAllocator.php',
+    'DrydockAllocatorWorker' => 'applications/drydock/allocator/DrydockAllocatorWorker.php',
+    'DrydockApacheWebrootBlueprint' => 'applications/drydock/blueprint/webroot/DrydockApacheWebrootBlueprint.php',
+    'DrydockApacheWebrootInterface' => 'applications/drydock/interface/webroot/DrydockApacheWebrootInterface.php',
+    'DrydockBlueprint' => 'applications/drydock/blueprint/DrydockBlueprint.php',
+    'DrydockCommandInterface' => 'applications/drydock/interface/command/DrydockCommandInterface.php',
+    'DrydockConstants' => 'applications/drydock/constants/DrydockConstants.php',
+    'DrydockController' => 'applications/drydock/controller/DrydockController.php',
+    'DrydockDAO' => 'applications/drydock/storage/DrydockDAO.php',
+    'DrydockEC2HostBlueprint' => 'applications/drydock/blueprint/DrydockEC2HostBlueprint.php',
+    'DrydockInterface' => 'applications/drydock/interface/DrydockInterface.php',
+    'DrydockLease' => 'applications/drydock/storage/DrydockLease.php',
+    'DrydockLeaseListController' => 'applications/drydock/controller/DrydockLeaseListController.php',
+    'DrydockLeaseStatus' => 'applications/drydock/constants/DrydockLeaseStatus.php',
+    'DrydockLocalCommandInterface' => 'applications/drydock/interface/command/DrydockLocalCommandInterface.php',
+    'DrydockLocalHostBlueprint' => 'applications/drydock/blueprint/DrydockLocalHostBlueprint.php',
+    'DrydockLog' => 'applications/drydock/storage/DrydockLog.php',
+    'DrydockLogController' => 'applications/drydock/controller/DrydockLogController.php',
+    'DrydockLogQuery' => 'applications/drydock/query/DrydockLogQuery.php',
+    'DrydockPhabricatorApplicationBlueprint' => 'applications/drydock/blueprint/application/DrydockPhabricatorApplicationBlueprint.php',
+    'DrydockRemoteHostBlueprint' => 'applications/drydock/blueprint/DrydockRemoteHostBlueprint.php',
+    'DrydockResource' => 'applications/drydock/storage/DrydockResource.php',
+    'DrydockResourceAllocateController' => 'applications/drydock/controller/DrydockResourceAllocateController.php',
+    'DrydockResourceListController' => 'applications/drydock/controller/DrydockResourceListController.php',
+    'DrydockResourceStatus' => 'applications/drydock/constants/DrydockResourceStatus.php',
+    'DrydockSSHCommandInterface' => 'applications/drydock/interface/command/DrydockSSHCommandInterface.php',
+    'DrydockWebrootInterface' => 'applications/drydock/interface/webroot/DrydockWebrootInterface.php',
+    'HarbormasterDAO' => 'applications/harbormaster/storage/HarbormasterDAO.php',
+    'HarbormasterScratchTable' => 'applications/harbormaster/storage/HarbormasterScratchTable.php',
+    'HeraldAction' => 'applications/herald/storage/HeraldAction.php',
+    'HeraldActionConfig' => 'applications/herald/config/HeraldActionConfig.php',
+    'HeraldApplyTranscript' => 'applications/herald/storage/transcript/HeraldApplyTranscript.php',
+    'HeraldCommitAdapter' => 'applications/herald/adapter/HeraldCommitAdapter.php',
+    'HeraldCondition' => 'applications/herald/storage/HeraldCondition.php',
+    'HeraldConditionConfig' => 'applications/herald/config/HeraldConditionConfig.php',
+    'HeraldConditionTranscript' => 'applications/herald/storage/transcript/HeraldConditionTranscript.php',
+    'HeraldContentTypeConfig' => 'applications/herald/config/HeraldContentTypeConfig.php',
+    'HeraldController' => 'applications/herald/controller/HeraldController.php',
+    'HeraldDAO' => 'applications/herald/storage/HeraldDAO.php',
+    'HeraldDeleteController' => 'applications/herald/controller/HeraldDeleteController.php',
+    'HeraldDifferentialRevisionAdapter' => 'applications/herald/adapter/HeraldDifferentialRevisionAdapter.php',
+    'HeraldDryRunAdapter' => 'applications/herald/adapter/HeraldDryRunAdapter.php',
+    'HeraldEditLogQuery' => 'applications/herald/query/HeraldEditLogQuery.php',
+    'HeraldEffect' => 'applications/herald/engine/HeraldEffect.php',
+    'HeraldEngine' => 'applications/herald/engine/HeraldEngine.php',
+    'HeraldFieldConfig' => 'applications/herald/config/HeraldFieldConfig.php',
+    'HeraldHomeController' => 'applications/herald/controller/HeraldHomeController.php',
+    'HeraldInvalidConditionException' => 'applications/herald/engine/engine/HeraldInvalidConditionException.php',
+    'HeraldInvalidFieldException' => 'applications/herald/engine/engine/HeraldInvalidFieldException.php',
+    'HeraldNewController' => 'applications/herald/controller/HeraldNewController.php',
+    'HeraldObjectAdapter' => 'applications/herald/adapter/HeraldObjectAdapter.php',
+    'HeraldObjectTranscript' => 'applications/herald/storage/transcript/HeraldObjectTranscript.php',
+    'HeraldRecursiveConditionsException' => 'applications/herald/engine/engine/HeraldRecursiveConditionsException.php',
+    'HeraldRepetitionPolicyConfig' => 'applications/herald/config/HeraldRepetitionPolicyConfig.php',
+    'HeraldRule' => 'applications/herald/storage/HeraldRule.php',
+    'HeraldRuleController' => 'applications/herald/controller/HeraldRuleController.php',
+    'HeraldRuleEdit' => 'applications/herald/storage/HeraldRuleEdit.php',
+    'HeraldRuleEditHistoryController' => 'applications/herald/controller/HeraldRuleEditHistoryController.php',
+    'HeraldRuleEditHistoryView' => 'applications/herald/view/HeraldRuleEditHistoryView.php',
+    'HeraldRuleListView' => 'applications/herald/view/HeraldRuleListView.php',
+    'HeraldRuleQuery' => 'applications/herald/query/HeraldRuleQuery.php',
+    'HeraldRuleTranscript' => 'applications/herald/storage/transcript/HeraldRuleTranscript.php',
+    'HeraldRuleTypeConfig' => 'applications/herald/config/HeraldRuleTypeConfig.php',
+    'HeraldTestConsoleController' => 'applications/herald/controller/HeraldTestConsoleController.php',
+    'HeraldTranscript' => 'applications/herald/storage/transcript/HeraldTranscript.php',
+    'HeraldTranscriptController' => 'applications/herald/controller/HeraldTranscriptController.php',
+    'HeraldTranscriptListController' => 'applications/herald/controller/HeraldTranscriptListController.php',
+    'HeraldValueTypeConfig' => 'applications/herald/config/HeraldValueTypeConfig.php',
+    'Javelin' => 'infrastructure/javelin/Javelin.php',
+    'JavelinReactorExample' => 'applications/uiexample/examples/JavelinReactorExample.php',
+    'JavelinViewExample' => 'applications/uiexample/examples/JavelinViewExample.php',
+    'JavelinViewExampleServerView' => 'applications/uiexample/examples/JavelinViewExampleServerView.php',
+    'LiskDAO' => 'storage/lisk/LiskDAO.php',
+    'LiskDAOSet' => 'storage/lisk/LiskDAOSet.php',
+    'LiskEphemeralObjectException' => 'storage/lisk/LiskEphemeralObjectException.php',
+    'LiskFixtureTestCase' => 'storage/lisk/__tests__/LiskFixtureTestCase.php',
+    'LiskIsolationTestCase' => 'storage/lisk/__tests__/LiskIsolationTestCase.php',
+    'LiskIsolationTestDAO' => 'storage/lisk/__tests__/LiskIsolationTestDAO.php',
+    'LiskIsolationTestDAOException' => 'storage/lisk/__tests__/LiskIsolationTestDAOException.php',
+    'ManiphestAction' => 'applications/maniphest/constants/ManiphestAction.php',
+    'ManiphestAuxiliaryFieldDefaultSpecification' => 'applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldDefaultSpecification.php',
+    'ManiphestAuxiliaryFieldSpecification' => 'applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldSpecification.php',
+    'ManiphestAuxiliaryFieldTypeException' => 'applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldTypeException.php',
+    'ManiphestAuxiliaryFieldValidationException' => 'applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldValidationException.php',
+    'ManiphestBatchEditController' => 'applications/maniphest/controller/ManiphestBatchEditController.php',
+    'ManiphestConstants' => 'applications/maniphest/constants/ManiphestConstants.php',
+    'ManiphestController' => 'applications/maniphest/controller/ManiphestController.php',
+    'ManiphestDAO' => 'applications/maniphest/storage/ManiphestDAO.php',
+    'ManiphestDefaultTaskExtensions' => 'applications/maniphest/extensions/ManiphestDefaultTaskExtensions.php',
+    'ManiphestExportController' => 'applications/maniphest/controller/ManiphestExportController.php',
+    'ManiphestReplyHandler' => 'applications/maniphest/ManiphestReplyHandler.php',
+    'ManiphestReportController' => 'applications/maniphest/controller/ManiphestReportController.php',
+    'ManiphestSavedQuery' => 'applications/maniphest/storage/ManiphestSavedQuery.php',
+    'ManiphestSavedQueryDeleteController' => 'applications/maniphest/controller/ManiphestSavedQueryDeleteController.php',
+    'ManiphestSavedQueryEditController' => 'applications/maniphest/controller/ManiphestSavedQueryEditController.php',
+    'ManiphestSavedQueryListController' => 'applications/maniphest/controller/ManiphestSavedQueryListController.php',
+    'ManiphestSubpriorityController' => 'applications/maniphest/controller/ManiphestSubpriorityController.php',
+    'ManiphestTask' => 'applications/maniphest/storage/ManiphestTask.php',
+    'ManiphestTaskAuxiliaryStorage' => 'applications/maniphest/storage/ManiphestTaskAuxiliaryStorage.php',
+    'ManiphestTaskDescriptionChangeController' => 'applications/maniphest/controller/ManiphestTaskDescriptionChangeController.php',
+    'ManiphestTaskDescriptionPreviewController' => 'applications/maniphest/controller/ManiphestTaskDescriptionPreviewController.php',
+    'ManiphestTaskDetailController' => 'applications/maniphest/controller/ManiphestTaskDetailController.php',
+    'ManiphestTaskEditController' => 'applications/maniphest/controller/ManiphestTaskEditController.php',
+    'ManiphestTaskExtensions' => 'applications/maniphest/extensions/ManiphestTaskExtensions.php',
+    'ManiphestTaskListController' => 'applications/maniphest/controller/ManiphestTaskListController.php',
+    'ManiphestTaskListView' => 'applications/maniphest/view/ManiphestTaskListView.php',
+    'ManiphestTaskOwner' => 'applications/maniphest/constants/ManiphestTaskOwner.php',
+    'ManiphestTaskPriority' => 'applications/maniphest/constants/ManiphestTaskPriority.php',
+    'ManiphestTaskProject' => 'applications/maniphest/storage/ManiphestTaskProject.php',
+    'ManiphestTaskProjectsView' => 'applications/maniphest/view/ManiphestTaskProjectsView.php',
+    'ManiphestTaskQuery' => 'applications/maniphest/ManiphestTaskQuery.php',
+    'ManiphestTaskStatus' => 'applications/maniphest/constants/ManiphestTaskStatus.php',
+    'ManiphestTaskSubscriber' => 'applications/maniphest/storage/ManiphestTaskSubscriber.php',
+    'ManiphestTaskSummaryView' => 'applications/maniphest/view/ManiphestTaskSummaryView.php',
+    'ManiphestTransaction' => 'applications/maniphest/storage/ManiphestTransaction.php',
+    'ManiphestTransactionDetailView' => 'applications/maniphest/view/ManiphestTransactionDetailView.php',
+    'ManiphestTransactionEditor' => 'applications/maniphest/editor/ManiphestTransactionEditor.php',
+    'ManiphestTransactionListView' => 'applications/maniphest/view/ManiphestTransactionListView.php',
+    'ManiphestTransactionPreviewController' => 'applications/maniphest/controller/ManiphestTransactionPreviewController.php',
+    'ManiphestTransactionSaveController' => 'applications/maniphest/controller/ManiphestTransactionSaveController.php',
+    'ManiphestTransactionType' => 'applications/maniphest/constants/ManiphestTransactionType.php',
+    'ManiphestView' => 'applications/maniphest/view/ManiphestView.php',
+    'MetaMTAConstants' => 'applications/metamta/constants/MetaMTAConstants.php',
+    'MetaMTANotificationType' => 'applications/metamta/constants/MetaMTANotificationType.php',
+    'OwnersPackageReplyHandler' => 'applications/owners/OwnersPackageReplyHandler.php',
+    'PackageCreateMail' => 'applications/owners/mail/PackageCreateMail.php',
+    'PackageDeleteMail' => 'applications/owners/mail/PackageDeleteMail.php',
+    'PackageMail' => 'applications/owners/mail/PackageMail.php',
+    'PackageModifyMail' => 'applications/owners/mail/PackageModifyMail.php',
+    'Phabricator404Controller' => 'applications/base/controller/Phabricator404Controller.php',
+    'PhabricatorAccessLog' => 'infrastructure/PhabricatorAccessLog.php',
+    'PhabricatorAphlictTestPageController' => 'applications/notifications/controller/PhabricatorAphlictTestPageController.php',
+    'PhabricatorAuditActionConstants' => 'applications/audit/constants/PhabricatorAuditActionConstants.php',
+    'PhabricatorAuditAddCommentController' => 'applications/audit/controller/PhabricatorAuditAddCommentController.php',
+    'PhabricatorAuditComment' => 'applications/audit/storage/PhabricatorAuditComment.php',
+    'PhabricatorAuditCommentEditor' => 'applications/audit/editor/PhabricatorAuditCommentEditor.php',
+    'PhabricatorAuditCommitListView' => 'applications/audit/view/PhabricatorAuditCommitListView.php',
+    'PhabricatorAuditCommitQuery' => 'applications/audit/query/PhabricatorAuditCommitQuery.php',
+    'PhabricatorAuditCommitStatusConstants' => 'applications/audit/constants/PhabricatorAuditCommitStatusConstants.php',
+    'PhabricatorAuditController' => 'applications/audit/controller/PhabricatorAuditController.php',
+    'PhabricatorAuditDAO' => 'applications/audit/storage/PhabricatorAuditDAO.php',
+    'PhabricatorAuditInlineComment' => 'applications/audit/storage/PhabricatorAuditInlineComment.php',
+    'PhabricatorAuditListController' => 'applications/audit/controller/PhabricatorAuditListController.php',
+    'PhabricatorAuditListView' => 'applications/audit/view/PhabricatorAuditListView.php',
+    'PhabricatorAuditPreviewController' => 'applications/audit/controller/PhabricatorAuditPreviewController.php',
+    'PhabricatorAuditQuery' => 'applications/audit/query/PhabricatorAuditQuery.php',
+    'PhabricatorAuditReplyHandler' => 'applications/audit/PhabricatorAuditReplyHandler.php',
+    'PhabricatorAuditStatusConstants' => 'applications/audit/constants/PhabricatorAuditStatusConstants.php',
+    'PhabricatorAuthController' => 'applications/auth/controller/PhabricatorAuthController.php',
+    'PhabricatorBuiltinPatchList' => 'infrastructure/setup/sql/PhabricatorBuiltinPatchList.php',
+    'PhabricatorCalendarBrowseController' => 'applications/calendar/controller/PhabricatorCalendarBrowseController.php',
+    'PhabricatorCalendarController' => 'applications/calendar/controller/PhabricatorCalendarController.php',
+    'PhabricatorCalendarDAO' => 'applications/calendar/storage/PhabricatorCalendarDAO.php',
+    'PhabricatorCalendarHoliday' => 'applications/calendar/storage/PhabricatorCalendarHoliday.php',
+    'PhabricatorCalendarHolidayTestCase' => 'applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php',
+    'PhabricatorChangesetResponse' => 'infrastructure/diff/PhabricatorChangesetResponse.php',
+    'PhabricatorChatLogChannelListController' => 'applications/chatlog/controller/PhabricatorChatLogChannelListController.php',
+    'PhabricatorChatLogChannelLogController' => 'applications/chatlog/controller/PhabricatorChatLogChannelLogController.php',
+    'PhabricatorChatLogConstants' => 'applications/chatlog/constants/PhabricatorChatLogConstants.php',
+    'PhabricatorChatLogController' => 'applications/chatlog/controller/PhabricatorChatLogController.php',
+    'PhabricatorChatLogDAO' => 'applications/chatlog/storage/PhabricatorChatLogDAO.php',
+    'PhabricatorChatLogEvent' => 'applications/chatlog/storage/PhabricatorChatLogEvent.php',
+    'PhabricatorChatLogEventType' => 'applications/chatlog/constants/PhabricatorChatLogEventType.php',
+    'PhabricatorChatLogQuery' => 'applications/chatlog/PhabricatorChatLogQuery.php',
+    'PhabricatorConduitAPIController' => 'applications/conduit/controller/PhabricatorConduitAPIController.php',
+    'PhabricatorConduitCertificateToken' => 'applications/conduit/storage/PhabricatorConduitCertificateToken.php',
+    'PhabricatorConduitConnectionLog' => 'applications/conduit/storage/PhabricatorConduitConnectionLog.php',
+    'PhabricatorConduitConsoleController' => 'applications/conduit/controller/PhabricatorConduitConsoleController.php',
+    'PhabricatorConduitController' => 'applications/conduit/controller/PhabricatorConduitController.php',
+    'PhabricatorConduitDAO' => 'applications/conduit/storage/PhabricatorConduitDAO.php',
+    'PhabricatorConduitListController' => 'applications/conduit/controller/PhabricatorConduitListController.php',
+    'PhabricatorConduitLogController' => 'applications/conduit/controller/PhabricatorConduitLogController.php',
+    'PhabricatorConduitMethodCallLog' => 'applications/conduit/storage/PhabricatorConduitMethodCallLog.php',
+    'PhabricatorConduitTokenController' => 'applications/conduit/controller/PhabricatorConduitTokenController.php',
+    'PhabricatorContentSource' => 'applications/metamta/contentsource/PhabricatorContentSource.php',
+    'PhabricatorContentSourceView' => 'applications/metamta/contentsource/PhabricatorContentSourceView.php',
+    'PhabricatorController' => 'applications/base/controller/PhabricatorController.php',
+    'PhabricatorCountdownController' => 'applications/countdown/controller/PhabricatorCountdownController.php',
+    'PhabricatorCountdownDAO' => 'applications/countdown/storage/PhabricatorCountdownDAO.php',
+    'PhabricatorCountdownDeleteController' => 'applications/countdown/controller/PhabricatorCountdownDeleteController.php',
+    'PhabricatorCountdownEditController' => 'applications/countdown/controller/PhabricatorCountdownEditController.php',
+    'PhabricatorCountdownListController' => 'applications/countdown/controller/PhabricatorCountdownListController.php',
+    'PhabricatorCountdownViewController' => 'applications/countdown/controller/PhabricatorCountdownViewController.php',
+    'PhabricatorDaemon' => 'infrastructure/daemon/PhabricatorDaemon.php',
+    'PhabricatorDaemonCombinedLogController' => 'applications/daemon/controller/PhabricatorDaemonCombinedLogController.php',
+    'PhabricatorDaemonConsoleController' => 'applications/daemon/controller/PhabricatorDaemonConsoleController.php',
+    'PhabricatorDaemonControl' => 'infrastructure/daemon/PhabricatorDaemonControl.php',
+    'PhabricatorDaemonController' => 'applications/daemon/controller/PhabricatorDaemonController.php',
+    'PhabricatorDaemonDAO' => 'infrastructure/daemon/storage/PhabricatorDaemonDAO.php',
+    'PhabricatorDaemonLog' => 'infrastructure/daemon/storage/PhabricatorDaemonLog.php',
+    'PhabricatorDaemonLogEvent' => 'infrastructure/daemon/storage/PhabricatorDaemonLogEvent.php',
+    'PhabricatorDaemonLogEventsView' => 'applications/daemon/view/PhabricatorDaemonLogEventsView.php',
+    'PhabricatorDaemonLogListController' => 'applications/daemon/controller/PhabricatorDaemonLogListController.php',
+    'PhabricatorDaemonLogListView' => 'applications/daemon/view/PhabricatorDaemonLogListView.php',
+    'PhabricatorDaemonLogViewController' => 'applications/daemon/controller/PhabricatorDaemonLogViewController.php',
+    'PhabricatorDaemonReference' => 'infrastructure/daemon/control/PhabricatorDaemonReference.php',
+    'PhabricatorDaemonTimelineConsoleController' => 'applications/daemon/controller/PhabricatorDaemonTimelineConsoleController.php',
+    'PhabricatorDaemonTimelineEventController' => 'applications/daemon/controller/PhabricatorDaemonTimelineEventController.php',
+    'PhabricatorDefaultFileStorageEngineSelector' => 'applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php',
+    'PhabricatorDefaultSearchEngineSelector' => 'applications/search/selector/PhabricatorDefaultSearchEngineSelector.php',
+    'PhabricatorDifferenceEngine' => 'infrastructure/diff/PhabricatorDifferenceEngine.php',
+    'PhabricatorDirectoryController' => 'applications/directory/controller/PhabricatorDirectoryController.php',
+    'PhabricatorDirectoryMainController' => 'applications/directory/controller/PhabricatorDirectoryMainController.php',
+    'PhabricatorDisabledUserController' => 'applications/auth/controller/PhabricatorDisabledUserController.php',
+    'PhabricatorDraft' => 'applications/draft/storage/PhabricatorDraft.php',
+    'PhabricatorDraftDAO' => 'applications/draft/storage/PhabricatorDraftDAO.php',
+    'PhabricatorEdgeConfig' => 'infrastructure/edges/constants/PhabricatorEdgeConfig.php',
+    'PhabricatorEdgeConstants' => 'infrastructure/edges/constants/PhabricatorEdgeConstants.php',
+    'PhabricatorEdgeEditor' => 'infrastructure/edges/editor/PhabricatorEdgeEditor.php',
+    'PhabricatorEdgeQuery' => 'infrastructure/edges/query/PhabricatorEdgeQuery.php',
+    'PhabricatorEmailLoginController' => 'applications/auth/controller/PhabricatorEmailLoginController.php',
+    'PhabricatorEmailTokenController' => 'applications/auth/controller/PhabricatorEmailTokenController.php',
+    'PhabricatorEmailVerificationController' => 'applications/people/controller/PhabricatorEmailVerificationController.php',
+    'PhabricatorEnv' => 'infrastructure/PhabricatorEnv.php',
+    'PhabricatorEnvTestCase' => 'infrastructure/__tests__/PhabricatorEnvTestCase.php',
+    'PhabricatorErrorExample' => 'applications/uiexample/examples/PhabricatorErrorExample.php',
+    'PhabricatorEvent' => 'infrastructure/events/PhabricatorEvent.php',
+    'PhabricatorEventEngine' => 'infrastructure/events/PhabricatorEventEngine.php',
+    'PhabricatorEventType' => 'infrastructure/events/constant/PhabricatorEventType.php',
+    'PhabricatorFeedBuilder' => 'applications/feed/builder/PhabricatorFeedBuilder.php',
+    'PhabricatorFeedConstants' => 'applications/feed/constants/PhabricatorFeedConstants.php',
+    'PhabricatorFeedController' => 'applications/feed/controller/PhabricatorFeedController.php',
+    'PhabricatorFeedDAO' => 'applications/feed/storage/PhabricatorFeedDAO.php',
+    'PhabricatorFeedPublicStreamController' => 'applications/feed/controller/PhabricatorFeedPublicStreamController.php',
+    'PhabricatorFeedQuery' => 'applications/feed/PhabricatorFeedQuery.php',
+    'PhabricatorFeedStory' => 'applications/feed/story/PhabricatorFeedStory.php',
+    'PhabricatorFeedStoryAudit' => 'applications/feed/story/PhabricatorFeedStoryAudit.php',
+    'PhabricatorFeedStoryData' => 'applications/feed/storage/PhabricatorFeedStoryData.php',
+    'PhabricatorFeedStoryDifferential' => 'applications/feed/story/PhabricatorFeedStoryDifferential.php',
+    'PhabricatorFeedStoryManiphest' => 'applications/feed/story/PhabricatorFeedStoryManiphest.php',
+    'PhabricatorFeedStoryPhriction' => 'applications/feed/story/PhabricatorFeedStoryPhriction.php',
+    'PhabricatorFeedStoryProject' => 'applications/feed/story/PhabricatorFeedStoryProject.php',
+    'PhabricatorFeedStoryPublisher' => 'applications/feed/PhabricatorFeedStoryPublisher.php',
+    'PhabricatorFeedStoryReference' => 'applications/feed/storage/PhabricatorFeedStoryReference.php',
+    'PhabricatorFeedStoryStatus' => 'applications/feed/story/PhabricatorFeedStoryStatus.php',
+    'PhabricatorFeedStoryTypeConstants' => 'applications/feed/constants/PhabricatorFeedStoryTypeConstants.php',
+    'PhabricatorFeedStoryUnknown' => 'applications/feed/story/PhabricatorFeedStoryUnknown.php',
+    'PhabricatorFeedStoryView' => 'applications/feed/view/PhabricatorFeedStoryView.php',
+    'PhabricatorFeedView' => 'applications/feed/view/PhabricatorFeedView.php',
+    'PhabricatorFile' => 'applications/files/storage/PhabricatorFile.php',
+    'PhabricatorFileController' => 'applications/files/controller/PhabricatorFileController.php',
+    'PhabricatorFileDAO' => 'applications/files/storage/PhabricatorFileDAO.php',
+    'PhabricatorFileDataController' => 'applications/files/controller/PhabricatorFileDataController.php',
+    'PhabricatorFileDeleteController' => 'applications/files/controller/PhabricatorFileDeleteController.php',
+    'PhabricatorFileDropUploadController' => 'applications/files/controller/PhabricatorFileDropUploadController.php',
+    'PhabricatorFileImageMacro' => 'applications/files/storage/PhabricatorFileImageMacro.php',
+    'PhabricatorFileInfoController' => 'applications/files/controller/PhabricatorFileInfoController.php',
+    'PhabricatorFileListController' => 'applications/files/controller/PhabricatorFileListController.php',
+    'PhabricatorFileMacroDeleteController' => 'applications/files/controller/PhabricatorFileMacroDeleteController.php',
+    'PhabricatorFileMacroEditController' => 'applications/files/controller/PhabricatorFileMacroEditController.php',
+    'PhabricatorFileMacroListController' => 'applications/files/controller/PhabricatorFileMacroListController.php',
+    'PhabricatorFileProxyController' => 'applications/files/controller/PhabricatorFileProxyController.php',
+    'PhabricatorFileProxyImage' => 'applications/files/storage/PhabricatorFileProxyImage.php',
+    'PhabricatorFileShortcutController' => 'applications/files/controller/PhabricatorFileShortcutController.php',
+    'PhabricatorFileSideNavView' => 'applications/files/view/PhabricatorFileSideNavView.php',
+    'PhabricatorFileStorageBlob' => 'applications/files/storage/PhabricatorFileStorageBlob.php',
+    'PhabricatorFileStorageConfigurationException' => 'applications/files/exception/PhabricatorFileStorageConfigurationException.php',
+    'PhabricatorFileStorageEngine' => 'applications/files/engine/PhabricatorFileStorageEngine.php',
+    'PhabricatorFileStorageEngineSelector' => 'applications/files/engineselector/PhabricatorFileStorageEngineSelector.php',
+    'PhabricatorFileTransformController' => 'applications/files/controller/PhabricatorFileTransformController.php',
+    'PhabricatorFileUploadController' => 'applications/files/controller/PhabricatorFileUploadController.php',
+    'PhabricatorFileUploadException' => 'applications/files/exception/PhabricatorFileUploadException.php',
+    'PhabricatorFileUploadView' => 'applications/files/view/PhabricatorFileUploadView.php',
+    'PhabricatorFlag' => 'applications/flag/storage/PhabricatorFlag.php',
+    'PhabricatorFlagColor' => 'applications/flag/constants/PhabricatorFlagColor.php',
+    'PhabricatorFlagConstants' => 'applications/flag/constants/PhabricatorFlagConstants.php',
+    'PhabricatorFlagController' => 'applications/flag/controller/PhabricatorFlagController.php',
+    'PhabricatorFlagDAO' => 'applications/flag/storage/PhabricatorFlagDAO.php',
+    'PhabricatorFlagDeleteController' => 'applications/flag/controller/PhabricatorFlagDeleteController.php',
+    'PhabricatorFlagEditController' => 'applications/flag/controller/PhabricatorFlagEditController.php',
+    'PhabricatorFlagListController' => 'applications/flag/controller/PhabricatorFlagListController.php',
+    'PhabricatorFlagListView' => 'applications/flag/view/PhabricatorFlagListView.php',
+    'PhabricatorFlagQuery' => 'applications/flag/query/PhabricatorFlagQuery.php',
+    'PhabricatorFormExample' => 'applications/uiexample/examples/PhabricatorFormExample.php',
+    'PhabricatorGarbageCollectorDaemon' => 'infrastructure/daemon/PhabricatorGarbageCollectorDaemon.php',
+    'PhabricatorGoodForNothingWorker' => 'infrastructure/daemon/workers/worker/PhabricatorGoodForNothingWorker.php',
+    'PhabricatorHandleObjectSelectorDataView' => 'applications/phid/handle/view/PhabricatorHandleObjectSelectorDataView.php',
+    'PhabricatorHash' => 'infrastructure/util/PhabricatorHash.php',
+    'PhabricatorHelpController' => 'applications/help/controller/PhabricatorHelpController.php',
+    'PhabricatorHelpKeyboardShortcutController' => 'applications/help/controller/PhabricatorHelpKeyboardShortcutController.php',
+    'PhabricatorIDPagedPolicyQuery' => 'infrastructure/query/policy/PhabricatorIDPagedPolicyQuery.php',
+    'PhabricatorIRCBot' => 'infrastructure/daemon/irc/PhabricatorIRCBot.php',
+    'PhabricatorIRCDifferentialNotificationHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCDifferentialNotificationHandler.php',
+    'PhabricatorIRCHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCHandler.php',
+    'PhabricatorIRCLogHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCLogHandler.php',
+    'PhabricatorIRCMacroHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCMacroHandler.php',
+    'PhabricatorIRCMessage' => 'infrastructure/daemon/irc/PhabricatorIRCMessage.php',
+    'PhabricatorIRCObjectNameHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCObjectNameHandler.php',
+    'PhabricatorIRCProtocolHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCProtocolHandler.php',
+    'PhabricatorIRCWhatsNewHandler' => 'infrastructure/daemon/irc/handler/PhabricatorIRCWhatsNewHandler.php',
+    'PhabricatorImageTransformer' => 'applications/files/PhabricatorImageTransformer.php',
     'PhabricatorInfrastructureTestCase' => 'infrastructure/__tests__/PhabricatorInfrastructureTestCase.php',
-    'PhabricatorInlineCommentController' => 'infrastructure/diff/controller/PhabricatorInlineCommentController.php',
-    'PhabricatorInlineCommentInterface' => 'infrastructure/diff/interface/inline/PhabricatorInlineCommentInterface.php',
-    'PhabricatorInlineSummaryView' => 'infrastructure/diff/view/inline/PhabricatorInlineSummaryView.php',
-    'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/javelin/PhabricatorJavelinLinter.php',
-    'PhabricatorJumpNavHandler' => 'applications/search/engine/jumpnav/PhabricatorJumpNavHandler.php',
-    'PhabricatorLintEngine' => 'infrastructure/lint/engine/PhabricatorLintEngine.php',
-    'PhabricatorLiskDAO' => 'applications/base/storage/lisk/PhabricatorLiskDAO.php',
-    'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/localdisk/PhabricatorLocalDiskFileStorageEngine.php',
-    'PhabricatorLocalTimeTestCase' => 'view/utils/__tests__/PhabricatorLocalTimeTestCase.php',
-    'PhabricatorLoginController' => 'applications/auth/controller/login/PhabricatorLoginController.php',
-    'PhabricatorLoginValidateController' => 'applications/auth/controller/validate/PhabricatorLoginValidateController.php',
-    'PhabricatorLogoutController' => 'applications/auth/controller/logout/PhabricatorLogoutController.php',
-    'PhabricatorMailImplementationAdapter' => 'applications/metamta/adapter/base/PhabricatorMailImplementationAdapter.php',
-    'PhabricatorMailImplementationAmazonSESAdapter' => 'applications/metamta/adapter/amazonses/PhabricatorMailImplementationAmazonSESAdapter.php',
-    'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'applications/metamta/adapter/phpmailerlite/PhabricatorMailImplementationPHPMailerLiteAdapter.php',
-    'PhabricatorMailImplementationSendGridAdapter' => 'applications/metamta/adapter/sendgrid/PhabricatorMailImplementationSendGridAdapter.php',
-    'PhabricatorMailImplementationTestAdapter' => 'applications/metamta/adapter/test/PhabricatorMailImplementationTestAdapter.php',
-    'PhabricatorMailReplyHandler' => 'applications/metamta/replyhandler/base/PhabricatorMailReplyHandler.php',
-    'PhabricatorMarkupEngine' => 'applications/markup/engine/PhabricatorMarkupEngine.php',
-    'PhabricatorMercurialGraphStream' => 'applications/repository/daemon/pulllocal/PhabricatorMercurialGraphStream.php',
-    'PhabricatorMetaMTAAttachment' => 'applications/metamta/storage/mail/PhabricatorMetaMTAAttachment.php',
-    'PhabricatorMetaMTAController' => 'applications/metamta/controller/base/PhabricatorMetaMTAController.php',
-    'PhabricatorMetaMTADAO' => 'applications/metamta/storage/base/PhabricatorMetaMTADAO.php',
-    'PhabricatorMetaMTAEmailBodyParser' => 'applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php',
-    'PhabricatorMetaMTAEmailBodyParserTestCase' => 'applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php',
-    'PhabricatorMetaMTAListController' => 'applications/metamta/controller/list/PhabricatorMetaMTAListController.php',
-    'PhabricatorMetaMTAMail' => 'applications/metamta/storage/mail/PhabricatorMetaMTAMail.php',
-    'PhabricatorMetaMTAMailTestCase' => 'applications/metamta/storage/mail/__tests__/PhabricatorMetaMTAMailTestCase.php',
-    'PhabricatorMetaMTAMailingList' => 'applications/metamta/storage/mailinglist/PhabricatorMetaMTAMailingList.php',
-    'PhabricatorMetaMTAMailingListEditController' => 'applications/metamta/controller/mailinglistedit/PhabricatorMetaMTAMailingListEditController.php',
-    'PhabricatorMetaMTAMailingListsController' => 'applications/metamta/controller/mailinglists/PhabricatorMetaMTAMailingListsController.php',
-    'PhabricatorMetaMTAReceiveController' => 'applications/metamta/controller/receive/PhabricatorMetaMTAReceiveController.php',
-    'PhabricatorMetaMTAReceivedListController' => 'applications/metamta/controller/receivedlist/PhabricatorMetaMTAReceivedListController.php',
-    'PhabricatorMetaMTAReceivedMail' => 'applications/metamta/storage/receivedmail/PhabricatorMetaMTAReceivedMail.php',
-    'PhabricatorMetaMTASendController' => 'applications/metamta/controller/send/PhabricatorMetaMTASendController.php',
-    'PhabricatorMetaMTASendGridReceiveController' => 'applications/metamta/controller/sendgridreceive/PhabricatorMetaMTASendGridReceiveController.php',
-    'PhabricatorMetaMTAViewController' => 'applications/metamta/controller/view/PhabricatorMetaMTAViewController.php',
-    'PhabricatorMetaMTAWorker' => 'applications/metamta/worker/PhabricatorMetaMTAWorker.php',
-    'PhabricatorMustVerifyEmailController' => 'applications/auth/controller/mustverify/PhabricatorMustVerifyEmailController.php',
-    'PhabricatorMySQLFileStorageEngine' => 'applications/files/engine/mysql/PhabricatorMySQLFileStorageEngine.php',
-    'PhabricatorNotificationsController' => 'applications/notifications/controller/base/PhabricatorNotificationsController.php',
-    'PhabricatorOAuthClientAuthorization' => 'applications/oauthserver/storage/clientauthorization/PhabricatorOAuthClientAuthorization.php',
-    'PhabricatorOAuthClientAuthorizationBaseController' => 'applications/oauthserver/controller/clientauthorization/base/PhabricatorOAuthClientAuthorizationBaseController.php',
-    'PhabricatorOAuthClientAuthorizationDeleteController' => 'applications/oauthserver/controller/clientauthorization/delete/PhabricatorOAuthClientAuthorizationDeleteController.php',
-    'PhabricatorOAuthClientAuthorizationEditController' => 'applications/oauthserver/controller/clientauthorization/edit/PhabricatorOAuthClientAuthorizationEditController.php',
-    'PhabricatorOAuthClientAuthorizationListController' => 'applications/oauthserver/controller/clientauthorization/list/PhabricatorOAuthClientAuthorizationListController.php',
-    'PhabricatorOAuthClientAuthorizationQuery' => 'applications/oauthserver/query/clientauthorization/PhabricatorOAuthClientAuthorizationQuery.php',
-    'PhabricatorOAuthClientBaseController' => 'applications/oauthserver/controller/client/base/PhabricatorOAuthClientBaseController.php',
-    'PhabricatorOAuthClientDeleteController' => 'applications/oauthserver/controller/client/delete/PhabricatorOAuthClientDeleteController.php',
-    'PhabricatorOAuthClientEditController' => 'applications/oauthserver/controller/client/edit/PhabricatorOAuthClientEditController.php',
-    'PhabricatorOAuthClientListController' => 'applications/oauthserver/controller/client/list/PhabricatorOAuthClientListController.php',
-    'PhabricatorOAuthClientViewController' => 'applications/oauthserver/controller/client/view/PhabricatorOAuthClientViewController.php',
-    'PhabricatorOAuthDefaultRegistrationController' => 'applications/auth/controller/oauthregistration/default/PhabricatorOAuthDefaultRegistrationController.php',
-    'PhabricatorOAuthDiagnosticsController' => 'applications/auth/controller/oauthdiagnostics/PhabricatorOAuthDiagnosticsController.php',
-    'PhabricatorOAuthFailureView' => 'applications/auth/view/oauthfailure/PhabricatorOAuthFailureView.php',
-    'PhabricatorOAuthLoginController' => 'applications/auth/controller/oauth/PhabricatorOAuthLoginController.php',
-    'PhabricatorOAuthProvider' => 'applications/auth/oauth/provider/base/PhabricatorOAuthProvider.php',
-    'PhabricatorOAuthProviderDisqus' => 'applications/auth/oauth/provider/disqus/PhabricatorOAuthProviderDisqus.php',
-    'PhabricatorOAuthProviderException' => 'applications/auth/oauth/provider/exception/PhabricatorOAuthProviderException.php',
-    'PhabricatorOAuthProviderFacebook' => 'applications/auth/oauth/provider/facebook/PhabricatorOAuthProviderFacebook.php',
-    'PhabricatorOAuthProviderGitHub' => 'applications/auth/oauth/provider/github/PhabricatorOAuthProviderGitHub.php',
-    'PhabricatorOAuthProviderGoogle' => 'applications/auth/oauth/provider/google/PhabricatorOAuthProviderGoogle.php',
-    'PhabricatorOAuthProviderPhabricator' => 'applications/auth/oauth/provider/phabricator/PhabricatorOAuthProviderPhabricator.php',
-    'PhabricatorOAuthRegistrationController' => 'applications/auth/controller/oauthregistration/base/PhabricatorOAuthRegistrationController.php',
-    'PhabricatorOAuthResponse' => 'applications/oauthserver/response/PhabricatorOAuthResponse.php',
-    'PhabricatorOAuthServer' => 'applications/oauthserver/server/PhabricatorOAuthServer.php',
-    'PhabricatorOAuthServerAccessToken' => 'applications/oauthserver/storage/accesstoken/PhabricatorOAuthServerAccessToken.php',
-    'PhabricatorOAuthServerAuthController' => 'applications/oauthserver/controller/auth/PhabricatorOAuthServerAuthController.php',
-    'PhabricatorOAuthServerAuthorizationCode' => 'applications/oauthserver/storage/authorizationcode/PhabricatorOAuthServerAuthorizationCode.php',
-    'PhabricatorOAuthServerClient' => 'applications/oauthserver/storage/client/PhabricatorOAuthServerClient.php',
-    'PhabricatorOAuthServerClientQuery' => 'applications/oauthserver/query/client/PhabricatorOAuthServerClientQuery.php',
-    'PhabricatorOAuthServerController' => 'applications/oauthserver/controller/base/PhabricatorOAuthServerController.php',
-    'PhabricatorOAuthServerDAO' => 'applications/oauthserver/storage/base/PhabricatorOAuthServerDAO.php',
-    'PhabricatorOAuthServerScope' => 'applications/oauthserver/scope/PhabricatorOAuthServerScope.php',
-    'PhabricatorOAuthServerTestCase' => 'applications/oauthserver/server/__tests__/PhabricatorOAuthServerTestCase.php',
-    'PhabricatorOAuthServerTestController' => 'applications/oauthserver/controller/test/PhabricatorOAuthServerTestController.php',
-    'PhabricatorOAuthServerTokenController' => 'applications/oauthserver/controller/token/PhabricatorOAuthServerTokenController.php',
-    'PhabricatorOAuthUnlinkController' => 'applications/auth/controller/unlink/PhabricatorOAuthUnlinkController.php',
-    'PhabricatorObjectAttachmentEditor' => 'applications/search/editor/attach/PhabricatorObjectAttachmentEditor.php',
-    'PhabricatorObjectGraph' => 'applications/phid/graph/PhabricatorObjectGraph.php',
-    'PhabricatorObjectHandle' => 'applications/phid/handle/PhabricatorObjectHandle.php',
-    'PhabricatorObjectHandleConstants' => 'applications/phid/handle/const/base/PhabricatorObjectHandleConstants.php',
-    'PhabricatorObjectHandleData' => 'applications/phid/handle/data/PhabricatorObjectHandleData.php',
-    'PhabricatorObjectHandleStatus' => 'applications/phid/handle/const/status/PhabricatorObjectHandleStatus.php',
-    'PhabricatorObjectSelectorDialog' => 'view/control/objectselector/PhabricatorObjectSelectorDialog.php',
-    'PhabricatorOffsetPagedQuery' => 'infrastructure/query/offsetpaged/PhabricatorOffsetPagedQuery.php',
-    'PhabricatorOwnerPathQuery' => 'applications/owners/query/path/PhabricatorOwnerPathQuery.php',
-    'PhabricatorOwnersController' => 'applications/owners/controller/base/PhabricatorOwnersController.php',
-    'PhabricatorOwnersDAO' => 'applications/owners/storage/base/PhabricatorOwnersDAO.php',
-    'PhabricatorOwnersDeleteController' => 'applications/owners/controller/delete/PhabricatorOwnersDeleteController.php',
-    'PhabricatorOwnersDetailController' => 'applications/owners/controller/detail/PhabricatorOwnersDetailController.php',
-    'PhabricatorOwnersEditController' => 'applications/owners/controller/edit/PhabricatorOwnersEditController.php',
-    'PhabricatorOwnersListController' => 'applications/owners/controller/list/PhabricatorOwnersListController.php',
-    'PhabricatorOwnersOwner' => 'applications/owners/storage/owner/PhabricatorOwnersOwner.php',
-    'PhabricatorOwnersPackage' => 'applications/owners/storage/package/PhabricatorOwnersPackage.php',
-    'PhabricatorOwnersPath' => 'applications/owners/storage/path/PhabricatorOwnersPath.php',
-    'PhabricatorPHID' => 'applications/phid/storage/phid/PhabricatorPHID.php',
-    'PhabricatorPHIDConstants' => 'applications/phid/constants/PhabricatorPHIDConstants.php',
-    'PhabricatorPHIDController' => 'applications/phid/controller/base/PhabricatorPHIDController.php',
-    'PhabricatorPHIDLookupController' => 'applications/phid/controller/lookup/PhabricatorPHIDLookupController.php',
-    'PhabricatorPaste' => 'applications/paste/storage/paste/PhabricatorPaste.php',
-    'PhabricatorPasteController' => 'applications/paste/controller/base/PhabricatorPasteController.php',
-    'PhabricatorPasteDAO' => 'applications/paste/storage/base/PhabricatorPasteDAO.php',
-    'PhabricatorPasteListController' => 'applications/paste/controller/list/PhabricatorPasteListController.php',
-    'PhabricatorPasteQuery' => 'applications/paste/query/paste/PhabricatorPasteQuery.php',
-    'PhabricatorPasteViewController' => 'applications/paste/controller/view/PhabricatorPasteViewController.php',
-    'PhabricatorPeopleController' => 'applications/people/controller/base/PhabricatorPeopleController.php',
-    'PhabricatorPeopleEditController' => 'applications/people/controller/edit/PhabricatorPeopleEditController.php',
-    'PhabricatorPeopleListController' => 'applications/people/controller/list/PhabricatorPeopleListController.php',
-    'PhabricatorPeopleLogsController' => 'applications/people/controller/logs/PhabricatorPeopleLogsController.php',
-    'PhabricatorPeopleProfileController' => 'applications/people/controller/profile/PhabricatorPeopleProfileController.php',
-    'PhabricatorPeopleQuery' => 'applications/people/query/PhabricatorPeopleQuery.php',
-    'PhabricatorPolicies' => 'applications/policy/constants/policy/PhabricatorPolicies.php',
-    'PhabricatorPolicyCapability' => 'applications/policy/constants/capability/PhabricatorPolicyCapability.php',
-    'PhabricatorPolicyConstants' => 'applications/policy/constants/base/PhabricatorPolicyConstants.php',
-    'PhabricatorPolicyException' => 'applications/policy/exception/base/PhabricatorPolicyException.php',
-    'PhabricatorPolicyFilter' => 'applications/policy/filter/policy/PhabricatorPolicyFilter.php',
-    'PhabricatorPolicyInterface' => 'applications/policy/interface/policy/PhabricatorPolicyInterface.php',
-    'PhabricatorPolicyQuery' => 'infrastructure/query/policy/base/PhabricatorPolicyQuery.php',
-    'PhabricatorPolicyTestCase' => 'applications/policy/__tests__/PhabricatorPolicyTestCase.php',
-    'PhabricatorPolicyTestObject' => 'applications/policy/__tests__/PhabricatorPolicyTestObject.php',
-    'PhabricatorPolicyTestQuery' => 'applications/policy/__tests__/PhabricatorPolicyTestQuery.php',
-    'PhabricatorProfileHeaderView' => 'view/layout/profileheader/PhabricatorProfileHeaderView.php',
-    'PhabricatorProject' => 'applications/project/storage/project/PhabricatorProject.php',
-    'PhabricatorProjectAffiliation' => 'applications/project/storage/affiliation/PhabricatorProjectAffiliation.php',
-    'PhabricatorProjectConstants' => 'applications/project/constants/base/PhabricatorProjectConstants.php',
-    'PhabricatorProjectController' => 'applications/project/controller/base/PhabricatorProjectController.php',
-    'PhabricatorProjectCreateController' => 'applications/project/controller/create/PhabricatorProjectCreateController.php',
-    'PhabricatorProjectDAO' => 'applications/project/storage/base/PhabricatorProjectDAO.php',
-    'PhabricatorProjectEditor' => 'applications/project/editor/project/PhabricatorProjectEditor.php',
-    'PhabricatorProjectListController' => 'applications/project/controller/list/PhabricatorProjectListController.php',
-    'PhabricatorProjectNameCollisionException' => 'applications/project/exception/namecollison/PhabricatorProjectNameCollisionException.php',
-    'PhabricatorProjectProfile' => 'applications/project/storage/profile/PhabricatorProjectProfile.php',
-    'PhabricatorProjectProfileController' => 'applications/project/controller/profile/PhabricatorProjectProfileController.php',
-    'PhabricatorProjectProfileEditController' => 'applications/project/controller/profileedit/PhabricatorProjectProfileEditController.php',
-    'PhabricatorProjectQuery' => 'applications/project/query/project/PhabricatorProjectQuery.php',
-    'PhabricatorProjectStatus' => 'applications/project/constants/status/PhabricatorProjectStatus.php',
-    'PhabricatorProjectSubproject' => 'applications/project/storage/subproject/PhabricatorProjectSubproject.php',
-    'PhabricatorProjectTransaction' => 'applications/project/storage/transaction/PhabricatorProjectTransaction.php',
-    'PhabricatorProjectTransactionType' => 'applications/project/constants/transaction/PhabricatorProjectTransactionType.php',
-    'PhabricatorProjectUpdateController' => 'applications/project/controller/update/PhabricatorProjectUpdateController.php',
-    'PhabricatorQuery' => 'infrastructure/query/base/PhabricatorQuery.php',
-    'PhabricatorRedirectController' => 'applications/base/controller/redirect/PhabricatorRedirectController.php',
-    'PhabricatorRefreshCSRFController' => 'applications/auth/controller/refresh/PhabricatorRefreshCSRFController.php',
-    'PhabricatorRemarkupRuleDifferential' => 'infrastructure/markup/remarkup/markuprule/differential/PhabricatorRemarkupRuleDifferential.php',
-    'PhabricatorRemarkupRuleDifferentialHandle' => 'infrastructure/markup/remarkup/markuprule/handle/differential/PhabricatorRemarkupRuleDifferentialHandle.php',
-    'PhabricatorRemarkupRuleDiffusion' => 'infrastructure/markup/remarkup/markuprule/diffusion/PhabricatorRemarkupRuleDiffusion.php',
-    'PhabricatorRemarkupRuleEmbedFile' => 'infrastructure/markup/remarkup/markuprule/embedobject/PhabricatorRemarkupRuleEmbedFile.php',
-    'PhabricatorRemarkupRuleImageMacro' => 'infrastructure/markup/remarkup/markuprule/imagemacro/PhabricatorRemarkupRuleImageMacro.php',
-    'PhabricatorRemarkupRuleManiphest' => 'infrastructure/markup/remarkup/markuprule/maniphest/PhabricatorRemarkupRuleManiphest.php',
-    'PhabricatorRemarkupRuleManiphestHandle' => 'infrastructure/markup/remarkup/markuprule/handle/maniphest/PhabricatorRemarkupRuleManiphestHandle.php',
-    'PhabricatorRemarkupRuleMention' => 'infrastructure/markup/remarkup/markuprule/mention/PhabricatorRemarkupRuleMention.php',
-    'PhabricatorRemarkupRuleObjectHandle' => 'infrastructure/markup/remarkup/markuprule/handle/PhabricatorRemarkupRuleObjectHandle.php',
-    'PhabricatorRemarkupRuleObjectName' => 'infrastructure/markup/remarkup/markuprule/objectname/PhabricatorRemarkupRuleObjectName.php',
-    'PhabricatorRemarkupRulePaste' => 'infrastructure/markup/remarkup/markuprule/paste/PhabricatorRemarkupRulePaste.php',
-    'PhabricatorRemarkupRulePhriction' => 'infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php',
-    'PhabricatorRemarkupRuleProxyImage' => 'infrastructure/markup/remarkup/markuprule/proxyimage/PhabricatorRemarkupRuleProxyImage.php',
-    'PhabricatorRemarkupRuleYoutube' => 'infrastructure/markup/remarkup/markuprule/youtube/PhabricatorRemarkupRuleYoutube.php',
-    'PhabricatorRepository' => 'applications/repository/storage/repository/PhabricatorRepository.php',
-    'PhabricatorRepositoryArcanistProject' => 'applications/repository/storage/arcanistproject/PhabricatorRepositoryArcanistProject.php',
-    'PhabricatorRepositoryArcanistProjectEditController' => 'applications/repository/controller/arcansistprojectedit/PhabricatorRepositoryArcanistProjectEditController.php',
-    'PhabricatorRepositoryAuditRequest' => 'applications/repository/storage/auditrequest/PhabricatorRepositoryAuditRequest.php',
-    'PhabricatorRepositoryCommit' => 'applications/repository/storage/commit/PhabricatorRepositoryCommit.php',
-    'PhabricatorRepositoryCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/base/PhabricatorRepositoryCommitChangeParserWorker.php',
-    'PhabricatorRepositoryCommitData' => 'applications/repository/storage/commitdata/PhabricatorRepositoryCommitData.php',
-    'PhabricatorRepositoryCommitHeraldWorker' => 'applications/repository/worker/herald/PhabricatorRepositoryCommitHeraldWorker.php',
-    'PhabricatorRepositoryCommitMessageDetailParser' => 'applications/repository/parser/base/PhabricatorRepositoryCommitMessageDetailParser.php',
-    'PhabricatorRepositoryCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/base/PhabricatorRepositoryCommitMessageParserWorker.php',
-    'PhabricatorRepositoryCommitOwnersWorker' => 'applications/repository/worker/owner/PhabricatorRepositoryCommitOwnersWorker.php',
-    'PhabricatorRepositoryCommitParserWorker' => 'applications/repository/worker/base/PhabricatorRepositoryCommitParserWorker.php',
-    'PhabricatorRepositoryController' => 'applications/repository/controller/base/PhabricatorRepositoryController.php',
-    'PhabricatorRepositoryCreateController' => 'applications/repository/controller/create/PhabricatorRepositoryCreateController.php',
-    'PhabricatorRepositoryDAO' => 'applications/repository/storage/base/PhabricatorRepositoryDAO.php',
-    'PhabricatorRepositoryDefaultCommitMessageDetailParser' => 'applications/repository/parser/default/PhabricatorRepositoryDefaultCommitMessageDetailParser.php',
-    'PhabricatorRepositoryDeleteController' => 'applications/repository/controller/delete/PhabricatorRepositoryDeleteController.php',
-    'PhabricatorRepositoryEditController' => 'applications/repository/controller/edit/PhabricatorRepositoryEditController.php',
-    'PhabricatorRepositoryGitCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/git/PhabricatorRepositoryGitCommitChangeParserWorker.php',
-    'PhabricatorRepositoryGitCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/git/PhabricatorRepositoryGitCommitMessageParserWorker.php',
-    'PhabricatorRepositoryListController' => 'applications/repository/controller/list/PhabricatorRepositoryListController.php',
-    'PhabricatorRepositoryMercurialCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/mercurial/PhabricatorRepositoryMercurialCommitChangeParserWorker.php',
-    'PhabricatorRepositoryMercurialCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/mercurial/PhabricatorRepositoryMercurialCommitMessageParserWorker.php',
-    'PhabricatorRepositoryPullLocalDaemon' => 'applications/repository/daemon/pulllocal/PhabricatorRepositoryPullLocalDaemon.php',
-    'PhabricatorRepositoryPullLocalDaemonTestCase' => 'applications/repository/daemon/pulllocal/__tests__/PhabricatorRepositoryPullLocalDaemonTestCase.php',
-    'PhabricatorRepositoryShortcut' => 'applications/repository/storage/shortcut/PhabricatorRepositoryShortcut.php',
-    'PhabricatorRepositorySvnCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/svn/PhabricatorRepositorySvnCommitChangeParserWorker.php',
-    'PhabricatorRepositorySvnCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/svn/PhabricatorRepositorySvnCommitMessageParserWorker.php',
-    'PhabricatorRepositorySymbol' => 'applications/repository/storage/symbol/PhabricatorRepositorySymbol.php',
-    'PhabricatorRepositoryTestCase' => 'applications/repository/storage/repository/__tests__/PhabricatorRepositoryTestCase.php',
-    'PhabricatorRepositoryType' => 'applications/repository/constants/repositorytype/PhabricatorRepositoryType.php',
-    'PhabricatorS3FileStorageEngine' => 'applications/files/engine/s3/PhabricatorS3FileStorageEngine.php',
-    'PhabricatorSQLPatchList' => 'infrastructure/setup/sql/base/PhabricatorSQLPatchList.php',
-    'PhabricatorScopedEnv' => 'infrastructure/env/PhabricatorScopedEnv.php',
-    'PhabricatorSearchAbstractDocument' => 'applications/search/index/abstractdocument/PhabricatorSearchAbstractDocument.php',
-    'PhabricatorSearchAttachController' => 'applications/search/controller/attach/PhabricatorSearchAttachController.php',
-    'PhabricatorSearchBaseController' => 'applications/search/controller/base/PhabricatorSearchBaseController.php',
-    'PhabricatorSearchCommitIndexer' => 'applications/search/index/indexer/repository/PhabricatorSearchCommitIndexer.php',
-    'PhabricatorSearchController' => 'applications/search/controller/search/PhabricatorSearchController.php',
-    'PhabricatorSearchDAO' => 'applications/search/storage/base/PhabricatorSearchDAO.php',
-    'PhabricatorSearchDifferentialIndexer' => 'applications/search/index/indexer/differential/PhabricatorSearchDifferentialIndexer.php',
-    'PhabricatorSearchDocument' => 'applications/search/storage/document/document/PhabricatorSearchDocument.php',
-    'PhabricatorSearchDocumentField' => 'applications/search/storage/document/field/PhabricatorSearchDocumentField.php',
-    'PhabricatorSearchDocumentIndexer' => 'applications/search/index/indexer/base/PhabricatorSearchDocumentIndexer.php',
-    'PhabricatorSearchDocumentRelationship' => 'applications/search/storage/document/relationship/PhabricatorSearchDocumentRelationship.php',
-    'PhabricatorSearchEngine' => 'applications/search/engine/base/PhabricatorSearchEngine.php',
-    'PhabricatorSearchEngineElastic' => 'applications/search/engine/elastic/PhabricatorSearchEngineElastic.php',
-    'PhabricatorSearchEngineMySQL' => 'applications/search/engine/mysql/PhabricatorSearchEngineMySQL.php',
-    'PhabricatorSearchEngineSelector' => 'applications/search/selector/base/PhabricatorSearchEngineSelector.php',
-    'PhabricatorSearchField' => 'applications/search/constants/field/PhabricatorSearchField.php',
-    'PhabricatorSearchIndexController' => 'applications/search/controller/index/PhabricatorSearchIndexController.php',
-    'PhabricatorSearchManiphestIndexer' => 'applications/search/index/indexer/maniphest/PhabricatorSearchManiphestIndexer.php',
-    'PhabricatorSearchPhrictionIndexer' => 'applications/search/index/indexer/phriction/PhabricatorSearchPhrictionIndexer.php',
-    'PhabricatorSearchQuery' => 'applications/search/storage/query/PhabricatorSearchQuery.php',
-    'PhabricatorSearchRelationship' => 'applications/search/constants/relationship/PhabricatorSearchRelationship.php',
-    'PhabricatorSearchResultView' => 'applications/search/view/searchresult/PhabricatorSearchResultView.php',
-    'PhabricatorSearchScope' => 'applications/search/constants/scope/PhabricatorSearchScope.php',
-    'PhabricatorSearchSelectController' => 'applications/search/controller/select/PhabricatorSearchSelectController.php',
-    'PhabricatorSearchUserIndexer' => 'applications/search/index/indexer/user/PhabricatorSearchUserIndexer.php',
-    'PhabricatorSetup' => 'infrastructure/setup/PhabricatorSetup.php',
-    'PhabricatorSlowvoteChoice' => 'applications/slowvote/storage/choice/PhabricatorSlowvoteChoice.php',
-    'PhabricatorSlowvoteComment' => 'applications/slowvote/storage/comment/PhabricatorSlowvoteComment.php',
-    'PhabricatorSlowvoteController' => 'applications/slowvote/controller/base/PhabricatorSlowvoteController.php',
-    'PhabricatorSlowvoteCreateController' => 'applications/slowvote/controller/create/PhabricatorSlowvoteCreateController.php',
-    'PhabricatorSlowvoteDAO' => 'applications/slowvote/storage/base/PhabricatorSlowvoteDAO.php',
-    'PhabricatorSlowvoteListController' => 'applications/slowvote/controller/list/PhabricatorSlowvoteListController.php',
-    'PhabricatorSlowvoteOption' => 'applications/slowvote/storage/option/PhabricatorSlowvoteOption.php',
-    'PhabricatorSlowvotePoll' => 'applications/slowvote/storage/poll/PhabricatorSlowvotePoll.php',
-    'PhabricatorSlowvotePollController' => 'applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php',
-    'PhabricatorSlug' => 'infrastructure/util/slug/PhabricatorSlug.php',
-    'PhabricatorSlugTestCase' => 'infrastructure/util/slug/__tests__/PhabricatorSlugTestCase.php',
-    'PhabricatorSortTableExample' => 'applications/uiexample/examples/sorttable/PhabricatorSortTableExample.php',
-    'PhabricatorStandardPageView' => 'view/page/standard/PhabricatorStandardPageView.php',
-    'PhabricatorStatusController' => 'applications/status/base/PhabricatorStatusController.php',
-    'PhabricatorStorageFixtureScopeGuard' => 'infrastructure/testing/fixture/storage/PhabricatorStorageFixtureScopeGuard.php',
-    'PhabricatorStorageManagementAPI' => 'infrastructure/setup/storage/management/PhabricatorStorageManagementAPI.php',
-    'PhabricatorStorageManagementDatabasesWorkflow' => 'infrastructure/setup/storage/workflow/databases/PhabricatorStorageManagementDatabasesWorkflow.php',
-    'PhabricatorStorageManagementDestroyWorkflow' => 'infrastructure/setup/storage/workflow/destroy/PhabricatorStorageManagementDestroyWorkflow.php',
-    'PhabricatorStorageManagementDumpWorkflow' => 'infrastructure/setup/storage/workflow/dump/PhabricatorStorageManagementDumpWorkflow.php',
-    'PhabricatorStorageManagementStatusWorkflow' => 'infrastructure/setup/storage/workflow/status/PhabricatorStorageManagementStatusWorkflow.php',
-    'PhabricatorStorageManagementUpgradeWorkflow' => 'infrastructure/setup/storage/workflow/upgrade/PhabricatorStorageManagementUpgradeWorkflow.php',
-    'PhabricatorStorageManagementWorkflow' => 'infrastructure/setup/storage/workflow/base/PhabricatorStorageManagementWorkflow.php',
-    'PhabricatorStoragePatch' => 'infrastructure/setup/storage/patch/PhabricatorStoragePatch.php',
-    'PhabricatorSymbolNameLinter' => 'infrastructure/lint/hook/xhpastsymbolname/PhabricatorSymbolNameLinter.php',
-    'PhabricatorSyntaxHighlighter' => 'applications/markup/syntax/PhabricatorSyntaxHighlighter.php',
-    'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/taskmaster/PhabricatorTaskmasterDaemon.php',
-    'PhabricatorTestCase' => 'infrastructure/testing/testcase/PhabricatorTestCase.php',
-    'PhabricatorTimelineCursor' => 'infrastructure/daemon/timeline/storage/cursor/PhabricatorTimelineCursor.php',
-    'PhabricatorTimelineDAO' => 'infrastructure/daemon/timeline/storage/base/PhabricatorTimelineDAO.php',
-    'PhabricatorTimelineEvent' => 'infrastructure/daemon/timeline/storage/event/PhabricatorTimelineEvent.php',
-    'PhabricatorTimelineEventData' => 'infrastructure/daemon/timeline/storage/eventdata/PhabricatorTimelineEventData.php',
-    'PhabricatorTimelineIterator' => 'infrastructure/daemon/timeline/cursor/iterator/PhabricatorTimelineIterator.php',
-    'PhabricatorTimer' => 'applications/countdown/storage/timer/PhabricatorTimer.php',
-    'PhabricatorTransactionView' => 'view/layout/transaction/PhabricatorTransactionView.php',
-    'PhabricatorTransformedFile' => 'applications/files/storage/transformed/PhabricatorTransformedFile.php',
-    'PhabricatorTrivialTestCase' => 'infrastructure/testing/testcase/__tests__/PhabricatorTrivialTestCase.php',
-    'PhabricatorTypeaheadCommonDatasourceController' => 'applications/typeahead/controller/common/PhabricatorTypeaheadCommonDatasourceController.php',
-    'PhabricatorTypeaheadDatasourceController' => 'applications/typeahead/controller/base/PhabricatorTypeaheadDatasourceController.php',
-    'PhabricatorUIExample' => 'applications/uiexample/examples/base/PhabricatorUIExample.php',
-    'PhabricatorUIExampleController' => 'applications/uiexample/controller/base/PhabricatorUIExampleController.php',
-    'PhabricatorUIExampleRenderController' => 'applications/uiexample/controller/render/PhabricatorUIExampleRenderController.php',
-    'PhabricatorUIListFilterExample' => 'applications/uiexample/examples/listfilter/PhabricatorUIListFilterExample.php',
-    'PhabricatorUIPagerExample' => 'applications/uiexample/examples/pager/PhabricatorUIPagerExample.php',
-    'PhabricatorUITooltipExample' => 'applications/uiexample/examples/tooltip/PhabricatorUITooltipExample.php',
-    'PhabricatorUnitsTestCase' => 'view/utils/__tests__/PhabricatorUnitsTestCase.php',
-    'PhabricatorUser' => 'applications/people/storage/user/PhabricatorUser.php',
-    'PhabricatorUserAccountSettingsPanelController' => 'applications/people/controller/settings/panels/account/PhabricatorUserAccountSettingsPanelController.php',
-    'PhabricatorUserConduitSettingsPanelController' => 'applications/people/controller/settings/panels/conduit/PhabricatorUserConduitSettingsPanelController.php',
-    'PhabricatorUserDAO' => 'applications/people/storage/base/PhabricatorUserDAO.php',
-    'PhabricatorUserEditor' => 'applications/people/editor/PhabricatorUserEditor.php',
-    'PhabricatorUserEmail' => 'applications/people/storage/email/PhabricatorUserEmail.php',
-    'PhabricatorUserEmailPreferenceSettingsPanelController' => 'applications/people/controller/settings/panels/emailpref/PhabricatorUserEmailPreferenceSettingsPanelController.php',
-    'PhabricatorUserEmailSettingsPanelController' => 'applications/people/controller/settings/panels/email/PhabricatorUserEmailSettingsPanelController.php',
-    'PhabricatorUserLog' => 'applications/people/storage/log/PhabricatorUserLog.php',
-    'PhabricatorUserOAuthInfo' => 'applications/people/storage/useroauthinfo/PhabricatorUserOAuthInfo.php',
-    'PhabricatorUserOAuthSettingsPanelController' => 'applications/people/controller/settings/panels/oauth/PhabricatorUserOAuthSettingsPanelController.php',
-    'PhabricatorUserPasswordSettingsPanelController' => 'applications/people/controller/settings/panels/password/PhabricatorUserPasswordSettingsPanelController.php',
-    'PhabricatorUserPreferenceSettingsPanelController' => 'applications/people/controller/settings/panels/preferences/PhabricatorUserPreferenceSettingsPanelController.php',
-    'PhabricatorUserPreferences' => 'applications/people/storage/preferences/PhabricatorUserPreferences.php',
-    'PhabricatorUserProfile' => 'applications/people/storage/profile/PhabricatorUserProfile.php',
-    'PhabricatorUserProfileSettingsPanelController' => 'applications/people/controller/settings/panels/profile/PhabricatorUserProfileSettingsPanelController.php',
-    'PhabricatorUserSSHKey' => 'applications/people/storage/usersshkey/PhabricatorUserSSHKey.php',
-    'PhabricatorUserSSHKeysSettingsPanelController' => 'applications/people/controller/settings/panels/sshkeys/PhabricatorUserSSHKeysSettingsPanelController.php',
-    'PhabricatorUserSearchSettingsPanelController' => 'applications/people/controller/settings/panels/search/PhabricatorUserSearchSettingsPanelController.php',
-    'PhabricatorUserSettingsController' => 'applications/people/controller/settings/PhabricatorUserSettingsController.php',
-    'PhabricatorUserSettingsPanelController' => 'applications/people/controller/settings/panels/base/PhabricatorUserSettingsPanelController.php',
-    'PhabricatorUserStatus' => 'applications/people/storage/userstatus/PhabricatorUserStatus.php',
-    'PhabricatorUserTestCase' => 'applications/people/storage/user/__tests__/PhabricatorUserTestCase.php',
-    'PhabricatorWorker' => 'infrastructure/daemon/workers/worker/PhabricatorWorker.php',
-    'PhabricatorWorkerDAO' => 'infrastructure/daemon/workers/storage/base/PhabricatorWorkerDAO.php',
-    'PhabricatorWorkerTask' => 'infrastructure/daemon/workers/storage/task/PhabricatorWorkerTask.php',
-    'PhabricatorWorkerTaskData' => 'infrastructure/daemon/workers/storage/taskdata/PhabricatorWorkerTaskData.php',
-    'PhabricatorWorkerTaskDetailController' => 'applications/daemon/controller/workertaskdetail/PhabricatorWorkerTaskDetailController.php',
-    'PhabricatorWorkerTaskUpdateController' => 'applications/daemon/controller/workertaskupdate/PhabricatorWorkerTaskUpdateController.php',
-    'PhabricatorXHPASTViewController' => 'applications/xhpastview/controller/base/PhabricatorXHPASTViewController.php',
-    'PhabricatorXHPASTViewDAO' => 'applications/xhpastview/storage/base/PhabricatorXHPASTViewDAO.php',
-    'PhabricatorXHPASTViewFrameController' => 'applications/xhpastview/controller/viewframe/PhabricatorXHPASTViewFrameController.php',
-    'PhabricatorXHPASTViewFramesetController' => 'applications/xhpastview/controller/viewframeset/PhabricatorXHPASTViewFramesetController.php',
-    'PhabricatorXHPASTViewInputController' => 'applications/xhpastview/controller/viewinput/PhabricatorXHPASTViewInputController.php',
-    'PhabricatorXHPASTViewPanelController' => 'applications/xhpastview/controller/viewpanel/PhabricatorXHPASTViewPanelController.php',
-    'PhabricatorXHPASTViewParseTree' => 'applications/xhpastview/storage/parsetree/PhabricatorXHPASTViewParseTree.php',
-    'PhabricatorXHPASTViewRunController' => 'applications/xhpastview/controller/run/PhabricatorXHPASTViewRunController.php',
-    'PhabricatorXHPASTViewStreamController' => 'applications/xhpastview/controller/viewstream/PhabricatorXHPASTViewStreamController.php',
-    'PhabricatorXHPASTViewTreeController' => 'applications/xhpastview/controller/viewtree/PhabricatorXHPASTViewTreeController.php',
-    'PhabricatorXHProfController' => 'applications/xhprof/controller/base/PhabricatorXHProfController.php',
-    'PhabricatorXHProfProfileController' => 'applications/xhprof/controller/profile/PhabricatorXHProfProfileController.php',
-    'PhabricatorXHProfProfileSymbolView' => 'applications/xhprof/view/symbol/PhabricatorXHProfProfileSymbolView.php',
-    'PhabricatorXHProfProfileTopLevelView' => 'applications/xhprof/view/toplevel/PhabricatorXHProfProfileTopLevelView.php',
-    'PhabricatorXHProfProfileView' => 'applications/xhprof/view/base/PhabricatorXHProfProfileView.php',
-    'PhameController' => 'applications/phame/controller/base/PhameController.php',
-    'PhameDAO' => 'applications/phame/storage/base/PhameDAO.php',
-    'PhameDraftListController' => 'applications/phame/controller/post/list/drafts/PhameDraftListController.php',
-    'PhamePost' => 'applications/phame/storage/post/PhamePost.php',
-    'PhamePostDeleteController' => 'applications/phame/controller/post/delete/PhamePostDeleteController.php',
-    'PhamePostDetailView' => 'applications/phame/view/postdetail/PhamePostDetailView.php',
-    'PhamePostEditController' => 'applications/phame/controller/post/edit/PhamePostEditController.php',
-    'PhamePostListBaseController' => 'applications/phame/controller/post/list/base/PhamePostListBaseController.php',
-    'PhamePostListController' => 'applications/phame/controller/post/list/posts/PhamePostListController.php',
-    'PhamePostListView' => 'applications/phame/view/postlist/PhamePostListView.php',
-    'PhamePostPreviewController' => 'applications/phame/controller/post/preview/PhamePostPreviewController.php',
-    'PhamePostQuery' => 'applications/phame/query/post/PhamePostQuery.php',
-    'PhamePostViewController' => 'applications/phame/controller/post/view/PhamePostViewController.php',
-    'PhortuneMonthYearExpiryControl' => 'applications/phortune/control/monthyearexpiry/PhortuneMonthYearExpiryControl.php',
-    'PhortuneStripeBaseController' => 'applications/phortune/stripe/controller/base/PhortuneStripeBaseController.php',
-    'PhortuneStripePaymentFormView' => 'applications/phortune/stripe/view/paymentform/PhortuneStripePaymentFormView.php',
-    'PhortuneStripeTestPaymentFormController' => 'applications/phortune/stripe/controller/testpaymentform/PhortuneStripeTestPaymentFormController.php',
-    'PhrictionActionConstants' => 'applications/phriction/constants/action/PhrictionActionConstants.php',
-    'PhrictionChangeType' => 'applications/phriction/constants/changetype/PhrictionChangeType.php',
-    'PhrictionConstants' => 'applications/phriction/constants/base/PhrictionConstants.php',
-    'PhrictionContent' => 'applications/phriction/storage/content/PhrictionContent.php',
-    'PhrictionController' => 'applications/phriction/controller/base/PhrictionController.php',
-    'PhrictionDAO' => 'applications/phriction/storage/base/PhrictionDAO.php',
-    'PhrictionDeleteController' => 'applications/phriction/controller/delete/PhrictionDeleteController.php',
-    'PhrictionDiffController' => 'applications/phriction/controller/diff/PhrictionDiffController.php',
-    'PhrictionDocument' => 'applications/phriction/storage/document/PhrictionDocument.php',
-    'PhrictionDocumentController' => 'applications/phriction/controller/document/PhrictionDocumentController.php',
-    'PhrictionDocumentEditor' => 'applications/phriction/editor/document/PhrictionDocumentEditor.php',
-    'PhrictionDocumentPreviewController' => 'applications/phriction/controller/documentpreview/PhrictionDocumentPreviewController.php',
-    'PhrictionDocumentStatus' => 'applications/phriction/constants/documentstatus/PhrictionDocumentStatus.php',
-    'PhrictionDocumentTestCase' => 'applications/phriction/storage/document/__tests__/PhrictionDocumentTestCase.php',
-    'PhrictionEditController' => 'applications/phriction/controller/edit/PhrictionEditController.php',
-    'PhrictionHistoryController' => 'applications/phriction/controller/history/PhrictionHistoryController.php',
-    'PhrictionListController' => 'applications/phriction/controller/list/PhrictionListController.php',
-    'QueryFormattingTestCase' => 'storage/qsprintf/__tests__/QueryFormattingTestCase.php',
+    'PhabricatorInlineCommentController' => 'infrastructure/diff/PhabricatorInlineCommentController.php',
+    'PhabricatorInlineCommentInterface' => 'infrastructure/diff/interface/PhabricatorInlineCommentInterface.php',
+    'PhabricatorInlineSummaryView' => 'infrastructure/diff/view/PhabricatorInlineSummaryView.php',
+    'PhabricatorJavelinLinter' => 'infrastructure/lint/linter/PhabricatorJavelinLinter.php',
+    'PhabricatorJumpNavHandler' => 'applications/search/engine/PhabricatorJumpNavHandler.php',
+    'PhabricatorLintEngine' => 'infrastructure/lint/PhabricatorLintEngine.php',
+    'PhabricatorLiskDAO' => 'applications/base/storage/PhabricatorLiskDAO.php',
+    'PhabricatorLocalDiskFileStorageEngine' => 'applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php',
+    'PhabricatorLocalTimeTestCase' => 'view/__tests__/PhabricatorLocalTimeTestCase.php',
+    'PhabricatorLoginController' => 'applications/auth/controller/PhabricatorLoginController.php',
+    'PhabricatorLoginValidateController' => 'applications/auth/controller/PhabricatorLoginValidateController.php',
+    'PhabricatorLogoutController' => 'applications/auth/controller/PhabricatorLogoutController.php',
+    'PhabricatorMailImplementationAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationAdapter.php',
+    'PhabricatorMailImplementationAmazonSESAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php',
+    'PhabricatorMailImplementationPHPMailerLiteAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php',
+    'PhabricatorMailImplementationSendGridAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php',
+    'PhabricatorMailImplementationTestAdapter' => 'applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php',
+    'PhabricatorMailReplyHandler' => 'applications/metamta/replyhandler/PhabricatorMailReplyHandler.php',
+    'PhabricatorMarkupEngine' => 'applications/markup/PhabricatorMarkupEngine.php',
+    'PhabricatorMercurialGraphStream' => 'applications/repository/daemon/PhabricatorMercurialGraphStream.php',
+    'PhabricatorMetaMTAAttachment' => 'applications/metamta/storage/PhabricatorMetaMTAAttachment.php',
+    'PhabricatorMetaMTAController' => 'applications/metamta/controller/PhabricatorMetaMTAController.php',
+    'PhabricatorMetaMTADAO' => 'applications/metamta/storage/PhabricatorMetaMTADAO.php',
+    'PhabricatorMetaMTAEmailBodyParser' => 'applications/metamta/PhabricatorMetaMTAEmailBodyParser.php',
+    'PhabricatorMetaMTAEmailBodyParserTestCase' => 'applications/metamta/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php',
+    'PhabricatorMetaMTAListController' => 'applications/metamta/controller/PhabricatorMetaMTAListController.php',
+    'PhabricatorMetaMTAMail' => 'applications/metamta/storage/PhabricatorMetaMTAMail.php',
+    'PhabricatorMetaMTAMailTestCase' => 'applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php',
+    'PhabricatorMetaMTAMailingList' => 'applications/metamta/storage/PhabricatorMetaMTAMailingList.php',
+    'PhabricatorMetaMTAMailingListEditController' => 'applications/metamta/controller/PhabricatorMetaMTAMailingListEditController.php',
+    'PhabricatorMetaMTAMailingListsController' => 'applications/metamta/controller/PhabricatorMetaMTAMailingListsController.php',
+    'PhabricatorMetaMTAReceiveController' => 'applications/metamta/controller/PhabricatorMetaMTAReceiveController.php',
+    'PhabricatorMetaMTAReceivedListController' => 'applications/metamta/controller/PhabricatorMetaMTAReceivedListController.php',
+    'PhabricatorMetaMTAReceivedMail' => 'applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php',
+    'PhabricatorMetaMTASendController' => 'applications/metamta/controller/PhabricatorMetaMTASendController.php',
+    'PhabricatorMetaMTASendGridReceiveController' => 'applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php',
+    'PhabricatorMetaMTAViewController' => 'applications/metamta/controller/PhabricatorMetaMTAViewController.php',
+    'PhabricatorMetaMTAWorker' => 'applications/metamta/PhabricatorMetaMTAWorker.php',
+    'PhabricatorMustVerifyEmailController' => 'applications/auth/controller/PhabricatorMustVerifyEmailController.php',
+    'PhabricatorMySQLFileStorageEngine' => 'applications/files/engine/PhabricatorMySQLFileStorageEngine.php',
+    'PhabricatorNotificationsController' => 'applications/notifications/controller/PhabricatorNotificationsController.php',
+    'PhabricatorOAuthClientAuthorization' => 'applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php',
+    'PhabricatorOAuthClientAuthorizationBaseController' => 'applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationBaseController.php',
+    'PhabricatorOAuthClientAuthorizationDeleteController' => 'applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationDeleteController.php',
+    'PhabricatorOAuthClientAuthorizationEditController' => 'applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationEditController.php',
+    'PhabricatorOAuthClientAuthorizationListController' => 'applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationListController.php',
+    'PhabricatorOAuthClientAuthorizationQuery' => 'applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php',
+    'PhabricatorOAuthClientBaseController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientBaseController.php',
+    'PhabricatorOAuthClientDeleteController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientDeleteController.php',
+    'PhabricatorOAuthClientEditController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php',
+    'PhabricatorOAuthClientListController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php',
+    'PhabricatorOAuthClientViewController' => 'applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php',
+    'PhabricatorOAuthDefaultRegistrationController' => 'applications/auth/controller/oauthregistration/PhabricatorOAuthDefaultRegistrationController.php',
+    'PhabricatorOAuthDiagnosticsController' => 'applications/auth/controller/PhabricatorOAuthDiagnosticsController.php',
+    'PhabricatorOAuthFailureView' => 'applications/auth/view/PhabricatorOAuthFailureView.php',
+    'PhabricatorOAuthLoginController' => 'applications/auth/controller/PhabricatorOAuthLoginController.php',
+    'PhabricatorOAuthProvider' => 'applications/auth/oauth/provider/PhabricatorOAuthProvider.php',
+    'PhabricatorOAuthProviderDisqus' => 'applications/auth/oauth/provider/PhabricatorOAuthProviderDisqus.php',
+    'PhabricatorOAuthProviderException' => 'applications/auth/oauth/provider/PhabricatorOAuthProviderException.php',
+    'PhabricatorOAuthProviderFacebook' => 'applications/auth/oauth/provider/PhabricatorOAuthProviderFacebook.php',
+    'PhabricatorOAuthProviderGitHub' => 'applications/auth/oauth/provider/PhabricatorOAuthProviderGitHub.php',
+    'PhabricatorOAuthProviderGoogle' => 'applications/auth/oauth/provider/PhabricatorOAuthProviderGoogle.php',
+    'PhabricatorOAuthProviderPhabricator' => 'applications/auth/oauth/provider/PhabricatorOAuthProviderPhabricator.php',
+    'PhabricatorOAuthRegistrationController' => 'applications/auth/controller/oauthregistration/PhabricatorOAuthRegistrationController.php',
+    'PhabricatorOAuthResponse' => 'applications/oauthserver/PhabricatorOAuthResponse.php',
+    'PhabricatorOAuthServer' => 'applications/oauthserver/PhabricatorOAuthServer.php',
+    'PhabricatorOAuthServerAccessToken' => 'applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php',
+    'PhabricatorOAuthServerAuthController' => 'applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php',
+    'PhabricatorOAuthServerAuthorizationCode' => 'applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php',
+    'PhabricatorOAuthServerClient' => 'applications/oauthserver/storage/PhabricatorOAuthServerClient.php',
+    'PhabricatorOAuthServerClientQuery' => 'applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php',
+    'PhabricatorOAuthServerController' => 'applications/oauthserver/controller/PhabricatorOAuthServerController.php',
+    'PhabricatorOAuthServerDAO' => 'applications/oauthserver/storage/PhabricatorOAuthServerDAO.php',
+    'PhabricatorOAuthServerScope' => 'applications/oauthserver/PhabricatorOAuthServerScope.php',
+    'PhabricatorOAuthServerTestCase' => 'applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php',
+    'PhabricatorOAuthServerTestController' => 'applications/oauthserver/controller/PhabricatorOAuthServerTestController.php',
+    'PhabricatorOAuthServerTokenController' => 'applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php',
+    'PhabricatorOAuthUnlinkController' => 'applications/auth/controller/PhabricatorOAuthUnlinkController.php',
+    'PhabricatorObjectAttachmentEditor' => 'applications/search/editor/PhabricatorObjectAttachmentEditor.php',
+    'PhabricatorObjectGraph' => 'applications/phid/PhabricatorObjectGraph.php',
+    'PhabricatorObjectHandle' => 'applications/phid/PhabricatorObjectHandle.php',
+    'PhabricatorObjectHandleConstants' => 'applications/phid/handle/const/PhabricatorObjectHandleConstants.php',
+    'PhabricatorObjectHandleData' => 'applications/phid/handle/PhabricatorObjectHandleData.php',
+    'PhabricatorObjectHandleStatus' => 'applications/phid/handle/const/PhabricatorObjectHandleStatus.php',
+    'PhabricatorObjectSelectorDialog' => 'view/control/PhabricatorObjectSelectorDialog.php',
+    'PhabricatorOffsetPagedQuery' => 'infrastructure/query/PhabricatorOffsetPagedQuery.php',
+    'PhabricatorOwnerPathQuery' => 'applications/owners/query/PhabricatorOwnerPathQuery.php',
+    'PhabricatorOwnersController' => 'applications/owners/controller/PhabricatorOwnersController.php',
+    'PhabricatorOwnersDAO' => 'applications/owners/storage/PhabricatorOwnersDAO.php',
+    'PhabricatorOwnersDeleteController' => 'applications/owners/controller/PhabricatorOwnersDeleteController.php',
+    'PhabricatorOwnersDetailController' => 'applications/owners/controller/PhabricatorOwnersDetailController.php',
+    'PhabricatorOwnersEditController' => 'applications/owners/controller/PhabricatorOwnersEditController.php',
+    'PhabricatorOwnersListController' => 'applications/owners/controller/PhabricatorOwnersListController.php',
+    'PhabricatorOwnersOwner' => 'applications/owners/storage/PhabricatorOwnersOwner.php',
+    'PhabricatorOwnersPackage' => 'applications/owners/storage/PhabricatorOwnersPackage.php',
+    'PhabricatorOwnersPath' => 'applications/owners/storage/PhabricatorOwnersPath.php',
+    'PhabricatorPHID' => 'applications/phid/storage/PhabricatorPHID.php',
+    'PhabricatorPHIDConstants' => 'applications/phid/PhabricatorPHIDConstants.php',
+    'PhabricatorPHIDController' => 'applications/phid/controller/PhabricatorPHIDController.php',
+    'PhabricatorPHIDLookupController' => 'applications/phid/controller/PhabricatorPHIDLookupController.php',
+    'PhabricatorPaste' => 'applications/paste/storage/PhabricatorPaste.php',
+    'PhabricatorPasteController' => 'applications/paste/controller/PhabricatorPasteController.php',
+    'PhabricatorPasteDAO' => 'applications/paste/storage/PhabricatorPasteDAO.php',
+    'PhabricatorPasteListController' => 'applications/paste/controller/PhabricatorPasteListController.php',
+    'PhabricatorPasteQuery' => 'applications/paste/query/PhabricatorPasteQuery.php',
+    'PhabricatorPasteViewController' => 'applications/paste/controller/PhabricatorPasteViewController.php',
+    'PhabricatorPeopleController' => 'applications/people/controller/PhabricatorPeopleController.php',
+    'PhabricatorPeopleEditController' => 'applications/people/controller/PhabricatorPeopleEditController.php',
+    'PhabricatorPeopleListController' => 'applications/people/controller/PhabricatorPeopleListController.php',
+    'PhabricatorPeopleLogsController' => 'applications/people/controller/PhabricatorPeopleLogsController.php',
+    'PhabricatorPeopleProfileController' => 'applications/people/controller/PhabricatorPeopleProfileController.php',
+    'PhabricatorPeopleQuery' => 'applications/people/PhabricatorPeopleQuery.php',
+    'PhabricatorPolicies' => 'applications/policy/constants/PhabricatorPolicies.php',
+    'PhabricatorPolicyCapability' => 'applications/policy/constants/PhabricatorPolicyCapability.php',
+    'PhabricatorPolicyConstants' => 'applications/policy/constants/PhabricatorPolicyConstants.php',
+    'PhabricatorPolicyException' => 'applications/policy/exception/PhabricatorPolicyException.php',
+    'PhabricatorPolicyFilter' => 'applications/policy/filter/PhabricatorPolicyFilter.php',
+    'PhabricatorPolicyInterface' => 'applications/policy/interface/PhabricatorPolicyInterface.php',
+    'PhabricatorPolicyQuery' => 'infrastructure/query/policy/PhabricatorPolicyQuery.php',
+    'PhabricatorPolicyTestCase' => 'applications/__tests__/PhabricatorPolicyTestCase.php',
+    'PhabricatorPolicyTestObject' => 'applications/__tests__/PhabricatorPolicyTestObject.php',
+    'PhabricatorPolicyTestQuery' => 'applications/__tests__/PhabricatorPolicyTestQuery.php',
+    'PhabricatorProfileHeaderView' => 'view/layout/PhabricatorProfileHeaderView.php',
+    'PhabricatorProject' => 'applications/project/storage/PhabricatorProject.php',
+    'PhabricatorProjectAffiliation' => 'applications/project/storage/PhabricatorProjectAffiliation.php',
+    'PhabricatorProjectConstants' => 'applications/project/constants/PhabricatorProjectConstants.php',
+    'PhabricatorProjectController' => 'applications/project/controller/PhabricatorProjectController.php',
+    'PhabricatorProjectCreateController' => 'applications/project/controller/PhabricatorProjectCreateController.php',
+    'PhabricatorProjectDAO' => 'applications/project/storage/PhabricatorProjectDAO.php',
+    'PhabricatorProjectEditor' => 'applications/project/editor/PhabricatorProjectEditor.php',
+    'PhabricatorProjectListController' => 'applications/project/controller/PhabricatorProjectListController.php',
+    'PhabricatorProjectNameCollisionException' => 'applications/project/exception/PhabricatorProjectNameCollisionException.php',
+    'PhabricatorProjectProfile' => 'applications/project/storage/PhabricatorProjectProfile.php',
+    'PhabricatorProjectProfileController' => 'applications/project/controller/PhabricatorProjectProfileController.php',
+    'PhabricatorProjectProfileEditController' => 'applications/project/controller/PhabricatorProjectProfileEditController.php',
+    'PhabricatorProjectQuery' => 'applications/project/query/PhabricatorProjectQuery.php',
+    'PhabricatorProjectStatus' => 'applications/project/constants/PhabricatorProjectStatus.php',
+    'PhabricatorProjectSubproject' => 'applications/project/storage/PhabricatorProjectSubproject.php',
+    'PhabricatorProjectTransaction' => 'applications/project/storage/PhabricatorProjectTransaction.php',
+    'PhabricatorProjectTransactionType' => 'applications/project/constants/PhabricatorProjectTransactionType.php',
+    'PhabricatorProjectUpdateController' => 'applications/project/controller/PhabricatorProjectUpdateController.php',
+    'PhabricatorQuery' => 'infrastructure/query/PhabricatorQuery.php',
+    'PhabricatorRedirectController' => 'applications/base/controller/PhabricatorRedirectController.php',
+    'PhabricatorRefreshCSRFController' => 'applications/auth/controller/PhabricatorRefreshCSRFController.php',
+    'PhabricatorRemarkupRuleDifferential' => 'infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleDifferential.php',
+    'PhabricatorRemarkupRuleDifferentialHandle' => 'infrastructure/markup/remarkup/markuprule/handle/PhabricatorRemarkupRuleDifferentialHandle.php',
+    'PhabricatorRemarkupRuleDiffusion' => 'infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleDiffusion.php',
+    'PhabricatorRemarkupRuleEmbedFile' => 'infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleEmbedFile.php',
+    'PhabricatorRemarkupRuleImageMacro' => 'infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleImageMacro.php',
+    'PhabricatorRemarkupRuleManiphest' => 'infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleManiphest.php',
+    'PhabricatorRemarkupRuleManiphestHandle' => 'infrastructure/markup/remarkup/markuprule/handle/PhabricatorRemarkupRuleManiphestHandle.php',
+    'PhabricatorRemarkupRuleMention' => 'infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleMention.php',
+    'PhabricatorRemarkupRuleObjectHandle' => 'infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleObjectHandle.php',
+    'PhabricatorRemarkupRuleObjectName' => 'infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleObjectName.php',
+    'PhabricatorRemarkupRulePaste' => 'infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRulePaste.php',
+    'PhabricatorRemarkupRulePhriction' => 'infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRulePhriction.php',
+    'PhabricatorRemarkupRuleProxyImage' => 'infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleProxyImage.php',
+    'PhabricatorRemarkupRuleYoutube' => 'infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleYoutube.php',
+    'PhabricatorRepository' => 'applications/repository/storage/PhabricatorRepository.php',
+    'PhabricatorRepositoryArcanistProject' => 'applications/repository/storage/PhabricatorRepositoryArcanistProject.php',
+    'PhabricatorRepositoryArcanistProjectEditController' => 'applications/repository/controller/PhabricatorRepositoryArcanistProjectEditController.php',
+    'PhabricatorRepositoryAuditRequest' => 'applications/repository/storage/PhabricatorRepositoryAuditRequest.php',
+    'PhabricatorRepositoryCommit' => 'applications/repository/storage/PhabricatorRepositoryCommit.php',
+    'PhabricatorRepositoryCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php',
+    'PhabricatorRepositoryCommitData' => 'applications/repository/storage/PhabricatorRepositoryCommitData.php',
+    'PhabricatorRepositoryCommitHeraldWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php',
+    'PhabricatorRepositoryCommitMessageDetailParser' => 'applications/repository/parser/PhabricatorRepositoryCommitMessageDetailParser.php',
+    'PhabricatorRepositoryCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php',
+    'PhabricatorRepositoryCommitOwnersWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php',
+    'PhabricatorRepositoryCommitParserWorker' => 'applications/repository/worker/PhabricatorRepositoryCommitParserWorker.php',
+    'PhabricatorRepositoryController' => 'applications/repository/controller/PhabricatorRepositoryController.php',
+    'PhabricatorRepositoryCreateController' => 'applications/repository/controller/PhabricatorRepositoryCreateController.php',
+    'PhabricatorRepositoryDAO' => 'applications/repository/storage/PhabricatorRepositoryDAO.php',
+    'PhabricatorRepositoryDefaultCommitMessageDetailParser' => 'applications/repository/parser/PhabricatorRepositoryDefaultCommitMessageDetailParser.php',
+    'PhabricatorRepositoryDeleteController' => 'applications/repository/controller/PhabricatorRepositoryDeleteController.php',
+    'PhabricatorRepositoryEditController' => 'applications/repository/controller/PhabricatorRepositoryEditController.php',
+    'PhabricatorRepositoryGitCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php',
+    'PhabricatorRepositoryGitCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php',
+    'PhabricatorRepositoryListController' => 'applications/repository/controller/PhabricatorRepositoryListController.php',
+    'PhabricatorRepositoryMercurialCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php',
+    'PhabricatorRepositoryMercurialCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositoryMercurialCommitMessageParserWorker.php',
+    'PhabricatorRepositoryPullLocalDaemon' => 'applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php',
+    'PhabricatorRepositoryPullLocalDaemonTestCase' => 'applications/repository/daemon/__tests__/PhabricatorRepositoryPullLocalDaemonTestCase.php',
+    'PhabricatorRepositoryShortcut' => 'applications/repository/storage/PhabricatorRepositoryShortcut.php',
+    'PhabricatorRepositorySvnCommitChangeParserWorker' => 'applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php',
+    'PhabricatorRepositorySvnCommitMessageParserWorker' => 'applications/repository/worker/commitmessageparser/PhabricatorRepositorySvnCommitMessageParserWorker.php',
+    'PhabricatorRepositorySymbol' => 'applications/repository/storage/PhabricatorRepositorySymbol.php',
+    'PhabricatorRepositoryTestCase' => 'applications/repository/storage/__tests__/PhabricatorRepositoryTestCase.php',
+    'PhabricatorRepositoryType' => 'applications/repository/constants/PhabricatorRepositoryType.php',
+    'PhabricatorS3FileStorageEngine' => 'applications/files/engine/PhabricatorS3FileStorageEngine.php',
+    'PhabricatorSQLPatchList' => 'infrastructure/setup/sql/PhabricatorSQLPatchList.php',
+    'PhabricatorScopedEnv' => 'infrastructure/PhabricatorScopedEnv.php',
+    'PhabricatorSearchAbstractDocument' => 'applications/search/index/PhabricatorSearchAbstractDocument.php',
+    'PhabricatorSearchAttachController' => 'applications/search/controller/PhabricatorSearchAttachController.php',
+    'PhabricatorSearchBaseController' => 'applications/search/controller/PhabricatorSearchBaseController.php',
+    'PhabricatorSearchCommitIndexer' => 'applications/search/index/indexer/PhabricatorSearchCommitIndexer.php',
+    'PhabricatorSearchController' => 'applications/search/controller/PhabricatorSearchController.php',
+    'PhabricatorSearchDAO' => 'applications/search/storage/PhabricatorSearchDAO.php',
+    'PhabricatorSearchDifferentialIndexer' => 'applications/search/index/indexer/PhabricatorSearchDifferentialIndexer.php',
+    'PhabricatorSearchDocument' => 'applications/search/storage/document/PhabricatorSearchDocument.php',
+    'PhabricatorSearchDocumentField' => 'applications/search/storage/document/PhabricatorSearchDocumentField.php',
+    'PhabricatorSearchDocumentIndexer' => 'applications/search/index/indexer/PhabricatorSearchDocumentIndexer.php',
+    'PhabricatorSearchDocumentRelationship' => 'applications/search/storage/document/PhabricatorSearchDocumentRelationship.php',
+    'PhabricatorSearchEngine' => 'applications/search/engine/PhabricatorSearchEngine.php',
+    'PhabricatorSearchEngineElastic' => 'applications/search/engine/PhabricatorSearchEngineElastic.php',
+    'PhabricatorSearchEngineMySQL' => 'applications/search/engine/PhabricatorSearchEngineMySQL.php',
+    'PhabricatorSearchEngineSelector' => 'applications/search/selector/PhabricatorSearchEngineSelector.php',
+    'PhabricatorSearchField' => 'applications/search/constants/PhabricatorSearchField.php',
+    'PhabricatorSearchIndexController' => 'applications/search/controller/PhabricatorSearchIndexController.php',
+    'PhabricatorSearchManiphestIndexer' => 'applications/search/index/indexer/PhabricatorSearchManiphestIndexer.php',
+    'PhabricatorSearchPhrictionIndexer' => 'applications/search/index/indexer/PhabricatorSearchPhrictionIndexer.php',
+    'PhabricatorSearchQuery' => 'applications/search/storage/PhabricatorSearchQuery.php',
+    'PhabricatorSearchRelationship' => 'applications/search/constants/PhabricatorSearchRelationship.php',
+    'PhabricatorSearchResultView' => 'applications/search/view/PhabricatorSearchResultView.php',
+    'PhabricatorSearchScope' => 'applications/search/constants/PhabricatorSearchScope.php',
+    'PhabricatorSearchSelectController' => 'applications/search/controller/PhabricatorSearchSelectController.php',
+    'PhabricatorSearchUserIndexer' => 'applications/search/index/indexer/PhabricatorSearchUserIndexer.php',
+    'PhabricatorSetup' => 'infrastructure/PhabricatorSetup.php',
+    'PhabricatorSlowvoteChoice' => 'applications/slowvote/storage/PhabricatorSlowvoteChoice.php',
+    'PhabricatorSlowvoteComment' => 'applications/slowvote/storage/PhabricatorSlowvoteComment.php',
+    'PhabricatorSlowvoteController' => 'applications/slowvote/controller/PhabricatorSlowvoteController.php',
+    'PhabricatorSlowvoteCreateController' => 'applications/slowvote/controller/PhabricatorSlowvoteCreateController.php',
+    'PhabricatorSlowvoteDAO' => 'applications/slowvote/storage/PhabricatorSlowvoteDAO.php',
+    'PhabricatorSlowvoteListController' => 'applications/slowvote/controller/PhabricatorSlowvoteListController.php',
+    'PhabricatorSlowvoteOption' => 'applications/slowvote/storage/PhabricatorSlowvoteOption.php',
+    'PhabricatorSlowvotePoll' => 'applications/slowvote/storage/PhabricatorSlowvotePoll.php',
+    'PhabricatorSlowvotePollController' => 'applications/slowvote/controller/PhabricatorSlowvotePollController.php',
+    'PhabricatorSlug' => 'infrastructure/util/PhabricatorSlug.php',
+    'PhabricatorSlugTestCase' => 'infrastructure/util/__tests__/PhabricatorSlugTestCase.php',
+    'PhabricatorSortTableExample' => 'applications/uiexample/examples/PhabricatorSortTableExample.php',
+    'PhabricatorStandardPageView' => 'view/page/PhabricatorStandardPageView.php',
+    'PhabricatorStatusController' => 'applications/status/PhabricatorStatusController.php',
+    'PhabricatorStorageFixtureScopeGuard' => 'infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php',
+    'PhabricatorStorageManagementAPI' => 'infrastructure/setup/storage/PhabricatorStorageManagementAPI.php',
+    'PhabricatorStorageManagementDatabasesWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementDatabasesWorkflow.php',
+    'PhabricatorStorageManagementDestroyWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementDestroyWorkflow.php',
+    'PhabricatorStorageManagementDumpWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementDumpWorkflow.php',
+    'PhabricatorStorageManagementStatusWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementStatusWorkflow.php',
+    'PhabricatorStorageManagementUpgradeWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementUpgradeWorkflow.php',
+    'PhabricatorStorageManagementWorkflow' => 'infrastructure/setup/storage/workflow/PhabricatorStorageManagementWorkflow.php',
+    'PhabricatorStoragePatch' => 'infrastructure/setup/storage/PhabricatorStoragePatch.php',
+    'PhabricatorSymbolNameLinter' => 'infrastructure/lint/hook/PhabricatorSymbolNameLinter.php',
+    'PhabricatorSyntaxHighlighter' => 'applications/markup/PhabricatorSyntaxHighlighter.php',
+    'PhabricatorTaskmasterDaemon' => 'infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php',
+    'PhabricatorTestCase' => 'infrastructure/testing/PhabricatorTestCase.php',
+    'PhabricatorTimelineCursor' => 'infrastructure/daemon/timeline/storage/PhabricatorTimelineCursor.php',
+    'PhabricatorTimelineDAO' => 'infrastructure/daemon/timeline/storage/PhabricatorTimelineDAO.php',
+    'PhabricatorTimelineEvent' => 'infrastructure/daemon/timeline/storage/PhabricatorTimelineEvent.php',
+    'PhabricatorTimelineEventData' => 'infrastructure/daemon/timeline/storage/PhabricatorTimelineEventData.php',
+    'PhabricatorTimelineIterator' => 'infrastructure/daemon/timeline/cursor/PhabricatorTimelineIterator.php',
+    'PhabricatorTimer' => 'applications/countdown/storage/PhabricatorTimer.php',
+    'PhabricatorTransactionView' => 'view/layout/PhabricatorTransactionView.php',
+    'PhabricatorTransformedFile' => 'applications/files/storage/PhabricatorTransformedFile.php',
+    'PhabricatorTrivialTestCase' => 'infrastructure/testing/__tests__/PhabricatorTrivialTestCase.php',
+    'PhabricatorTypeaheadCommonDatasourceController' => 'applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php',
+    'PhabricatorTypeaheadDatasourceController' => 'applications/typeahead/controller/PhabricatorTypeaheadDatasourceController.php',
+    'PhabricatorUIExample' => 'applications/uiexample/examples/PhabricatorUIExample.php',
+    'PhabricatorUIExampleController' => 'applications/uiexample/controller/PhabricatorUIExampleController.php',
+    'PhabricatorUIExampleRenderController' => 'applications/uiexample/controller/PhabricatorUIExampleRenderController.php',
+    'PhabricatorUIListFilterExample' => 'applications/uiexample/examples/PhabricatorUIListFilterExample.php',
+    'PhabricatorUIPagerExample' => 'applications/uiexample/examples/PhabricatorUIPagerExample.php',
+    'PhabricatorUITooltipExample' => 'applications/uiexample/examples/PhabricatorUITooltipExample.php',
+    'PhabricatorUnitsTestCase' => 'view/__tests__/PhabricatorUnitsTestCase.php',
+    'PhabricatorUser' => 'applications/people/storage/PhabricatorUser.php',
+    'PhabricatorUserAccountSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserAccountSettingsPanelController.php',
+    'PhabricatorUserConduitSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserConduitSettingsPanelController.php',
+    'PhabricatorUserDAO' => 'applications/people/storage/PhabricatorUserDAO.php',
+    'PhabricatorUserEditor' => 'applications/people/PhabricatorUserEditor.php',
+    'PhabricatorUserEmail' => 'applications/people/storage/PhabricatorUserEmail.php',
+    'PhabricatorUserEmailPreferenceSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserEmailPreferenceSettingsPanelController.php',
+    'PhabricatorUserEmailSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserEmailSettingsPanelController.php',
+    'PhabricatorUserLog' => 'applications/people/storage/PhabricatorUserLog.php',
+    'PhabricatorUserOAuthInfo' => 'applications/people/storage/PhabricatorUserOAuthInfo.php',
+    'PhabricatorUserOAuthSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserOAuthSettingsPanelController.php',
+    'PhabricatorUserPasswordSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserPasswordSettingsPanelController.php',
+    'PhabricatorUserPreferenceSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserPreferenceSettingsPanelController.php',
+    'PhabricatorUserPreferences' => 'applications/people/storage/PhabricatorUserPreferences.php',
+    'PhabricatorUserProfile' => 'applications/people/storage/PhabricatorUserProfile.php',
+    'PhabricatorUserProfileSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserProfileSettingsPanelController.php',
+    'PhabricatorUserSSHKey' => 'applications/people/storage/PhabricatorUserSSHKey.php',
+    'PhabricatorUserSSHKeysSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserSSHKeysSettingsPanelController.php',
+    'PhabricatorUserSearchSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserSearchSettingsPanelController.php',
+    'PhabricatorUserSettingsController' => 'applications/people/controller/PhabricatorUserSettingsController.php',
+    'PhabricatorUserSettingsPanelController' => 'applications/people/controller/settings/panels/PhabricatorUserSettingsPanelController.php',
+    'PhabricatorUserStatus' => 'applications/people/storage/PhabricatorUserStatus.php',
+    'PhabricatorUserTestCase' => 'applications/people/storage/__tests__/PhabricatorUserTestCase.php',
+    'PhabricatorWorker' => 'infrastructure/daemon/workers/PhabricatorWorker.php',
+    'PhabricatorWorkerDAO' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerDAO.php',
+    'PhabricatorWorkerTask' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerTask.php',
+    'PhabricatorWorkerTaskData' => 'infrastructure/daemon/workers/storage/PhabricatorWorkerTaskData.php',
+    'PhabricatorWorkerTaskDetailController' => 'applications/daemon/controller/PhabricatorWorkerTaskDetailController.php',
+    'PhabricatorWorkerTaskUpdateController' => 'applications/daemon/controller/PhabricatorWorkerTaskUpdateController.php',
+    'PhabricatorXHPASTViewController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewController.php',
+    'PhabricatorXHPASTViewDAO' => 'applications/xhpastview/storage/PhabricatorXHPASTViewDAO.php',
+    'PhabricatorXHPASTViewFrameController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewFrameController.php',
+    'PhabricatorXHPASTViewFramesetController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewFramesetController.php',
+    'PhabricatorXHPASTViewInputController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewInputController.php',
+    'PhabricatorXHPASTViewPanelController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewPanelController.php',
+    'PhabricatorXHPASTViewParseTree' => 'applications/xhpastview/storage/PhabricatorXHPASTViewParseTree.php',
+    'PhabricatorXHPASTViewRunController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewRunController.php',
+    'PhabricatorXHPASTViewStreamController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewStreamController.php',
+    'PhabricatorXHPASTViewTreeController' => 'applications/xhpastview/controller/PhabricatorXHPASTViewTreeController.php',
+    'PhabricatorXHProfController' => 'applications/xhprof/controller/PhabricatorXHProfController.php',
+    'PhabricatorXHProfProfileController' => 'applications/xhprof/controller/PhabricatorXHProfProfileController.php',
+    'PhabricatorXHProfProfileSymbolView' => 'applications/xhprof/view/PhabricatorXHProfProfileSymbolView.php',
+    'PhabricatorXHProfProfileTopLevelView' => 'applications/xhprof/view/PhabricatorXHProfProfileTopLevelView.php',
+    'PhabricatorXHProfProfileView' => 'applications/xhprof/view/PhabricatorXHProfProfileView.php',
+    'PhameController' => 'applications/phame/controller/PhameController.php',
+    'PhameDAO' => 'applications/phame/storage/PhameDAO.php',
+    'PhameDraftListController' => 'applications/phame/controller/post/list/PhameDraftListController.php',
+    'PhamePost' => 'applications/phame/storage/PhamePost.php',
+    'PhamePostDeleteController' => 'applications/phame/controller/post/PhamePostDeleteController.php',
+    'PhamePostDetailView' => 'applications/phame/view/PhamePostDetailView.php',
+    'PhamePostEditController' => 'applications/phame/controller/post/PhamePostEditController.php',
+    'PhamePostListBaseController' => 'applications/phame/controller/post/list/PhamePostListBaseController.php',
+    'PhamePostListController' => 'applications/phame/controller/post/list/PhamePostListController.php',
+    'PhamePostListView' => 'applications/phame/view/PhamePostListView.php',
+    'PhamePostPreviewController' => 'applications/phame/controller/post/PhamePostPreviewController.php',
+    'PhamePostQuery' => 'applications/phame/query/PhamePostQuery.php',
+    'PhamePostViewController' => 'applications/phame/controller/post/PhamePostViewController.php',
+    'PhortuneMonthYearExpiryControl' => 'applications/phortune/control/PhortuneMonthYearExpiryControl.php',
+    'PhortuneStripeBaseController' => 'applications/phortune/stripe/controller/PhortuneStripeBaseController.php',
+    'PhortuneStripePaymentFormView' => 'applications/phortune/stripe/view/PhortuneStripePaymentFormView.php',
+    'PhortuneStripeTestPaymentFormController' => 'applications/phortune/stripe/controller/PhortuneStripeTestPaymentFormController.php',
+    'PhrictionActionConstants' => 'applications/phriction/constants/PhrictionActionConstants.php',
+    'PhrictionChangeType' => 'applications/phriction/constants/PhrictionChangeType.php',
+    'PhrictionConstants' => 'applications/phriction/constants/PhrictionConstants.php',
+    'PhrictionContent' => 'applications/phriction/storage/PhrictionContent.php',
+    'PhrictionController' => 'applications/phriction/controller/PhrictionController.php',
+    'PhrictionDAO' => 'applications/phriction/storage/PhrictionDAO.php',
+    'PhrictionDeleteController' => 'applications/phriction/controller/PhrictionDeleteController.php',
+    'PhrictionDiffController' => 'applications/phriction/controller/PhrictionDiffController.php',
+    'PhrictionDocument' => 'applications/phriction/storage/PhrictionDocument.php',
+    'PhrictionDocumentController' => 'applications/phriction/controller/PhrictionDocumentController.php',
+    'PhrictionDocumentEditor' => 'applications/phriction/editor/PhrictionDocumentEditor.php',
+    'PhrictionDocumentPreviewController' => 'applications/phriction/controller/PhrictionDocumentPreviewController.php',
+    'PhrictionDocumentStatus' => 'applications/phriction/constants/PhrictionDocumentStatus.php',
+    'PhrictionDocumentTestCase' => 'applications/phriction/storage/__tests__/PhrictionDocumentTestCase.php',
+    'PhrictionEditController' => 'applications/phriction/controller/PhrictionEditController.php',
+    'PhrictionHistoryController' => 'applications/phriction/controller/PhrictionHistoryController.php',
+    'PhrictionListController' => 'applications/phriction/controller/PhrictionListController.php',
+    'QueryFormattingTestCase' => 'storage/__tests__/QueryFormattingTestCase.php',
   ),
   'function' =>
   array(
-    '_phabricator_date_format' => 'view/utils/viewutils.php',
-    '_qsprintf_check_scalar_type' => 'storage/qsprintf/qsprintf.php',
-    '_qsprintf_check_type' => 'storage/qsprintf/qsprintf.php',
-    'celerity_generate_unique_node_id' => 'infrastructure/celerity/api/utils.php',
-    'celerity_get_resource_uri' => 'infrastructure/celerity/api/utils.php',
-    'celerity_register_resource_map' => 'infrastructure/celerity/map/utils.php',
-    'javelin_render_tag' => 'infrastructure/javelin/markup/markup.php',
-    'phabricator_date' => 'view/utils/viewutils.php',
-    'phabricator_datetime' => 'view/utils/viewutils.php',
-    'phabricator_format_bytes' => 'view/utils/viewutils.php',
-    'phabricator_format_local_time' => 'view/utils/viewutils.php',
-    'phabricator_format_relative_time' => 'view/utils/viewutils.php',
-    'phabricator_format_units_generic' => 'view/utils/viewutils.php',
-    'phabricator_on_relative_date' => 'view/utils/viewutils.php',
-    'phabricator_parse_bytes' => 'view/utils/viewutils.php',
-    'phabricator_relative_date' => 'view/utils/viewutils.php',
-    'phabricator_render_form' => 'infrastructure/javelin/markup/markup.php',
-    'phabricator_time' => 'view/utils/viewutils.php',
-    'phid_get_type' => 'applications/phid/utils/utils.php',
-    'phid_group_by_type' => 'applications/phid/utils/utils.php',
-    'qsprintf' => 'storage/qsprintf/qsprintf.php',
-    'queryfx' => 'storage/queryfx/queryfx.php',
-    'queryfx_all' => 'storage/queryfx/queryfx.php',
-    'queryfx_one' => 'storage/queryfx/queryfx.php',
-    'require_celerity_resource' => 'infrastructure/celerity/api/utils.php',
-    'vqsprintf' => 'storage/qsprintf/qsprintf.php',
-    'vqueryfx' => 'storage/queryfx/queryfx.php',
-    'vqueryfx_all' => 'storage/queryfx/queryfx.php',
-    'xsprintf_query' => 'storage/qsprintf/qsprintf.php',
+    '_phabricator_date_format' => 'view/viewutils.php',
+    '_qsprintf_check_scalar_type' => 'storage/qsprintf.php',
+    '_qsprintf_check_type' => 'storage/qsprintf.php',
+    'celerity_generate_unique_node_id' => 'infrastructure/celerity/api.php',
+    'celerity_get_resource_uri' => 'infrastructure/celerity/api.php',
+    'celerity_register_resource_map' => 'infrastructure/celerity/map.php',
+    'javelin_render_tag' => 'infrastructure/javelin/markup.php',
+    'phabricator_date' => 'view/viewutils.php',
+    'phabricator_datetime' => 'view/viewutils.php',
+    'phabricator_format_bytes' => 'view/viewutils.php',
+    'phabricator_format_local_time' => 'view/viewutils.php',
+    'phabricator_format_relative_time' => 'view/viewutils.php',
+    'phabricator_format_units_generic' => 'view/viewutils.php',
+    'phabricator_on_relative_date' => 'view/viewutils.php',
+    'phabricator_parse_bytes' => 'view/viewutils.php',
+    'phabricator_relative_date' => 'view/viewutils.php',
+    'phabricator_render_form' => 'infrastructure/javelin/markup.php',
+    'phabricator_time' => 'view/viewutils.php',
+    'phid_get_type' => 'applications/phid/utils.php',
+    'phid_group_by_type' => 'applications/phid/utils.php',
+    'qsprintf' => 'storage/qsprintf.php',
+    'queryfx' => 'storage/queryfx.php',
+    'queryfx_all' => 'storage/queryfx.php',
+    'queryfx_one' => 'storage/queryfx.php',
+    'require_celerity_resource' => 'infrastructure/celerity/api.php',
+    'vqsprintf' => 'storage/qsprintf.php',
+    'vqueryfx' => 'storage/queryfx.php',
+    'vqueryfx_all' => 'storage/queryfx.php',
+    'xsprintf_query' => 'storage/qsprintf.php',
   ),
   'xmap' =>
   array(
diff --git a/src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php b/src/aphront/AphrontApplicationConfiguration.php
similarity index 100%
rename from src/aphront/applicationconfiguration/AphrontApplicationConfiguration.php
rename to src/aphront/AphrontApplicationConfiguration.php
diff --git a/src/aphront/controller/AphrontController.php b/src/aphront/AphrontController.php
similarity index 100%
rename from src/aphront/controller/AphrontController.php
rename to src/aphront/AphrontController.php
diff --git a/src/aphront/request/AphrontRequest.php b/src/aphront/AphrontRequest.php
similarity index 100%
rename from src/aphront/request/AphrontRequest.php
rename to src/aphront/AphrontRequest.php
diff --git a/src/aphront/mapper/AphrontURIMapper.php b/src/aphront/AphrontURIMapper.php
similarity index 100%
rename from src/aphront/mapper/AphrontURIMapper.php
rename to src/aphront/AphrontURIMapper.php
diff --git a/src/aphront/writeguard/AphrontWriteGuard.php b/src/aphront/AphrontWriteGuard.php
similarity index 100%
rename from src/aphront/writeguard/AphrontWriteGuard.php
rename to src/aphront/AphrontWriteGuard.php
diff --git a/src/aphront/request/__tests__/AphrontRequestTestCase.php b/src/aphront/__tests__/AphrontRequestTestCase.php
similarity index 100%
rename from src/aphront/request/__tests__/AphrontRequestTestCase.php
rename to src/aphront/__tests__/AphrontRequestTestCase.php
diff --git a/src/aphront/console/controller/DarkConsoleController.php b/src/aphront/console/DarkConsoleController.php
similarity index 100%
rename from src/aphront/console/controller/DarkConsoleController.php
rename to src/aphront/console/DarkConsoleController.php
diff --git a/src/aphront/console/core/DarkConsoleCore.php b/src/aphront/console/DarkConsoleCore.php
similarity index 100%
rename from src/aphront/console/core/DarkConsoleCore.php
rename to src/aphront/console/DarkConsoleCore.php
diff --git a/src/aphront/console/plugin/config/DarkConsoleConfigPlugin.php b/src/aphront/console/plugin/DarkConsoleConfigPlugin.php
similarity index 100%
rename from src/aphront/console/plugin/config/DarkConsoleConfigPlugin.php
rename to src/aphront/console/plugin/DarkConsoleConfigPlugin.php
diff --git a/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPlugin.php b/src/aphront/console/plugin/DarkConsoleErrorLogPlugin.php
similarity index 100%
rename from src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPlugin.php
rename to src/aphront/console/plugin/DarkConsoleErrorLogPlugin.php
diff --git a/src/aphront/console/plugin/event/DarkConsoleEventPlugin.php b/src/aphront/console/plugin/DarkConsoleEventPlugin.php
similarity index 100%
rename from src/aphront/console/plugin/event/DarkConsoleEventPlugin.php
rename to src/aphront/console/plugin/DarkConsoleEventPlugin.php
diff --git a/src/aphront/console/plugin/base/DarkConsolePlugin.php b/src/aphront/console/plugin/DarkConsolePlugin.php
similarity index 100%
rename from src/aphront/console/plugin/base/DarkConsolePlugin.php
rename to src/aphront/console/plugin/DarkConsolePlugin.php
diff --git a/src/aphront/console/plugin/request/DarkConsoleRequestPlugin.php b/src/aphront/console/plugin/DarkConsoleRequestPlugin.php
similarity index 100%
rename from src/aphront/console/plugin/request/DarkConsoleRequestPlugin.php
rename to src/aphront/console/plugin/DarkConsoleRequestPlugin.php
diff --git a/src/aphront/console/plugin/services/DarkConsoleServicesPlugin.php b/src/aphront/console/plugin/DarkConsoleServicesPlugin.php
similarity index 100%
rename from src/aphront/console/plugin/services/DarkConsoleServicesPlugin.php
rename to src/aphront/console/plugin/DarkConsoleServicesPlugin.php
diff --git a/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPlugin.php b/src/aphront/console/plugin/DarkConsoleXHProfPlugin.php
similarity index 100%
rename from src/aphront/console/plugin/xhprof/DarkConsoleXHProfPlugin.php
rename to src/aphront/console/plugin/DarkConsoleXHProfPlugin.php
diff --git a/src/aphront/console/plugin/errorlog/api/DarkConsoleErrorLogPluginAPI.php b/src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPluginAPI.php
similarity index 100%
rename from src/aphront/console/plugin/errorlog/api/DarkConsoleErrorLogPluginAPI.php
rename to src/aphront/console/plugin/errorlog/DarkConsoleErrorLogPluginAPI.php
diff --git a/src/aphront/console/plugin/event/api/DarkConsoleEventPluginAPI.php b/src/aphront/console/plugin/event/DarkConsoleEventPluginAPI.php
similarity index 100%
rename from src/aphront/console/plugin/event/api/DarkConsoleEventPluginAPI.php
rename to src/aphront/console/plugin/event/DarkConsoleEventPluginAPI.php
diff --git a/src/aphront/console/plugin/xhprof/api/DarkConsoleXHProfPluginAPI.php b/src/aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php
similarity index 100%
rename from src/aphront/console/plugin/xhprof/api/DarkConsoleXHProfPluginAPI.php
rename to src/aphront/console/plugin/xhprof/DarkConsoleXHProfPluginAPI.php
diff --git a/src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/default/AphrontDefaultApplicationConfiguration.php
similarity index 100%
rename from src/aphront/default/configuration/AphrontDefaultApplicationConfiguration.php
rename to src/aphront/default/AphrontDefaultApplicationConfiguration.php
diff --git a/src/aphront/exception/csrf/AphrontCSRFException.php b/src/aphront/exception/AphrontCSRFException.php
similarity index 100%
rename from src/aphront/exception/csrf/AphrontCSRFException.php
rename to src/aphront/exception/AphrontCSRFException.php
diff --git a/src/aphront/exception/base/AphrontException.php b/src/aphront/exception/AphrontException.php
similarity index 100%
rename from src/aphront/exception/base/AphrontException.php
rename to src/aphront/exception/AphrontException.php
diff --git a/src/aphront/exception/redirect/AphrontRedirectException.php b/src/aphront/exception/AphrontRedirectException.php
similarity index 100%
rename from src/aphront/exception/redirect/AphrontRedirectException.php
rename to src/aphront/exception/AphrontRedirectException.php
diff --git a/src/aphront/exception/usage/AphrontUsageException.php b/src/aphront/exception/AphrontUsageException.php
similarity index 100%
rename from src/aphront/exception/usage/AphrontUsageException.php
rename to src/aphront/exception/AphrontUsageException.php
diff --git a/src/aphront/response/304/Aphront304Response.php b/src/aphront/response/Aphront304Response.php
similarity index 100%
rename from src/aphront/response/304/Aphront304Response.php
rename to src/aphront/response/Aphront304Response.php
diff --git a/src/aphront/response/400/Aphront400Response.php b/src/aphront/response/Aphront400Response.php
similarity index 100%
rename from src/aphront/response/400/Aphront400Response.php
rename to src/aphront/response/Aphront400Response.php
diff --git a/src/aphront/response/403/Aphront403Response.php b/src/aphront/response/Aphront403Response.php
similarity index 100%
rename from src/aphront/response/403/Aphront403Response.php
rename to src/aphront/response/Aphront403Response.php
diff --git a/src/aphront/response/404/Aphront404Response.php b/src/aphront/response/Aphront404Response.php
similarity index 100%
rename from src/aphront/response/404/Aphront404Response.php
rename to src/aphront/response/Aphront404Response.php
diff --git a/src/aphront/response/ajax/AphrontAjaxResponse.php b/src/aphront/response/AphrontAjaxResponse.php
similarity index 100%
rename from src/aphront/response/ajax/AphrontAjaxResponse.php
rename to src/aphront/response/AphrontAjaxResponse.php
diff --git a/src/aphront/response/dialog/AphrontDialogResponse.php b/src/aphront/response/AphrontDialogResponse.php
similarity index 100%
rename from src/aphront/response/dialog/AphrontDialogResponse.php
rename to src/aphront/response/AphrontDialogResponse.php
diff --git a/src/aphront/response/file/AphrontFileResponse.php b/src/aphront/response/AphrontFileResponse.php
similarity index 100%
rename from src/aphront/response/file/AphrontFileResponse.php
rename to src/aphront/response/AphrontFileResponse.php
diff --git a/src/aphront/response/json/AphrontJSONResponse.php b/src/aphront/response/AphrontJSONResponse.php
similarity index 100%
rename from src/aphront/response/json/AphrontJSONResponse.php
rename to src/aphront/response/AphrontJSONResponse.php
diff --git a/src/aphront/response/plaintext/AphrontPlainTextResponse.php b/src/aphront/response/AphrontPlainTextResponse.php
similarity index 100%
rename from src/aphront/response/plaintext/AphrontPlainTextResponse.php
rename to src/aphront/response/AphrontPlainTextResponse.php
diff --git a/src/aphront/response/proxy/AphrontProxyResponse.php b/src/aphront/response/AphrontProxyResponse.php
similarity index 100%
rename from src/aphront/response/proxy/AphrontProxyResponse.php
rename to src/aphront/response/AphrontProxyResponse.php
diff --git a/src/aphront/response/redirect/AphrontRedirectResponse.php b/src/aphront/response/AphrontRedirectResponse.php
similarity index 100%
rename from src/aphront/response/redirect/AphrontRedirectResponse.php
rename to src/aphront/response/AphrontRedirectResponse.php
diff --git a/src/aphront/response/reload/AphrontReloadResponse.php b/src/aphront/response/AphrontReloadResponse.php
similarity index 100%
rename from src/aphront/response/reload/AphrontReloadResponse.php
rename to src/aphront/response/AphrontReloadResponse.php
diff --git a/src/aphront/response/base/AphrontResponse.php b/src/aphront/response/AphrontResponse.php
similarity index 100%
rename from src/aphront/response/base/AphrontResponse.php
rename to src/aphront/response/AphrontResponse.php
diff --git a/src/aphront/response/webpage/AphrontWebpageResponse.php b/src/aphront/response/AphrontWebpageResponse.php
similarity index 100%
rename from src/aphront/response/webpage/AphrontWebpageResponse.php
rename to src/aphront/response/AphrontWebpageResponse.php
diff --git a/src/aphront/sink/base/AphrontHTTPSink.php b/src/aphront/sink/AphrontHTTPSink.php
similarity index 100%
rename from src/aphront/sink/base/AphrontHTTPSink.php
rename to src/aphront/sink/AphrontHTTPSink.php
diff --git a/src/aphront/sink/test/AphrontIsolatedHTTPSink.php b/src/aphront/sink/AphrontIsolatedHTTPSink.php
similarity index 100%
rename from src/aphront/sink/test/AphrontIsolatedHTTPSink.php
rename to src/aphront/sink/AphrontIsolatedHTTPSink.php
diff --git a/src/aphront/sink/php/AphrontPHPHTTPSink.php b/src/aphront/sink/AphrontPHPHTTPSink.php
similarity index 100%
rename from src/aphront/sink/php/AphrontPHPHTTPSink.php
rename to src/aphront/sink/AphrontPHPHTTPSink.php
diff --git a/src/aphront/sink/base/__tests__/AphrontHTTPSinkTestCase.php b/src/aphront/sink/__tests__/AphrontHTTPSinkTestCase.php
similarity index 100%
rename from src/aphront/sink/base/__tests__/AphrontHTTPSinkTestCase.php
rename to src/aphront/sink/__tests__/AphrontHTTPSinkTestCase.php
diff --git a/src/aphront/writeguard/scopeguard/AphrontScopedUnguardedWriteCapability.php b/src/aphront/writeguard/AphrontScopedUnguardedWriteCapability.php
similarity index 100%
rename from src/aphront/writeguard/scopeguard/AphrontScopedUnguardedWriteCapability.php
rename to src/aphront/writeguard/AphrontScopedUnguardedWriteCapability.php
diff --git a/src/applications/policy/__tests__/PhabricatorPolicyTestCase.php b/src/applications/__tests__/PhabricatorPolicyTestCase.php
similarity index 100%
rename from src/applications/policy/__tests__/PhabricatorPolicyTestCase.php
rename to src/applications/__tests__/PhabricatorPolicyTestCase.php
diff --git a/src/applications/policy/__tests__/PhabricatorPolicyTestObject.php b/src/applications/__tests__/PhabricatorPolicyTestObject.php
similarity index 100%
rename from src/applications/policy/__tests__/PhabricatorPolicyTestObject.php
rename to src/applications/__tests__/PhabricatorPolicyTestObject.php
diff --git a/src/applications/policy/__tests__/PhabricatorPolicyTestQuery.php b/src/applications/__tests__/PhabricatorPolicyTestQuery.php
similarity index 100%
rename from src/applications/policy/__tests__/PhabricatorPolicyTestQuery.php
rename to src/applications/__tests__/PhabricatorPolicyTestQuery.php
diff --git a/src/applications/audit/replyhandler/PhabricatorAuditReplyHandler.php b/src/applications/audit/PhabricatorAuditReplyHandler.php
similarity index 100%
rename from src/applications/audit/replyhandler/PhabricatorAuditReplyHandler.php
rename to src/applications/audit/PhabricatorAuditReplyHandler.php
diff --git a/src/applications/audit/constants/action/PhabricatorAuditActionConstants.php b/src/applications/audit/constants/PhabricatorAuditActionConstants.php
similarity index 100%
rename from src/applications/audit/constants/action/PhabricatorAuditActionConstants.php
rename to src/applications/audit/constants/PhabricatorAuditActionConstants.php
diff --git a/src/applications/audit/constants/commitstatus/PhabricatorAuditCommitStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
similarity index 100%
rename from src/applications/audit/constants/commitstatus/PhabricatorAuditCommitStatusConstants.php
rename to src/applications/audit/constants/PhabricatorAuditCommitStatusConstants.php
diff --git a/src/applications/audit/constants/status/PhabricatorAuditStatusConstants.php b/src/applications/audit/constants/PhabricatorAuditStatusConstants.php
similarity index 100%
rename from src/applications/audit/constants/status/PhabricatorAuditStatusConstants.php
rename to src/applications/audit/constants/PhabricatorAuditStatusConstants.php
diff --git a/src/applications/audit/controller/addcomment/PhabricatorAuditAddCommentController.php b/src/applications/audit/controller/PhabricatorAuditAddCommentController.php
similarity index 100%
rename from src/applications/audit/controller/addcomment/PhabricatorAuditAddCommentController.php
rename to src/applications/audit/controller/PhabricatorAuditAddCommentController.php
diff --git a/src/applications/audit/controller/base/PhabricatorAuditController.php b/src/applications/audit/controller/PhabricatorAuditController.php
similarity index 100%
rename from src/applications/audit/controller/base/PhabricatorAuditController.php
rename to src/applications/audit/controller/PhabricatorAuditController.php
diff --git a/src/applications/audit/controller/list/PhabricatorAuditListController.php b/src/applications/audit/controller/PhabricatorAuditListController.php
similarity index 100%
rename from src/applications/audit/controller/list/PhabricatorAuditListController.php
rename to src/applications/audit/controller/PhabricatorAuditListController.php
diff --git a/src/applications/audit/controller/preview/PhabricatorAuditPreviewController.php b/src/applications/audit/controller/PhabricatorAuditPreviewController.php
similarity index 100%
rename from src/applications/audit/controller/preview/PhabricatorAuditPreviewController.php
rename to src/applications/audit/controller/PhabricatorAuditPreviewController.php
diff --git a/src/applications/audit/editor/comment/PhabricatorAuditCommentEditor.php b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
similarity index 100%
rename from src/applications/audit/editor/comment/PhabricatorAuditCommentEditor.php
rename to src/applications/audit/editor/PhabricatorAuditCommentEditor.php
diff --git a/src/applications/audit/query/commit/PhabricatorAuditCommitQuery.php b/src/applications/audit/query/PhabricatorAuditCommitQuery.php
similarity index 100%
rename from src/applications/audit/query/commit/PhabricatorAuditCommitQuery.php
rename to src/applications/audit/query/PhabricatorAuditCommitQuery.php
diff --git a/src/applications/audit/query/audit/PhabricatorAuditQuery.php b/src/applications/audit/query/PhabricatorAuditQuery.php
similarity index 100%
rename from src/applications/audit/query/audit/PhabricatorAuditQuery.php
rename to src/applications/audit/query/PhabricatorAuditQuery.php
diff --git a/src/applications/audit/storage/auditcomment/PhabricatorAuditComment.php b/src/applications/audit/storage/PhabricatorAuditComment.php
similarity index 100%
rename from src/applications/audit/storage/auditcomment/PhabricatorAuditComment.php
rename to src/applications/audit/storage/PhabricatorAuditComment.php
diff --git a/src/applications/audit/storage/base/PhabricatorAuditDAO.php b/src/applications/audit/storage/PhabricatorAuditDAO.php
similarity index 100%
rename from src/applications/audit/storage/base/PhabricatorAuditDAO.php
rename to src/applications/audit/storage/PhabricatorAuditDAO.php
diff --git a/src/applications/audit/storage/inlinecommment/PhabricatorAuditInlineComment.php b/src/applications/audit/storage/PhabricatorAuditInlineComment.php
similarity index 100%
rename from src/applications/audit/storage/inlinecommment/PhabricatorAuditInlineComment.php
rename to src/applications/audit/storage/PhabricatorAuditInlineComment.php
diff --git a/src/applications/audit/view/commitlist/PhabricatorAuditCommitListView.php b/src/applications/audit/view/PhabricatorAuditCommitListView.php
similarity index 100%
rename from src/applications/audit/view/commitlist/PhabricatorAuditCommitListView.php
rename to src/applications/audit/view/PhabricatorAuditCommitListView.php
diff --git a/src/applications/audit/view/list/PhabricatorAuditListView.php b/src/applications/audit/view/PhabricatorAuditListView.php
similarity index 100%
rename from src/applications/audit/view/list/PhabricatorAuditListView.php
rename to src/applications/audit/view/PhabricatorAuditListView.php
diff --git a/src/applications/auth/controller/base/PhabricatorAuthController.php b/src/applications/auth/controller/PhabricatorAuthController.php
similarity index 100%
rename from src/applications/auth/controller/base/PhabricatorAuthController.php
rename to src/applications/auth/controller/PhabricatorAuthController.php
diff --git a/src/applications/auth/controller/disabled/PhabricatorDisabledUserController.php b/src/applications/auth/controller/PhabricatorDisabledUserController.php
similarity index 100%
rename from src/applications/auth/controller/disabled/PhabricatorDisabledUserController.php
rename to src/applications/auth/controller/PhabricatorDisabledUserController.php
diff --git a/src/applications/auth/controller/email/PhabricatorEmailLoginController.php b/src/applications/auth/controller/PhabricatorEmailLoginController.php
similarity index 100%
rename from src/applications/auth/controller/email/PhabricatorEmailLoginController.php
rename to src/applications/auth/controller/PhabricatorEmailLoginController.php
diff --git a/src/applications/auth/controller/emailtoken/PhabricatorEmailTokenController.php b/src/applications/auth/controller/PhabricatorEmailTokenController.php
similarity index 100%
rename from src/applications/auth/controller/emailtoken/PhabricatorEmailTokenController.php
rename to src/applications/auth/controller/PhabricatorEmailTokenController.php
diff --git a/src/applications/auth/controller/login/PhabricatorLoginController.php b/src/applications/auth/controller/PhabricatorLoginController.php
similarity index 100%
rename from src/applications/auth/controller/login/PhabricatorLoginController.php
rename to src/applications/auth/controller/PhabricatorLoginController.php
diff --git a/src/applications/auth/controller/validate/PhabricatorLoginValidateController.php b/src/applications/auth/controller/PhabricatorLoginValidateController.php
similarity index 100%
rename from src/applications/auth/controller/validate/PhabricatorLoginValidateController.php
rename to src/applications/auth/controller/PhabricatorLoginValidateController.php
diff --git a/src/applications/auth/controller/logout/PhabricatorLogoutController.php b/src/applications/auth/controller/PhabricatorLogoutController.php
similarity index 100%
rename from src/applications/auth/controller/logout/PhabricatorLogoutController.php
rename to src/applications/auth/controller/PhabricatorLogoutController.php
diff --git a/src/applications/auth/controller/mustverify/PhabricatorMustVerifyEmailController.php b/src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
similarity index 100%
rename from src/applications/auth/controller/mustverify/PhabricatorMustVerifyEmailController.php
rename to src/applications/auth/controller/PhabricatorMustVerifyEmailController.php
diff --git a/src/applications/auth/controller/oauthdiagnostics/PhabricatorOAuthDiagnosticsController.php b/src/applications/auth/controller/PhabricatorOAuthDiagnosticsController.php
similarity index 100%
rename from src/applications/auth/controller/oauthdiagnostics/PhabricatorOAuthDiagnosticsController.php
rename to src/applications/auth/controller/PhabricatorOAuthDiagnosticsController.php
diff --git a/src/applications/auth/controller/oauth/PhabricatorOAuthLoginController.php b/src/applications/auth/controller/PhabricatorOAuthLoginController.php
similarity index 100%
rename from src/applications/auth/controller/oauth/PhabricatorOAuthLoginController.php
rename to src/applications/auth/controller/PhabricatorOAuthLoginController.php
diff --git a/src/applications/auth/controller/unlink/PhabricatorOAuthUnlinkController.php b/src/applications/auth/controller/PhabricatorOAuthUnlinkController.php
similarity index 100%
rename from src/applications/auth/controller/unlink/PhabricatorOAuthUnlinkController.php
rename to src/applications/auth/controller/PhabricatorOAuthUnlinkController.php
diff --git a/src/applications/auth/controller/refresh/PhabricatorRefreshCSRFController.php b/src/applications/auth/controller/PhabricatorRefreshCSRFController.php
similarity index 100%
rename from src/applications/auth/controller/refresh/PhabricatorRefreshCSRFController.php
rename to src/applications/auth/controller/PhabricatorRefreshCSRFController.php
diff --git a/src/applications/auth/controller/oauthregistration/default/PhabricatorOAuthDefaultRegistrationController.php b/src/applications/auth/controller/oauthregistration/PhabricatorOAuthDefaultRegistrationController.php
similarity index 100%
rename from src/applications/auth/controller/oauthregistration/default/PhabricatorOAuthDefaultRegistrationController.php
rename to src/applications/auth/controller/oauthregistration/PhabricatorOAuthDefaultRegistrationController.php
diff --git a/src/applications/auth/controller/oauthregistration/base/PhabricatorOAuthRegistrationController.php b/src/applications/auth/controller/oauthregistration/PhabricatorOAuthRegistrationController.php
similarity index 100%
rename from src/applications/auth/controller/oauthregistration/base/PhabricatorOAuthRegistrationController.php
rename to src/applications/auth/controller/oauthregistration/PhabricatorOAuthRegistrationController.php
diff --git a/src/applications/auth/oauth/provider/base/PhabricatorOAuthProvider.php b/src/applications/auth/oauth/provider/PhabricatorOAuthProvider.php
similarity index 100%
rename from src/applications/auth/oauth/provider/base/PhabricatorOAuthProvider.php
rename to src/applications/auth/oauth/provider/PhabricatorOAuthProvider.php
diff --git a/src/applications/auth/oauth/provider/disqus/PhabricatorOAuthProviderDisqus.php b/src/applications/auth/oauth/provider/PhabricatorOAuthProviderDisqus.php
similarity index 100%
rename from src/applications/auth/oauth/provider/disqus/PhabricatorOAuthProviderDisqus.php
rename to src/applications/auth/oauth/provider/PhabricatorOAuthProviderDisqus.php
diff --git a/src/applications/auth/oauth/provider/exception/PhabricatorOAuthProviderException.php b/src/applications/auth/oauth/provider/PhabricatorOAuthProviderException.php
similarity index 100%
rename from src/applications/auth/oauth/provider/exception/PhabricatorOAuthProviderException.php
rename to src/applications/auth/oauth/provider/PhabricatorOAuthProviderException.php
diff --git a/src/applications/auth/oauth/provider/facebook/PhabricatorOAuthProviderFacebook.php b/src/applications/auth/oauth/provider/PhabricatorOAuthProviderFacebook.php
similarity index 100%
rename from src/applications/auth/oauth/provider/facebook/PhabricatorOAuthProviderFacebook.php
rename to src/applications/auth/oauth/provider/PhabricatorOAuthProviderFacebook.php
diff --git a/src/applications/auth/oauth/provider/github/PhabricatorOAuthProviderGitHub.php b/src/applications/auth/oauth/provider/PhabricatorOAuthProviderGitHub.php
similarity index 100%
rename from src/applications/auth/oauth/provider/github/PhabricatorOAuthProviderGitHub.php
rename to src/applications/auth/oauth/provider/PhabricatorOAuthProviderGitHub.php
diff --git a/src/applications/auth/oauth/provider/google/PhabricatorOAuthProviderGoogle.php b/src/applications/auth/oauth/provider/PhabricatorOAuthProviderGoogle.php
similarity index 100%
rename from src/applications/auth/oauth/provider/google/PhabricatorOAuthProviderGoogle.php
rename to src/applications/auth/oauth/provider/PhabricatorOAuthProviderGoogle.php
diff --git a/src/applications/auth/oauth/provider/phabricator/PhabricatorOAuthProviderPhabricator.php b/src/applications/auth/oauth/provider/PhabricatorOAuthProviderPhabricator.php
similarity index 100%
rename from src/applications/auth/oauth/provider/phabricator/PhabricatorOAuthProviderPhabricator.php
rename to src/applications/auth/oauth/provider/PhabricatorOAuthProviderPhabricator.php
diff --git a/src/applications/auth/view/oauthfailure/PhabricatorOAuthFailureView.php b/src/applications/auth/view/PhabricatorOAuthFailureView.php
similarity index 100%
rename from src/applications/auth/view/oauthfailure/PhabricatorOAuthFailureView.php
rename to src/applications/auth/view/PhabricatorOAuthFailureView.php
diff --git a/src/applications/base/controller/404/Phabricator404Controller.php b/src/applications/base/controller/Phabricator404Controller.php
similarity index 100%
rename from src/applications/base/controller/404/Phabricator404Controller.php
rename to src/applications/base/controller/Phabricator404Controller.php
diff --git a/src/applications/base/controller/base/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
similarity index 100%
rename from src/applications/base/controller/base/PhabricatorController.php
rename to src/applications/base/controller/PhabricatorController.php
diff --git a/src/applications/base/controller/redirect/PhabricatorRedirectController.php b/src/applications/base/controller/PhabricatorRedirectController.php
similarity index 100%
rename from src/applications/base/controller/redirect/PhabricatorRedirectController.php
rename to src/applications/base/controller/PhabricatorRedirectController.php
diff --git a/src/applications/base/storage/lisk/PhabricatorLiskDAO.php b/src/applications/base/storage/PhabricatorLiskDAO.php
similarity index 100%
rename from src/applications/base/storage/lisk/PhabricatorLiskDAO.php
rename to src/applications/base/storage/PhabricatorLiskDAO.php
diff --git a/src/applications/base/storage/configuration/base/DatabaseConfigurationProvider.php b/src/applications/base/storage/configuration/DatabaseConfigurationProvider.php
similarity index 100%
rename from src/applications/base/storage/configuration/base/DatabaseConfigurationProvider.php
rename to src/applications/base/storage/configuration/DatabaseConfigurationProvider.php
diff --git a/src/applications/base/storage/configuration/default/DefaultDatabaseConfigurationProvider.php b/src/applications/base/storage/configuration/DefaultDatabaseConfigurationProvider.php
similarity index 100%
rename from src/applications/base/storage/configuration/default/DefaultDatabaseConfigurationProvider.php
rename to src/applications/base/storage/configuration/DefaultDatabaseConfigurationProvider.php
diff --git a/src/applications/calendar/controller/browse/PhabricatorCalendarBrowseController.php b/src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
similarity index 100%
rename from src/applications/calendar/controller/browse/PhabricatorCalendarBrowseController.php
rename to src/applications/calendar/controller/PhabricatorCalendarBrowseController.php
diff --git a/src/applications/calendar/controller/base/PhabricatorCalendarController.php b/src/applications/calendar/controller/PhabricatorCalendarController.php
similarity index 100%
rename from src/applications/calendar/controller/base/PhabricatorCalendarController.php
rename to src/applications/calendar/controller/PhabricatorCalendarController.php
diff --git a/src/applications/calendar/storage/base/PhabricatorCalendarDAO.php b/src/applications/calendar/storage/PhabricatorCalendarDAO.php
similarity index 100%
rename from src/applications/calendar/storage/base/PhabricatorCalendarDAO.php
rename to src/applications/calendar/storage/PhabricatorCalendarDAO.php
diff --git a/src/applications/calendar/storage/holiday/PhabricatorCalendarHoliday.php b/src/applications/calendar/storage/PhabricatorCalendarHoliday.php
similarity index 100%
rename from src/applications/calendar/storage/holiday/PhabricatorCalendarHoliday.php
rename to src/applications/calendar/storage/PhabricatorCalendarHoliday.php
diff --git a/src/applications/calendar/storage/holiday/__tests__/PhabricatorCalendarHolidayTestCase.php b/src/applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php
similarity index 100%
rename from src/applications/calendar/storage/holiday/__tests__/PhabricatorCalendarHolidayTestCase.php
rename to src/applications/calendar/storage/__tests__/PhabricatorCalendarHolidayTestCase.php
diff --git a/src/applications/calendar/view/event/AphrontCalendarEventView.php b/src/applications/calendar/view/AphrontCalendarEventView.php
similarity index 100%
rename from src/applications/calendar/view/event/AphrontCalendarEventView.php
rename to src/applications/calendar/view/AphrontCalendarEventView.php
diff --git a/src/applications/calendar/view/month/AphrontCalendarMonthView.php b/src/applications/calendar/view/AphrontCalendarMonthView.php
similarity index 100%
rename from src/applications/calendar/view/month/AphrontCalendarMonthView.php
rename to src/applications/calendar/view/AphrontCalendarMonthView.php
diff --git a/src/applications/chatlog/query/PhabricatorChatLogQuery.php b/src/applications/chatlog/PhabricatorChatLogQuery.php
similarity index 100%
rename from src/applications/chatlog/query/PhabricatorChatLogQuery.php
rename to src/applications/chatlog/PhabricatorChatLogQuery.php
diff --git a/src/applications/chatlog/constants/base/PhabricatorChatLogConstants.php b/src/applications/chatlog/constants/PhabricatorChatLogConstants.php
similarity index 100%
rename from src/applications/chatlog/constants/base/PhabricatorChatLogConstants.php
rename to src/applications/chatlog/constants/PhabricatorChatLogConstants.php
diff --git a/src/applications/chatlog/constants/eventtype/PhabricatorChatLogEventType.php b/src/applications/chatlog/constants/PhabricatorChatLogEventType.php
similarity index 100%
rename from src/applications/chatlog/constants/eventtype/PhabricatorChatLogEventType.php
rename to src/applications/chatlog/constants/PhabricatorChatLogEventType.php
diff --git a/src/applications/chatlog/controller/channellist/PhabricatorChatLogChannelListController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php
similarity index 100%
rename from src/applications/chatlog/controller/channellist/PhabricatorChatLogChannelListController.php
rename to src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php
diff --git a/src/applications/chatlog/controller/channellog/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
similarity index 100%
rename from src/applications/chatlog/controller/channellog/PhabricatorChatLogChannelLogController.php
rename to src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
diff --git a/src/applications/chatlog/controller/base/PhabricatorChatLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogController.php
similarity index 100%
rename from src/applications/chatlog/controller/base/PhabricatorChatLogController.php
rename to src/applications/chatlog/controller/PhabricatorChatLogController.php
diff --git a/src/applications/chatlog/storage/base/PhabricatorChatLogDAO.php b/src/applications/chatlog/storage/PhabricatorChatLogDAO.php
similarity index 100%
rename from src/applications/chatlog/storage/base/PhabricatorChatLogDAO.php
rename to src/applications/chatlog/storage/PhabricatorChatLogDAO.php
diff --git a/src/applications/chatlog/storage/event/PhabricatorChatLogEvent.php b/src/applications/chatlog/storage/PhabricatorChatLogEvent.php
similarity index 100%
rename from src/applications/chatlog/storage/event/PhabricatorChatLogEvent.php
rename to src/applications/chatlog/storage/PhabricatorChatLogEvent.php
diff --git a/src/applications/conduit/controller/api/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/PhabricatorConduitAPIController.php
similarity index 100%
rename from src/applications/conduit/controller/api/PhabricatorConduitAPIController.php
rename to src/applications/conduit/controller/PhabricatorConduitAPIController.php
diff --git a/src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php
similarity index 100%
rename from src/applications/conduit/controller/console/PhabricatorConduitConsoleController.php
rename to src/applications/conduit/controller/PhabricatorConduitConsoleController.php
diff --git a/src/applications/conduit/controller/base/PhabricatorConduitController.php b/src/applications/conduit/controller/PhabricatorConduitController.php
similarity index 100%
rename from src/applications/conduit/controller/base/PhabricatorConduitController.php
rename to src/applications/conduit/controller/PhabricatorConduitController.php
diff --git a/src/applications/conduit/controller/list/PhabricatorConduitListController.php b/src/applications/conduit/controller/PhabricatorConduitListController.php
similarity index 100%
rename from src/applications/conduit/controller/list/PhabricatorConduitListController.php
rename to src/applications/conduit/controller/PhabricatorConduitListController.php
diff --git a/src/applications/conduit/controller/log/PhabricatorConduitLogController.php b/src/applications/conduit/controller/PhabricatorConduitLogController.php
similarity index 100%
rename from src/applications/conduit/controller/log/PhabricatorConduitLogController.php
rename to src/applications/conduit/controller/PhabricatorConduitLogController.php
diff --git a/src/applications/conduit/controller/token/PhabricatorConduitTokenController.php b/src/applications/conduit/controller/PhabricatorConduitTokenController.php
similarity index 100%
rename from src/applications/conduit/controller/token/PhabricatorConduitTokenController.php
rename to src/applications/conduit/controller/PhabricatorConduitTokenController.php
diff --git a/src/applications/conduit/method/base/ConduitAPIMethod.php b/src/applications/conduit/method/ConduitAPIMethod.php
similarity index 100%
rename from src/applications/conduit/method/base/ConduitAPIMethod.php
rename to src/applications/conduit/method/ConduitAPIMethod.php
diff --git a/src/applications/conduit/method/arcanist/base/ConduitAPI_arcanist_Method.php b/src/applications/conduit/method/arcanist/ConduitAPI_arcanist_Method.php
similarity index 100%
rename from src/applications/conduit/method/arcanist/base/ConduitAPI_arcanist_Method.php
rename to src/applications/conduit/method/arcanist/ConduitAPI_arcanist_Method.php
diff --git a/src/applications/conduit/method/arcanist/projectinfo/ConduitAPI_arcanist_projectinfo_Method.php b/src/applications/conduit/method/arcanist/ConduitAPI_arcanist_projectinfo_Method.php
similarity index 100%
rename from src/applications/conduit/method/arcanist/projectinfo/ConduitAPI_arcanist_projectinfo_Method.php
rename to src/applications/conduit/method/arcanist/ConduitAPI_arcanist_projectinfo_Method.php
diff --git a/src/applications/conduit/method/audit/base/ConduitAPI_audit_Method.php b/src/applications/conduit/method/audit/ConduitAPI_audit_Method.php
similarity index 100%
rename from src/applications/conduit/method/audit/base/ConduitAPI_audit_Method.php
rename to src/applications/conduit/method/audit/ConduitAPI_audit_Method.php
diff --git a/src/applications/conduit/method/audit/query/ConduitAPI_audit_query_Method.php b/src/applications/conduit/method/audit/ConduitAPI_audit_query_Method.php
similarity index 100%
rename from src/applications/conduit/method/audit/query/ConduitAPI_audit_query_Method.php
rename to src/applications/conduit/method/audit/ConduitAPI_audit_query_Method.php
diff --git a/src/applications/conduit/method/chatlog/base/ConduitAPI_chatlog_Method.php b/src/applications/conduit/method/chatlog/ConduitAPI_chatlog_Method.php
similarity index 100%
rename from src/applications/conduit/method/chatlog/base/ConduitAPI_chatlog_Method.php
rename to src/applications/conduit/method/chatlog/ConduitAPI_chatlog_Method.php
diff --git a/src/applications/conduit/method/chatlog/query/ConduitAPI_chatlog_query_Method.php b/src/applications/conduit/method/chatlog/ConduitAPI_chatlog_query_Method.php
similarity index 100%
rename from src/applications/conduit/method/chatlog/query/ConduitAPI_chatlog_query_Method.php
rename to src/applications/conduit/method/chatlog/ConduitAPI_chatlog_query_Method.php
diff --git a/src/applications/conduit/method/chatlog/record/ConduitAPI_chatlog_record_Method.php b/src/applications/conduit/method/chatlog/ConduitAPI_chatlog_record_Method.php
similarity index 100%
rename from src/applications/conduit/method/chatlog/record/ConduitAPI_chatlog_record_Method.php
rename to src/applications/conduit/method/chatlog/ConduitAPI_chatlog_record_Method.php
diff --git a/src/applications/conduit/method/conduit/connect/ConduitAPI_conduit_connect_Method.php b/src/applications/conduit/method/conduit/ConduitAPI_conduit_connect_Method.php
similarity index 100%
rename from src/applications/conduit/method/conduit/connect/ConduitAPI_conduit_connect_Method.php
rename to src/applications/conduit/method/conduit/ConduitAPI_conduit_connect_Method.php
diff --git a/src/applications/conduit/method/conduit/getcertificate/ConduitAPI_conduit_getcertificate_Method.php b/src/applications/conduit/method/conduit/ConduitAPI_conduit_getcertificate_Method.php
similarity index 100%
rename from src/applications/conduit/method/conduit/getcertificate/ConduitAPI_conduit_getcertificate_Method.php
rename to src/applications/conduit/method/conduit/ConduitAPI_conduit_getcertificate_Method.php
diff --git a/src/applications/conduit/method/conduit/ping/ConduitAPI_conduit_ping_Method.php b/src/applications/conduit/method/conduit/ConduitAPI_conduit_ping_Method.php
similarity index 100%
rename from src/applications/conduit/method/conduit/ping/ConduitAPI_conduit_ping_Method.php
rename to src/applications/conduit/method/conduit/ConduitAPI_conduit_ping_Method.php
diff --git a/src/applications/conduit/method/daemon/launched/ConduitAPI_daemon_launched_Method.php b/src/applications/conduit/method/daemon/ConduitAPI_daemon_launched_Method.php
similarity index 100%
rename from src/applications/conduit/method/daemon/launched/ConduitAPI_daemon_launched_Method.php
rename to src/applications/conduit/method/daemon/ConduitAPI_daemon_launched_Method.php
diff --git a/src/applications/conduit/method/daemon/log/ConduitAPI_daemon_log_Method.php b/src/applications/conduit/method/daemon/ConduitAPI_daemon_log_Method.php
similarity index 100%
rename from src/applications/conduit/method/daemon/log/ConduitAPI_daemon_log_Method.php
rename to src/applications/conduit/method/daemon/ConduitAPI_daemon_log_Method.php
diff --git a/src/applications/conduit/method/differential/close/ConduitAPI_differential_close_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_close_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/close/ConduitAPI_differential_close_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_close_Method.php
diff --git a/src/applications/conduit/method/differential/createcomment/ConduitAPI_differential_createcomment_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_createcomment_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/createcomment/ConduitAPI_differential_createcomment_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_createcomment_Method.php
diff --git a/src/applications/conduit/method/differential/creatediff/ConduitAPI_differential_creatediff_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_creatediff_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/creatediff/ConduitAPI_differential_creatediff_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_creatediff_Method.php
diff --git a/src/applications/conduit/method/differential/createrevision/ConduitAPI_differential_createrevision_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_createrevision_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/createrevision/ConduitAPI_differential_createrevision_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_createrevision_Method.php
diff --git a/src/applications/conduit/method/differential/find/ConduitAPI_differential_find_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_find_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/find/ConduitAPI_differential_find_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_find_Method.php
diff --git a/src/applications/conduit/method/differential/getalldiffs/ConduitAPI_differential_getalldiffs_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_getalldiffs_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/getalldiffs/ConduitAPI_differential_getalldiffs_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_getalldiffs_Method.php
diff --git a/src/applications/conduit/method/differential/getcommitmessage/ConduitAPI_differential_getcommitmessage_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_getcommitmessage_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/getcommitmessage/ConduitAPI_differential_getcommitmessage_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_getcommitmessage_Method.php
diff --git a/src/applications/conduit/method/differential/getcommitpaths/ConduitAPI_differential_getcommitpaths_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_getcommitpaths_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/getcommitpaths/ConduitAPI_differential_getcommitpaths_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_getcommitpaths_Method.php
diff --git a/src/applications/conduit/method/differential/getdiff/ConduitAPI_differential_getdiff_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_getdiff_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/getdiff/ConduitAPI_differential_getdiff_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_getdiff_Method.php
diff --git a/src/applications/conduit/method/differential/getrevision/ConduitAPI_differential_getrevision_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_getrevision_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/getrevision/ConduitAPI_differential_getrevision_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_getrevision_Method.php
diff --git a/src/applications/conduit/method/differential/getrevisioncomments/ConduitAPI_differential_getrevisioncomments_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_getrevisioncomments_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/getrevisioncomments/ConduitAPI_differential_getrevisioncomments_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_getrevisioncomments_Method.php
diff --git a/src/applications/conduit/method/differential/getrevisionfeedback/ConduitAPI_differential_getrevisionfeedback_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_getrevisionfeedback_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/getrevisionfeedback/ConduitAPI_differential_getrevisionfeedback_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_getrevisionfeedback_Method.php
diff --git a/src/applications/conduit/method/differential/markcommitted/ConduitAPI_differential_markcommitted_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_markcommitted_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/markcommitted/ConduitAPI_differential_markcommitted_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_markcommitted_Method.php
diff --git a/src/applications/conduit/method/differential/parsecommitmessage/ConduitAPI_differential_parsecommitmessage_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_parsecommitmessage_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/parsecommitmessage/ConduitAPI_differential_parsecommitmessage_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_parsecommitmessage_Method.php
diff --git a/src/applications/conduit/method/differential/query/ConduitAPI_differential_query_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_query_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/query/ConduitAPI_differential_query_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_query_Method.php
diff --git a/src/applications/conduit/method/differential/setdiffproperty/ConduitAPI_differential_setdiffproperty_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_setdiffproperty_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/setdiffproperty/ConduitAPI_differential_setdiffproperty_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_setdiffproperty_Method.php
diff --git a/src/applications/conduit/method/differential/updaterevision/ConduitAPI_differential_updaterevision_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_updaterevision_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/updaterevision/ConduitAPI_differential_updaterevision_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_updaterevision_Method.php
diff --git a/src/applications/conduit/method/differential/updatetaskrevisionassoc/ConduitAPI_differential_updatetaskrevisionassoc_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_updatetaskrevisionassoc_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/updatetaskrevisionassoc/ConduitAPI_differential_updatetaskrevisionassoc_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_updatetaskrevisionassoc_Method.php
diff --git a/src/applications/conduit/method/differential/updateunitresults/ConduitAPI_differential_updateunitresults_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_updateunitresults_Method.php
similarity index 100%
rename from src/applications/conduit/method/differential/updateunitresults/ConduitAPI_differential_updateunitresults_Method.php
rename to src/applications/conduit/method/differential/ConduitAPI_differential_updateunitresults_Method.php
diff --git a/src/applications/conduit/method/diffusion/findsymbols/ConduitAPI_diffusion_findsymbols_Method.php b/src/applications/conduit/method/diffusion/ConduitAPI_diffusion_findsymbols_Method.php
similarity index 100%
rename from src/applications/conduit/method/diffusion/findsymbols/ConduitAPI_diffusion_findsymbols_Method.php
rename to src/applications/conduit/method/diffusion/ConduitAPI_diffusion_findsymbols_Method.php
diff --git a/src/applications/conduit/method/diffusion/getcommits/ConduitAPI_diffusion_getcommits_Method.php b/src/applications/conduit/method/diffusion/ConduitAPI_diffusion_getcommits_Method.php
similarity index 100%
rename from src/applications/conduit/method/diffusion/getcommits/ConduitAPI_diffusion_getcommits_Method.php
rename to src/applications/conduit/method/diffusion/ConduitAPI_diffusion_getcommits_Method.php
diff --git a/src/applications/conduit/method/diffusion/getrecentcommitsbypath/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php b/src/applications/conduit/method/diffusion/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php
similarity index 100%
rename from src/applications/conduit/method/diffusion/getrecentcommitsbypath/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php
rename to src/applications/conduit/method/diffusion/ConduitAPI_diffusion_getrecentcommitsbypath_Method.php
diff --git a/src/applications/conduit/method/feed/publish/ConduitAPI_feed_publish_Method.php b/src/applications/conduit/method/feed/ConduitAPI_feed_publish_Method.php
similarity index 100%
rename from src/applications/conduit/method/feed/publish/ConduitAPI_feed_publish_Method.php
rename to src/applications/conduit/method/feed/ConduitAPI_feed_publish_Method.php
diff --git a/src/applications/conduit/method/feed/query/ConduitAPI_feed_query_Method.php b/src/applications/conduit/method/feed/ConduitAPI_feed_query_Method.php
similarity index 100%
rename from src/applications/conduit/method/feed/query/ConduitAPI_feed_query_Method.php
rename to src/applications/conduit/method/feed/ConduitAPI_feed_query_Method.php
diff --git a/src/applications/conduit/method/file/download/ConduitAPI_file_download_Method.php b/src/applications/conduit/method/file/ConduitAPI_file_download_Method.php
similarity index 100%
rename from src/applications/conduit/method/file/download/ConduitAPI_file_download_Method.php
rename to src/applications/conduit/method/file/ConduitAPI_file_download_Method.php
diff --git a/src/applications/conduit/method/file/info/ConduitAPI_file_info_Method.php b/src/applications/conduit/method/file/ConduitAPI_file_info_Method.php
similarity index 100%
rename from src/applications/conduit/method/file/info/ConduitAPI_file_info_Method.php
rename to src/applications/conduit/method/file/ConduitAPI_file_info_Method.php
diff --git a/src/applications/conduit/method/file/upload/ConduitAPI_file_upload_Method.php b/src/applications/conduit/method/file/ConduitAPI_file_upload_Method.php
similarity index 100%
rename from src/applications/conduit/method/file/upload/ConduitAPI_file_upload_Method.php
rename to src/applications/conduit/method/file/ConduitAPI_file_upload_Method.php
diff --git a/src/applications/conduit/method/flag/base/ConduitAPI_flag_Method.php b/src/applications/conduit/method/flag/ConduitAPI_flag_Method.php
similarity index 100%
rename from src/applications/conduit/method/flag/base/ConduitAPI_flag_Method.php
rename to src/applications/conduit/method/flag/ConduitAPI_flag_Method.php
diff --git a/src/applications/conduit/method/flag/query/ConduitAPI_flag_query_Method.php b/src/applications/conduit/method/flag/ConduitAPI_flag_query_Method.php
similarity index 100%
rename from src/applications/conduit/method/flag/query/ConduitAPI_flag_query_Method.php
rename to src/applications/conduit/method/flag/ConduitAPI_flag_query_Method.php
diff --git a/src/applications/conduit/method/macro/base/ConduitAPI_macro_Method.php b/src/applications/conduit/method/macro/ConduitAPI_macro_Method.php
similarity index 100%
rename from src/applications/conduit/method/macro/base/ConduitAPI_macro_Method.php
rename to src/applications/conduit/method/macro/ConduitAPI_macro_Method.php
diff --git a/src/applications/conduit/method/macro/query/ConduitAPI_macro_query_Method.php b/src/applications/conduit/method/macro/ConduitAPI_macro_query_Method.php
similarity index 100%
rename from src/applications/conduit/method/macro/query/ConduitAPI_macro_query_Method.php
rename to src/applications/conduit/method/macro/ConduitAPI_macro_query_Method.php
diff --git a/src/applications/conduit/method/maniphest/base/ConduitAPI_maniphest_Method.php b/src/applications/conduit/method/maniphest/ConduitAPI_maniphest_Method.php
similarity index 100%
rename from src/applications/conduit/method/maniphest/base/ConduitAPI_maniphest_Method.php
rename to src/applications/conduit/method/maniphest/ConduitAPI_maniphest_Method.php
diff --git a/src/applications/conduit/method/maniphest/createtask/ConduitAPI_maniphest_createtask_Method.php b/src/applications/conduit/method/maniphest/ConduitAPI_maniphest_createtask_Method.php
similarity index 100%
rename from src/applications/conduit/method/maniphest/createtask/ConduitAPI_maniphest_createtask_Method.php
rename to src/applications/conduit/method/maniphest/ConduitAPI_maniphest_createtask_Method.php
diff --git a/src/applications/conduit/method/maniphest/find/ConduitAPI_maniphest_find_Method.php b/src/applications/conduit/method/maniphest/ConduitAPI_maniphest_find_Method.php
similarity index 100%
rename from src/applications/conduit/method/maniphest/find/ConduitAPI_maniphest_find_Method.php
rename to src/applications/conduit/method/maniphest/ConduitAPI_maniphest_find_Method.php
diff --git a/src/applications/conduit/method/maniphest/gettasktransactions/ConduitAPI_maniphest_gettasktransactions_Method.php b/src/applications/conduit/method/maniphest/ConduitAPI_maniphest_gettasktransactions_Method.php
similarity index 100%
rename from src/applications/conduit/method/maniphest/gettasktransactions/ConduitAPI_maniphest_gettasktransactions_Method.php
rename to src/applications/conduit/method/maniphest/ConduitAPI_maniphest_gettasktransactions_Method.php
diff --git a/src/applications/conduit/method/maniphest/info/ConduitAPI_maniphest_info_Method.php b/src/applications/conduit/method/maniphest/ConduitAPI_maniphest_info_Method.php
similarity index 100%
rename from src/applications/conduit/method/maniphest/info/ConduitAPI_maniphest_info_Method.php
rename to src/applications/conduit/method/maniphest/ConduitAPI_maniphest_info_Method.php
diff --git a/src/applications/conduit/method/maniphest/update/ConduitAPI_maniphest_update_Method.php b/src/applications/conduit/method/maniphest/ConduitAPI_maniphest_update_Method.php
similarity index 100%
rename from src/applications/conduit/method/maniphest/update/ConduitAPI_maniphest_update_Method.php
rename to src/applications/conduit/method/maniphest/ConduitAPI_maniphest_update_Method.php
diff --git a/src/applications/conduit/method/owners/query/ConduitAPI_owners_query_Method.php b/src/applications/conduit/method/owners/ConduitAPI_owners_query_Method.php
similarity index 100%
rename from src/applications/conduit/method/owners/query/ConduitAPI_owners_query_Method.php
rename to src/applications/conduit/method/owners/ConduitAPI_owners_query_Method.php
diff --git a/src/applications/conduit/method/paste/base/ConduitAPI_paste_Method.php b/src/applications/conduit/method/paste/ConduitAPI_paste_Method.php
similarity index 100%
rename from src/applications/conduit/method/paste/base/ConduitAPI_paste_Method.php
rename to src/applications/conduit/method/paste/ConduitAPI_paste_Method.php
diff --git a/src/applications/conduit/method/paste/create/ConduitAPI_paste_create_Method.php b/src/applications/conduit/method/paste/ConduitAPI_paste_create_Method.php
similarity index 100%
rename from src/applications/conduit/method/paste/create/ConduitAPI_paste_create_Method.php
rename to src/applications/conduit/method/paste/ConduitAPI_paste_create_Method.php
diff --git a/src/applications/conduit/method/paste/info/ConduitAPI_paste_info_Method.php b/src/applications/conduit/method/paste/ConduitAPI_paste_info_Method.php
similarity index 100%
rename from src/applications/conduit/method/paste/info/ConduitAPI_paste_info_Method.php
rename to src/applications/conduit/method/paste/ConduitAPI_paste_info_Method.php
diff --git a/src/applications/conduit/method/path/getowners/ConduitAPI_path_getowners_Method.php b/src/applications/conduit/method/path/ConduitAPI_path_getowners_Method.php
similarity index 100%
rename from src/applications/conduit/method/path/getowners/ConduitAPI_path_getowners_Method.php
rename to src/applications/conduit/method/path/ConduitAPI_path_getowners_Method.php
diff --git a/src/applications/conduit/method/phid/base/ConduitAPI_phid_Method.php b/src/applications/conduit/method/phid/ConduitAPI_phid_Method.php
similarity index 100%
rename from src/applications/conduit/method/phid/base/ConduitAPI_phid_Method.php
rename to src/applications/conduit/method/phid/ConduitAPI_phid_Method.php
diff --git a/src/applications/conduit/method/phid/info/ConduitAPI_phid_info_Method.php b/src/applications/conduit/method/phid/ConduitAPI_phid_info_Method.php
similarity index 100%
rename from src/applications/conduit/method/phid/info/ConduitAPI_phid_info_Method.php
rename to src/applications/conduit/method/phid/ConduitAPI_phid_info_Method.php
diff --git a/src/applications/conduit/method/phid/query/ConduitAPI_phid_query_Method.php b/src/applications/conduit/method/phid/ConduitAPI_phid_query_Method.php
similarity index 100%
rename from src/applications/conduit/method/phid/query/ConduitAPI_phid_query_Method.php
rename to src/applications/conduit/method/phid/ConduitAPI_phid_query_Method.php
diff --git a/src/applications/conduit/method/phriction/base/ConduitAPI_phriction_Method.php b/src/applications/conduit/method/phriction/ConduitAPI_phriction_Method.php
similarity index 100%
rename from src/applications/conduit/method/phriction/base/ConduitAPI_phriction_Method.php
rename to src/applications/conduit/method/phriction/ConduitAPI_phriction_Method.php
diff --git a/src/applications/conduit/method/phriction/edit/ConduitAPI_phriction_edit_Method.php b/src/applications/conduit/method/phriction/ConduitAPI_phriction_edit_Method.php
similarity index 100%
rename from src/applications/conduit/method/phriction/edit/ConduitAPI_phriction_edit_Method.php
rename to src/applications/conduit/method/phriction/ConduitAPI_phriction_edit_Method.php
diff --git a/src/applications/conduit/method/phriction/history/ConduitAPI_phriction_history_Method.php b/src/applications/conduit/method/phriction/ConduitAPI_phriction_history_Method.php
similarity index 100%
rename from src/applications/conduit/method/phriction/history/ConduitAPI_phriction_history_Method.php
rename to src/applications/conduit/method/phriction/ConduitAPI_phriction_history_Method.php
diff --git a/src/applications/conduit/method/phriction/info/ConduitAPI_phriction_info_Method.php b/src/applications/conduit/method/phriction/ConduitAPI_phriction_info_Method.php
similarity index 100%
rename from src/applications/conduit/method/phriction/info/ConduitAPI_phriction_info_Method.php
rename to src/applications/conduit/method/phriction/ConduitAPI_phriction_info_Method.php
diff --git a/src/applications/conduit/method/project/base/ConduitAPI_project_Method.php b/src/applications/conduit/method/project/ConduitAPI_project_Method.php
similarity index 100%
rename from src/applications/conduit/method/project/base/ConduitAPI_project_Method.php
rename to src/applications/conduit/method/project/ConduitAPI_project_Method.php
diff --git a/src/applications/conduit/method/project/query/ConduitAPI_project_query_Method.php b/src/applications/conduit/method/project/ConduitAPI_project_query_Method.php
similarity index 100%
rename from src/applications/conduit/method/project/query/ConduitAPI_project_query_Method.php
rename to src/applications/conduit/method/project/ConduitAPI_project_query_Method.php
diff --git a/src/applications/conduit/method/remarkup/process/ConduitAPI_remarkup_process_Method.php b/src/applications/conduit/method/remarkup/ConduitAPI_remarkup_process_Method.php
similarity index 100%
rename from src/applications/conduit/method/remarkup/process/ConduitAPI_remarkup_process_Method.php
rename to src/applications/conduit/method/remarkup/ConduitAPI_remarkup_process_Method.php
diff --git a/src/applications/conduit/method/repository/base/ConduitAPI_repository_Method.php b/src/applications/conduit/method/repository/ConduitAPI_repository_Method.php
similarity index 100%
rename from src/applications/conduit/method/repository/base/ConduitAPI_repository_Method.php
rename to src/applications/conduit/method/repository/ConduitAPI_repository_Method.php
diff --git a/src/applications/conduit/method/repository/create/ConduitAPI_repository_create_Method.php b/src/applications/conduit/method/repository/ConduitAPI_repository_create_Method.php
similarity index 100%
rename from src/applications/conduit/method/repository/create/ConduitAPI_repository_create_Method.php
rename to src/applications/conduit/method/repository/ConduitAPI_repository_create_Method.php
diff --git a/src/applications/conduit/method/repository/query/ConduitAPI_repository_query_Method.php b/src/applications/conduit/method/repository/ConduitAPI_repository_query_Method.php
similarity index 100%
rename from src/applications/conduit/method/repository/query/ConduitAPI_repository_query_Method.php
rename to src/applications/conduit/method/repository/ConduitAPI_repository_query_Method.php
diff --git a/src/applications/conduit/method/slowvote/info/ConduitAPI_slowvote_info_Method.php b/src/applications/conduit/method/slowvote/ConduitAPI_slowvote_info_Method.php
similarity index 100%
rename from src/applications/conduit/method/slowvote/info/ConduitAPI_slowvote_info_Method.php
rename to src/applications/conduit/method/slowvote/ConduitAPI_slowvote_info_Method.php
diff --git a/src/applications/conduit/method/user/base/ConduitAPI_user_Method.php b/src/applications/conduit/method/user/ConduitAPI_user_Method.php
similarity index 100%
rename from src/applications/conduit/method/user/base/ConduitAPI_user_Method.php
rename to src/applications/conduit/method/user/ConduitAPI_user_Method.php
diff --git a/src/applications/conduit/method/user/addstatus/ConduitAPI_user_addstatus_Method.php b/src/applications/conduit/method/user/ConduitAPI_user_addstatus_Method.php
similarity index 100%
rename from src/applications/conduit/method/user/addstatus/ConduitAPI_user_addstatus_Method.php
rename to src/applications/conduit/method/user/ConduitAPI_user_addstatus_Method.php
diff --git a/src/applications/conduit/method/user/disable/ConduitAPI_user_disable_Method.php b/src/applications/conduit/method/user/ConduitAPI_user_disable_Method.php
similarity index 100%
rename from src/applications/conduit/method/user/disable/ConduitAPI_user_disable_Method.php
rename to src/applications/conduit/method/user/ConduitAPI_user_disable_Method.php
diff --git a/src/applications/conduit/method/user/find/ConduitAPI_user_find_Method.php b/src/applications/conduit/method/user/ConduitAPI_user_find_Method.php
similarity index 100%
rename from src/applications/conduit/method/user/find/ConduitAPI_user_find_Method.php
rename to src/applications/conduit/method/user/ConduitAPI_user_find_Method.php
diff --git a/src/applications/conduit/method/user/info/ConduitAPI_user_info_Method.php b/src/applications/conduit/method/user/ConduitAPI_user_info_Method.php
similarity index 100%
rename from src/applications/conduit/method/user/info/ConduitAPI_user_info_Method.php
rename to src/applications/conduit/method/user/ConduitAPI_user_info_Method.php
diff --git a/src/applications/conduit/method/user/query/ConduitAPI_user_query_Method.php b/src/applications/conduit/method/user/ConduitAPI_user_query_Method.php
similarity index 100%
rename from src/applications/conduit/method/user/query/ConduitAPI_user_query_Method.php
rename to src/applications/conduit/method/user/ConduitAPI_user_query_Method.php
diff --git a/src/applications/conduit/method/user/removestatus/ConduitAPI_user_removestatus_Method.php b/src/applications/conduit/method/user/ConduitAPI_user_removestatus_Method.php
similarity index 100%
rename from src/applications/conduit/method/user/removestatus/ConduitAPI_user_removestatus_Method.php
rename to src/applications/conduit/method/user/ConduitAPI_user_removestatus_Method.php
diff --git a/src/applications/conduit/method/user/whoami/ConduitAPI_user_whoami_Method.php b/src/applications/conduit/method/user/ConduitAPI_user_whoami_Method.php
similarity index 100%
rename from src/applications/conduit/method/user/whoami/ConduitAPI_user_whoami_Method.php
rename to src/applications/conduit/method/user/ConduitAPI_user_whoami_Method.php
diff --git a/src/applications/conduit/protocol/request/ConduitAPIRequest.php b/src/applications/conduit/protocol/ConduitAPIRequest.php
similarity index 100%
rename from src/applications/conduit/protocol/request/ConduitAPIRequest.php
rename to src/applications/conduit/protocol/ConduitAPIRequest.php
diff --git a/src/applications/conduit/protocol/response/ConduitAPIResponse.php b/src/applications/conduit/protocol/ConduitAPIResponse.php
similarity index 100%
rename from src/applications/conduit/protocol/response/ConduitAPIResponse.php
rename to src/applications/conduit/protocol/ConduitAPIResponse.php
diff --git a/src/applications/conduit/protocol/exception/ConduitException.php b/src/applications/conduit/protocol/ConduitException.php
similarity index 100%
rename from src/applications/conduit/protocol/exception/ConduitException.php
rename to src/applications/conduit/protocol/ConduitException.php
diff --git a/src/applications/conduit/storage/token/PhabricatorConduitCertificateToken.php b/src/applications/conduit/storage/PhabricatorConduitCertificateToken.php
similarity index 100%
rename from src/applications/conduit/storage/token/PhabricatorConduitCertificateToken.php
rename to src/applications/conduit/storage/PhabricatorConduitCertificateToken.php
diff --git a/src/applications/conduit/storage/connectionlog/PhabricatorConduitConnectionLog.php b/src/applications/conduit/storage/PhabricatorConduitConnectionLog.php
similarity index 100%
rename from src/applications/conduit/storage/connectionlog/PhabricatorConduitConnectionLog.php
rename to src/applications/conduit/storage/PhabricatorConduitConnectionLog.php
diff --git a/src/applications/conduit/storage/base/PhabricatorConduitDAO.php b/src/applications/conduit/storage/PhabricatorConduitDAO.php
similarity index 100%
rename from src/applications/conduit/storage/base/PhabricatorConduitDAO.php
rename to src/applications/conduit/storage/PhabricatorConduitDAO.php
diff --git a/src/applications/conduit/storage/methodcalllog/PhabricatorConduitMethodCallLog.php b/src/applications/conduit/storage/PhabricatorConduitMethodCallLog.php
similarity index 100%
rename from src/applications/conduit/storage/methodcalllog/PhabricatorConduitMethodCallLog.php
rename to src/applications/conduit/storage/PhabricatorConduitMethodCallLog.php
diff --git a/src/applications/countdown/controller/base/PhabricatorCountdownController.php b/src/applications/countdown/controller/PhabricatorCountdownController.php
similarity index 100%
rename from src/applications/countdown/controller/base/PhabricatorCountdownController.php
rename to src/applications/countdown/controller/PhabricatorCountdownController.php
diff --git a/src/applications/countdown/controller/delete/PhabricatorCountdownDeleteController.php b/src/applications/countdown/controller/PhabricatorCountdownDeleteController.php
similarity index 100%
rename from src/applications/countdown/controller/delete/PhabricatorCountdownDeleteController.php
rename to src/applications/countdown/controller/PhabricatorCountdownDeleteController.php
diff --git a/src/applications/countdown/controller/edit/PhabricatorCountdownEditController.php b/src/applications/countdown/controller/PhabricatorCountdownEditController.php
similarity index 100%
rename from src/applications/countdown/controller/edit/PhabricatorCountdownEditController.php
rename to src/applications/countdown/controller/PhabricatorCountdownEditController.php
diff --git a/src/applications/countdown/controller/list/PhabricatorCountdownListController.php b/src/applications/countdown/controller/PhabricatorCountdownListController.php
similarity index 100%
rename from src/applications/countdown/controller/list/PhabricatorCountdownListController.php
rename to src/applications/countdown/controller/PhabricatorCountdownListController.php
diff --git a/src/applications/countdown/controller/view/PhabricatorCountdownViewController.php b/src/applications/countdown/controller/PhabricatorCountdownViewController.php
similarity index 100%
rename from src/applications/countdown/controller/view/PhabricatorCountdownViewController.php
rename to src/applications/countdown/controller/PhabricatorCountdownViewController.php
diff --git a/src/applications/countdown/storage/base/PhabricatorCountdownDAO.php b/src/applications/countdown/storage/PhabricatorCountdownDAO.php
similarity index 100%
rename from src/applications/countdown/storage/base/PhabricatorCountdownDAO.php
rename to src/applications/countdown/storage/PhabricatorCountdownDAO.php
diff --git a/src/applications/countdown/storage/timer/PhabricatorTimer.php b/src/applications/countdown/storage/PhabricatorTimer.php
similarity index 100%
rename from src/applications/countdown/storage/timer/PhabricatorTimer.php
rename to src/applications/countdown/storage/PhabricatorTimer.php
diff --git a/src/applications/daemon/controller/combined/PhabricatorDaemonCombinedLogController.php b/src/applications/daemon/controller/PhabricatorDaemonCombinedLogController.php
similarity index 100%
rename from src/applications/daemon/controller/combined/PhabricatorDaemonCombinedLogController.php
rename to src/applications/daemon/controller/PhabricatorDaemonCombinedLogController.php
diff --git a/src/applications/daemon/controller/console/PhabricatorDaemonConsoleController.php b/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php
similarity index 100%
rename from src/applications/daemon/controller/console/PhabricatorDaemonConsoleController.php
rename to src/applications/daemon/controller/PhabricatorDaemonConsoleController.php
diff --git a/src/applications/daemon/controller/base/PhabricatorDaemonController.php b/src/applications/daemon/controller/PhabricatorDaemonController.php
similarity index 100%
rename from src/applications/daemon/controller/base/PhabricatorDaemonController.php
rename to src/applications/daemon/controller/PhabricatorDaemonController.php
diff --git a/src/applications/daemon/controller/loglist/PhabricatorDaemonLogListController.php b/src/applications/daemon/controller/PhabricatorDaemonLogListController.php
similarity index 100%
rename from src/applications/daemon/controller/loglist/PhabricatorDaemonLogListController.php
rename to src/applications/daemon/controller/PhabricatorDaemonLogListController.php
diff --git a/src/applications/daemon/controller/logview/PhabricatorDaemonLogViewController.php b/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
similarity index 100%
rename from src/applications/daemon/controller/logview/PhabricatorDaemonLogViewController.php
rename to src/applications/daemon/controller/PhabricatorDaemonLogViewController.php
diff --git a/src/applications/daemon/controller/timeline/PhabricatorDaemonTimelineConsoleController.php b/src/applications/daemon/controller/PhabricatorDaemonTimelineConsoleController.php
similarity index 100%
rename from src/applications/daemon/controller/timeline/PhabricatorDaemonTimelineConsoleController.php
rename to src/applications/daemon/controller/PhabricatorDaemonTimelineConsoleController.php
diff --git a/src/applications/daemon/controller/timelineevent/PhabricatorDaemonTimelineEventController.php b/src/applications/daemon/controller/PhabricatorDaemonTimelineEventController.php
similarity index 100%
rename from src/applications/daemon/controller/timelineevent/PhabricatorDaemonTimelineEventController.php
rename to src/applications/daemon/controller/PhabricatorDaemonTimelineEventController.php
diff --git a/src/applications/daemon/controller/workertaskdetail/PhabricatorWorkerTaskDetailController.php b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
similarity index 100%
rename from src/applications/daemon/controller/workertaskdetail/PhabricatorWorkerTaskDetailController.php
rename to src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php
diff --git a/src/applications/daemon/controller/workertaskupdate/PhabricatorWorkerTaskUpdateController.php b/src/applications/daemon/controller/PhabricatorWorkerTaskUpdateController.php
similarity index 100%
rename from src/applications/daemon/controller/workertaskupdate/PhabricatorWorkerTaskUpdateController.php
rename to src/applications/daemon/controller/PhabricatorWorkerTaskUpdateController.php
diff --git a/src/applications/daemon/view/daemonlogevents/PhabricatorDaemonLogEventsView.php b/src/applications/daemon/view/PhabricatorDaemonLogEventsView.php
similarity index 100%
rename from src/applications/daemon/view/daemonlogevents/PhabricatorDaemonLogEventsView.php
rename to src/applications/daemon/view/PhabricatorDaemonLogEventsView.php
diff --git a/src/applications/daemon/view/daemonloglist/PhabricatorDaemonLogListView.php b/src/applications/daemon/view/PhabricatorDaemonLogListView.php
similarity index 100%
rename from src/applications/daemon/view/daemonloglist/PhabricatorDaemonLogListView.php
rename to src/applications/daemon/view/PhabricatorDaemonLogListView.php
diff --git a/src/applications/differential/replyhandler/DifferentialReplyHandler.php b/src/applications/differential/DifferentialReplyHandler.php
similarity index 100%
rename from src/applications/differential/replyhandler/DifferentialReplyHandler.php
rename to src/applications/differential/DifferentialReplyHandler.php
diff --git a/src/applications/differential/tasks/DifferentialTasksAttacher.php b/src/applications/differential/DifferentialTasksAttacher.php
similarity index 100%
rename from src/applications/differential/tasks/DifferentialTasksAttacher.php
rename to src/applications/differential/DifferentialTasksAttacher.php
diff --git a/src/applications/differential/constants/action/DifferentialAction.php b/src/applications/differential/constants/DifferentialAction.php
similarity index 100%
rename from src/applications/differential/constants/action/DifferentialAction.php
rename to src/applications/differential/constants/DifferentialAction.php
diff --git a/src/applications/differential/constants/changetype/DifferentialChangeType.php b/src/applications/differential/constants/DifferentialChangeType.php
similarity index 100%
rename from src/applications/differential/constants/changetype/DifferentialChangeType.php
rename to src/applications/differential/constants/DifferentialChangeType.php
diff --git a/src/applications/differential/constants/lintstatus/DifferentialLintStatus.php b/src/applications/differential/constants/DifferentialLintStatus.php
similarity index 100%
rename from src/applications/differential/constants/lintstatus/DifferentialLintStatus.php
rename to src/applications/differential/constants/DifferentialLintStatus.php
diff --git a/src/applications/differential/constants/revisioncontrolsystem/DifferentialRevisionControlSystem.php b/src/applications/differential/constants/DifferentialRevisionControlSystem.php
similarity index 100%
rename from src/applications/differential/constants/revisioncontrolsystem/DifferentialRevisionControlSystem.php
rename to src/applications/differential/constants/DifferentialRevisionControlSystem.php
diff --git a/src/applications/differential/constants/unitstatus/DifferentialUnitStatus.php b/src/applications/differential/constants/DifferentialUnitStatus.php
similarity index 100%
rename from src/applications/differential/constants/unitstatus/DifferentialUnitStatus.php
rename to src/applications/differential/constants/DifferentialUnitStatus.php
diff --git a/src/applications/differential/constants/unittestresult/DifferentialUnitTestResult.php b/src/applications/differential/constants/DifferentialUnitTestResult.php
similarity index 100%
rename from src/applications/differential/constants/unittestresult/DifferentialUnitTestResult.php
rename to src/applications/differential/constants/DifferentialUnitTestResult.php
diff --git a/src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php b/src/applications/differential/controller/DifferentialChangesetViewController.php
similarity index 100%
rename from src/applications/differential/controller/changesetview/DifferentialChangesetViewController.php
rename to src/applications/differential/controller/DifferentialChangesetViewController.php
diff --git a/src/applications/differential/controller/commentpreview/DifferentialCommentPreviewController.php b/src/applications/differential/controller/DifferentialCommentPreviewController.php
similarity index 100%
rename from src/applications/differential/controller/commentpreview/DifferentialCommentPreviewController.php
rename to src/applications/differential/controller/DifferentialCommentPreviewController.php
diff --git a/src/applications/differential/controller/commentsave/DifferentialCommentSaveController.php b/src/applications/differential/controller/DifferentialCommentSaveController.php
similarity index 100%
rename from src/applications/differential/controller/commentsave/DifferentialCommentSaveController.php
rename to src/applications/differential/controller/DifferentialCommentSaveController.php
diff --git a/src/applications/differential/controller/base/DifferentialController.php b/src/applications/differential/controller/DifferentialController.php
similarity index 100%
rename from src/applications/differential/controller/base/DifferentialController.php
rename to src/applications/differential/controller/DifferentialController.php
diff --git a/src/applications/differential/controller/diffcreate/DifferentialDiffCreateController.php b/src/applications/differential/controller/DifferentialDiffCreateController.php
similarity index 100%
rename from src/applications/differential/controller/diffcreate/DifferentialDiffCreateController.php
rename to src/applications/differential/controller/DifferentialDiffCreateController.php
diff --git a/src/applications/differential/controller/diffview/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php
similarity index 100%
rename from src/applications/differential/controller/diffview/DifferentialDiffViewController.php
rename to src/applications/differential/controller/DifferentialDiffViewController.php
diff --git a/src/applications/differential/controller/inlinecommentedit/DifferentialInlineCommentEditController.php b/src/applications/differential/controller/DifferentialInlineCommentEditController.php
similarity index 100%
rename from src/applications/differential/controller/inlinecommentedit/DifferentialInlineCommentEditController.php
rename to src/applications/differential/controller/DifferentialInlineCommentEditController.php
diff --git a/src/applications/differential/controller/inlinecommentpreview/DifferentialInlineCommentPreviewController.php b/src/applications/differential/controller/DifferentialInlineCommentPreviewController.php
similarity index 100%
rename from src/applications/differential/controller/inlinecommentpreview/DifferentialInlineCommentPreviewController.php
rename to src/applications/differential/controller/DifferentialInlineCommentPreviewController.php
diff --git a/src/applications/differential/controller/customrenderer/DifferentialRevisionDetailRenderer.php b/src/applications/differential/controller/DifferentialRevisionDetailRenderer.php
similarity index 100%
rename from src/applications/differential/controller/customrenderer/DifferentialRevisionDetailRenderer.php
rename to src/applications/differential/controller/DifferentialRevisionDetailRenderer.php
diff --git a/src/applications/differential/controller/revisionedit/DifferentialRevisionEditController.php b/src/applications/differential/controller/DifferentialRevisionEditController.php
similarity index 100%
rename from src/applications/differential/controller/revisionedit/DifferentialRevisionEditController.php
rename to src/applications/differential/controller/DifferentialRevisionEditController.php
diff --git a/src/applications/differential/controller/revisionlist/DifferentialRevisionListController.php b/src/applications/differential/controller/DifferentialRevisionListController.php
similarity index 100%
rename from src/applications/differential/controller/revisionlist/DifferentialRevisionListController.php
rename to src/applications/differential/controller/DifferentialRevisionListController.php
diff --git a/src/applications/differential/controller/revisionstats/DifferentialRevisionStatsController.php b/src/applications/differential/controller/DifferentialRevisionStatsController.php
similarity index 100%
rename from src/applications/differential/controller/revisionstats/DifferentialRevisionStatsController.php
rename to src/applications/differential/controller/DifferentialRevisionStatsController.php
diff --git a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
similarity index 100%
rename from src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
rename to src/applications/differential/controller/DifferentialRevisionViewController.php
diff --git a/src/applications/differential/controller/subscribe/DifferentialSubscribeController.php b/src/applications/differential/controller/DifferentialSubscribeController.php
similarity index 100%
rename from src/applications/differential/controller/subscribe/DifferentialSubscribeController.php
rename to src/applications/differential/controller/DifferentialSubscribeController.php
diff --git a/src/applications/differential/data/revisionlist/DifferentialRevisionListData.php b/src/applications/differential/data/DifferentialRevisionListData.php
similarity index 100%
rename from src/applications/differential/data/revisionlist/DifferentialRevisionListData.php
rename to src/applications/differential/data/DifferentialRevisionListData.php
diff --git a/src/applications/differential/editor/comment/DifferentialCommentEditor.php b/src/applications/differential/editor/DifferentialCommentEditor.php
similarity index 100%
rename from src/applications/differential/editor/comment/DifferentialCommentEditor.php
rename to src/applications/differential/editor/DifferentialCommentEditor.php
diff --git a/src/applications/differential/editor/revision/DifferentialRevisionEditor.php b/src/applications/differential/editor/DifferentialRevisionEditor.php
similarity index 100%
rename from src/applications/differential/editor/revision/DifferentialRevisionEditor.php
rename to src/applications/differential/editor/DifferentialRevisionEditor.php
diff --git a/src/applications/differential/exception/noeffect/DifferentialActionHasNoEffectException.php b/src/applications/differential/exception/DifferentialActionHasNoEffectException.php
similarity index 100%
rename from src/applications/differential/exception/noeffect/DifferentialActionHasNoEffectException.php
rename to src/applications/differential/exception/DifferentialActionHasNoEffectException.php
diff --git a/src/applications/differential/exception/base/DifferentialException.php b/src/applications/differential/exception/DifferentialException.php
similarity index 100%
rename from src/applications/differential/exception/base/DifferentialException.php
rename to src/applications/differential/exception/DifferentialException.php
diff --git a/src/applications/differential/field/exception/notavailable/DifferentialFieldDataNotAvailableException.php b/src/applications/differential/field/exception/DifferentialFieldDataNotAvailableException.php
similarity index 100%
rename from src/applications/differential/field/exception/notavailable/DifferentialFieldDataNotAvailableException.php
rename to src/applications/differential/field/exception/DifferentialFieldDataNotAvailableException.php
diff --git a/src/applications/differential/field/exception/parse/DifferentialFieldParseException.php b/src/applications/differential/field/exception/DifferentialFieldParseException.php
similarity index 100%
rename from src/applications/differential/field/exception/parse/DifferentialFieldParseException.php
rename to src/applications/differential/field/exception/DifferentialFieldParseException.php
diff --git a/src/applications/differential/field/exception/incomplete/DifferentialFieldSpecificationIncompleteException.php b/src/applications/differential/field/exception/DifferentialFieldSpecificationIncompleteException.php
similarity index 100%
rename from src/applications/differential/field/exception/incomplete/DifferentialFieldSpecificationIncompleteException.php
rename to src/applications/differential/field/exception/DifferentialFieldSpecificationIncompleteException.php
diff --git a/src/applications/differential/field/exception/validation/DifferentialFieldValidationException.php b/src/applications/differential/field/exception/DifferentialFieldValidationException.php
similarity index 100%
rename from src/applications/differential/field/exception/validation/DifferentialFieldValidationException.php
rename to src/applications/differential/field/exception/DifferentialFieldValidationException.php
diff --git a/src/applications/differential/field/selector/default/DifferentialDefaultFieldSelector.php b/src/applications/differential/field/selector/DifferentialDefaultFieldSelector.php
similarity index 100%
rename from src/applications/differential/field/selector/default/DifferentialDefaultFieldSelector.php
rename to src/applications/differential/field/selector/DifferentialDefaultFieldSelector.php
diff --git a/src/applications/differential/field/selector/base/DifferentialFieldSelector.php b/src/applications/differential/field/selector/DifferentialFieldSelector.php
similarity index 100%
rename from src/applications/differential/field/selector/base/DifferentialFieldSelector.php
rename to src/applications/differential/field/selector/DifferentialFieldSelector.php
diff --git a/src/applications/differential/field/specification/applypatch/DifferentialApplyPatchFieldSpecification.php b/src/applications/differential/field/specification/DifferentialApplyPatchFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/applypatch/DifferentialApplyPatchFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialApplyPatchFieldSpecification.php
diff --git a/src/applications/differential/field/specification/arcanistproject/DifferentialArcanistProjectFieldSpecification.php b/src/applications/differential/field/specification/DifferentialArcanistProjectFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/arcanistproject/DifferentialArcanistProjectFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialArcanistProjectFieldSpecification.php
diff --git a/src/applications/differential/field/specification/auditors/DifferentialAuditorsFieldSpecification.php b/src/applications/differential/field/specification/DifferentialAuditorsFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/auditors/DifferentialAuditorsFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialAuditorsFieldSpecification.php
diff --git a/src/applications/differential/field/specification/author/DifferentialAuthorFieldSpecification.php b/src/applications/differential/field/specification/DifferentialAuthorFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/author/DifferentialAuthorFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialAuthorFieldSpecification.php
diff --git a/src/applications/differential/field/specification/blamerev/DifferentialBlameRevisionFieldSpecification.php b/src/applications/differential/field/specification/DifferentialBlameRevisionFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/blamerev/DifferentialBlameRevisionFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialBlameRevisionFieldSpecification.php
diff --git a/src/applications/differential/field/specification/branch/DifferentialBranchFieldSpecification.php b/src/applications/differential/field/specification/DifferentialBranchFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/branch/DifferentialBranchFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialBranchFieldSpecification.php
diff --git a/src/applications/differential/field/specification/ccs/DifferentialCCsFieldSpecification.php b/src/applications/differential/field/specification/DifferentialCCsFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/ccs/DifferentialCCsFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialCCsFieldSpecification.php
diff --git a/src/applications/differential/field/specification/commits/DifferentialCommitsFieldSpecification.php b/src/applications/differential/field/specification/DifferentialCommitsFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/commits/DifferentialCommitsFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialCommitsFieldSpecification.php
diff --git a/src/applications/differential/field/specification/datecreated/DifferentialDateCreatedFieldSpecification.php b/src/applications/differential/field/specification/DifferentialDateCreatedFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/datecreated/DifferentialDateCreatedFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialDateCreatedFieldSpecification.php
diff --git a/src/applications/differential/field/specification/datemodified/DifferentialDateModifiedFieldSpecification.php b/src/applications/differential/field/specification/DifferentialDateModifiedFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/datemodified/DifferentialDateModifiedFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialDateModifiedFieldSpecification.php
diff --git a/src/applications/differential/field/specification/dependencies/DifferentialDependenciesFieldSpecification.php b/src/applications/differential/field/specification/DifferentialDependenciesFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/dependencies/DifferentialDependenciesFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialDependenciesFieldSpecification.php
diff --git a/src/applications/differential/field/specification/exportpatch/DifferentialExportPatchFieldSpecification.php b/src/applications/differential/field/specification/DifferentialExportPatchFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/exportpatch/DifferentialExportPatchFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialExportPatchFieldSpecification.php
diff --git a/src/applications/differential/field/specification/base/DifferentialFieldSpecification.php b/src/applications/differential/field/specification/DifferentialFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/base/DifferentialFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialFieldSpecification.php
diff --git a/src/applications/differential/field/specification/gitsvnid/DifferentialGitSVNIDFieldSpecification.php b/src/applications/differential/field/specification/DifferentialGitSVNIDFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/gitsvnid/DifferentialGitSVNIDFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialGitSVNIDFieldSpecification.php
diff --git a/src/applications/differential/field/specification/host/DifferentialHostFieldSpecification.php b/src/applications/differential/field/specification/DifferentialHostFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/host/DifferentialHostFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialHostFieldSpecification.php
diff --git a/src/applications/differential/field/specification/lines/DifferentialLinesFieldSpecification.php b/src/applications/differential/field/specification/DifferentialLinesFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/lines/DifferentialLinesFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialLinesFieldSpecification.php
diff --git a/src/applications/differential/field/specification/lint/DifferentialLintFieldSpecification.php b/src/applications/differential/field/specification/DifferentialLintFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/lint/DifferentialLintFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialLintFieldSpecification.php
diff --git a/src/applications/differential/field/specification/maniphesttasks/DifferentialManiphestTasksFieldSpecification.php b/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/maniphesttasks/DifferentialManiphestTasksFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php
diff --git a/src/applications/differential/field/specification/path/DifferentialPathFieldSpecification.php b/src/applications/differential/field/specification/DifferentialPathFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/path/DifferentialPathFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialPathFieldSpecification.php
diff --git a/src/applications/differential/field/specification/revertplan/DifferentialRevertPlanFieldSpecification.php b/src/applications/differential/field/specification/DifferentialRevertPlanFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/revertplan/DifferentialRevertPlanFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialRevertPlanFieldSpecification.php
diff --git a/src/applications/differential/field/specification/reviewedby/DifferentialReviewedByFieldSpecification.php b/src/applications/differential/field/specification/DifferentialReviewedByFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/reviewedby/DifferentialReviewedByFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialReviewedByFieldSpecification.php
diff --git a/src/applications/differential/field/specification/reviewers/DifferentialReviewersFieldSpecification.php b/src/applications/differential/field/specification/DifferentialReviewersFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/reviewers/DifferentialReviewersFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialReviewersFieldSpecification.php
diff --git a/src/applications/differential/field/specification/revisionid/DifferentialRevisionIDFieldSpecification.php b/src/applications/differential/field/specification/DifferentialRevisionIDFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/revisionid/DifferentialRevisionIDFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialRevisionIDFieldSpecification.php
diff --git a/src/applications/differential/field/specification/revisionstatus/DifferentialRevisionStatusFieldSpecification.php b/src/applications/differential/field/specification/DifferentialRevisionStatusFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/revisionstatus/DifferentialRevisionStatusFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialRevisionStatusFieldSpecification.php
diff --git a/src/applications/differential/field/specification/summary/DifferentialSummaryFieldSpecification.php b/src/applications/differential/field/specification/DifferentialSummaryFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/summary/DifferentialSummaryFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialSummaryFieldSpecification.php
diff --git a/src/applications/differential/field/specification/testplan/DifferentialTestPlanFieldSpecification.php b/src/applications/differential/field/specification/DifferentialTestPlanFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/testplan/DifferentialTestPlanFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialTestPlanFieldSpecification.php
diff --git a/src/applications/differential/field/specification/title/DifferentialTitleFieldSpecification.php b/src/applications/differential/field/specification/DifferentialTitleFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/title/DifferentialTitleFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialTitleFieldSpecification.php
diff --git a/src/applications/differential/field/specification/unit/DifferentialUnitFieldSpecification.php b/src/applications/differential/field/specification/DifferentialUnitFieldSpecification.php
similarity index 100%
rename from src/applications/differential/field/specification/unit/DifferentialUnitFieldSpecification.php
rename to src/applications/differential/field/specification/DifferentialUnitFieldSpecification.php
diff --git a/src/applications/differential/field/specification/revisionid/__tests__/DifferentialRevisionIDFieldParserTestCase.php b/src/applications/differential/field/specification/__tests__/DifferentialRevisionIDFieldParserTestCase.php
similarity index 100%
rename from src/applications/differential/field/specification/revisionid/__tests__/DifferentialRevisionIDFieldParserTestCase.php
rename to src/applications/differential/field/specification/__tests__/DifferentialRevisionIDFieldParserTestCase.php
diff --git a/src/applications/differential/mail/ccwelcome/DifferentialCCWelcomeMail.php b/src/applications/differential/mail/DifferentialCCWelcomeMail.php
similarity index 100%
rename from src/applications/differential/mail/ccwelcome/DifferentialCCWelcomeMail.php
rename to src/applications/differential/mail/DifferentialCCWelcomeMail.php
diff --git a/src/applications/differential/mail/comment/DifferentialCommentMail.php b/src/applications/differential/mail/DifferentialCommentMail.php
similarity index 100%
rename from src/applications/differential/mail/comment/DifferentialCommentMail.php
rename to src/applications/differential/mail/DifferentialCommentMail.php
diff --git a/src/applications/differential/mail/diffcontent/DifferentialDiffContentMail.php b/src/applications/differential/mail/DifferentialDiffContentMail.php
similarity index 100%
rename from src/applications/differential/mail/diffcontent/DifferentialDiffContentMail.php
rename to src/applications/differential/mail/DifferentialDiffContentMail.php
diff --git a/src/applications/differential/mail/exception/DifferentialExceptionMail.php b/src/applications/differential/mail/DifferentialExceptionMail.php
similarity index 100%
rename from src/applications/differential/mail/exception/DifferentialExceptionMail.php
rename to src/applications/differential/mail/DifferentialExceptionMail.php
diff --git a/src/applications/differential/mail/base/DifferentialMail.php b/src/applications/differential/mail/DifferentialMail.php
similarity index 100%
rename from src/applications/differential/mail/base/DifferentialMail.php
rename to src/applications/differential/mail/DifferentialMail.php
diff --git a/src/applications/differential/mail/newdiff/DifferentialNewDiffMail.php b/src/applications/differential/mail/DifferentialNewDiffMail.php
similarity index 100%
rename from src/applications/differential/mail/newdiff/DifferentialNewDiffMail.php
rename to src/applications/differential/mail/DifferentialNewDiffMail.php
diff --git a/src/applications/differential/mail/reviewrequest/DifferentialReviewRequestMail.php b/src/applications/differential/mail/DifferentialReviewRequestMail.php
similarity index 100%
rename from src/applications/differential/mail/reviewrequest/DifferentialReviewRequestMail.php
rename to src/applications/differential/mail/DifferentialReviewRequestMail.php
diff --git a/src/applications/differential/parser/changeset/DifferentialChangesetParser.php b/src/applications/differential/parser/DifferentialChangesetParser.php
similarity index 100%
rename from src/applications/differential/parser/changeset/DifferentialChangesetParser.php
rename to src/applications/differential/parser/DifferentialChangesetParser.php
diff --git a/src/applications/differential/query/revision/DifferentialRevisionQuery.php b/src/applications/differential/query/DifferentialRevisionQuery.php
similarity index 100%
rename from src/applications/differential/query/revision/DifferentialRevisionQuery.php
rename to src/applications/differential/query/DifferentialRevisionQuery.php
diff --git a/src/applications/differential/storage/affectedpath/DifferentialAffectedPath.php b/src/applications/differential/storage/DifferentialAffectedPath.php
similarity index 100%
rename from src/applications/differential/storage/affectedpath/DifferentialAffectedPath.php
rename to src/applications/differential/storage/DifferentialAffectedPath.php
diff --git a/src/applications/differential/storage/auxiliaryfield/DifferentialAuxiliaryField.php b/src/applications/differential/storage/DifferentialAuxiliaryField.php
similarity index 100%
rename from src/applications/differential/storage/auxiliaryfield/DifferentialAuxiliaryField.php
rename to src/applications/differential/storage/DifferentialAuxiliaryField.php
diff --git a/src/applications/differential/storage/changeset/DifferentialChangeset.php b/src/applications/differential/storage/DifferentialChangeset.php
similarity index 100%
rename from src/applications/differential/storage/changeset/DifferentialChangeset.php
rename to src/applications/differential/storage/DifferentialChangeset.php
diff --git a/src/applications/differential/storage/comment/DifferentialComment.php b/src/applications/differential/storage/DifferentialComment.php
similarity index 100%
rename from src/applications/differential/storage/comment/DifferentialComment.php
rename to src/applications/differential/storage/DifferentialComment.php
diff --git a/src/applications/differential/storage/base/DifferentialDAO.php b/src/applications/differential/storage/DifferentialDAO.php
similarity index 100%
rename from src/applications/differential/storage/base/DifferentialDAO.php
rename to src/applications/differential/storage/DifferentialDAO.php
diff --git a/src/applications/differential/storage/diff/DifferentialDiff.php b/src/applications/differential/storage/DifferentialDiff.php
similarity index 100%
rename from src/applications/differential/storage/diff/DifferentialDiff.php
rename to src/applications/differential/storage/DifferentialDiff.php
diff --git a/src/applications/differential/storage/diffproperty/DifferentialDiffProperty.php b/src/applications/differential/storage/DifferentialDiffProperty.php
similarity index 100%
rename from src/applications/differential/storage/diffproperty/DifferentialDiffProperty.php
rename to src/applications/differential/storage/DifferentialDiffProperty.php
diff --git a/src/applications/differential/storage/hunk/DifferentialHunk.php b/src/applications/differential/storage/DifferentialHunk.php
similarity index 100%
rename from src/applications/differential/storage/hunk/DifferentialHunk.php
rename to src/applications/differential/storage/DifferentialHunk.php
diff --git a/src/applications/differential/storage/inlinecomment/DifferentialInlineComment.php b/src/applications/differential/storage/DifferentialInlineComment.php
similarity index 100%
rename from src/applications/differential/storage/inlinecomment/DifferentialInlineComment.php
rename to src/applications/differential/storage/DifferentialInlineComment.php
diff --git a/src/applications/differential/storage/revision/DifferentialRevision.php b/src/applications/differential/storage/DifferentialRevision.php
similarity index 100%
rename from src/applications/differential/storage/revision/DifferentialRevision.php
rename to src/applications/differential/storage/DifferentialRevision.php
diff --git a/src/applications/differential/view/addcomment/DifferentialAddCommentView.php b/src/applications/differential/view/DifferentialAddCommentView.php
similarity index 100%
rename from src/applications/differential/view/addcomment/DifferentialAddCommentView.php
rename to src/applications/differential/view/DifferentialAddCommentView.php
diff --git a/src/applications/differential/view/changesetdetailview/DifferentialChangesetDetailView.php b/src/applications/differential/view/DifferentialChangesetDetailView.php
similarity index 100%
rename from src/applications/differential/view/changesetdetailview/DifferentialChangesetDetailView.php
rename to src/applications/differential/view/DifferentialChangesetDetailView.php
diff --git a/src/applications/differential/view/changesetlistview/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
similarity index 100%
rename from src/applications/differential/view/changesetlistview/DifferentialChangesetListView.php
rename to src/applications/differential/view/DifferentialChangesetListView.php
diff --git a/src/applications/differential/view/difftableofcontents/DifferentialDiffTableOfContentsView.php b/src/applications/differential/view/DifferentialDiffTableOfContentsView.php
similarity index 100%
rename from src/applications/differential/view/difftableofcontents/DifferentialDiffTableOfContentsView.php
rename to src/applications/differential/view/DifferentialDiffTableOfContentsView.php
diff --git a/src/applications/differential/view/inlinecommentedit/DifferentialInlineCommentEditView.php b/src/applications/differential/view/DifferentialInlineCommentEditView.php
similarity index 100%
rename from src/applications/differential/view/inlinecommentedit/DifferentialInlineCommentEditView.php
rename to src/applications/differential/view/DifferentialInlineCommentEditView.php
diff --git a/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php b/src/applications/differential/view/DifferentialInlineCommentView.php
similarity index 100%
rename from src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php
rename to src/applications/differential/view/DifferentialInlineCommentView.php
diff --git a/src/applications/differential/view/localcommits/DifferentialLocalCommitsView.php b/src/applications/differential/view/DifferentialLocalCommitsView.php
similarity index 100%
rename from src/applications/differential/view/localcommits/DifferentialLocalCommitsView.php
rename to src/applications/differential/view/DifferentialLocalCommitsView.php
diff --git a/src/applications/differential/view/primarypane/DifferentialPrimaryPaneView.php b/src/applications/differential/view/DifferentialPrimaryPaneView.php
similarity index 100%
rename from src/applications/differential/view/primarypane/DifferentialPrimaryPaneView.php
rename to src/applications/differential/view/DifferentialPrimaryPaneView.php
diff --git a/src/applications/differential/view/resultstableview/DifferentialResultsTableView.php b/src/applications/differential/view/DifferentialResultsTableView.php
similarity index 100%
rename from src/applications/differential/view/resultstableview/DifferentialResultsTableView.php
rename to src/applications/differential/view/DifferentialResultsTableView.php
diff --git a/src/applications/differential/view/revisioncommentlist/DifferentialRevisionCommentListView.php b/src/applications/differential/view/DifferentialRevisionCommentListView.php
similarity index 100%
rename from src/applications/differential/view/revisioncommentlist/DifferentialRevisionCommentListView.php
rename to src/applications/differential/view/DifferentialRevisionCommentListView.php
diff --git a/src/applications/differential/view/revisioncomment/DifferentialRevisionCommentView.php b/src/applications/differential/view/DifferentialRevisionCommentView.php
similarity index 100%
rename from src/applications/differential/view/revisioncomment/DifferentialRevisionCommentView.php
rename to src/applications/differential/view/DifferentialRevisionCommentView.php
diff --git a/src/applications/differential/view/revisiondetail/DifferentialRevisionDetailView.php b/src/applications/differential/view/DifferentialRevisionDetailView.php
similarity index 100%
rename from src/applications/differential/view/revisiondetail/DifferentialRevisionDetailView.php
rename to src/applications/differential/view/DifferentialRevisionDetailView.php
diff --git a/src/applications/differential/view/revisionlist/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
similarity index 100%
rename from src/applications/differential/view/revisionlist/DifferentialRevisionListView.php
rename to src/applications/differential/view/DifferentialRevisionListView.php
diff --git a/src/applications/differential/view/revisionstats/DifferentialRevisionStatsView.php b/src/applications/differential/view/DifferentialRevisionStatsView.php
similarity index 100%
rename from src/applications/differential/view/revisionstats/DifferentialRevisionStatsView.php
rename to src/applications/differential/view/DifferentialRevisionStatsView.php
diff --git a/src/applications/differential/view/revisionupdatehistory/DifferentialRevisionUpdateHistoryView.php b/src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
similarity index 100%
rename from src/applications/differential/view/revisionupdatehistory/DifferentialRevisionUpdateHistoryView.php
rename to src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
diff --git a/src/applications/diffusion/tag/DiffusionRepositoryTag.php b/src/applications/diffusion/DiffusionRepositoryTag.php
similarity index 100%
rename from src/applications/diffusion/tag/DiffusionRepositoryTag.php
rename to src/applications/diffusion/DiffusionRepositoryTag.php
diff --git a/src/applications/diffusion/controller/branchtable/DiffusionBranchTableController.php b/src/applications/diffusion/controller/DiffusionBranchTableController.php
similarity index 100%
rename from src/applications/diffusion/controller/branchtable/DiffusionBranchTableController.php
rename to src/applications/diffusion/controller/DiffusionBranchTableController.php
diff --git a/src/applications/diffusion/controller/browse/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
similarity index 100%
rename from src/applications/diffusion/controller/browse/DiffusionBrowseController.php
rename to src/applications/diffusion/controller/DiffusionBrowseController.php
diff --git a/src/applications/diffusion/controller/file/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
similarity index 100%
rename from src/applications/diffusion/controller/file/DiffusionBrowseFileController.php
rename to src/applications/diffusion/controller/DiffusionBrowseFileController.php
diff --git a/src/applications/diffusion/controller/change/DiffusionChangeController.php b/src/applications/diffusion/controller/DiffusionChangeController.php
similarity index 100%
rename from src/applications/diffusion/controller/change/DiffusionChangeController.php
rename to src/applications/diffusion/controller/DiffusionChangeController.php
diff --git a/src/applications/diffusion/controller/commit/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
similarity index 100%
rename from src/applications/diffusion/controller/commit/DiffusionCommitController.php
rename to src/applications/diffusion/controller/DiffusionCommitController.php
diff --git a/src/applications/diffusion/controller/base/DiffusionController.php b/src/applications/diffusion/controller/DiffusionController.php
similarity index 100%
rename from src/applications/diffusion/controller/base/DiffusionController.php
rename to src/applications/diffusion/controller/DiffusionController.php
diff --git a/src/applications/diffusion/controller/diff/DiffusionDiffController.php b/src/applications/diffusion/controller/DiffusionDiffController.php
similarity index 100%
rename from src/applications/diffusion/controller/diff/DiffusionDiffController.php
rename to src/applications/diffusion/controller/DiffusionDiffController.php
diff --git a/src/applications/diffusion/controller/external/DiffusionExternalController.php b/src/applications/diffusion/controller/DiffusionExternalController.php
similarity index 100%
rename from src/applications/diffusion/controller/external/DiffusionExternalController.php
rename to src/applications/diffusion/controller/DiffusionExternalController.php
diff --git a/src/applications/diffusion/controller/history/DiffusionHistoryController.php b/src/applications/diffusion/controller/DiffusionHistoryController.php
similarity index 100%
rename from src/applications/diffusion/controller/history/DiffusionHistoryController.php
rename to src/applications/diffusion/controller/DiffusionHistoryController.php
diff --git a/src/applications/diffusion/controller/home/DiffusionHomeController.php b/src/applications/diffusion/controller/DiffusionHomeController.php
similarity index 100%
rename from src/applications/diffusion/controller/home/DiffusionHomeController.php
rename to src/applications/diffusion/controller/DiffusionHomeController.php
diff --git a/src/applications/diffusion/controller/inline/DiffusionInlineCommentController.php b/src/applications/diffusion/controller/DiffusionInlineCommentController.php
similarity index 100%
rename from src/applications/diffusion/controller/inline/DiffusionInlineCommentController.php
rename to src/applications/diffusion/controller/DiffusionInlineCommentController.php
diff --git a/src/applications/diffusion/controller/lastmodified/DiffusionLastModifiedController.php b/src/applications/diffusion/controller/DiffusionLastModifiedController.php
similarity index 100%
rename from src/applications/diffusion/controller/lastmodified/DiffusionLastModifiedController.php
rename to src/applications/diffusion/controller/DiffusionLastModifiedController.php
diff --git a/src/applications/diffusion/controller/pathcomplete/DiffusionPathCompleteController.php b/src/applications/diffusion/controller/DiffusionPathCompleteController.php
similarity index 100%
rename from src/applications/diffusion/controller/pathcomplete/DiffusionPathCompleteController.php
rename to src/applications/diffusion/controller/DiffusionPathCompleteController.php
diff --git a/src/applications/diffusion/controller/pathvalidate/DiffusionPathValidateController.php b/src/applications/diffusion/controller/DiffusionPathValidateController.php
similarity index 100%
rename from src/applications/diffusion/controller/pathvalidate/DiffusionPathValidateController.php
rename to src/applications/diffusion/controller/DiffusionPathValidateController.php
diff --git a/src/applications/diffusion/controller/repository/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
similarity index 100%
rename from src/applications/diffusion/controller/repository/DiffusionRepositoryController.php
rename to src/applications/diffusion/controller/DiffusionRepositoryController.php
diff --git a/src/applications/diffusion/controller/symbol/DiffusionSymbolController.php b/src/applications/diffusion/controller/DiffusionSymbolController.php
similarity index 100%
rename from src/applications/diffusion/controller/symbol/DiffusionSymbolController.php
rename to src/applications/diffusion/controller/DiffusionSymbolController.php
diff --git a/src/applications/diffusion/controller/taglist/DiffusionTagListController.php b/src/applications/diffusion/controller/DiffusionTagListController.php
similarity index 100%
rename from src/applications/diffusion/controller/taglist/DiffusionTagListController.php
rename to src/applications/diffusion/controller/DiffusionTagListController.php
diff --git a/src/applications/diffusion/data/branch/DiffusionBranchInformation.php b/src/applications/diffusion/data/DiffusionBranchInformation.php
similarity index 100%
rename from src/applications/diffusion/data/branch/DiffusionBranchInformation.php
rename to src/applications/diffusion/data/DiffusionBranchInformation.php
diff --git a/src/applications/diffusion/data/filecontent/DiffusionFileContent.php b/src/applications/diffusion/data/DiffusionFileContent.php
similarity index 100%
rename from src/applications/diffusion/data/filecontent/DiffusionFileContent.php
rename to src/applications/diffusion/data/DiffusionFileContent.php
diff --git a/src/applications/diffusion/data/pathchange/DiffusionPathChange.php b/src/applications/diffusion/data/DiffusionPathChange.php
similarity index 100%
rename from src/applications/diffusion/data/pathchange/DiffusionPathChange.php
rename to src/applications/diffusion/data/DiffusionPathChange.php
diff --git a/src/applications/diffusion/data/repositorypath/DiffusionRepositoryPath.php b/src/applications/diffusion/data/DiffusionRepositoryPath.php
similarity index 100%
rename from src/applications/diffusion/data/repositorypath/DiffusionRepositoryPath.php
rename to src/applications/diffusion/data/DiffusionRepositoryPath.php
diff --git a/src/applications/diffusion/exception/setup/DiffusionSetupException.php b/src/applications/diffusion/exception/DiffusionSetupException.php
similarity index 100%
rename from src/applications/diffusion/exception/setup/DiffusionSetupException.php
rename to src/applications/diffusion/exception/DiffusionSetupException.php
diff --git a/src/applications/diffusion/query/path/DiffusionPathQuery.php b/src/applications/diffusion/query/DiffusionPathQuery.php
similarity index 100%
rename from src/applications/diffusion/query/path/DiffusionPathQuery.php
rename to src/applications/diffusion/query/DiffusionPathQuery.php
diff --git a/src/applications/diffusion/query/base/DiffusionQuery.php b/src/applications/diffusion/query/DiffusionQuery.php
similarity index 100%
rename from src/applications/diffusion/query/base/DiffusionQuery.php
rename to src/applications/diffusion/query/DiffusionQuery.php
diff --git a/src/applications/diffusion/query/symbol/DiffusionSymbolQuery.php b/src/applications/diffusion/query/DiffusionSymbolQuery.php
similarity index 100%
rename from src/applications/diffusion/query/symbol/DiffusionSymbolQuery.php
rename to src/applications/diffusion/query/DiffusionSymbolQuery.php
diff --git a/src/applications/diffusion/query/branch/base/DiffusionBranchQuery.php b/src/applications/diffusion/query/branch/DiffusionBranchQuery.php
similarity index 100%
rename from src/applications/diffusion/query/branch/base/DiffusionBranchQuery.php
rename to src/applications/diffusion/query/branch/DiffusionBranchQuery.php
diff --git a/src/applications/diffusion/query/branch/git/DiffusionGitBranchQuery.php b/src/applications/diffusion/query/branch/DiffusionGitBranchQuery.php
similarity index 100%
rename from src/applications/diffusion/query/branch/git/DiffusionGitBranchQuery.php
rename to src/applications/diffusion/query/branch/DiffusionGitBranchQuery.php
diff --git a/src/applications/diffusion/query/branch/mercurial/DiffusionMercurialBranchQuery.php b/src/applications/diffusion/query/branch/DiffusionMercurialBranchQuery.php
similarity index 100%
rename from src/applications/diffusion/query/branch/mercurial/DiffusionMercurialBranchQuery.php
rename to src/applications/diffusion/query/branch/DiffusionMercurialBranchQuery.php
diff --git a/src/applications/diffusion/query/branch/git/__tests__/DiffusionGitBranchQueryTestCase.php b/src/applications/diffusion/query/branch/__tests__/DiffusionGitBranchQueryTestCase.php
similarity index 100%
rename from src/applications/diffusion/query/branch/git/__tests__/DiffusionGitBranchQueryTestCase.php
rename to src/applications/diffusion/query/branch/__tests__/DiffusionGitBranchQueryTestCase.php
diff --git a/src/applications/diffusion/query/browse/base/DiffusionBrowseQuery.php b/src/applications/diffusion/query/browse/DiffusionBrowseQuery.php
similarity index 100%
rename from src/applications/diffusion/query/browse/base/DiffusionBrowseQuery.php
rename to src/applications/diffusion/query/browse/DiffusionBrowseQuery.php
diff --git a/src/applications/diffusion/query/browse/git/DiffusionGitBrowseQuery.php b/src/applications/diffusion/query/browse/DiffusionGitBrowseQuery.php
similarity index 100%
rename from src/applications/diffusion/query/browse/git/DiffusionGitBrowseQuery.php
rename to src/applications/diffusion/query/browse/DiffusionGitBrowseQuery.php
diff --git a/src/applications/diffusion/query/browse/mercurial/DiffusionMercurialBrowseQuery.php b/src/applications/diffusion/query/browse/DiffusionMercurialBrowseQuery.php
similarity index 100%
rename from src/applications/diffusion/query/browse/mercurial/DiffusionMercurialBrowseQuery.php
rename to src/applications/diffusion/query/browse/DiffusionMercurialBrowseQuery.php
diff --git a/src/applications/diffusion/query/browse/svn/DiffusionSvnBrowseQuery.php b/src/applications/diffusion/query/browse/DiffusionSvnBrowseQuery.php
similarity index 100%
rename from src/applications/diffusion/query/browse/svn/DiffusionSvnBrowseQuery.php
rename to src/applications/diffusion/query/browse/DiffusionSvnBrowseQuery.php
diff --git a/src/applications/diffusion/query/committags/base/DiffusionCommitTagsQuery.php b/src/applications/diffusion/query/committags/DiffusionCommitTagsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/committags/base/DiffusionCommitTagsQuery.php
rename to src/applications/diffusion/query/committags/DiffusionCommitTagsQuery.php
diff --git a/src/applications/diffusion/query/committags/git/DiffusionGitCommitTagsQuery.php b/src/applications/diffusion/query/committags/DiffusionGitCommitTagsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/committags/git/DiffusionGitCommitTagsQuery.php
rename to src/applications/diffusion/query/committags/DiffusionGitCommitTagsQuery.php
diff --git a/src/applications/diffusion/query/committags/mercurial/DiffusionMercurialCommitTagsQuery.php b/src/applications/diffusion/query/committags/DiffusionMercurialCommitTagsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/committags/mercurial/DiffusionMercurialCommitTagsQuery.php
rename to src/applications/diffusion/query/committags/DiffusionMercurialCommitTagsQuery.php
diff --git a/src/applications/diffusion/query/committags/svn/DiffusionSvnCommitTagsQuery.php b/src/applications/diffusion/query/committags/DiffusionSvnCommitTagsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/committags/svn/DiffusionSvnCommitTagsQuery.php
rename to src/applications/diffusion/query/committags/DiffusionSvnCommitTagsQuery.php
diff --git a/src/applications/diffusion/query/contains/base/DiffusionContainsQuery.php b/src/applications/diffusion/query/contains/DiffusionContainsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/contains/base/DiffusionContainsQuery.php
rename to src/applications/diffusion/query/contains/DiffusionContainsQuery.php
diff --git a/src/applications/diffusion/query/contains/git/DiffusionGitContainsQuery.php b/src/applications/diffusion/query/contains/DiffusionGitContainsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/contains/git/DiffusionGitContainsQuery.php
rename to src/applications/diffusion/query/contains/DiffusionGitContainsQuery.php
diff --git a/src/applications/diffusion/query/contains/mercurial/DiffusionMercurialContainsQuery.php b/src/applications/diffusion/query/contains/DiffusionMercurialContainsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/contains/mercurial/DiffusionMercurialContainsQuery.php
rename to src/applications/diffusion/query/contains/DiffusionMercurialContainsQuery.php
diff --git a/src/applications/diffusion/query/contains/svn/DiffusionSvnContainsQuery.php b/src/applications/diffusion/query/contains/DiffusionSvnContainsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/contains/svn/DiffusionSvnContainsQuery.php
rename to src/applications/diffusion/query/contains/DiffusionSvnContainsQuery.php
diff --git a/src/applications/diffusion/query/diff/base/DiffusionDiffQuery.php b/src/applications/diffusion/query/diff/DiffusionDiffQuery.php
similarity index 100%
rename from src/applications/diffusion/query/diff/base/DiffusionDiffQuery.php
rename to src/applications/diffusion/query/diff/DiffusionDiffQuery.php
diff --git a/src/applications/diffusion/query/diff/git/DiffusionGitDiffQuery.php b/src/applications/diffusion/query/diff/DiffusionGitDiffQuery.php
similarity index 100%
rename from src/applications/diffusion/query/diff/git/DiffusionGitDiffQuery.php
rename to src/applications/diffusion/query/diff/DiffusionGitDiffQuery.php
diff --git a/src/applications/diffusion/query/diff/mercurial/DiffusionMercurialDiffQuery.php b/src/applications/diffusion/query/diff/DiffusionMercurialDiffQuery.php
similarity index 100%
rename from src/applications/diffusion/query/diff/mercurial/DiffusionMercurialDiffQuery.php
rename to src/applications/diffusion/query/diff/DiffusionMercurialDiffQuery.php
diff --git a/src/applications/diffusion/query/diff/svn/DiffusionSvnDiffQuery.php b/src/applications/diffusion/query/diff/DiffusionSvnDiffQuery.php
similarity index 100%
rename from src/applications/diffusion/query/diff/svn/DiffusionSvnDiffQuery.php
rename to src/applications/diffusion/query/diff/DiffusionSvnDiffQuery.php
diff --git a/src/applications/diffusion/query/filecontent/base/DiffusionFileContentQuery.php b/src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php
similarity index 100%
rename from src/applications/diffusion/query/filecontent/base/DiffusionFileContentQuery.php
rename to src/applications/diffusion/query/filecontent/DiffusionFileContentQuery.php
diff --git a/src/applications/diffusion/query/filecontent/git/DiffusionGitFileContentQuery.php b/src/applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php
similarity index 100%
rename from src/applications/diffusion/query/filecontent/git/DiffusionGitFileContentQuery.php
rename to src/applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php
diff --git a/src/applications/diffusion/query/filecontent/mercurial/DiffusionMercurialFileContentQuery.php b/src/applications/diffusion/query/filecontent/DiffusionMercurialFileContentQuery.php
similarity index 100%
rename from src/applications/diffusion/query/filecontent/mercurial/DiffusionMercurialFileContentQuery.php
rename to src/applications/diffusion/query/filecontent/DiffusionMercurialFileContentQuery.php
diff --git a/src/applications/diffusion/query/filecontent/svn/DiffusionSvnFileContentQuery.php b/src/applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php
similarity index 100%
rename from src/applications/diffusion/query/filecontent/svn/DiffusionSvnFileContentQuery.php
rename to src/applications/diffusion/query/filecontent/DiffusionSvnFileContentQuery.php
diff --git a/src/applications/diffusion/query/history/git/DiffusionGitHistoryQuery.php b/src/applications/diffusion/query/history/DiffusionGitHistoryQuery.php
similarity index 100%
rename from src/applications/diffusion/query/history/git/DiffusionGitHistoryQuery.php
rename to src/applications/diffusion/query/history/DiffusionGitHistoryQuery.php
diff --git a/src/applications/diffusion/query/history/base/DiffusionHistoryQuery.php b/src/applications/diffusion/query/history/DiffusionHistoryQuery.php
similarity index 100%
rename from src/applications/diffusion/query/history/base/DiffusionHistoryQuery.php
rename to src/applications/diffusion/query/history/DiffusionHistoryQuery.php
diff --git a/src/applications/diffusion/query/history/mercurial/DiffusionMercurialHistoryQuery.php b/src/applications/diffusion/query/history/DiffusionMercurialHistoryQuery.php
similarity index 100%
rename from src/applications/diffusion/query/history/mercurial/DiffusionMercurialHistoryQuery.php
rename to src/applications/diffusion/query/history/DiffusionMercurialHistoryQuery.php
diff --git a/src/applications/diffusion/query/history/svn/DiffusionSvnHistoryQuery.php b/src/applications/diffusion/query/history/DiffusionSvnHistoryQuery.php
similarity index 100%
rename from src/applications/diffusion/query/history/svn/DiffusionSvnHistoryQuery.php
rename to src/applications/diffusion/query/history/DiffusionSvnHistoryQuery.php
diff --git a/src/applications/diffusion/query/lastmodified/git/DiffusionGitLastModifiedQuery.php b/src/applications/diffusion/query/lastmodified/DiffusionGitLastModifiedQuery.php
similarity index 100%
rename from src/applications/diffusion/query/lastmodified/git/DiffusionGitLastModifiedQuery.php
rename to src/applications/diffusion/query/lastmodified/DiffusionGitLastModifiedQuery.php
diff --git a/src/applications/diffusion/query/lastmodified/base/DiffusionLastModifiedQuery.php b/src/applications/diffusion/query/lastmodified/DiffusionLastModifiedQuery.php
similarity index 100%
rename from src/applications/diffusion/query/lastmodified/base/DiffusionLastModifiedQuery.php
rename to src/applications/diffusion/query/lastmodified/DiffusionLastModifiedQuery.php
diff --git a/src/applications/diffusion/query/lastmodified/mercurial/DiffusionMercurialLastModifiedQuery.php b/src/applications/diffusion/query/lastmodified/DiffusionMercurialLastModifiedQuery.php
similarity index 100%
rename from src/applications/diffusion/query/lastmodified/mercurial/DiffusionMercurialLastModifiedQuery.php
rename to src/applications/diffusion/query/lastmodified/DiffusionMercurialLastModifiedQuery.php
diff --git a/src/applications/diffusion/query/lastmodified/svn/DiffusionSvnLastModifiedQuery.php b/src/applications/diffusion/query/lastmodified/DiffusionSvnLastModifiedQuery.php
similarity index 100%
rename from src/applications/diffusion/query/lastmodified/svn/DiffusionSvnLastModifiedQuery.php
rename to src/applications/diffusion/query/lastmodified/DiffusionSvnLastModifiedQuery.php
diff --git a/src/applications/diffusion/query/mergedcommits/git/DiffusionGitMergedCommitsQuery.php b/src/applications/diffusion/query/mergedcommits/DiffusionGitMergedCommitsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/mergedcommits/git/DiffusionGitMergedCommitsQuery.php
rename to src/applications/diffusion/query/mergedcommits/DiffusionGitMergedCommitsQuery.php
diff --git a/src/applications/diffusion/query/mergedcommits/mercurial/DiffusionMercurialMergedCommitsQuery.php b/src/applications/diffusion/query/mergedcommits/DiffusionMercurialMergedCommitsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/mergedcommits/mercurial/DiffusionMercurialMergedCommitsQuery.php
rename to src/applications/diffusion/query/mergedcommits/DiffusionMercurialMergedCommitsQuery.php
diff --git a/src/applications/diffusion/query/mergedcommits/base/DiffusionMergedCommitsQuery.php b/src/applications/diffusion/query/mergedcommits/DiffusionMergedCommitsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/mergedcommits/base/DiffusionMergedCommitsQuery.php
rename to src/applications/diffusion/query/mergedcommits/DiffusionMergedCommitsQuery.php
diff --git a/src/applications/diffusion/query/mergedcommits/svn/DiffusionSvnMergedCommitsQuery.php b/src/applications/diffusion/query/mergedcommits/DiffusionSvnMergedCommitsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/mergedcommits/svn/DiffusionSvnMergedCommitsQuery.php
rename to src/applications/diffusion/query/mergedcommits/DiffusionSvnMergedCommitsQuery.php
diff --git a/src/applications/diffusion/query/parents/base/DiffusionCommitParentsQuery.php b/src/applications/diffusion/query/parents/DiffusionCommitParentsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/parents/base/DiffusionCommitParentsQuery.php
rename to src/applications/diffusion/query/parents/DiffusionCommitParentsQuery.php
diff --git a/src/applications/diffusion/query/parents/git/DiffusionGitCommitParentsQuery.php b/src/applications/diffusion/query/parents/DiffusionGitCommitParentsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/parents/git/DiffusionGitCommitParentsQuery.php
rename to src/applications/diffusion/query/parents/DiffusionGitCommitParentsQuery.php
diff --git a/src/applications/diffusion/query/parents/mercurial/DiffusionMercurialCommitParentsQuery.php b/src/applications/diffusion/query/parents/DiffusionMercurialCommitParentsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/parents/mercurial/DiffusionMercurialCommitParentsQuery.php
rename to src/applications/diffusion/query/parents/DiffusionMercurialCommitParentsQuery.php
diff --git a/src/applications/diffusion/query/parents/svn/DiffusionSvnCommitParentsQuery.php b/src/applications/diffusion/query/parents/DiffusionSvnCommitParentsQuery.php
similarity index 100%
rename from src/applications/diffusion/query/parents/svn/DiffusionSvnCommitParentsQuery.php
rename to src/applications/diffusion/query/parents/DiffusionSvnCommitParentsQuery.php
diff --git a/src/applications/diffusion/query/pathchange/base/DiffusionPathChangeQuery.php b/src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php
similarity index 100%
rename from src/applications/diffusion/query/pathchange/base/DiffusionPathChangeQuery.php
rename to src/applications/diffusion/query/pathchange/DiffusionPathChangeQuery.php
diff --git a/src/applications/diffusion/query/pathid/base/DiffusionPathIDQuery.php b/src/applications/diffusion/query/pathid/DiffusionPathIDQuery.php
similarity index 100%
rename from src/applications/diffusion/query/pathid/base/DiffusionPathIDQuery.php
rename to src/applications/diffusion/query/pathid/DiffusionPathIDQuery.php
diff --git a/src/applications/diffusion/query/pathid/base/__tests__/DiffusionPathQueryTestCase.php b/src/applications/diffusion/query/pathid/__tests__/DiffusionPathQueryTestCase.php
similarity index 100%
rename from src/applications/diffusion/query/pathid/base/__tests__/DiffusionPathQueryTestCase.php
rename to src/applications/diffusion/query/pathid/__tests__/DiffusionPathQueryTestCase.php
diff --git a/src/applications/diffusion/query/rawdiff/git/DiffusionGitRawDiffQuery.php b/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php
similarity index 100%
rename from src/applications/diffusion/query/rawdiff/git/DiffusionGitRawDiffQuery.php
rename to src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php
diff --git a/src/applications/diffusion/query/rawdiff/mercurial/DiffusionMercurialRawDiffQuery.php b/src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php
similarity index 100%
rename from src/applications/diffusion/query/rawdiff/mercurial/DiffusionMercurialRawDiffQuery.php
rename to src/applications/diffusion/query/rawdiff/DiffusionMercurialRawDiffQuery.php
diff --git a/src/applications/diffusion/query/rawdiff/base/DiffusionRawDiffQuery.php b/src/applications/diffusion/query/rawdiff/DiffusionRawDiffQuery.php
similarity index 100%
rename from src/applications/diffusion/query/rawdiff/base/DiffusionRawDiffQuery.php
rename to src/applications/diffusion/query/rawdiff/DiffusionRawDiffQuery.php
diff --git a/src/applications/diffusion/query/rawdiff/svn/DiffusionSvnRawDiffQuery.php b/src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php
similarity index 100%
rename from src/applications/diffusion/query/rawdiff/svn/DiffusionSvnRawDiffQuery.php
rename to src/applications/diffusion/query/rawdiff/DiffusionSvnRawDiffQuery.php
diff --git a/src/applications/diffusion/query/renamehistory/git/DiffusionGitRenameHistoryQuery.php b/src/applications/diffusion/query/renamehistory/DiffusionGitRenameHistoryQuery.php
similarity index 100%
rename from src/applications/diffusion/query/renamehistory/git/DiffusionGitRenameHistoryQuery.php
rename to src/applications/diffusion/query/renamehistory/DiffusionGitRenameHistoryQuery.php
diff --git a/src/applications/diffusion/query/renamehistory/mercurial/DiffusionMercurialRenameHistoryQuery.php b/src/applications/diffusion/query/renamehistory/DiffusionMercurialRenameHistoryQuery.php
similarity index 100%
rename from src/applications/diffusion/query/renamehistory/mercurial/DiffusionMercurialRenameHistoryQuery.php
rename to src/applications/diffusion/query/renamehistory/DiffusionMercurialRenameHistoryQuery.php
diff --git a/src/applications/diffusion/query/renamehistory/base/DiffusionRenameHistoryQuery.php b/src/applications/diffusion/query/renamehistory/DiffusionRenameHistoryQuery.php
similarity index 100%
rename from src/applications/diffusion/query/renamehistory/base/DiffusionRenameHistoryQuery.php
rename to src/applications/diffusion/query/renamehistory/DiffusionRenameHistoryQuery.php
diff --git a/src/applications/diffusion/query/renamehistory/svn/DiffusionSvnRenameHistoryQuery.php b/src/applications/diffusion/query/renamehistory/DiffusionSvnRenameHistoryQuery.php
similarity index 100%
rename from src/applications/diffusion/query/renamehistory/svn/DiffusionSvnRenameHistoryQuery.php
rename to src/applications/diffusion/query/renamehistory/DiffusionSvnRenameHistoryQuery.php
diff --git a/src/applications/diffusion/query/taglist/git/DiffusionGitTagListQuery.php b/src/applications/diffusion/query/taglist/DiffusionGitTagListQuery.php
similarity index 100%
rename from src/applications/diffusion/query/taglist/git/DiffusionGitTagListQuery.php
rename to src/applications/diffusion/query/taglist/DiffusionGitTagListQuery.php
diff --git a/src/applications/diffusion/query/taglist/mercurial/DiffusionMercurialTagListQuery.php b/src/applications/diffusion/query/taglist/DiffusionMercurialTagListQuery.php
similarity index 100%
rename from src/applications/diffusion/query/taglist/mercurial/DiffusionMercurialTagListQuery.php
rename to src/applications/diffusion/query/taglist/DiffusionMercurialTagListQuery.php
diff --git a/src/applications/diffusion/query/taglist/svn/DiffusionSvnTagListQuery.php b/src/applications/diffusion/query/taglist/DiffusionSvnTagListQuery.php
similarity index 100%
rename from src/applications/diffusion/query/taglist/svn/DiffusionSvnTagListQuery.php
rename to src/applications/diffusion/query/taglist/DiffusionSvnTagListQuery.php
diff --git a/src/applications/diffusion/query/taglist/base/DiffusionTagListQuery.php b/src/applications/diffusion/query/taglist/DiffusionTagListQuery.php
similarity index 100%
rename from src/applications/diffusion/query/taglist/base/DiffusionTagListQuery.php
rename to src/applications/diffusion/query/taglist/DiffusionTagListQuery.php
diff --git a/src/applications/diffusion/request/git/DiffusionGitRequest.php b/src/applications/diffusion/request/DiffusionGitRequest.php
similarity index 100%
rename from src/applications/diffusion/request/git/DiffusionGitRequest.php
rename to src/applications/diffusion/request/DiffusionGitRequest.php
diff --git a/src/applications/diffusion/request/mercurial/DiffusionMercurialRequest.php b/src/applications/diffusion/request/DiffusionMercurialRequest.php
similarity index 100%
rename from src/applications/diffusion/request/mercurial/DiffusionMercurialRequest.php
rename to src/applications/diffusion/request/DiffusionMercurialRequest.php
diff --git a/src/applications/diffusion/request/base/DiffusionRequest.php b/src/applications/diffusion/request/DiffusionRequest.php
similarity index 100%
rename from src/applications/diffusion/request/base/DiffusionRequest.php
rename to src/applications/diffusion/request/DiffusionRequest.php
diff --git a/src/applications/diffusion/request/svn/DiffusionSvnRequest.php b/src/applications/diffusion/request/DiffusionSvnRequest.php
similarity index 100%
rename from src/applications/diffusion/request/svn/DiffusionSvnRequest.php
rename to src/applications/diffusion/request/DiffusionSvnRequest.php
diff --git a/src/applications/diffusion/request/base/__tests__/DiffusionURITestCase.php b/src/applications/diffusion/request/__tests__/DiffusionURITestCase.php
similarity index 100%
rename from src/applications/diffusion/request/base/__tests__/DiffusionURITestCase.php
rename to src/applications/diffusion/request/__tests__/DiffusionURITestCase.php
diff --git a/src/applications/diffusion/view/branchtable/DiffusionBranchTableView.php b/src/applications/diffusion/view/DiffusionBranchTableView.php
similarity index 100%
rename from src/applications/diffusion/view/branchtable/DiffusionBranchTableView.php
rename to src/applications/diffusion/view/DiffusionBranchTableView.php
diff --git a/src/applications/diffusion/view/browsetable/DiffusionBrowseTableView.php b/src/applications/diffusion/view/DiffusionBrowseTableView.php
similarity index 100%
rename from src/applications/diffusion/view/browsetable/DiffusionBrowseTableView.php
rename to src/applications/diffusion/view/DiffusionBrowseTableView.php
diff --git a/src/applications/diffusion/view/commentlist/DiffusionCommentListView.php b/src/applications/diffusion/view/DiffusionCommentListView.php
similarity index 100%
rename from src/applications/diffusion/view/commentlist/DiffusionCommentListView.php
rename to src/applications/diffusion/view/DiffusionCommentListView.php
diff --git a/src/applications/diffusion/view/comment/DiffusionCommentView.php b/src/applications/diffusion/view/DiffusionCommentView.php
similarity index 100%
rename from src/applications/diffusion/view/comment/DiffusionCommentView.php
rename to src/applications/diffusion/view/DiffusionCommentView.php
diff --git a/src/applications/diffusion/view/commitchangetable/DiffusionCommitChangeTableView.php b/src/applications/diffusion/view/DiffusionCommitChangeTableView.php
similarity index 100%
rename from src/applications/diffusion/view/commitchangetable/DiffusionCommitChangeTableView.php
rename to src/applications/diffusion/view/DiffusionCommitChangeTableView.php
diff --git a/src/applications/diffusion/view/emptyresult/DiffusionEmptyResultView.php b/src/applications/diffusion/view/DiffusionEmptyResultView.php
similarity index 100%
rename from src/applications/diffusion/view/emptyresult/DiffusionEmptyResultView.php
rename to src/applications/diffusion/view/DiffusionEmptyResultView.php
diff --git a/src/applications/diffusion/view/historytable/DiffusionHistoryTableView.php b/src/applications/diffusion/view/DiffusionHistoryTableView.php
similarity index 100%
rename from src/applications/diffusion/view/historytable/DiffusionHistoryTableView.php
rename to src/applications/diffusion/view/DiffusionHistoryTableView.php
diff --git a/src/applications/diffusion/view/taglist/DiffusionTagListView.php b/src/applications/diffusion/view/DiffusionTagListView.php
similarity index 100%
rename from src/applications/diffusion/view/taglist/DiffusionTagListView.php
rename to src/applications/diffusion/view/DiffusionTagListView.php
diff --git a/src/applications/diffusion/view/base/DiffusionView.php b/src/applications/diffusion/view/DiffusionView.php
similarity index 100%
rename from src/applications/diffusion/view/base/DiffusionView.php
rename to src/applications/diffusion/view/DiffusionView.php
diff --git a/src/applications/directory/controller/base/PhabricatorDirectoryController.php b/src/applications/directory/controller/PhabricatorDirectoryController.php
similarity index 100%
rename from src/applications/directory/controller/base/PhabricatorDirectoryController.php
rename to src/applications/directory/controller/PhabricatorDirectoryController.php
diff --git a/src/applications/directory/controller/main/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php
similarity index 100%
rename from src/applications/directory/controller/main/PhabricatorDirectoryMainController.php
rename to src/applications/directory/controller/PhabricatorDirectoryMainController.php
diff --git a/src/applications/draft/storage/draft/PhabricatorDraft.php b/src/applications/draft/storage/PhabricatorDraft.php
similarity index 100%
rename from src/applications/draft/storage/draft/PhabricatorDraft.php
rename to src/applications/draft/storage/PhabricatorDraft.php
diff --git a/src/applications/draft/storage/base/PhabricatorDraftDAO.php b/src/applications/draft/storage/PhabricatorDraftDAO.php
similarity index 100%
rename from src/applications/draft/storage/base/PhabricatorDraftDAO.php
rename to src/applications/draft/storage/PhabricatorDraftDAO.php
diff --git a/src/applications/drydock/allocator/resource/DrydockAllocator.php b/src/applications/drydock/allocator/DrydockAllocator.php
similarity index 100%
rename from src/applications/drydock/allocator/resource/DrydockAllocator.php
rename to src/applications/drydock/allocator/DrydockAllocator.php
diff --git a/src/applications/drydock/allocator/worker/DrydockAllocatorWorker.php b/src/applications/drydock/allocator/DrydockAllocatorWorker.php
similarity index 100%
rename from src/applications/drydock/allocator/worker/DrydockAllocatorWorker.php
rename to src/applications/drydock/allocator/DrydockAllocatorWorker.php
diff --git a/src/applications/drydock/blueprint/base/DrydockBlueprint.php b/src/applications/drydock/blueprint/DrydockBlueprint.php
similarity index 100%
rename from src/applications/drydock/blueprint/base/DrydockBlueprint.php
rename to src/applications/drydock/blueprint/DrydockBlueprint.php
diff --git a/src/applications/drydock/blueprint/ec2host/DrydockEC2HostBlueprint.php b/src/applications/drydock/blueprint/DrydockEC2HostBlueprint.php
similarity index 100%
rename from src/applications/drydock/blueprint/ec2host/DrydockEC2HostBlueprint.php
rename to src/applications/drydock/blueprint/DrydockEC2HostBlueprint.php
diff --git a/src/applications/drydock/blueprint/localhost/DrydockLocalHostBlueprint.php b/src/applications/drydock/blueprint/DrydockLocalHostBlueprint.php
similarity index 100%
rename from src/applications/drydock/blueprint/localhost/DrydockLocalHostBlueprint.php
rename to src/applications/drydock/blueprint/DrydockLocalHostBlueprint.php
diff --git a/src/applications/drydock/blueprint/remotehost/DrydockRemoteHostBlueprint.php b/src/applications/drydock/blueprint/DrydockRemoteHostBlueprint.php
similarity index 100%
rename from src/applications/drydock/blueprint/remotehost/DrydockRemoteHostBlueprint.php
rename to src/applications/drydock/blueprint/DrydockRemoteHostBlueprint.php
diff --git a/src/applications/drydock/blueprint/application/phabricator/DrydockPhabricatorApplicationBlueprint.php b/src/applications/drydock/blueprint/application/DrydockPhabricatorApplicationBlueprint.php
similarity index 100%
rename from src/applications/drydock/blueprint/application/phabricator/DrydockPhabricatorApplicationBlueprint.php
rename to src/applications/drydock/blueprint/application/DrydockPhabricatorApplicationBlueprint.php
diff --git a/src/applications/drydock/blueprint/webroot/apache/DrydockApacheWebrootBlueprint.php b/src/applications/drydock/blueprint/webroot/DrydockApacheWebrootBlueprint.php
similarity index 100%
rename from src/applications/drydock/blueprint/webroot/apache/DrydockApacheWebrootBlueprint.php
rename to src/applications/drydock/blueprint/webroot/DrydockApacheWebrootBlueprint.php
diff --git a/src/applications/drydock/constants/base/DrydockConstants.php b/src/applications/drydock/constants/DrydockConstants.php
similarity index 100%
rename from src/applications/drydock/constants/base/DrydockConstants.php
rename to src/applications/drydock/constants/DrydockConstants.php
diff --git a/src/applications/drydock/constants/leasestatus/DrydockLeaseStatus.php b/src/applications/drydock/constants/DrydockLeaseStatus.php
similarity index 100%
rename from src/applications/drydock/constants/leasestatus/DrydockLeaseStatus.php
rename to src/applications/drydock/constants/DrydockLeaseStatus.php
diff --git a/src/applications/drydock/constants/resourcestatus/DrydockResourceStatus.php b/src/applications/drydock/constants/DrydockResourceStatus.php
similarity index 100%
rename from src/applications/drydock/constants/resourcestatus/DrydockResourceStatus.php
rename to src/applications/drydock/constants/DrydockResourceStatus.php
diff --git a/src/applications/drydock/controller/base/DrydockController.php b/src/applications/drydock/controller/DrydockController.php
similarity index 100%
rename from src/applications/drydock/controller/base/DrydockController.php
rename to src/applications/drydock/controller/DrydockController.php
diff --git a/src/applications/drydock/controller/leaselist/DrydockLeaseListController.php b/src/applications/drydock/controller/DrydockLeaseListController.php
similarity index 100%
rename from src/applications/drydock/controller/leaselist/DrydockLeaseListController.php
rename to src/applications/drydock/controller/DrydockLeaseListController.php
diff --git a/src/applications/drydock/controller/log/DrydockLogController.php b/src/applications/drydock/controller/DrydockLogController.php
similarity index 100%
rename from src/applications/drydock/controller/log/DrydockLogController.php
rename to src/applications/drydock/controller/DrydockLogController.php
diff --git a/src/applications/drydock/controller/resourceallocate/DrydockResourceAllocateController.php b/src/applications/drydock/controller/DrydockResourceAllocateController.php
similarity index 100%
rename from src/applications/drydock/controller/resourceallocate/DrydockResourceAllocateController.php
rename to src/applications/drydock/controller/DrydockResourceAllocateController.php
diff --git a/src/applications/drydock/controller/resourcelist/DrydockResourceListController.php b/src/applications/drydock/controller/DrydockResourceListController.php
similarity index 100%
rename from src/applications/drydock/controller/resourcelist/DrydockResourceListController.php
rename to src/applications/drydock/controller/DrydockResourceListController.php
diff --git a/src/applications/drydock/interface/base/DrydockInterface.php b/src/applications/drydock/interface/DrydockInterface.php
similarity index 100%
rename from src/applications/drydock/interface/base/DrydockInterface.php
rename to src/applications/drydock/interface/DrydockInterface.php
diff --git a/src/applications/drydock/interface/command/base/DrydockCommandInterface.php b/src/applications/drydock/interface/command/DrydockCommandInterface.php
similarity index 100%
rename from src/applications/drydock/interface/command/base/DrydockCommandInterface.php
rename to src/applications/drydock/interface/command/DrydockCommandInterface.php
diff --git a/src/applications/drydock/interface/command/local/DrydockLocalCommandInterface.php b/src/applications/drydock/interface/command/DrydockLocalCommandInterface.php
similarity index 100%
rename from src/applications/drydock/interface/command/local/DrydockLocalCommandInterface.php
rename to src/applications/drydock/interface/command/DrydockLocalCommandInterface.php
diff --git a/src/applications/drydock/interface/command/ssh/DrydockSSHCommandInterface.php b/src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
similarity index 100%
rename from src/applications/drydock/interface/command/ssh/DrydockSSHCommandInterface.php
rename to src/applications/drydock/interface/command/DrydockSSHCommandInterface.php
diff --git a/src/applications/drydock/interface/webroot/apache/DrydockApacheWebrootInterface.php b/src/applications/drydock/interface/webroot/DrydockApacheWebrootInterface.php
similarity index 100%
rename from src/applications/drydock/interface/webroot/apache/DrydockApacheWebrootInterface.php
rename to src/applications/drydock/interface/webroot/DrydockApacheWebrootInterface.php
diff --git a/src/applications/drydock/interface/webroot/base/DrydockWebrootInterface.php b/src/applications/drydock/interface/webroot/DrydockWebrootInterface.php
similarity index 100%
rename from src/applications/drydock/interface/webroot/base/DrydockWebrootInterface.php
rename to src/applications/drydock/interface/webroot/DrydockWebrootInterface.php
diff --git a/src/applications/drydock/query/log/DrydockLogQuery.php b/src/applications/drydock/query/DrydockLogQuery.php
similarity index 100%
rename from src/applications/drydock/query/log/DrydockLogQuery.php
rename to src/applications/drydock/query/DrydockLogQuery.php
diff --git a/src/applications/drydock/storage/base/DrydockDAO.php b/src/applications/drydock/storage/DrydockDAO.php
similarity index 100%
rename from src/applications/drydock/storage/base/DrydockDAO.php
rename to src/applications/drydock/storage/DrydockDAO.php
diff --git a/src/applications/drydock/storage/lease/DrydockLease.php b/src/applications/drydock/storage/DrydockLease.php
similarity index 100%
rename from src/applications/drydock/storage/lease/DrydockLease.php
rename to src/applications/drydock/storage/DrydockLease.php
diff --git a/src/applications/drydock/storage/log/DrydockLog.php b/src/applications/drydock/storage/DrydockLog.php
similarity index 100%
rename from src/applications/drydock/storage/log/DrydockLog.php
rename to src/applications/drydock/storage/DrydockLog.php
diff --git a/src/applications/drydock/storage/resource/DrydockResource.php b/src/applications/drydock/storage/DrydockResource.php
similarity index 100%
rename from src/applications/drydock/storage/resource/DrydockResource.php
rename to src/applications/drydock/storage/DrydockResource.php
diff --git a/src/applications/feed/query/PhabricatorFeedQuery.php b/src/applications/feed/PhabricatorFeedQuery.php
similarity index 100%
rename from src/applications/feed/query/PhabricatorFeedQuery.php
rename to src/applications/feed/PhabricatorFeedQuery.php
diff --git a/src/applications/feed/publisher/PhabricatorFeedStoryPublisher.php b/src/applications/feed/PhabricatorFeedStoryPublisher.php
similarity index 100%
rename from src/applications/feed/publisher/PhabricatorFeedStoryPublisher.php
rename to src/applications/feed/PhabricatorFeedStoryPublisher.php
diff --git a/src/applications/feed/builder/feed/PhabricatorFeedBuilder.php b/src/applications/feed/builder/PhabricatorFeedBuilder.php
similarity index 100%
rename from src/applications/feed/builder/feed/PhabricatorFeedBuilder.php
rename to src/applications/feed/builder/PhabricatorFeedBuilder.php
diff --git a/src/applications/feed/constants/base/PhabricatorFeedConstants.php b/src/applications/feed/constants/PhabricatorFeedConstants.php
similarity index 100%
rename from src/applications/feed/constants/base/PhabricatorFeedConstants.php
rename to src/applications/feed/constants/PhabricatorFeedConstants.php
diff --git a/src/applications/feed/constants/story/PhabricatorFeedStoryTypeConstants.php b/src/applications/feed/constants/PhabricatorFeedStoryTypeConstants.php
similarity index 100%
rename from src/applications/feed/constants/story/PhabricatorFeedStoryTypeConstants.php
rename to src/applications/feed/constants/PhabricatorFeedStoryTypeConstants.php
diff --git a/src/applications/feed/controller/base/PhabricatorFeedController.php b/src/applications/feed/controller/PhabricatorFeedController.php
similarity index 100%
rename from src/applications/feed/controller/base/PhabricatorFeedController.php
rename to src/applications/feed/controller/PhabricatorFeedController.php
diff --git a/src/applications/feed/controller/publicstream/PhabricatorFeedPublicStreamController.php b/src/applications/feed/controller/PhabricatorFeedPublicStreamController.php
similarity index 100%
rename from src/applications/feed/controller/publicstream/PhabricatorFeedPublicStreamController.php
rename to src/applications/feed/controller/PhabricatorFeedPublicStreamController.php
diff --git a/src/applications/feed/storage/base/PhabricatorFeedDAO.php b/src/applications/feed/storage/PhabricatorFeedDAO.php
similarity index 100%
rename from src/applications/feed/storage/base/PhabricatorFeedDAO.php
rename to src/applications/feed/storage/PhabricatorFeedDAO.php
diff --git a/src/applications/feed/storage/story/PhabricatorFeedStoryData.php b/src/applications/feed/storage/PhabricatorFeedStoryData.php
similarity index 100%
rename from src/applications/feed/storage/story/PhabricatorFeedStoryData.php
rename to src/applications/feed/storage/PhabricatorFeedStoryData.php
diff --git a/src/applications/feed/storage/storyreference/PhabricatorFeedStoryReference.php b/src/applications/feed/storage/PhabricatorFeedStoryReference.php
similarity index 100%
rename from src/applications/feed/storage/storyreference/PhabricatorFeedStoryReference.php
rename to src/applications/feed/storage/PhabricatorFeedStoryReference.php
diff --git a/src/applications/feed/story/base/PhabricatorFeedStory.php b/src/applications/feed/story/PhabricatorFeedStory.php
similarity index 100%
rename from src/applications/feed/story/base/PhabricatorFeedStory.php
rename to src/applications/feed/story/PhabricatorFeedStory.php
diff --git a/src/applications/feed/story/audit/PhabricatorFeedStoryAudit.php b/src/applications/feed/story/PhabricatorFeedStoryAudit.php
similarity index 100%
rename from src/applications/feed/story/audit/PhabricatorFeedStoryAudit.php
rename to src/applications/feed/story/PhabricatorFeedStoryAudit.php
diff --git a/src/applications/feed/story/differential/PhabricatorFeedStoryDifferential.php b/src/applications/feed/story/PhabricatorFeedStoryDifferential.php
similarity index 100%
rename from src/applications/feed/story/differential/PhabricatorFeedStoryDifferential.php
rename to src/applications/feed/story/PhabricatorFeedStoryDifferential.php
diff --git a/src/applications/feed/story/maniphest/PhabricatorFeedStoryManiphest.php b/src/applications/feed/story/PhabricatorFeedStoryManiphest.php
similarity index 100%
rename from src/applications/feed/story/maniphest/PhabricatorFeedStoryManiphest.php
rename to src/applications/feed/story/PhabricatorFeedStoryManiphest.php
diff --git a/src/applications/feed/story/phriction/PhabricatorFeedStoryPhriction.php b/src/applications/feed/story/PhabricatorFeedStoryPhriction.php
similarity index 100%
rename from src/applications/feed/story/phriction/PhabricatorFeedStoryPhriction.php
rename to src/applications/feed/story/PhabricatorFeedStoryPhriction.php
diff --git a/src/applications/feed/story/project/PhabricatorFeedStoryProject.php b/src/applications/feed/story/PhabricatorFeedStoryProject.php
similarity index 100%
rename from src/applications/feed/story/project/PhabricatorFeedStoryProject.php
rename to src/applications/feed/story/PhabricatorFeedStoryProject.php
diff --git a/src/applications/feed/story/status/PhabricatorFeedStoryStatus.php b/src/applications/feed/story/PhabricatorFeedStoryStatus.php
similarity index 100%
rename from src/applications/feed/story/status/PhabricatorFeedStoryStatus.php
rename to src/applications/feed/story/PhabricatorFeedStoryStatus.php
diff --git a/src/applications/feed/story/unknown/PhabricatorFeedStoryUnknown.php b/src/applications/feed/story/PhabricatorFeedStoryUnknown.php
similarity index 100%
rename from src/applications/feed/story/unknown/PhabricatorFeedStoryUnknown.php
rename to src/applications/feed/story/PhabricatorFeedStoryUnknown.php
diff --git a/src/applications/feed/view/story/PhabricatorFeedStoryView.php b/src/applications/feed/view/PhabricatorFeedStoryView.php
similarity index 100%
rename from src/applications/feed/view/story/PhabricatorFeedStoryView.php
rename to src/applications/feed/view/PhabricatorFeedStoryView.php
diff --git a/src/applications/feed/view/base/PhabricatorFeedView.php b/src/applications/feed/view/PhabricatorFeedView.php
similarity index 100%
rename from src/applications/feed/view/base/PhabricatorFeedView.php
rename to src/applications/feed/view/PhabricatorFeedView.php
diff --git a/src/applications/files/transform/PhabricatorImageTransformer.php b/src/applications/files/PhabricatorImageTransformer.php
similarity index 100%
rename from src/applications/files/transform/PhabricatorImageTransformer.php
rename to src/applications/files/PhabricatorImageTransformer.php
diff --git a/src/applications/files/controller/base/PhabricatorFileController.php b/src/applications/files/controller/PhabricatorFileController.php
similarity index 100%
rename from src/applications/files/controller/base/PhabricatorFileController.php
rename to src/applications/files/controller/PhabricatorFileController.php
diff --git a/src/applications/files/controller/data/PhabricatorFileDataController.php b/src/applications/files/controller/PhabricatorFileDataController.php
similarity index 100%
rename from src/applications/files/controller/data/PhabricatorFileDataController.php
rename to src/applications/files/controller/PhabricatorFileDataController.php
diff --git a/src/applications/files/controller/delete/PhabricatorFileDeleteController.php b/src/applications/files/controller/PhabricatorFileDeleteController.php
similarity index 100%
rename from src/applications/files/controller/delete/PhabricatorFileDeleteController.php
rename to src/applications/files/controller/PhabricatorFileDeleteController.php
diff --git a/src/applications/files/controller/dropupload/PhabricatorFileDropUploadController.php b/src/applications/files/controller/PhabricatorFileDropUploadController.php
similarity index 100%
rename from src/applications/files/controller/dropupload/PhabricatorFileDropUploadController.php
rename to src/applications/files/controller/PhabricatorFileDropUploadController.php
diff --git a/src/applications/files/controller/info/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php
similarity index 100%
rename from src/applications/files/controller/info/PhabricatorFileInfoController.php
rename to src/applications/files/controller/PhabricatorFileInfoController.php
diff --git a/src/applications/files/controller/list/PhabricatorFileListController.php b/src/applications/files/controller/PhabricatorFileListController.php
similarity index 100%
rename from src/applications/files/controller/list/PhabricatorFileListController.php
rename to src/applications/files/controller/PhabricatorFileListController.php
diff --git a/src/applications/files/controller/macrodelete/PhabricatorFileMacroDeleteController.php b/src/applications/files/controller/PhabricatorFileMacroDeleteController.php
similarity index 100%
rename from src/applications/files/controller/macrodelete/PhabricatorFileMacroDeleteController.php
rename to src/applications/files/controller/PhabricatorFileMacroDeleteController.php
diff --git a/src/applications/files/controller/macroedit/PhabricatorFileMacroEditController.php b/src/applications/files/controller/PhabricatorFileMacroEditController.php
similarity index 100%
rename from src/applications/files/controller/macroedit/PhabricatorFileMacroEditController.php
rename to src/applications/files/controller/PhabricatorFileMacroEditController.php
diff --git a/src/applications/files/controller/macrolist/PhabricatorFileMacroListController.php b/src/applications/files/controller/PhabricatorFileMacroListController.php
similarity index 100%
rename from src/applications/files/controller/macrolist/PhabricatorFileMacroListController.php
rename to src/applications/files/controller/PhabricatorFileMacroListController.php
diff --git a/src/applications/files/controller/proxy/PhabricatorFileProxyController.php b/src/applications/files/controller/PhabricatorFileProxyController.php
similarity index 100%
rename from src/applications/files/controller/proxy/PhabricatorFileProxyController.php
rename to src/applications/files/controller/PhabricatorFileProxyController.php
diff --git a/src/applications/files/controller/shortcut/PhabricatorFileShortcutController.php b/src/applications/files/controller/PhabricatorFileShortcutController.php
similarity index 100%
rename from src/applications/files/controller/shortcut/PhabricatorFileShortcutController.php
rename to src/applications/files/controller/PhabricatorFileShortcutController.php
diff --git a/src/applications/files/controller/transform/PhabricatorFileTransformController.php b/src/applications/files/controller/PhabricatorFileTransformController.php
similarity index 100%
rename from src/applications/files/controller/transform/PhabricatorFileTransformController.php
rename to src/applications/files/controller/PhabricatorFileTransformController.php
diff --git a/src/applications/files/controller/upload/PhabricatorFileUploadController.php b/src/applications/files/controller/PhabricatorFileUploadController.php
similarity index 100%
rename from src/applications/files/controller/upload/PhabricatorFileUploadController.php
rename to src/applications/files/controller/PhabricatorFileUploadController.php
diff --git a/src/applications/files/engine/base/PhabricatorFileStorageEngine.php b/src/applications/files/engine/PhabricatorFileStorageEngine.php
similarity index 100%
rename from src/applications/files/engine/base/PhabricatorFileStorageEngine.php
rename to src/applications/files/engine/PhabricatorFileStorageEngine.php
diff --git a/src/applications/files/engine/localdisk/PhabricatorLocalDiskFileStorageEngine.php b/src/applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php
similarity index 100%
rename from src/applications/files/engine/localdisk/PhabricatorLocalDiskFileStorageEngine.php
rename to src/applications/files/engine/PhabricatorLocalDiskFileStorageEngine.php
diff --git a/src/applications/files/engine/mysql/PhabricatorMySQLFileStorageEngine.php b/src/applications/files/engine/PhabricatorMySQLFileStorageEngine.php
similarity index 100%
rename from src/applications/files/engine/mysql/PhabricatorMySQLFileStorageEngine.php
rename to src/applications/files/engine/PhabricatorMySQLFileStorageEngine.php
diff --git a/src/applications/files/engine/s3/PhabricatorS3FileStorageEngine.php b/src/applications/files/engine/PhabricatorS3FileStorageEngine.php
similarity index 100%
rename from src/applications/files/engine/s3/PhabricatorS3FileStorageEngine.php
rename to src/applications/files/engine/PhabricatorS3FileStorageEngine.php
diff --git a/src/applications/files/engineselector/default/PhabricatorDefaultFileStorageEngineSelector.php b/src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php
similarity index 100%
rename from src/applications/files/engineselector/default/PhabricatorDefaultFileStorageEngineSelector.php
rename to src/applications/files/engineselector/PhabricatorDefaultFileStorageEngineSelector.php
diff --git a/src/applications/files/engineselector/base/PhabricatorFileStorageEngineSelector.php b/src/applications/files/engineselector/PhabricatorFileStorageEngineSelector.php
similarity index 100%
rename from src/applications/files/engineselector/base/PhabricatorFileStorageEngineSelector.php
rename to src/applications/files/engineselector/PhabricatorFileStorageEngineSelector.php
diff --git a/src/applications/files/exception/configuration/PhabricatorFileStorageConfigurationException.php b/src/applications/files/exception/PhabricatorFileStorageConfigurationException.php
similarity index 100%
rename from src/applications/files/exception/configuration/PhabricatorFileStorageConfigurationException.php
rename to src/applications/files/exception/PhabricatorFileStorageConfigurationException.php
diff --git a/src/applications/files/exception/upload/PhabricatorFileUploadException.php b/src/applications/files/exception/PhabricatorFileUploadException.php
similarity index 100%
rename from src/applications/files/exception/upload/PhabricatorFileUploadException.php
rename to src/applications/files/exception/PhabricatorFileUploadException.php
diff --git a/src/applications/files/storage/file/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
similarity index 100%
rename from src/applications/files/storage/file/PhabricatorFile.php
rename to src/applications/files/storage/PhabricatorFile.php
diff --git a/src/applications/files/storage/base/PhabricatorFileDAO.php b/src/applications/files/storage/PhabricatorFileDAO.php
similarity index 100%
rename from src/applications/files/storage/base/PhabricatorFileDAO.php
rename to src/applications/files/storage/PhabricatorFileDAO.php
diff --git a/src/applications/files/storage/imagemacro/PhabricatorFileImageMacro.php b/src/applications/files/storage/PhabricatorFileImageMacro.php
similarity index 100%
rename from src/applications/files/storage/imagemacro/PhabricatorFileImageMacro.php
rename to src/applications/files/storage/PhabricatorFileImageMacro.php
diff --git a/src/applications/files/storage/proxyimage/PhabricatorFileProxyImage.php b/src/applications/files/storage/PhabricatorFileProxyImage.php
similarity index 100%
rename from src/applications/files/storage/proxyimage/PhabricatorFileProxyImage.php
rename to src/applications/files/storage/PhabricatorFileProxyImage.php
diff --git a/src/applications/files/storage/storageblob/PhabricatorFileStorageBlob.php b/src/applications/files/storage/PhabricatorFileStorageBlob.php
similarity index 100%
rename from src/applications/files/storage/storageblob/PhabricatorFileStorageBlob.php
rename to src/applications/files/storage/PhabricatorFileStorageBlob.php
diff --git a/src/applications/files/storage/transformed/PhabricatorTransformedFile.php b/src/applications/files/storage/PhabricatorTransformedFile.php
similarity index 100%
rename from src/applications/files/storage/transformed/PhabricatorTransformedFile.php
rename to src/applications/files/storage/PhabricatorTransformedFile.php
diff --git a/src/applications/files/view/sidenav/PhabricatorFileSideNavView.php b/src/applications/files/view/PhabricatorFileSideNavView.php
similarity index 100%
rename from src/applications/files/view/sidenav/PhabricatorFileSideNavView.php
rename to src/applications/files/view/PhabricatorFileSideNavView.php
diff --git a/src/applications/files/view/upload/PhabricatorFileUploadView.php b/src/applications/files/view/PhabricatorFileUploadView.php
similarity index 100%
rename from src/applications/files/view/upload/PhabricatorFileUploadView.php
rename to src/applications/files/view/PhabricatorFileUploadView.php
diff --git a/src/applications/flag/constants/color/PhabricatorFlagColor.php b/src/applications/flag/constants/PhabricatorFlagColor.php
similarity index 100%
rename from src/applications/flag/constants/color/PhabricatorFlagColor.php
rename to src/applications/flag/constants/PhabricatorFlagColor.php
diff --git a/src/applications/flag/constants/base/PhabricatorFlagConstants.php b/src/applications/flag/constants/PhabricatorFlagConstants.php
similarity index 100%
rename from src/applications/flag/constants/base/PhabricatorFlagConstants.php
rename to src/applications/flag/constants/PhabricatorFlagConstants.php
diff --git a/src/applications/flag/controller/base/PhabricatorFlagController.php b/src/applications/flag/controller/PhabricatorFlagController.php
similarity index 100%
rename from src/applications/flag/controller/base/PhabricatorFlagController.php
rename to src/applications/flag/controller/PhabricatorFlagController.php
diff --git a/src/applications/flag/controller/delete/PhabricatorFlagDeleteController.php b/src/applications/flag/controller/PhabricatorFlagDeleteController.php
similarity index 100%
rename from src/applications/flag/controller/delete/PhabricatorFlagDeleteController.php
rename to src/applications/flag/controller/PhabricatorFlagDeleteController.php
diff --git a/src/applications/flag/controller/edit/PhabricatorFlagEditController.php b/src/applications/flag/controller/PhabricatorFlagEditController.php
similarity index 100%
rename from src/applications/flag/controller/edit/PhabricatorFlagEditController.php
rename to src/applications/flag/controller/PhabricatorFlagEditController.php
diff --git a/src/applications/flag/controller/list/PhabricatorFlagListController.php b/src/applications/flag/controller/PhabricatorFlagListController.php
similarity index 100%
rename from src/applications/flag/controller/list/PhabricatorFlagListController.php
rename to src/applications/flag/controller/PhabricatorFlagListController.php
diff --git a/src/applications/flag/query/flag/PhabricatorFlagQuery.php b/src/applications/flag/query/PhabricatorFlagQuery.php
similarity index 100%
rename from src/applications/flag/query/flag/PhabricatorFlagQuery.php
rename to src/applications/flag/query/PhabricatorFlagQuery.php
diff --git a/src/applications/flag/storage/flag/PhabricatorFlag.php b/src/applications/flag/storage/PhabricatorFlag.php
similarity index 100%
rename from src/applications/flag/storage/flag/PhabricatorFlag.php
rename to src/applications/flag/storage/PhabricatorFlag.php
diff --git a/src/applications/flag/storage/base/PhabricatorFlagDAO.php b/src/applications/flag/storage/PhabricatorFlagDAO.php
similarity index 100%
rename from src/applications/flag/storage/base/PhabricatorFlagDAO.php
rename to src/applications/flag/storage/PhabricatorFlagDAO.php
diff --git a/src/applications/flag/view/list/PhabricatorFlagListView.php b/src/applications/flag/view/PhabricatorFlagListView.php
similarity index 100%
rename from src/applications/flag/view/list/PhabricatorFlagListView.php
rename to src/applications/flag/view/PhabricatorFlagListView.php
diff --git a/src/applications/harbormaster/storage/base/HarbormasterDAO.php b/src/applications/harbormaster/storage/HarbormasterDAO.php
similarity index 100%
rename from src/applications/harbormaster/storage/base/HarbormasterDAO.php
rename to src/applications/harbormaster/storage/HarbormasterDAO.php
diff --git a/src/applications/harbormaster/storage/scratchtable/HarbormasterScratchTable.php b/src/applications/harbormaster/storage/HarbormasterScratchTable.php
similarity index 100%
rename from src/applications/harbormaster/storage/scratchtable/HarbormasterScratchTable.php
rename to src/applications/harbormaster/storage/HarbormasterScratchTable.php
diff --git a/src/applications/help/controller/base/PhabricatorHelpController.php b/src/applications/help/controller/PhabricatorHelpController.php
similarity index 100%
rename from src/applications/help/controller/base/PhabricatorHelpController.php
rename to src/applications/help/controller/PhabricatorHelpController.php
diff --git a/src/applications/help/controller/keyboardshortcut/PhabricatorHelpKeyboardShortcutController.php b/src/applications/help/controller/PhabricatorHelpKeyboardShortcutController.php
similarity index 100%
rename from src/applications/help/controller/keyboardshortcut/PhabricatorHelpKeyboardShortcutController.php
rename to src/applications/help/controller/PhabricatorHelpKeyboardShortcutController.php
diff --git a/src/applications/herald/adapter/commit/HeraldCommitAdapter.php b/src/applications/herald/adapter/HeraldCommitAdapter.php
similarity index 100%
rename from src/applications/herald/adapter/commit/HeraldCommitAdapter.php
rename to src/applications/herald/adapter/HeraldCommitAdapter.php
diff --git a/src/applications/herald/adapter/differential/HeraldDifferentialRevisionAdapter.php b/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php
similarity index 100%
rename from src/applications/herald/adapter/differential/HeraldDifferentialRevisionAdapter.php
rename to src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php
diff --git a/src/applications/herald/adapter/dryrun/HeraldDryRunAdapter.php b/src/applications/herald/adapter/HeraldDryRunAdapter.php
similarity index 100%
rename from src/applications/herald/adapter/dryrun/HeraldDryRunAdapter.php
rename to src/applications/herald/adapter/HeraldDryRunAdapter.php
diff --git a/src/applications/herald/adapter/base/HeraldObjectAdapter.php b/src/applications/herald/adapter/HeraldObjectAdapter.php
similarity index 100%
rename from src/applications/herald/adapter/base/HeraldObjectAdapter.php
rename to src/applications/herald/adapter/HeraldObjectAdapter.php
diff --git a/src/applications/herald/config/action/HeraldActionConfig.php b/src/applications/herald/config/HeraldActionConfig.php
similarity index 100%
rename from src/applications/herald/config/action/HeraldActionConfig.php
rename to src/applications/herald/config/HeraldActionConfig.php
diff --git a/src/applications/herald/config/condition/HeraldConditionConfig.php b/src/applications/herald/config/HeraldConditionConfig.php
similarity index 100%
rename from src/applications/herald/config/condition/HeraldConditionConfig.php
rename to src/applications/herald/config/HeraldConditionConfig.php
diff --git a/src/applications/herald/config/contenttype/HeraldContentTypeConfig.php b/src/applications/herald/config/HeraldContentTypeConfig.php
similarity index 100%
rename from src/applications/herald/config/contenttype/HeraldContentTypeConfig.php
rename to src/applications/herald/config/HeraldContentTypeConfig.php
diff --git a/src/applications/herald/config/field/HeraldFieldConfig.php b/src/applications/herald/config/HeraldFieldConfig.php
similarity index 100%
rename from src/applications/herald/config/field/HeraldFieldConfig.php
rename to src/applications/herald/config/HeraldFieldConfig.php
diff --git a/src/applications/herald/config/repetitionpolicy/HeraldRepetitionPolicyConfig.php b/src/applications/herald/config/HeraldRepetitionPolicyConfig.php
similarity index 100%
rename from src/applications/herald/config/repetitionpolicy/HeraldRepetitionPolicyConfig.php
rename to src/applications/herald/config/HeraldRepetitionPolicyConfig.php
diff --git a/src/applications/herald/config/ruletype/HeraldRuleTypeConfig.php b/src/applications/herald/config/HeraldRuleTypeConfig.php
similarity index 100%
rename from src/applications/herald/config/ruletype/HeraldRuleTypeConfig.php
rename to src/applications/herald/config/HeraldRuleTypeConfig.php
diff --git a/src/applications/herald/config/valuetype/HeraldValueTypeConfig.php b/src/applications/herald/config/HeraldValueTypeConfig.php
similarity index 100%
rename from src/applications/herald/config/valuetype/HeraldValueTypeConfig.php
rename to src/applications/herald/config/HeraldValueTypeConfig.php
diff --git a/src/applications/herald/controller/base/HeraldController.php b/src/applications/herald/controller/HeraldController.php
similarity index 100%
rename from src/applications/herald/controller/base/HeraldController.php
rename to src/applications/herald/controller/HeraldController.php
diff --git a/src/applications/herald/controller/delete/HeraldDeleteController.php b/src/applications/herald/controller/HeraldDeleteController.php
similarity index 100%
rename from src/applications/herald/controller/delete/HeraldDeleteController.php
rename to src/applications/herald/controller/HeraldDeleteController.php
diff --git a/src/applications/herald/controller/home/HeraldHomeController.php b/src/applications/herald/controller/HeraldHomeController.php
similarity index 100%
rename from src/applications/herald/controller/home/HeraldHomeController.php
rename to src/applications/herald/controller/HeraldHomeController.php
diff --git a/src/applications/herald/controller/new/HeraldNewController.php b/src/applications/herald/controller/HeraldNewController.php
similarity index 100%
rename from src/applications/herald/controller/new/HeraldNewController.php
rename to src/applications/herald/controller/HeraldNewController.php
diff --git a/src/applications/herald/controller/rule/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
similarity index 100%
rename from src/applications/herald/controller/rule/HeraldRuleController.php
rename to src/applications/herald/controller/HeraldRuleController.php
diff --git a/src/applications/herald/controller/edithistory/HeraldRuleEditHistoryController.php b/src/applications/herald/controller/HeraldRuleEditHistoryController.php
similarity index 100%
rename from src/applications/herald/controller/edithistory/HeraldRuleEditHistoryController.php
rename to src/applications/herald/controller/HeraldRuleEditHistoryController.php
diff --git a/src/applications/herald/controller/test/HeraldTestConsoleController.php b/src/applications/herald/controller/HeraldTestConsoleController.php
similarity index 100%
rename from src/applications/herald/controller/test/HeraldTestConsoleController.php
rename to src/applications/herald/controller/HeraldTestConsoleController.php
diff --git a/src/applications/herald/controller/transcript/HeraldTranscriptController.php b/src/applications/herald/controller/HeraldTranscriptController.php
similarity index 100%
rename from src/applications/herald/controller/transcript/HeraldTranscriptController.php
rename to src/applications/herald/controller/HeraldTranscriptController.php
diff --git a/src/applications/herald/controller/transcriptlist/HeraldTranscriptListController.php b/src/applications/herald/controller/HeraldTranscriptListController.php
similarity index 100%
rename from src/applications/herald/controller/transcriptlist/HeraldTranscriptListController.php
rename to src/applications/herald/controller/HeraldTranscriptListController.php
diff --git a/src/applications/herald/engine/effect/HeraldEffect.php b/src/applications/herald/engine/HeraldEffect.php
similarity index 100%
rename from src/applications/herald/engine/effect/HeraldEffect.php
rename to src/applications/herald/engine/HeraldEffect.php
diff --git a/src/applications/herald/engine/engine/HeraldEngine.php b/src/applications/herald/engine/HeraldEngine.php
similarity index 100%
rename from src/applications/herald/engine/engine/HeraldEngine.php
rename to src/applications/herald/engine/HeraldEngine.php
diff --git a/src/applications/herald/engine/engine/exception/HeraldInvalidConditionException.php b/src/applications/herald/engine/engine/HeraldInvalidConditionException.php
similarity index 100%
rename from src/applications/herald/engine/engine/exception/HeraldInvalidConditionException.php
rename to src/applications/herald/engine/engine/HeraldInvalidConditionException.php
diff --git a/src/applications/herald/engine/engine/exception/HeraldInvalidFieldException.php b/src/applications/herald/engine/engine/HeraldInvalidFieldException.php
similarity index 100%
rename from src/applications/herald/engine/engine/exception/HeraldInvalidFieldException.php
rename to src/applications/herald/engine/engine/HeraldInvalidFieldException.php
diff --git a/src/applications/herald/engine/engine/exception/HeraldRecursiveConditionsException.php b/src/applications/herald/engine/engine/HeraldRecursiveConditionsException.php
similarity index 100%
rename from src/applications/herald/engine/engine/exception/HeraldRecursiveConditionsException.php
rename to src/applications/herald/engine/engine/HeraldRecursiveConditionsException.php
diff --git a/src/applications/herald/query/log/HeraldEditLogQuery.php b/src/applications/herald/query/HeraldEditLogQuery.php
similarity index 100%
rename from src/applications/herald/query/log/HeraldEditLogQuery.php
rename to src/applications/herald/query/HeraldEditLogQuery.php
diff --git a/src/applications/herald/query/rule/HeraldRuleQuery.php b/src/applications/herald/query/HeraldRuleQuery.php
similarity index 100%
rename from src/applications/herald/query/rule/HeraldRuleQuery.php
rename to src/applications/herald/query/HeraldRuleQuery.php
diff --git a/src/applications/herald/storage/action/HeraldAction.php b/src/applications/herald/storage/HeraldAction.php
similarity index 100%
rename from src/applications/herald/storage/action/HeraldAction.php
rename to src/applications/herald/storage/HeraldAction.php
diff --git a/src/applications/herald/storage/condition/HeraldCondition.php b/src/applications/herald/storage/HeraldCondition.php
similarity index 100%
rename from src/applications/herald/storage/condition/HeraldCondition.php
rename to src/applications/herald/storage/HeraldCondition.php
diff --git a/src/applications/herald/storage/base/HeraldDAO.php b/src/applications/herald/storage/HeraldDAO.php
similarity index 100%
rename from src/applications/herald/storage/base/HeraldDAO.php
rename to src/applications/herald/storage/HeraldDAO.php
diff --git a/src/applications/herald/storage/rule/HeraldRule.php b/src/applications/herald/storage/HeraldRule.php
similarity index 100%
rename from src/applications/herald/storage/rule/HeraldRule.php
rename to src/applications/herald/storage/HeraldRule.php
diff --git a/src/applications/herald/storage/edithistory/HeraldRuleEdit.php b/src/applications/herald/storage/HeraldRuleEdit.php
similarity index 100%
rename from src/applications/herald/storage/edithistory/HeraldRuleEdit.php
rename to src/applications/herald/storage/HeraldRuleEdit.php
diff --git a/src/applications/herald/storage/transcript/apply/HeraldApplyTranscript.php b/src/applications/herald/storage/transcript/HeraldApplyTranscript.php
similarity index 100%
rename from src/applications/herald/storage/transcript/apply/HeraldApplyTranscript.php
rename to src/applications/herald/storage/transcript/HeraldApplyTranscript.php
diff --git a/src/applications/herald/storage/transcript/condition/HeraldConditionTranscript.php b/src/applications/herald/storage/transcript/HeraldConditionTranscript.php
similarity index 100%
rename from src/applications/herald/storage/transcript/condition/HeraldConditionTranscript.php
rename to src/applications/herald/storage/transcript/HeraldConditionTranscript.php
diff --git a/src/applications/herald/storage/transcript/object/HeraldObjectTranscript.php b/src/applications/herald/storage/transcript/HeraldObjectTranscript.php
similarity index 100%
rename from src/applications/herald/storage/transcript/object/HeraldObjectTranscript.php
rename to src/applications/herald/storage/transcript/HeraldObjectTranscript.php
diff --git a/src/applications/herald/storage/transcript/rule/HeraldRuleTranscript.php b/src/applications/herald/storage/transcript/HeraldRuleTranscript.php
similarity index 100%
rename from src/applications/herald/storage/transcript/rule/HeraldRuleTranscript.php
rename to src/applications/herald/storage/transcript/HeraldRuleTranscript.php
diff --git a/src/applications/herald/storage/transcript/base/HeraldTranscript.php b/src/applications/herald/storage/transcript/HeraldTranscript.php
similarity index 100%
rename from src/applications/herald/storage/transcript/base/HeraldTranscript.php
rename to src/applications/herald/storage/transcript/HeraldTranscript.php
diff --git a/src/applications/herald/view/edithistory/HeraldRuleEditHistoryView.php b/src/applications/herald/view/HeraldRuleEditHistoryView.php
similarity index 100%
rename from src/applications/herald/view/edithistory/HeraldRuleEditHistoryView.php
rename to src/applications/herald/view/HeraldRuleEditHistoryView.php
diff --git a/src/applications/herald/view/rulelist/HeraldRuleListView.php b/src/applications/herald/view/HeraldRuleListView.php
similarity index 100%
rename from src/applications/herald/view/rulelist/HeraldRuleListView.php
rename to src/applications/herald/view/HeraldRuleListView.php
diff --git a/src/applications/maniphest/replyhandler/ManiphestReplyHandler.php b/src/applications/maniphest/ManiphestReplyHandler.php
similarity index 100%
rename from src/applications/maniphest/replyhandler/ManiphestReplyHandler.php
rename to src/applications/maniphest/ManiphestReplyHandler.php
diff --git a/src/applications/maniphest/query/ManiphestTaskQuery.php b/src/applications/maniphest/ManiphestTaskQuery.php
similarity index 100%
rename from src/applications/maniphest/query/ManiphestTaskQuery.php
rename to src/applications/maniphest/ManiphestTaskQuery.php
diff --git a/src/applications/maniphest/auxiliaryfield/default/ManiphestAuxiliaryFieldDefaultSpecification.php b/src/applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldDefaultSpecification.php
similarity index 100%
rename from src/applications/maniphest/auxiliaryfield/default/ManiphestAuxiliaryFieldDefaultSpecification.php
rename to src/applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldDefaultSpecification.php
diff --git a/src/applications/maniphest/auxiliaryfield/base/ManiphestAuxiliaryFieldSpecification.php b/src/applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldSpecification.php
similarity index 100%
rename from src/applications/maniphest/auxiliaryfield/base/ManiphestAuxiliaryFieldSpecification.php
rename to src/applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldSpecification.php
diff --git a/src/applications/maniphest/auxiliaryfield/typeexception/ManiphestAuxiliaryFieldTypeException.php b/src/applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldTypeException.php
similarity index 100%
rename from src/applications/maniphest/auxiliaryfield/typeexception/ManiphestAuxiliaryFieldTypeException.php
rename to src/applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldTypeException.php
diff --git a/src/applications/maniphest/auxiliaryfield/validationexception/ManiphestAuxiliaryFieldValidationException.php b/src/applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldValidationException.php
similarity index 100%
rename from src/applications/maniphest/auxiliaryfield/validationexception/ManiphestAuxiliaryFieldValidationException.php
rename to src/applications/maniphest/auxiliaryfield/ManiphestAuxiliaryFieldValidationException.php
diff --git a/src/applications/maniphest/constants/action/ManiphestAction.php b/src/applications/maniphest/constants/ManiphestAction.php
similarity index 100%
rename from src/applications/maniphest/constants/action/ManiphestAction.php
rename to src/applications/maniphest/constants/ManiphestAction.php
diff --git a/src/applications/maniphest/constants/base/ManiphestConstants.php b/src/applications/maniphest/constants/ManiphestConstants.php
similarity index 100%
rename from src/applications/maniphest/constants/base/ManiphestConstants.php
rename to src/applications/maniphest/constants/ManiphestConstants.php
diff --git a/src/applications/maniphest/constants/owner/ManiphestTaskOwner.php b/src/applications/maniphest/constants/ManiphestTaskOwner.php
similarity index 100%
rename from src/applications/maniphest/constants/owner/ManiphestTaskOwner.php
rename to src/applications/maniphest/constants/ManiphestTaskOwner.php
diff --git a/src/applications/maniphest/constants/priority/ManiphestTaskPriority.php b/src/applications/maniphest/constants/ManiphestTaskPriority.php
similarity index 100%
rename from src/applications/maniphest/constants/priority/ManiphestTaskPriority.php
rename to src/applications/maniphest/constants/ManiphestTaskPriority.php
diff --git a/src/applications/maniphest/constants/status/ManiphestTaskStatus.php b/src/applications/maniphest/constants/ManiphestTaskStatus.php
similarity index 100%
rename from src/applications/maniphest/constants/status/ManiphestTaskStatus.php
rename to src/applications/maniphest/constants/ManiphestTaskStatus.php
diff --git a/src/applications/maniphest/constants/transactiontype/ManiphestTransactionType.php b/src/applications/maniphest/constants/ManiphestTransactionType.php
similarity index 100%
rename from src/applications/maniphest/constants/transactiontype/ManiphestTransactionType.php
rename to src/applications/maniphest/constants/ManiphestTransactionType.php
diff --git a/src/applications/maniphest/controller/batch/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php
similarity index 100%
rename from src/applications/maniphest/controller/batch/ManiphestBatchEditController.php
rename to src/applications/maniphest/controller/ManiphestBatchEditController.php
diff --git a/src/applications/maniphest/controller/base/ManiphestController.php b/src/applications/maniphest/controller/ManiphestController.php
similarity index 100%
rename from src/applications/maniphest/controller/base/ManiphestController.php
rename to src/applications/maniphest/controller/ManiphestController.php
diff --git a/src/applications/maniphest/controller/export/ManiphestExportController.php b/src/applications/maniphest/controller/ManiphestExportController.php
similarity index 100%
rename from src/applications/maniphest/controller/export/ManiphestExportController.php
rename to src/applications/maniphest/controller/ManiphestExportController.php
diff --git a/src/applications/maniphest/controller/report/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php
similarity index 100%
rename from src/applications/maniphest/controller/report/ManiphestReportController.php
rename to src/applications/maniphest/controller/ManiphestReportController.php
diff --git a/src/applications/maniphest/controller/savedquerydelete/ManiphestSavedQueryDeleteController.php b/src/applications/maniphest/controller/ManiphestSavedQueryDeleteController.php
similarity index 100%
rename from src/applications/maniphest/controller/savedquerydelete/ManiphestSavedQueryDeleteController.php
rename to src/applications/maniphest/controller/ManiphestSavedQueryDeleteController.php
diff --git a/src/applications/maniphest/controller/savedqueryedit/ManiphestSavedQueryEditController.php b/src/applications/maniphest/controller/ManiphestSavedQueryEditController.php
similarity index 100%
rename from src/applications/maniphest/controller/savedqueryedit/ManiphestSavedQueryEditController.php
rename to src/applications/maniphest/controller/ManiphestSavedQueryEditController.php
diff --git a/src/applications/maniphest/controller/savedquerylist/ManiphestSavedQueryListController.php b/src/applications/maniphest/controller/ManiphestSavedQueryListController.php
similarity index 100%
rename from src/applications/maniphest/controller/savedquerylist/ManiphestSavedQueryListController.php
rename to src/applications/maniphest/controller/ManiphestSavedQueryListController.php
diff --git a/src/applications/maniphest/controller/subpriority/ManiphestSubpriorityController.php b/src/applications/maniphest/controller/ManiphestSubpriorityController.php
similarity index 100%
rename from src/applications/maniphest/controller/subpriority/ManiphestSubpriorityController.php
rename to src/applications/maniphest/controller/ManiphestSubpriorityController.php
diff --git a/src/applications/maniphest/controller/descriptionchange/ManiphestTaskDescriptionChangeController.php b/src/applications/maniphest/controller/ManiphestTaskDescriptionChangeController.php
similarity index 100%
rename from src/applications/maniphest/controller/descriptionchange/ManiphestTaskDescriptionChangeController.php
rename to src/applications/maniphest/controller/ManiphestTaskDescriptionChangeController.php
diff --git a/src/applications/maniphest/controller/descriptionpreview/ManiphestTaskDescriptionPreviewController.php b/src/applications/maniphest/controller/ManiphestTaskDescriptionPreviewController.php
similarity index 100%
rename from src/applications/maniphest/controller/descriptionpreview/ManiphestTaskDescriptionPreviewController.php
rename to src/applications/maniphest/controller/ManiphestTaskDescriptionPreviewController.php
diff --git a/src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
similarity index 100%
rename from src/applications/maniphest/controller/taskdetail/ManiphestTaskDetailController.php
rename to src/applications/maniphest/controller/ManiphestTaskDetailController.php
diff --git a/src/applications/maniphest/controller/taskedit/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php
similarity index 100%
rename from src/applications/maniphest/controller/taskedit/ManiphestTaskEditController.php
rename to src/applications/maniphest/controller/ManiphestTaskEditController.php
diff --git a/src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php b/src/applications/maniphest/controller/ManiphestTaskListController.php
similarity index 100%
rename from src/applications/maniphest/controller/tasklist/ManiphestTaskListController.php
rename to src/applications/maniphest/controller/ManiphestTaskListController.php
diff --git a/src/applications/maniphest/controller/transactionpreview/ManiphestTransactionPreviewController.php b/src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
similarity index 100%
rename from src/applications/maniphest/controller/transactionpreview/ManiphestTransactionPreviewController.php
rename to src/applications/maniphest/controller/ManiphestTransactionPreviewController.php
diff --git a/src/applications/maniphest/controller/transactionsave/ManiphestTransactionSaveController.php b/src/applications/maniphest/controller/ManiphestTransactionSaveController.php
similarity index 100%
rename from src/applications/maniphest/controller/transactionsave/ManiphestTransactionSaveController.php
rename to src/applications/maniphest/controller/ManiphestTransactionSaveController.php
diff --git a/src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php b/src/applications/maniphest/editor/ManiphestTransactionEditor.php
similarity index 100%
rename from src/applications/maniphest/editor/transaction/ManiphestTransactionEditor.php
rename to src/applications/maniphest/editor/ManiphestTransactionEditor.php
diff --git a/src/applications/maniphest/extensions/task/ManiphestDefaultTaskExtensions.php b/src/applications/maniphest/extensions/ManiphestDefaultTaskExtensions.php
similarity index 100%
rename from src/applications/maniphest/extensions/task/ManiphestDefaultTaskExtensions.php
rename to src/applications/maniphest/extensions/ManiphestDefaultTaskExtensions.php
diff --git a/src/applications/maniphest/extensions/base/ManiphestTaskExtensions.php b/src/applications/maniphest/extensions/ManiphestTaskExtensions.php
similarity index 100%
rename from src/applications/maniphest/extensions/base/ManiphestTaskExtensions.php
rename to src/applications/maniphest/extensions/ManiphestTaskExtensions.php
diff --git a/src/applications/maniphest/storage/base/ManiphestDAO.php b/src/applications/maniphest/storage/ManiphestDAO.php
similarity index 100%
rename from src/applications/maniphest/storage/base/ManiphestDAO.php
rename to src/applications/maniphest/storage/ManiphestDAO.php
diff --git a/src/applications/maniphest/storage/savedquery/ManiphestSavedQuery.php b/src/applications/maniphest/storage/ManiphestSavedQuery.php
similarity index 100%
rename from src/applications/maniphest/storage/savedquery/ManiphestSavedQuery.php
rename to src/applications/maniphest/storage/ManiphestSavedQuery.php
diff --git a/src/applications/maniphest/storage/task/ManiphestTask.php b/src/applications/maniphest/storage/ManiphestTask.php
similarity index 100%
rename from src/applications/maniphest/storage/task/ManiphestTask.php
rename to src/applications/maniphest/storage/ManiphestTask.php
diff --git a/src/applications/maniphest/storage/auxiliary/ManiphestTaskAuxiliaryStorage.php b/src/applications/maniphest/storage/ManiphestTaskAuxiliaryStorage.php
similarity index 100%
rename from src/applications/maniphest/storage/auxiliary/ManiphestTaskAuxiliaryStorage.php
rename to src/applications/maniphest/storage/ManiphestTaskAuxiliaryStorage.php
diff --git a/src/applications/maniphest/storage/taskproject/ManiphestTaskProject.php b/src/applications/maniphest/storage/ManiphestTaskProject.php
similarity index 100%
rename from src/applications/maniphest/storage/taskproject/ManiphestTaskProject.php
rename to src/applications/maniphest/storage/ManiphestTaskProject.php
diff --git a/src/applications/maniphest/storage/subscriber/ManiphestTaskSubscriber.php b/src/applications/maniphest/storage/ManiphestTaskSubscriber.php
similarity index 100%
rename from src/applications/maniphest/storage/subscriber/ManiphestTaskSubscriber.php
rename to src/applications/maniphest/storage/ManiphestTaskSubscriber.php
diff --git a/src/applications/maniphest/storage/transaction/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php
similarity index 100%
rename from src/applications/maniphest/storage/transaction/ManiphestTransaction.php
rename to src/applications/maniphest/storage/ManiphestTransaction.php
diff --git a/src/applications/maniphest/view/tasklist/ManiphestTaskListView.php b/src/applications/maniphest/view/ManiphestTaskListView.php
similarity index 100%
rename from src/applications/maniphest/view/tasklist/ManiphestTaskListView.php
rename to src/applications/maniphest/view/ManiphestTaskListView.php
diff --git a/src/applications/maniphest/view/taskprojects/ManiphestTaskProjectsView.php b/src/applications/maniphest/view/ManiphestTaskProjectsView.php
similarity index 100%
rename from src/applications/maniphest/view/taskprojects/ManiphestTaskProjectsView.php
rename to src/applications/maniphest/view/ManiphestTaskProjectsView.php
diff --git a/src/applications/maniphest/view/tasksummary/ManiphestTaskSummaryView.php b/src/applications/maniphest/view/ManiphestTaskSummaryView.php
similarity index 100%
rename from src/applications/maniphest/view/tasksummary/ManiphestTaskSummaryView.php
rename to src/applications/maniphest/view/ManiphestTaskSummaryView.php
diff --git a/src/applications/maniphest/view/transactiondetail/ManiphestTransactionDetailView.php b/src/applications/maniphest/view/ManiphestTransactionDetailView.php
similarity index 100%
rename from src/applications/maniphest/view/transactiondetail/ManiphestTransactionDetailView.php
rename to src/applications/maniphest/view/ManiphestTransactionDetailView.php
diff --git a/src/applications/maniphest/view/transactionlist/ManiphestTransactionListView.php b/src/applications/maniphest/view/ManiphestTransactionListView.php
similarity index 100%
rename from src/applications/maniphest/view/transactionlist/ManiphestTransactionListView.php
rename to src/applications/maniphest/view/ManiphestTransactionListView.php
diff --git a/src/applications/maniphest/view/base/ManiphestView.php b/src/applications/maniphest/view/ManiphestView.php
similarity index 100%
rename from src/applications/maniphest/view/base/ManiphestView.php
rename to src/applications/maniphest/view/ManiphestView.php
diff --git a/src/applications/markup/engine/PhabricatorMarkupEngine.php b/src/applications/markup/PhabricatorMarkupEngine.php
similarity index 100%
rename from src/applications/markup/engine/PhabricatorMarkupEngine.php
rename to src/applications/markup/PhabricatorMarkupEngine.php
diff --git a/src/applications/markup/syntax/PhabricatorSyntaxHighlighter.php b/src/applications/markup/PhabricatorSyntaxHighlighter.php
similarity index 100%
rename from src/applications/markup/syntax/PhabricatorSyntaxHighlighter.php
rename to src/applications/markup/PhabricatorSyntaxHighlighter.php
diff --git a/src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php b/src/applications/metamta/PhabricatorMetaMTAEmailBodyParser.php
similarity index 100%
rename from src/applications/metamta/parser/PhabricatorMetaMTAEmailBodyParser.php
rename to src/applications/metamta/PhabricatorMetaMTAEmailBodyParser.php
diff --git a/src/applications/metamta/worker/PhabricatorMetaMTAWorker.php b/src/applications/metamta/PhabricatorMetaMTAWorker.php
similarity index 100%
rename from src/applications/metamta/worker/PhabricatorMetaMTAWorker.php
rename to src/applications/metamta/PhabricatorMetaMTAWorker.php
diff --git a/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php b/src/applications/metamta/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
similarity index 100%
rename from src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
rename to src/applications/metamta/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
diff --git a/src/applications/metamta/adapter/base/PhabricatorMailImplementationAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
similarity index 100%
rename from src/applications/metamta/adapter/base/PhabricatorMailImplementationAdapter.php
rename to src/applications/metamta/adapter/PhabricatorMailImplementationAdapter.php
diff --git a/src/applications/metamta/adapter/amazonses/PhabricatorMailImplementationAmazonSESAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
similarity index 100%
rename from src/applications/metamta/adapter/amazonses/PhabricatorMailImplementationAmazonSESAdapter.php
rename to src/applications/metamta/adapter/PhabricatorMailImplementationAmazonSESAdapter.php
diff --git a/src/applications/metamta/adapter/phpmailerlite/PhabricatorMailImplementationPHPMailerLiteAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
similarity index 100%
rename from src/applications/metamta/adapter/phpmailerlite/PhabricatorMailImplementationPHPMailerLiteAdapter.php
rename to src/applications/metamta/adapter/PhabricatorMailImplementationPHPMailerLiteAdapter.php
diff --git a/src/applications/metamta/adapter/sendgrid/PhabricatorMailImplementationSendGridAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php
similarity index 100%
rename from src/applications/metamta/adapter/sendgrid/PhabricatorMailImplementationSendGridAdapter.php
rename to src/applications/metamta/adapter/PhabricatorMailImplementationSendGridAdapter.php
diff --git a/src/applications/metamta/adapter/test/PhabricatorMailImplementationTestAdapter.php b/src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php
similarity index 100%
rename from src/applications/metamta/adapter/test/PhabricatorMailImplementationTestAdapter.php
rename to src/applications/metamta/adapter/PhabricatorMailImplementationTestAdapter.php
diff --git a/src/applications/metamta/constants/base/MetaMTAConstants.php b/src/applications/metamta/constants/MetaMTAConstants.php
similarity index 100%
rename from src/applications/metamta/constants/base/MetaMTAConstants.php
rename to src/applications/metamta/constants/MetaMTAConstants.php
diff --git a/src/applications/metamta/constants/notificationtype/MetaMTANotificationType.php b/src/applications/metamta/constants/MetaMTANotificationType.php
similarity index 100%
rename from src/applications/metamta/constants/notificationtype/MetaMTANotificationType.php
rename to src/applications/metamta/constants/MetaMTANotificationType.php
diff --git a/src/applications/metamta/contentsource/source/PhabricatorContentSource.php b/src/applications/metamta/contentsource/PhabricatorContentSource.php
similarity index 100%
rename from src/applications/metamta/contentsource/source/PhabricatorContentSource.php
rename to src/applications/metamta/contentsource/PhabricatorContentSource.php
diff --git a/src/applications/metamta/contentsource/view/PhabricatorContentSourceView.php b/src/applications/metamta/contentsource/PhabricatorContentSourceView.php
similarity index 100%
rename from src/applications/metamta/contentsource/view/PhabricatorContentSourceView.php
rename to src/applications/metamta/contentsource/PhabricatorContentSourceView.php
diff --git a/src/applications/metamta/controller/base/PhabricatorMetaMTAController.php b/src/applications/metamta/controller/PhabricatorMetaMTAController.php
similarity index 100%
rename from src/applications/metamta/controller/base/PhabricatorMetaMTAController.php
rename to src/applications/metamta/controller/PhabricatorMetaMTAController.php
diff --git a/src/applications/metamta/controller/list/PhabricatorMetaMTAListController.php b/src/applications/metamta/controller/PhabricatorMetaMTAListController.php
similarity index 100%
rename from src/applications/metamta/controller/list/PhabricatorMetaMTAListController.php
rename to src/applications/metamta/controller/PhabricatorMetaMTAListController.php
diff --git a/src/applications/metamta/controller/mailinglistedit/PhabricatorMetaMTAMailingListEditController.php b/src/applications/metamta/controller/PhabricatorMetaMTAMailingListEditController.php
similarity index 100%
rename from src/applications/metamta/controller/mailinglistedit/PhabricatorMetaMTAMailingListEditController.php
rename to src/applications/metamta/controller/PhabricatorMetaMTAMailingListEditController.php
diff --git a/src/applications/metamta/controller/mailinglists/PhabricatorMetaMTAMailingListsController.php b/src/applications/metamta/controller/PhabricatorMetaMTAMailingListsController.php
similarity index 100%
rename from src/applications/metamta/controller/mailinglists/PhabricatorMetaMTAMailingListsController.php
rename to src/applications/metamta/controller/PhabricatorMetaMTAMailingListsController.php
diff --git a/src/applications/metamta/controller/receive/PhabricatorMetaMTAReceiveController.php b/src/applications/metamta/controller/PhabricatorMetaMTAReceiveController.php
similarity index 100%
rename from src/applications/metamta/controller/receive/PhabricatorMetaMTAReceiveController.php
rename to src/applications/metamta/controller/PhabricatorMetaMTAReceiveController.php
diff --git a/src/applications/metamta/controller/receivedlist/PhabricatorMetaMTAReceivedListController.php b/src/applications/metamta/controller/PhabricatorMetaMTAReceivedListController.php
similarity index 100%
rename from src/applications/metamta/controller/receivedlist/PhabricatorMetaMTAReceivedListController.php
rename to src/applications/metamta/controller/PhabricatorMetaMTAReceivedListController.php
diff --git a/src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php b/src/applications/metamta/controller/PhabricatorMetaMTASendController.php
similarity index 100%
rename from src/applications/metamta/controller/send/PhabricatorMetaMTASendController.php
rename to src/applications/metamta/controller/PhabricatorMetaMTASendController.php
diff --git a/src/applications/metamta/controller/sendgridreceive/PhabricatorMetaMTASendGridReceiveController.php b/src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php
similarity index 100%
rename from src/applications/metamta/controller/sendgridreceive/PhabricatorMetaMTASendGridReceiveController.php
rename to src/applications/metamta/controller/PhabricatorMetaMTASendGridReceiveController.php
diff --git a/src/applications/metamta/controller/view/PhabricatorMetaMTAViewController.php b/src/applications/metamta/controller/PhabricatorMetaMTAViewController.php
similarity index 100%
rename from src/applications/metamta/controller/view/PhabricatorMetaMTAViewController.php
rename to src/applications/metamta/controller/PhabricatorMetaMTAViewController.php
diff --git a/src/applications/metamta/replyhandler/base/PhabricatorMailReplyHandler.php b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
similarity index 100%
rename from src/applications/metamta/replyhandler/base/PhabricatorMailReplyHandler.php
rename to src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
diff --git a/src/applications/metamta/storage/mail/PhabricatorMetaMTAAttachment.php b/src/applications/metamta/storage/PhabricatorMetaMTAAttachment.php
similarity index 100%
rename from src/applications/metamta/storage/mail/PhabricatorMetaMTAAttachment.php
rename to src/applications/metamta/storage/PhabricatorMetaMTAAttachment.php
diff --git a/src/applications/metamta/storage/base/PhabricatorMetaMTADAO.php b/src/applications/metamta/storage/PhabricatorMetaMTADAO.php
similarity index 100%
rename from src/applications/metamta/storage/base/PhabricatorMetaMTADAO.php
rename to src/applications/metamta/storage/PhabricatorMetaMTADAO.php
diff --git a/src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAMail.php
similarity index 100%
rename from src/applications/metamta/storage/mail/PhabricatorMetaMTAMail.php
rename to src/applications/metamta/storage/PhabricatorMetaMTAMail.php
diff --git a/src/applications/metamta/storage/mailinglist/PhabricatorMetaMTAMailingList.php b/src/applications/metamta/storage/PhabricatorMetaMTAMailingList.php
similarity index 100%
rename from src/applications/metamta/storage/mailinglist/PhabricatorMetaMTAMailingList.php
rename to src/applications/metamta/storage/PhabricatorMetaMTAMailingList.php
diff --git a/src/applications/metamta/storage/receivedmail/PhabricatorMetaMTAReceivedMail.php b/src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
similarity index 100%
rename from src/applications/metamta/storage/receivedmail/PhabricatorMetaMTAReceivedMail.php
rename to src/applications/metamta/storage/PhabricatorMetaMTAReceivedMail.php
diff --git a/src/applications/metamta/storage/mail/__tests__/PhabricatorMetaMTAMailTestCase.php b/src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
similarity index 100%
rename from src/applications/metamta/storage/mail/__tests__/PhabricatorMetaMTAMailTestCase.php
rename to src/applications/metamta/storage/__tests__/PhabricatorMetaMTAMailTestCase.php
diff --git a/src/applications/notifications/controller/test/PhabricatorAphlictTestPageController.php b/src/applications/notifications/controller/PhabricatorAphlictTestPageController.php
similarity index 100%
rename from src/applications/notifications/controller/test/PhabricatorAphlictTestPageController.php
rename to src/applications/notifications/controller/PhabricatorAphlictTestPageController.php
diff --git a/src/applications/notifications/controller/base/PhabricatorNotificationsController.php b/src/applications/notifications/controller/PhabricatorNotificationsController.php
similarity index 100%
rename from src/applications/notifications/controller/base/PhabricatorNotificationsController.php
rename to src/applications/notifications/controller/PhabricatorNotificationsController.php
diff --git a/src/applications/oauthserver/response/PhabricatorOAuthResponse.php b/src/applications/oauthserver/PhabricatorOAuthResponse.php
similarity index 100%
rename from src/applications/oauthserver/response/PhabricatorOAuthResponse.php
rename to src/applications/oauthserver/PhabricatorOAuthResponse.php
diff --git a/src/applications/oauthserver/server/PhabricatorOAuthServer.php b/src/applications/oauthserver/PhabricatorOAuthServer.php
similarity index 100%
rename from src/applications/oauthserver/server/PhabricatorOAuthServer.php
rename to src/applications/oauthserver/PhabricatorOAuthServer.php
diff --git a/src/applications/oauthserver/scope/PhabricatorOAuthServerScope.php b/src/applications/oauthserver/PhabricatorOAuthServerScope.php
similarity index 100%
rename from src/applications/oauthserver/scope/PhabricatorOAuthServerScope.php
rename to src/applications/oauthserver/PhabricatorOAuthServerScope.php
diff --git a/src/applications/oauthserver/server/__tests__/PhabricatorOAuthServerTestCase.php b/src/applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php
similarity index 100%
rename from src/applications/oauthserver/server/__tests__/PhabricatorOAuthServerTestCase.php
rename to src/applications/oauthserver/__tests__/PhabricatorOAuthServerTestCase.php
diff --git a/src/applications/oauthserver/controller/auth/PhabricatorOAuthServerAuthController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
similarity index 100%
rename from src/applications/oauthserver/controller/auth/PhabricatorOAuthServerAuthController.php
rename to src/applications/oauthserver/controller/PhabricatorOAuthServerAuthController.php
diff --git a/src/applications/oauthserver/controller/base/PhabricatorOAuthServerController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerController.php
similarity index 100%
rename from src/applications/oauthserver/controller/base/PhabricatorOAuthServerController.php
rename to src/applications/oauthserver/controller/PhabricatorOAuthServerController.php
diff --git a/src/applications/oauthserver/controller/test/PhabricatorOAuthServerTestController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerTestController.php
similarity index 100%
rename from src/applications/oauthserver/controller/test/PhabricatorOAuthServerTestController.php
rename to src/applications/oauthserver/controller/PhabricatorOAuthServerTestController.php
diff --git a/src/applications/oauthserver/controller/token/PhabricatorOAuthServerTokenController.php b/src/applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php
similarity index 100%
rename from src/applications/oauthserver/controller/token/PhabricatorOAuthServerTokenController.php
rename to src/applications/oauthserver/controller/PhabricatorOAuthServerTokenController.php
diff --git a/src/applications/oauthserver/controller/client/base/PhabricatorOAuthClientBaseController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientBaseController.php
similarity index 100%
rename from src/applications/oauthserver/controller/client/base/PhabricatorOAuthClientBaseController.php
rename to src/applications/oauthserver/controller/client/PhabricatorOAuthClientBaseController.php
diff --git a/src/applications/oauthserver/controller/client/delete/PhabricatorOAuthClientDeleteController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientDeleteController.php
similarity index 100%
rename from src/applications/oauthserver/controller/client/delete/PhabricatorOAuthClientDeleteController.php
rename to src/applications/oauthserver/controller/client/PhabricatorOAuthClientDeleteController.php
diff --git a/src/applications/oauthserver/controller/client/edit/PhabricatorOAuthClientEditController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php
similarity index 100%
rename from src/applications/oauthserver/controller/client/edit/PhabricatorOAuthClientEditController.php
rename to src/applications/oauthserver/controller/client/PhabricatorOAuthClientEditController.php
diff --git a/src/applications/oauthserver/controller/client/list/PhabricatorOAuthClientListController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php
similarity index 100%
rename from src/applications/oauthserver/controller/client/list/PhabricatorOAuthClientListController.php
rename to src/applications/oauthserver/controller/client/PhabricatorOAuthClientListController.php
diff --git a/src/applications/oauthserver/controller/client/view/PhabricatorOAuthClientViewController.php b/src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php
similarity index 100%
rename from src/applications/oauthserver/controller/client/view/PhabricatorOAuthClientViewController.php
rename to src/applications/oauthserver/controller/client/PhabricatorOAuthClientViewController.php
diff --git a/src/applications/oauthserver/controller/clientauthorization/base/PhabricatorOAuthClientAuthorizationBaseController.php b/src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationBaseController.php
similarity index 100%
rename from src/applications/oauthserver/controller/clientauthorization/base/PhabricatorOAuthClientAuthorizationBaseController.php
rename to src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationBaseController.php
diff --git a/src/applications/oauthserver/controller/clientauthorization/delete/PhabricatorOAuthClientAuthorizationDeleteController.php b/src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationDeleteController.php
similarity index 100%
rename from src/applications/oauthserver/controller/clientauthorization/delete/PhabricatorOAuthClientAuthorizationDeleteController.php
rename to src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationDeleteController.php
diff --git a/src/applications/oauthserver/controller/clientauthorization/edit/PhabricatorOAuthClientAuthorizationEditController.php b/src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationEditController.php
similarity index 100%
rename from src/applications/oauthserver/controller/clientauthorization/edit/PhabricatorOAuthClientAuthorizationEditController.php
rename to src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationEditController.php
diff --git a/src/applications/oauthserver/controller/clientauthorization/list/PhabricatorOAuthClientAuthorizationListController.php b/src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationListController.php
similarity index 100%
rename from src/applications/oauthserver/controller/clientauthorization/list/PhabricatorOAuthClientAuthorizationListController.php
rename to src/applications/oauthserver/controller/clientauthorization/PhabricatorOAuthClientAuthorizationListController.php
diff --git a/src/applications/oauthserver/query/clientauthorization/PhabricatorOAuthClientAuthorizationQuery.php b/src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php
similarity index 100%
rename from src/applications/oauthserver/query/clientauthorization/PhabricatorOAuthClientAuthorizationQuery.php
rename to src/applications/oauthserver/query/PhabricatorOAuthClientAuthorizationQuery.php
diff --git a/src/applications/oauthserver/query/client/PhabricatorOAuthServerClientQuery.php b/src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php
similarity index 100%
rename from src/applications/oauthserver/query/client/PhabricatorOAuthServerClientQuery.php
rename to src/applications/oauthserver/query/PhabricatorOAuthServerClientQuery.php
diff --git a/src/applications/oauthserver/storage/clientauthorization/PhabricatorOAuthClientAuthorization.php b/src/applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php
similarity index 100%
rename from src/applications/oauthserver/storage/clientauthorization/PhabricatorOAuthClientAuthorization.php
rename to src/applications/oauthserver/storage/PhabricatorOAuthClientAuthorization.php
diff --git a/src/applications/oauthserver/storage/accesstoken/PhabricatorOAuthServerAccessToken.php b/src/applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php
similarity index 100%
rename from src/applications/oauthserver/storage/accesstoken/PhabricatorOAuthServerAccessToken.php
rename to src/applications/oauthserver/storage/PhabricatorOAuthServerAccessToken.php
diff --git a/src/applications/oauthserver/storage/authorizationcode/PhabricatorOAuthServerAuthorizationCode.php b/src/applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php
similarity index 100%
rename from src/applications/oauthserver/storage/authorizationcode/PhabricatorOAuthServerAuthorizationCode.php
rename to src/applications/oauthserver/storage/PhabricatorOAuthServerAuthorizationCode.php
diff --git a/src/applications/oauthserver/storage/client/PhabricatorOAuthServerClient.php b/src/applications/oauthserver/storage/PhabricatorOAuthServerClient.php
similarity index 100%
rename from src/applications/oauthserver/storage/client/PhabricatorOAuthServerClient.php
rename to src/applications/oauthserver/storage/PhabricatorOAuthServerClient.php
diff --git a/src/applications/oauthserver/storage/base/PhabricatorOAuthServerDAO.php b/src/applications/oauthserver/storage/PhabricatorOAuthServerDAO.php
similarity index 100%
rename from src/applications/oauthserver/storage/base/PhabricatorOAuthServerDAO.php
rename to src/applications/oauthserver/storage/PhabricatorOAuthServerDAO.php
diff --git a/src/applications/owners/replyhandler/OwnersPackageReplyHandler.php b/src/applications/owners/OwnersPackageReplyHandler.php
similarity index 100%
rename from src/applications/owners/replyhandler/OwnersPackageReplyHandler.php
rename to src/applications/owners/OwnersPackageReplyHandler.php
diff --git a/src/applications/owners/controller/base/PhabricatorOwnersController.php b/src/applications/owners/controller/PhabricatorOwnersController.php
similarity index 100%
rename from src/applications/owners/controller/base/PhabricatorOwnersController.php
rename to src/applications/owners/controller/PhabricatorOwnersController.php
diff --git a/src/applications/owners/controller/delete/PhabricatorOwnersDeleteController.php b/src/applications/owners/controller/PhabricatorOwnersDeleteController.php
similarity index 100%
rename from src/applications/owners/controller/delete/PhabricatorOwnersDeleteController.php
rename to src/applications/owners/controller/PhabricatorOwnersDeleteController.php
diff --git a/src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php b/src/applications/owners/controller/PhabricatorOwnersDetailController.php
similarity index 100%
rename from src/applications/owners/controller/detail/PhabricatorOwnersDetailController.php
rename to src/applications/owners/controller/PhabricatorOwnersDetailController.php
diff --git a/src/applications/owners/controller/edit/PhabricatorOwnersEditController.php b/src/applications/owners/controller/PhabricatorOwnersEditController.php
similarity index 100%
rename from src/applications/owners/controller/edit/PhabricatorOwnersEditController.php
rename to src/applications/owners/controller/PhabricatorOwnersEditController.php
diff --git a/src/applications/owners/controller/list/PhabricatorOwnersListController.php b/src/applications/owners/controller/PhabricatorOwnersListController.php
similarity index 100%
rename from src/applications/owners/controller/list/PhabricatorOwnersListController.php
rename to src/applications/owners/controller/PhabricatorOwnersListController.php
diff --git a/src/applications/owners/mail/create/PackageCreateMail.php b/src/applications/owners/mail/PackageCreateMail.php
similarity index 100%
rename from src/applications/owners/mail/create/PackageCreateMail.php
rename to src/applications/owners/mail/PackageCreateMail.php
diff --git a/src/applications/owners/mail/delete/PackageDeleteMail.php b/src/applications/owners/mail/PackageDeleteMail.php
similarity index 100%
rename from src/applications/owners/mail/delete/PackageDeleteMail.php
rename to src/applications/owners/mail/PackageDeleteMail.php
diff --git a/src/applications/owners/mail/base/PackageMail.php b/src/applications/owners/mail/PackageMail.php
similarity index 100%
rename from src/applications/owners/mail/base/PackageMail.php
rename to src/applications/owners/mail/PackageMail.php
diff --git a/src/applications/owners/mail/modify/PackageModifyMail.php b/src/applications/owners/mail/PackageModifyMail.php
similarity index 100%
rename from src/applications/owners/mail/modify/PackageModifyMail.php
rename to src/applications/owners/mail/PackageModifyMail.php
diff --git a/src/applications/owners/query/path/PhabricatorOwnerPathQuery.php b/src/applications/owners/query/PhabricatorOwnerPathQuery.php
similarity index 100%
rename from src/applications/owners/query/path/PhabricatorOwnerPathQuery.php
rename to src/applications/owners/query/PhabricatorOwnerPathQuery.php
diff --git a/src/applications/owners/storage/base/PhabricatorOwnersDAO.php b/src/applications/owners/storage/PhabricatorOwnersDAO.php
similarity index 100%
rename from src/applications/owners/storage/base/PhabricatorOwnersDAO.php
rename to src/applications/owners/storage/PhabricatorOwnersDAO.php
diff --git a/src/applications/owners/storage/owner/PhabricatorOwnersOwner.php b/src/applications/owners/storage/PhabricatorOwnersOwner.php
similarity index 100%
rename from src/applications/owners/storage/owner/PhabricatorOwnersOwner.php
rename to src/applications/owners/storage/PhabricatorOwnersOwner.php
diff --git a/src/applications/owners/storage/package/PhabricatorOwnersPackage.php b/src/applications/owners/storage/PhabricatorOwnersPackage.php
similarity index 100%
rename from src/applications/owners/storage/package/PhabricatorOwnersPackage.php
rename to src/applications/owners/storage/PhabricatorOwnersPackage.php
diff --git a/src/applications/owners/storage/path/PhabricatorOwnersPath.php b/src/applications/owners/storage/PhabricatorOwnersPath.php
similarity index 100%
rename from src/applications/owners/storage/path/PhabricatorOwnersPath.php
rename to src/applications/owners/storage/PhabricatorOwnersPath.php
diff --git a/src/applications/paste/controller/base/PhabricatorPasteController.php b/src/applications/paste/controller/PhabricatorPasteController.php
similarity index 100%
rename from src/applications/paste/controller/base/PhabricatorPasteController.php
rename to src/applications/paste/controller/PhabricatorPasteController.php
diff --git a/src/applications/paste/controller/list/PhabricatorPasteListController.php b/src/applications/paste/controller/PhabricatorPasteListController.php
similarity index 100%
rename from src/applications/paste/controller/list/PhabricatorPasteListController.php
rename to src/applications/paste/controller/PhabricatorPasteListController.php
diff --git a/src/applications/paste/controller/view/PhabricatorPasteViewController.php b/src/applications/paste/controller/PhabricatorPasteViewController.php
similarity index 100%
rename from src/applications/paste/controller/view/PhabricatorPasteViewController.php
rename to src/applications/paste/controller/PhabricatorPasteViewController.php
diff --git a/src/applications/paste/query/paste/PhabricatorPasteQuery.php b/src/applications/paste/query/PhabricatorPasteQuery.php
similarity index 100%
rename from src/applications/paste/query/paste/PhabricatorPasteQuery.php
rename to src/applications/paste/query/PhabricatorPasteQuery.php
diff --git a/src/applications/paste/storage/paste/PhabricatorPaste.php b/src/applications/paste/storage/PhabricatorPaste.php
similarity index 100%
rename from src/applications/paste/storage/paste/PhabricatorPaste.php
rename to src/applications/paste/storage/PhabricatorPaste.php
diff --git a/src/applications/paste/storage/base/PhabricatorPasteDAO.php b/src/applications/paste/storage/PhabricatorPasteDAO.php
similarity index 100%
rename from src/applications/paste/storage/base/PhabricatorPasteDAO.php
rename to src/applications/paste/storage/PhabricatorPasteDAO.php
diff --git a/src/applications/people/query/PhabricatorPeopleQuery.php b/src/applications/people/PhabricatorPeopleQuery.php
similarity index 100%
rename from src/applications/people/query/PhabricatorPeopleQuery.php
rename to src/applications/people/PhabricatorPeopleQuery.php
diff --git a/src/applications/people/editor/PhabricatorUserEditor.php b/src/applications/people/PhabricatorUserEditor.php
similarity index 100%
rename from src/applications/people/editor/PhabricatorUserEditor.php
rename to src/applications/people/PhabricatorUserEditor.php
diff --git a/src/applications/people/controller/emailverification/PhabricatorEmailVerificationController.php b/src/applications/people/controller/PhabricatorEmailVerificationController.php
similarity index 100%
rename from src/applications/people/controller/emailverification/PhabricatorEmailVerificationController.php
rename to src/applications/people/controller/PhabricatorEmailVerificationController.php
diff --git a/src/applications/people/controller/base/PhabricatorPeopleController.php b/src/applications/people/controller/PhabricatorPeopleController.php
similarity index 100%
rename from src/applications/people/controller/base/PhabricatorPeopleController.php
rename to src/applications/people/controller/PhabricatorPeopleController.php
diff --git a/src/applications/people/controller/edit/PhabricatorPeopleEditController.php b/src/applications/people/controller/PhabricatorPeopleEditController.php
similarity index 100%
rename from src/applications/people/controller/edit/PhabricatorPeopleEditController.php
rename to src/applications/people/controller/PhabricatorPeopleEditController.php
diff --git a/src/applications/people/controller/list/PhabricatorPeopleListController.php b/src/applications/people/controller/PhabricatorPeopleListController.php
similarity index 100%
rename from src/applications/people/controller/list/PhabricatorPeopleListController.php
rename to src/applications/people/controller/PhabricatorPeopleListController.php
diff --git a/src/applications/people/controller/logs/PhabricatorPeopleLogsController.php b/src/applications/people/controller/PhabricatorPeopleLogsController.php
similarity index 100%
rename from src/applications/people/controller/logs/PhabricatorPeopleLogsController.php
rename to src/applications/people/controller/PhabricatorPeopleLogsController.php
diff --git a/src/applications/people/controller/profile/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php
similarity index 100%
rename from src/applications/people/controller/profile/PhabricatorPeopleProfileController.php
rename to src/applications/people/controller/PhabricatorPeopleProfileController.php
diff --git a/src/applications/people/controller/settings/PhabricatorUserSettingsController.php b/src/applications/people/controller/PhabricatorUserSettingsController.php
similarity index 100%
rename from src/applications/people/controller/settings/PhabricatorUserSettingsController.php
rename to src/applications/people/controller/PhabricatorUserSettingsController.php
diff --git a/src/applications/people/controller/settings/panels/account/PhabricatorUserAccountSettingsPanelController.php b/src/applications/people/controller/settings/panels/PhabricatorUserAccountSettingsPanelController.php
similarity index 100%
rename from src/applications/people/controller/settings/panels/account/PhabricatorUserAccountSettingsPanelController.php
rename to src/applications/people/controller/settings/panels/PhabricatorUserAccountSettingsPanelController.php
diff --git a/src/applications/people/controller/settings/panels/conduit/PhabricatorUserConduitSettingsPanelController.php b/src/applications/people/controller/settings/panels/PhabricatorUserConduitSettingsPanelController.php
similarity index 100%
rename from src/applications/people/controller/settings/panels/conduit/PhabricatorUserConduitSettingsPanelController.php
rename to src/applications/people/controller/settings/panels/PhabricatorUserConduitSettingsPanelController.php
diff --git a/src/applications/people/controller/settings/panels/emailpref/PhabricatorUserEmailPreferenceSettingsPanelController.php b/src/applications/people/controller/settings/panels/PhabricatorUserEmailPreferenceSettingsPanelController.php
similarity index 100%
rename from src/applications/people/controller/settings/panels/emailpref/PhabricatorUserEmailPreferenceSettingsPanelController.php
rename to src/applications/people/controller/settings/panels/PhabricatorUserEmailPreferenceSettingsPanelController.php
diff --git a/src/applications/people/controller/settings/panels/email/PhabricatorUserEmailSettingsPanelController.php b/src/applications/people/controller/settings/panels/PhabricatorUserEmailSettingsPanelController.php
similarity index 100%
rename from src/applications/people/controller/settings/panels/email/PhabricatorUserEmailSettingsPanelController.php
rename to src/applications/people/controller/settings/panels/PhabricatorUserEmailSettingsPanelController.php
diff --git a/src/applications/people/controller/settings/panels/oauth/PhabricatorUserOAuthSettingsPanelController.php b/src/applications/people/controller/settings/panels/PhabricatorUserOAuthSettingsPanelController.php
similarity index 100%
rename from src/applications/people/controller/settings/panels/oauth/PhabricatorUserOAuthSettingsPanelController.php
rename to src/applications/people/controller/settings/panels/PhabricatorUserOAuthSettingsPanelController.php
diff --git a/src/applications/people/controller/settings/panels/password/PhabricatorUserPasswordSettingsPanelController.php b/src/applications/people/controller/settings/panels/PhabricatorUserPasswordSettingsPanelController.php
similarity index 100%
rename from src/applications/people/controller/settings/panels/password/PhabricatorUserPasswordSettingsPanelController.php
rename to src/applications/people/controller/settings/panels/PhabricatorUserPasswordSettingsPanelController.php
diff --git a/src/applications/people/controller/settings/panels/preferences/PhabricatorUserPreferenceSettingsPanelController.php b/src/applications/people/controller/settings/panels/PhabricatorUserPreferenceSettingsPanelController.php
similarity index 100%
rename from src/applications/people/controller/settings/panels/preferences/PhabricatorUserPreferenceSettingsPanelController.php
rename to src/applications/people/controller/settings/panels/PhabricatorUserPreferenceSettingsPanelController.php
diff --git a/src/applications/people/controller/settings/panels/profile/PhabricatorUserProfileSettingsPanelController.php b/src/applications/people/controller/settings/panels/PhabricatorUserProfileSettingsPanelController.php
similarity index 100%
rename from src/applications/people/controller/settings/panels/profile/PhabricatorUserProfileSettingsPanelController.php
rename to src/applications/people/controller/settings/panels/PhabricatorUserProfileSettingsPanelController.php
diff --git a/src/applications/people/controller/settings/panels/sshkeys/PhabricatorUserSSHKeysSettingsPanelController.php b/src/applications/people/controller/settings/panels/PhabricatorUserSSHKeysSettingsPanelController.php
similarity index 100%
rename from src/applications/people/controller/settings/panels/sshkeys/PhabricatorUserSSHKeysSettingsPanelController.php
rename to src/applications/people/controller/settings/panels/PhabricatorUserSSHKeysSettingsPanelController.php
diff --git a/src/applications/people/controller/settings/panels/search/PhabricatorUserSearchSettingsPanelController.php b/src/applications/people/controller/settings/panels/PhabricatorUserSearchSettingsPanelController.php
similarity index 100%
rename from src/applications/people/controller/settings/panels/search/PhabricatorUserSearchSettingsPanelController.php
rename to src/applications/people/controller/settings/panels/PhabricatorUserSearchSettingsPanelController.php
diff --git a/src/applications/people/controller/settings/panels/base/PhabricatorUserSettingsPanelController.php b/src/applications/people/controller/settings/panels/PhabricatorUserSettingsPanelController.php
similarity index 100%
rename from src/applications/people/controller/settings/panels/base/PhabricatorUserSettingsPanelController.php
rename to src/applications/people/controller/settings/panels/PhabricatorUserSettingsPanelController.php
diff --git a/src/applications/people/storage/user/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
similarity index 100%
rename from src/applications/people/storage/user/PhabricatorUser.php
rename to src/applications/people/storage/PhabricatorUser.php
diff --git a/src/applications/people/storage/base/PhabricatorUserDAO.php b/src/applications/people/storage/PhabricatorUserDAO.php
similarity index 100%
rename from src/applications/people/storage/base/PhabricatorUserDAO.php
rename to src/applications/people/storage/PhabricatorUserDAO.php
diff --git a/src/applications/people/storage/email/PhabricatorUserEmail.php b/src/applications/people/storage/PhabricatorUserEmail.php
similarity index 100%
rename from src/applications/people/storage/email/PhabricatorUserEmail.php
rename to src/applications/people/storage/PhabricatorUserEmail.php
diff --git a/src/applications/people/storage/log/PhabricatorUserLog.php b/src/applications/people/storage/PhabricatorUserLog.php
similarity index 100%
rename from src/applications/people/storage/log/PhabricatorUserLog.php
rename to src/applications/people/storage/PhabricatorUserLog.php
diff --git a/src/applications/people/storage/useroauthinfo/PhabricatorUserOAuthInfo.php b/src/applications/people/storage/PhabricatorUserOAuthInfo.php
similarity index 100%
rename from src/applications/people/storage/useroauthinfo/PhabricatorUserOAuthInfo.php
rename to src/applications/people/storage/PhabricatorUserOAuthInfo.php
diff --git a/src/applications/people/storage/preferences/PhabricatorUserPreferences.php b/src/applications/people/storage/PhabricatorUserPreferences.php
similarity index 100%
rename from src/applications/people/storage/preferences/PhabricatorUserPreferences.php
rename to src/applications/people/storage/PhabricatorUserPreferences.php
diff --git a/src/applications/people/storage/profile/PhabricatorUserProfile.php b/src/applications/people/storage/PhabricatorUserProfile.php
similarity index 100%
rename from src/applications/people/storage/profile/PhabricatorUserProfile.php
rename to src/applications/people/storage/PhabricatorUserProfile.php
diff --git a/src/applications/people/storage/usersshkey/PhabricatorUserSSHKey.php b/src/applications/people/storage/PhabricatorUserSSHKey.php
similarity index 100%
rename from src/applications/people/storage/usersshkey/PhabricatorUserSSHKey.php
rename to src/applications/people/storage/PhabricatorUserSSHKey.php
diff --git a/src/applications/people/storage/userstatus/PhabricatorUserStatus.php b/src/applications/people/storage/PhabricatorUserStatus.php
similarity index 100%
rename from src/applications/people/storage/userstatus/PhabricatorUserStatus.php
rename to src/applications/people/storage/PhabricatorUserStatus.php
diff --git a/src/applications/people/storage/user/__tests__/PhabricatorUserTestCase.php b/src/applications/people/storage/__tests__/PhabricatorUserTestCase.php
similarity index 100%
rename from src/applications/people/storage/user/__tests__/PhabricatorUserTestCase.php
rename to src/applications/people/storage/__tests__/PhabricatorUserTestCase.php
diff --git a/src/applications/phame/controller/base/PhameController.php b/src/applications/phame/controller/PhameController.php
similarity index 100%
rename from src/applications/phame/controller/base/PhameController.php
rename to src/applications/phame/controller/PhameController.php
diff --git a/src/applications/phame/controller/post/delete/PhamePostDeleteController.php b/src/applications/phame/controller/post/PhamePostDeleteController.php
similarity index 100%
rename from src/applications/phame/controller/post/delete/PhamePostDeleteController.php
rename to src/applications/phame/controller/post/PhamePostDeleteController.php
diff --git a/src/applications/phame/controller/post/edit/PhamePostEditController.php b/src/applications/phame/controller/post/PhamePostEditController.php
similarity index 100%
rename from src/applications/phame/controller/post/edit/PhamePostEditController.php
rename to src/applications/phame/controller/post/PhamePostEditController.php
diff --git a/src/applications/phame/controller/post/preview/PhamePostPreviewController.php b/src/applications/phame/controller/post/PhamePostPreviewController.php
similarity index 100%
rename from src/applications/phame/controller/post/preview/PhamePostPreviewController.php
rename to src/applications/phame/controller/post/PhamePostPreviewController.php
diff --git a/src/applications/phame/controller/post/view/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php
similarity index 100%
rename from src/applications/phame/controller/post/view/PhamePostViewController.php
rename to src/applications/phame/controller/post/PhamePostViewController.php
diff --git a/src/applications/phame/controller/post/list/drafts/PhameDraftListController.php b/src/applications/phame/controller/post/list/PhameDraftListController.php
similarity index 100%
rename from src/applications/phame/controller/post/list/drafts/PhameDraftListController.php
rename to src/applications/phame/controller/post/list/PhameDraftListController.php
diff --git a/src/applications/phame/controller/post/list/base/PhamePostListBaseController.php b/src/applications/phame/controller/post/list/PhamePostListBaseController.php
similarity index 100%
rename from src/applications/phame/controller/post/list/base/PhamePostListBaseController.php
rename to src/applications/phame/controller/post/list/PhamePostListBaseController.php
diff --git a/src/applications/phame/controller/post/list/posts/PhamePostListController.php b/src/applications/phame/controller/post/list/PhamePostListController.php
similarity index 100%
rename from src/applications/phame/controller/post/list/posts/PhamePostListController.php
rename to src/applications/phame/controller/post/list/PhamePostListController.php
diff --git a/src/applications/phame/query/post/PhamePostQuery.php b/src/applications/phame/query/PhamePostQuery.php
similarity index 100%
rename from src/applications/phame/query/post/PhamePostQuery.php
rename to src/applications/phame/query/PhamePostQuery.php
diff --git a/src/applications/phame/storage/base/PhameDAO.php b/src/applications/phame/storage/PhameDAO.php
similarity index 100%
rename from src/applications/phame/storage/base/PhameDAO.php
rename to src/applications/phame/storage/PhameDAO.php
diff --git a/src/applications/phame/storage/post/PhamePost.php b/src/applications/phame/storage/PhamePost.php
similarity index 100%
rename from src/applications/phame/storage/post/PhamePost.php
rename to src/applications/phame/storage/PhamePost.php
diff --git a/src/applications/phame/view/postdetail/PhamePostDetailView.php b/src/applications/phame/view/PhamePostDetailView.php
similarity index 100%
rename from src/applications/phame/view/postdetail/PhamePostDetailView.php
rename to src/applications/phame/view/PhamePostDetailView.php
diff --git a/src/applications/phame/view/postlist/PhamePostListView.php b/src/applications/phame/view/PhamePostListView.php
similarity index 100%
rename from src/applications/phame/view/postlist/PhamePostListView.php
rename to src/applications/phame/view/PhamePostListView.php
diff --git a/src/applications/phid/graph/PhabricatorObjectGraph.php b/src/applications/phid/PhabricatorObjectGraph.php
similarity index 100%
rename from src/applications/phid/graph/PhabricatorObjectGraph.php
rename to src/applications/phid/PhabricatorObjectGraph.php
diff --git a/src/applications/phid/handle/PhabricatorObjectHandle.php b/src/applications/phid/PhabricatorObjectHandle.php
similarity index 100%
rename from src/applications/phid/handle/PhabricatorObjectHandle.php
rename to src/applications/phid/PhabricatorObjectHandle.php
diff --git a/src/applications/phid/constants/PhabricatorPHIDConstants.php b/src/applications/phid/PhabricatorPHIDConstants.php
similarity index 100%
rename from src/applications/phid/constants/PhabricatorPHIDConstants.php
rename to src/applications/phid/PhabricatorPHIDConstants.php
diff --git a/src/applications/phid/controller/base/PhabricatorPHIDController.php b/src/applications/phid/controller/PhabricatorPHIDController.php
similarity index 100%
rename from src/applications/phid/controller/base/PhabricatorPHIDController.php
rename to src/applications/phid/controller/PhabricatorPHIDController.php
diff --git a/src/applications/phid/controller/lookup/PhabricatorPHIDLookupController.php b/src/applications/phid/controller/PhabricatorPHIDLookupController.php
similarity index 100%
rename from src/applications/phid/controller/lookup/PhabricatorPHIDLookupController.php
rename to src/applications/phid/controller/PhabricatorPHIDLookupController.php
diff --git a/src/applications/phid/handle/data/PhabricatorObjectHandleData.php b/src/applications/phid/handle/PhabricatorObjectHandleData.php
similarity index 100%
rename from src/applications/phid/handle/data/PhabricatorObjectHandleData.php
rename to src/applications/phid/handle/PhabricatorObjectHandleData.php
diff --git a/src/applications/phid/handle/const/base/PhabricatorObjectHandleConstants.php b/src/applications/phid/handle/const/PhabricatorObjectHandleConstants.php
similarity index 100%
rename from src/applications/phid/handle/const/base/PhabricatorObjectHandleConstants.php
rename to src/applications/phid/handle/const/PhabricatorObjectHandleConstants.php
diff --git a/src/applications/phid/handle/const/status/PhabricatorObjectHandleStatus.php b/src/applications/phid/handle/const/PhabricatorObjectHandleStatus.php
similarity index 100%
rename from src/applications/phid/handle/const/status/PhabricatorObjectHandleStatus.php
rename to src/applications/phid/handle/const/PhabricatorObjectHandleStatus.php
diff --git a/src/applications/phid/handle/view/selector/PhabricatorHandleObjectSelectorDataView.php b/src/applications/phid/handle/view/PhabricatorHandleObjectSelectorDataView.php
similarity index 100%
rename from src/applications/phid/handle/view/selector/PhabricatorHandleObjectSelectorDataView.php
rename to src/applications/phid/handle/view/PhabricatorHandleObjectSelectorDataView.php
diff --git a/src/applications/phid/storage/phid/PhabricatorPHID.php b/src/applications/phid/storage/PhabricatorPHID.php
similarity index 100%
rename from src/applications/phid/storage/phid/PhabricatorPHID.php
rename to src/applications/phid/storage/PhabricatorPHID.php
diff --git a/src/applications/phid/utils/utils.php b/src/applications/phid/utils.php
similarity index 100%
rename from src/applications/phid/utils/utils.php
rename to src/applications/phid/utils.php
diff --git a/src/applications/phortune/control/monthyearexpiry/PhortuneMonthYearExpiryControl.php b/src/applications/phortune/control/PhortuneMonthYearExpiryControl.php
similarity index 100%
rename from src/applications/phortune/control/monthyearexpiry/PhortuneMonthYearExpiryControl.php
rename to src/applications/phortune/control/PhortuneMonthYearExpiryControl.php
diff --git a/src/applications/phortune/stripe/controller/base/PhortuneStripeBaseController.php b/src/applications/phortune/stripe/controller/PhortuneStripeBaseController.php
similarity index 100%
rename from src/applications/phortune/stripe/controller/base/PhortuneStripeBaseController.php
rename to src/applications/phortune/stripe/controller/PhortuneStripeBaseController.php
diff --git a/src/applications/phortune/stripe/controller/testpaymentform/PhortuneStripeTestPaymentFormController.php b/src/applications/phortune/stripe/controller/PhortuneStripeTestPaymentFormController.php
similarity index 100%
rename from src/applications/phortune/stripe/controller/testpaymentform/PhortuneStripeTestPaymentFormController.php
rename to src/applications/phortune/stripe/controller/PhortuneStripeTestPaymentFormController.php
diff --git a/src/applications/phortune/stripe/view/paymentform/PhortuneStripePaymentFormView.php b/src/applications/phortune/stripe/view/PhortuneStripePaymentFormView.php
similarity index 100%
rename from src/applications/phortune/stripe/view/paymentform/PhortuneStripePaymentFormView.php
rename to src/applications/phortune/stripe/view/PhortuneStripePaymentFormView.php
diff --git a/src/applications/phriction/constants/action/PhrictionActionConstants.php b/src/applications/phriction/constants/PhrictionActionConstants.php
similarity index 100%
rename from src/applications/phriction/constants/action/PhrictionActionConstants.php
rename to src/applications/phriction/constants/PhrictionActionConstants.php
diff --git a/src/applications/phriction/constants/changetype/PhrictionChangeType.php b/src/applications/phriction/constants/PhrictionChangeType.php
similarity index 100%
rename from src/applications/phriction/constants/changetype/PhrictionChangeType.php
rename to src/applications/phriction/constants/PhrictionChangeType.php
diff --git a/src/applications/phriction/constants/base/PhrictionConstants.php b/src/applications/phriction/constants/PhrictionConstants.php
similarity index 100%
rename from src/applications/phriction/constants/base/PhrictionConstants.php
rename to src/applications/phriction/constants/PhrictionConstants.php
diff --git a/src/applications/phriction/constants/documentstatus/PhrictionDocumentStatus.php b/src/applications/phriction/constants/PhrictionDocumentStatus.php
similarity index 100%
rename from src/applications/phriction/constants/documentstatus/PhrictionDocumentStatus.php
rename to src/applications/phriction/constants/PhrictionDocumentStatus.php
diff --git a/src/applications/phriction/controller/base/PhrictionController.php b/src/applications/phriction/controller/PhrictionController.php
similarity index 100%
rename from src/applications/phriction/controller/base/PhrictionController.php
rename to src/applications/phriction/controller/PhrictionController.php
diff --git a/src/applications/phriction/controller/delete/PhrictionDeleteController.php b/src/applications/phriction/controller/PhrictionDeleteController.php
similarity index 100%
rename from src/applications/phriction/controller/delete/PhrictionDeleteController.php
rename to src/applications/phriction/controller/PhrictionDeleteController.php
diff --git a/src/applications/phriction/controller/diff/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
similarity index 100%
rename from src/applications/phriction/controller/diff/PhrictionDiffController.php
rename to src/applications/phriction/controller/PhrictionDiffController.php
diff --git a/src/applications/phriction/controller/document/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
similarity index 100%
rename from src/applications/phriction/controller/document/PhrictionDocumentController.php
rename to src/applications/phriction/controller/PhrictionDocumentController.php
diff --git a/src/applications/phriction/controller/documentpreview/PhrictionDocumentPreviewController.php b/src/applications/phriction/controller/PhrictionDocumentPreviewController.php
similarity index 100%
rename from src/applications/phriction/controller/documentpreview/PhrictionDocumentPreviewController.php
rename to src/applications/phriction/controller/PhrictionDocumentPreviewController.php
diff --git a/src/applications/phriction/controller/edit/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php
similarity index 100%
rename from src/applications/phriction/controller/edit/PhrictionEditController.php
rename to src/applications/phriction/controller/PhrictionEditController.php
diff --git a/src/applications/phriction/controller/history/PhrictionHistoryController.php b/src/applications/phriction/controller/PhrictionHistoryController.php
similarity index 100%
rename from src/applications/phriction/controller/history/PhrictionHistoryController.php
rename to src/applications/phriction/controller/PhrictionHistoryController.php
diff --git a/src/applications/phriction/controller/list/PhrictionListController.php b/src/applications/phriction/controller/PhrictionListController.php
similarity index 100%
rename from src/applications/phriction/controller/list/PhrictionListController.php
rename to src/applications/phriction/controller/PhrictionListController.php
diff --git a/src/applications/phriction/editor/document/PhrictionDocumentEditor.php b/src/applications/phriction/editor/PhrictionDocumentEditor.php
similarity index 100%
rename from src/applications/phriction/editor/document/PhrictionDocumentEditor.php
rename to src/applications/phriction/editor/PhrictionDocumentEditor.php
diff --git a/src/applications/phriction/storage/content/PhrictionContent.php b/src/applications/phriction/storage/PhrictionContent.php
similarity index 100%
rename from src/applications/phriction/storage/content/PhrictionContent.php
rename to src/applications/phriction/storage/PhrictionContent.php
diff --git a/src/applications/phriction/storage/base/PhrictionDAO.php b/src/applications/phriction/storage/PhrictionDAO.php
similarity index 100%
rename from src/applications/phriction/storage/base/PhrictionDAO.php
rename to src/applications/phriction/storage/PhrictionDAO.php
diff --git a/src/applications/phriction/storage/document/PhrictionDocument.php b/src/applications/phriction/storage/PhrictionDocument.php
similarity index 100%
rename from src/applications/phriction/storage/document/PhrictionDocument.php
rename to src/applications/phriction/storage/PhrictionDocument.php
diff --git a/src/applications/phriction/storage/document/__tests__/PhrictionDocumentTestCase.php b/src/applications/phriction/storage/__tests__/PhrictionDocumentTestCase.php
similarity index 100%
rename from src/applications/phriction/storage/document/__tests__/PhrictionDocumentTestCase.php
rename to src/applications/phriction/storage/__tests__/PhrictionDocumentTestCase.php
diff --git a/src/applications/policy/constants/policy/PhabricatorPolicies.php b/src/applications/policy/constants/PhabricatorPolicies.php
similarity index 100%
rename from src/applications/policy/constants/policy/PhabricatorPolicies.php
rename to src/applications/policy/constants/PhabricatorPolicies.php
diff --git a/src/applications/policy/constants/capability/PhabricatorPolicyCapability.php b/src/applications/policy/constants/PhabricatorPolicyCapability.php
similarity index 100%
rename from src/applications/policy/constants/capability/PhabricatorPolicyCapability.php
rename to src/applications/policy/constants/PhabricatorPolicyCapability.php
diff --git a/src/applications/policy/constants/base/PhabricatorPolicyConstants.php b/src/applications/policy/constants/PhabricatorPolicyConstants.php
similarity index 100%
rename from src/applications/policy/constants/base/PhabricatorPolicyConstants.php
rename to src/applications/policy/constants/PhabricatorPolicyConstants.php
diff --git a/src/applications/policy/exception/base/PhabricatorPolicyException.php b/src/applications/policy/exception/PhabricatorPolicyException.php
similarity index 100%
rename from src/applications/policy/exception/base/PhabricatorPolicyException.php
rename to src/applications/policy/exception/PhabricatorPolicyException.php
diff --git a/src/applications/policy/filter/policy/PhabricatorPolicyFilter.php b/src/applications/policy/filter/PhabricatorPolicyFilter.php
similarity index 100%
rename from src/applications/policy/filter/policy/PhabricatorPolicyFilter.php
rename to src/applications/policy/filter/PhabricatorPolicyFilter.php
diff --git a/src/applications/policy/interface/policy/PhabricatorPolicyInterface.php b/src/applications/policy/interface/PhabricatorPolicyInterface.php
similarity index 100%
rename from src/applications/policy/interface/policy/PhabricatorPolicyInterface.php
rename to src/applications/policy/interface/PhabricatorPolicyInterface.php
diff --git a/src/applications/project/constants/base/PhabricatorProjectConstants.php b/src/applications/project/constants/PhabricatorProjectConstants.php
similarity index 100%
rename from src/applications/project/constants/base/PhabricatorProjectConstants.php
rename to src/applications/project/constants/PhabricatorProjectConstants.php
diff --git a/src/applications/project/constants/status/PhabricatorProjectStatus.php b/src/applications/project/constants/PhabricatorProjectStatus.php
similarity index 100%
rename from src/applications/project/constants/status/PhabricatorProjectStatus.php
rename to src/applications/project/constants/PhabricatorProjectStatus.php
diff --git a/src/applications/project/constants/transaction/PhabricatorProjectTransactionType.php b/src/applications/project/constants/PhabricatorProjectTransactionType.php
similarity index 100%
rename from src/applications/project/constants/transaction/PhabricatorProjectTransactionType.php
rename to src/applications/project/constants/PhabricatorProjectTransactionType.php
diff --git a/src/applications/project/controller/base/PhabricatorProjectController.php b/src/applications/project/controller/PhabricatorProjectController.php
similarity index 100%
rename from src/applications/project/controller/base/PhabricatorProjectController.php
rename to src/applications/project/controller/PhabricatorProjectController.php
diff --git a/src/applications/project/controller/create/PhabricatorProjectCreateController.php b/src/applications/project/controller/PhabricatorProjectCreateController.php
similarity index 100%
rename from src/applications/project/controller/create/PhabricatorProjectCreateController.php
rename to src/applications/project/controller/PhabricatorProjectCreateController.php
diff --git a/src/applications/project/controller/list/PhabricatorProjectListController.php b/src/applications/project/controller/PhabricatorProjectListController.php
similarity index 100%
rename from src/applications/project/controller/list/PhabricatorProjectListController.php
rename to src/applications/project/controller/PhabricatorProjectListController.php
diff --git a/src/applications/project/controller/profile/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
similarity index 100%
rename from src/applications/project/controller/profile/PhabricatorProjectProfileController.php
rename to src/applications/project/controller/PhabricatorProjectProfileController.php
diff --git a/src/applications/project/controller/profileedit/PhabricatorProjectProfileEditController.php b/src/applications/project/controller/PhabricatorProjectProfileEditController.php
similarity index 100%
rename from src/applications/project/controller/profileedit/PhabricatorProjectProfileEditController.php
rename to src/applications/project/controller/PhabricatorProjectProfileEditController.php
diff --git a/src/applications/project/controller/update/PhabricatorProjectUpdateController.php b/src/applications/project/controller/PhabricatorProjectUpdateController.php
similarity index 100%
rename from src/applications/project/controller/update/PhabricatorProjectUpdateController.php
rename to src/applications/project/controller/PhabricatorProjectUpdateController.php
diff --git a/src/applications/project/editor/project/PhabricatorProjectEditor.php b/src/applications/project/editor/PhabricatorProjectEditor.php
similarity index 100%
rename from src/applications/project/editor/project/PhabricatorProjectEditor.php
rename to src/applications/project/editor/PhabricatorProjectEditor.php
diff --git a/src/applications/project/exception/namecollison/PhabricatorProjectNameCollisionException.php b/src/applications/project/exception/PhabricatorProjectNameCollisionException.php
similarity index 100%
rename from src/applications/project/exception/namecollison/PhabricatorProjectNameCollisionException.php
rename to src/applications/project/exception/PhabricatorProjectNameCollisionException.php
diff --git a/src/applications/project/query/project/PhabricatorProjectQuery.php b/src/applications/project/query/PhabricatorProjectQuery.php
similarity index 100%
rename from src/applications/project/query/project/PhabricatorProjectQuery.php
rename to src/applications/project/query/PhabricatorProjectQuery.php
diff --git a/src/applications/project/storage/project/PhabricatorProject.php b/src/applications/project/storage/PhabricatorProject.php
similarity index 100%
rename from src/applications/project/storage/project/PhabricatorProject.php
rename to src/applications/project/storage/PhabricatorProject.php
diff --git a/src/applications/project/storage/affiliation/PhabricatorProjectAffiliation.php b/src/applications/project/storage/PhabricatorProjectAffiliation.php
similarity index 100%
rename from src/applications/project/storage/affiliation/PhabricatorProjectAffiliation.php
rename to src/applications/project/storage/PhabricatorProjectAffiliation.php
diff --git a/src/applications/project/storage/base/PhabricatorProjectDAO.php b/src/applications/project/storage/PhabricatorProjectDAO.php
similarity index 100%
rename from src/applications/project/storage/base/PhabricatorProjectDAO.php
rename to src/applications/project/storage/PhabricatorProjectDAO.php
diff --git a/src/applications/project/storage/profile/PhabricatorProjectProfile.php b/src/applications/project/storage/PhabricatorProjectProfile.php
similarity index 100%
rename from src/applications/project/storage/profile/PhabricatorProjectProfile.php
rename to src/applications/project/storage/PhabricatorProjectProfile.php
diff --git a/src/applications/project/storage/subproject/PhabricatorProjectSubproject.php b/src/applications/project/storage/PhabricatorProjectSubproject.php
similarity index 100%
rename from src/applications/project/storage/subproject/PhabricatorProjectSubproject.php
rename to src/applications/project/storage/PhabricatorProjectSubproject.php
diff --git a/src/applications/project/storage/transaction/PhabricatorProjectTransaction.php b/src/applications/project/storage/PhabricatorProjectTransaction.php
similarity index 100%
rename from src/applications/project/storage/transaction/PhabricatorProjectTransaction.php
rename to src/applications/project/storage/PhabricatorProjectTransaction.php
diff --git a/src/applications/repository/constants/repositorytype/PhabricatorRepositoryType.php b/src/applications/repository/constants/PhabricatorRepositoryType.php
similarity index 100%
rename from src/applications/repository/constants/repositorytype/PhabricatorRepositoryType.php
rename to src/applications/repository/constants/PhabricatorRepositoryType.php
diff --git a/src/applications/repository/controller/arcansistprojectedit/PhabricatorRepositoryArcanistProjectEditController.php b/src/applications/repository/controller/PhabricatorRepositoryArcanistProjectEditController.php
similarity index 100%
rename from src/applications/repository/controller/arcansistprojectedit/PhabricatorRepositoryArcanistProjectEditController.php
rename to src/applications/repository/controller/PhabricatorRepositoryArcanistProjectEditController.php
diff --git a/src/applications/repository/controller/base/PhabricatorRepositoryController.php b/src/applications/repository/controller/PhabricatorRepositoryController.php
similarity index 100%
rename from src/applications/repository/controller/base/PhabricatorRepositoryController.php
rename to src/applications/repository/controller/PhabricatorRepositoryController.php
diff --git a/src/applications/repository/controller/create/PhabricatorRepositoryCreateController.php b/src/applications/repository/controller/PhabricatorRepositoryCreateController.php
similarity index 100%
rename from src/applications/repository/controller/create/PhabricatorRepositoryCreateController.php
rename to src/applications/repository/controller/PhabricatorRepositoryCreateController.php
diff --git a/src/applications/repository/controller/delete/PhabricatorRepositoryDeleteController.php b/src/applications/repository/controller/PhabricatorRepositoryDeleteController.php
similarity index 100%
rename from src/applications/repository/controller/delete/PhabricatorRepositoryDeleteController.php
rename to src/applications/repository/controller/PhabricatorRepositoryDeleteController.php
diff --git a/src/applications/repository/controller/edit/PhabricatorRepositoryEditController.php b/src/applications/repository/controller/PhabricatorRepositoryEditController.php
similarity index 100%
rename from src/applications/repository/controller/edit/PhabricatorRepositoryEditController.php
rename to src/applications/repository/controller/PhabricatorRepositoryEditController.php
diff --git a/src/applications/repository/controller/list/PhabricatorRepositoryListController.php b/src/applications/repository/controller/PhabricatorRepositoryListController.php
similarity index 100%
rename from src/applications/repository/controller/list/PhabricatorRepositoryListController.php
rename to src/applications/repository/controller/PhabricatorRepositoryListController.php
diff --git a/src/applications/repository/daemon/pulllocal/PhabricatorMercurialGraphStream.php b/src/applications/repository/daemon/PhabricatorMercurialGraphStream.php
similarity index 100%
rename from src/applications/repository/daemon/pulllocal/PhabricatorMercurialGraphStream.php
rename to src/applications/repository/daemon/PhabricatorMercurialGraphStream.php
diff --git a/src/applications/repository/daemon/pulllocal/PhabricatorRepositoryPullLocalDaemon.php b/src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
similarity index 100%
rename from src/applications/repository/daemon/pulllocal/PhabricatorRepositoryPullLocalDaemon.php
rename to src/applications/repository/daemon/PhabricatorRepositoryPullLocalDaemon.php
diff --git a/src/applications/repository/daemon/pulllocal/__tests__/PhabricatorRepositoryPullLocalDaemonTestCase.php b/src/applications/repository/daemon/__tests__/PhabricatorRepositoryPullLocalDaemonTestCase.php
similarity index 100%
rename from src/applications/repository/daemon/pulllocal/__tests__/PhabricatorRepositoryPullLocalDaemonTestCase.php
rename to src/applications/repository/daemon/__tests__/PhabricatorRepositoryPullLocalDaemonTestCase.php
diff --git a/src/applications/repository/parser/base/PhabricatorRepositoryCommitMessageDetailParser.php b/src/applications/repository/parser/PhabricatorRepositoryCommitMessageDetailParser.php
similarity index 100%
rename from src/applications/repository/parser/base/PhabricatorRepositoryCommitMessageDetailParser.php
rename to src/applications/repository/parser/PhabricatorRepositoryCommitMessageDetailParser.php
diff --git a/src/applications/repository/parser/default/PhabricatorRepositoryDefaultCommitMessageDetailParser.php b/src/applications/repository/parser/PhabricatorRepositoryDefaultCommitMessageDetailParser.php
similarity index 100%
rename from src/applications/repository/parser/default/PhabricatorRepositoryDefaultCommitMessageDetailParser.php
rename to src/applications/repository/parser/PhabricatorRepositoryDefaultCommitMessageDetailParser.php
diff --git a/src/applications/repository/storage/repository/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
similarity index 100%
rename from src/applications/repository/storage/repository/PhabricatorRepository.php
rename to src/applications/repository/storage/PhabricatorRepository.php
diff --git a/src/applications/repository/storage/arcanistproject/PhabricatorRepositoryArcanistProject.php b/src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php
similarity index 100%
rename from src/applications/repository/storage/arcanistproject/PhabricatorRepositoryArcanistProject.php
rename to src/applications/repository/storage/PhabricatorRepositoryArcanistProject.php
diff --git a/src/applications/repository/storage/auditrequest/PhabricatorRepositoryAuditRequest.php b/src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php
similarity index 100%
rename from src/applications/repository/storage/auditrequest/PhabricatorRepositoryAuditRequest.php
rename to src/applications/repository/storage/PhabricatorRepositoryAuditRequest.php
diff --git a/src/applications/repository/storage/commit/PhabricatorRepositoryCommit.php b/src/applications/repository/storage/PhabricatorRepositoryCommit.php
similarity index 100%
rename from src/applications/repository/storage/commit/PhabricatorRepositoryCommit.php
rename to src/applications/repository/storage/PhabricatorRepositoryCommit.php
diff --git a/src/applications/repository/storage/commitdata/PhabricatorRepositoryCommitData.php b/src/applications/repository/storage/PhabricatorRepositoryCommitData.php
similarity index 100%
rename from src/applications/repository/storage/commitdata/PhabricatorRepositoryCommitData.php
rename to src/applications/repository/storage/PhabricatorRepositoryCommitData.php
diff --git a/src/applications/repository/storage/base/PhabricatorRepositoryDAO.php b/src/applications/repository/storage/PhabricatorRepositoryDAO.php
similarity index 100%
rename from src/applications/repository/storage/base/PhabricatorRepositoryDAO.php
rename to src/applications/repository/storage/PhabricatorRepositoryDAO.php
diff --git a/src/applications/repository/storage/shortcut/PhabricatorRepositoryShortcut.php b/src/applications/repository/storage/PhabricatorRepositoryShortcut.php
similarity index 100%
rename from src/applications/repository/storage/shortcut/PhabricatorRepositoryShortcut.php
rename to src/applications/repository/storage/PhabricatorRepositoryShortcut.php
diff --git a/src/applications/repository/storage/symbol/PhabricatorRepositorySymbol.php b/src/applications/repository/storage/PhabricatorRepositorySymbol.php
similarity index 100%
rename from src/applications/repository/storage/symbol/PhabricatorRepositorySymbol.php
rename to src/applications/repository/storage/PhabricatorRepositorySymbol.php
diff --git a/src/applications/repository/storage/repository/__tests__/PhabricatorRepositoryTestCase.php b/src/applications/repository/storage/__tests__/PhabricatorRepositoryTestCase.php
similarity index 100%
rename from src/applications/repository/storage/repository/__tests__/PhabricatorRepositoryTestCase.php
rename to src/applications/repository/storage/__tests__/PhabricatorRepositoryTestCase.php
diff --git a/src/applications/repository/worker/herald/PhabricatorRepositoryCommitHeraldWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
similarity index 100%
rename from src/applications/repository/worker/herald/PhabricatorRepositoryCommitHeraldWorker.php
rename to src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
diff --git a/src/applications/repository/worker/owner/PhabricatorRepositoryCommitOwnersWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php
similarity index 100%
rename from src/applications/repository/worker/owner/PhabricatorRepositoryCommitOwnersWorker.php
rename to src/applications/repository/worker/PhabricatorRepositoryCommitOwnersWorker.php
diff --git a/src/applications/repository/worker/base/PhabricatorRepositoryCommitParserWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitParserWorker.php
similarity index 100%
rename from src/applications/repository/worker/base/PhabricatorRepositoryCommitParserWorker.php
rename to src/applications/repository/worker/PhabricatorRepositoryCommitParserWorker.php
diff --git a/src/applications/repository/worker/commitchangeparser/base/PhabricatorRepositoryCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
similarity index 100%
rename from src/applications/repository/worker/commitchangeparser/base/PhabricatorRepositoryCommitChangeParserWorker.php
rename to src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryCommitChangeParserWorker.php
diff --git a/src/applications/repository/worker/commitchangeparser/git/PhabricatorRepositoryGitCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php
similarity index 100%
rename from src/applications/repository/worker/commitchangeparser/git/PhabricatorRepositoryGitCommitChangeParserWorker.php
rename to src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryGitCommitChangeParserWorker.php
diff --git a/src/applications/repository/worker/commitchangeparser/mercurial/PhabricatorRepositoryMercurialCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php
similarity index 100%
rename from src/applications/repository/worker/commitchangeparser/mercurial/PhabricatorRepositoryMercurialCommitChangeParserWorker.php
rename to src/applications/repository/worker/commitchangeparser/PhabricatorRepositoryMercurialCommitChangeParserWorker.php
diff --git a/src/applications/repository/worker/commitchangeparser/svn/PhabricatorRepositorySvnCommitChangeParserWorker.php b/src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php
similarity index 100%
rename from src/applications/repository/worker/commitchangeparser/svn/PhabricatorRepositorySvnCommitChangeParserWorker.php
rename to src/applications/repository/worker/commitchangeparser/PhabricatorRepositorySvnCommitChangeParserWorker.php
diff --git a/src/applications/repository/worker/commitmessageparser/base/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
similarity index 100%
rename from src/applications/repository/worker/commitmessageparser/base/PhabricatorRepositoryCommitMessageParserWorker.php
rename to src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
diff --git a/src/applications/repository/worker/commitmessageparser/git/PhabricatorRepositoryGitCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php
similarity index 100%
rename from src/applications/repository/worker/commitmessageparser/git/PhabricatorRepositoryGitCommitMessageParserWorker.php
rename to src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryGitCommitMessageParserWorker.php
diff --git a/src/applications/repository/worker/commitmessageparser/mercurial/PhabricatorRepositoryMercurialCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryMercurialCommitMessageParserWorker.php
similarity index 100%
rename from src/applications/repository/worker/commitmessageparser/mercurial/PhabricatorRepositoryMercurialCommitMessageParserWorker.php
rename to src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryMercurialCommitMessageParserWorker.php
diff --git a/src/applications/repository/worker/commitmessageparser/svn/PhabricatorRepositorySvnCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/PhabricatorRepositorySvnCommitMessageParserWorker.php
similarity index 100%
rename from src/applications/repository/worker/commitmessageparser/svn/PhabricatorRepositorySvnCommitMessageParserWorker.php
rename to src/applications/repository/worker/commitmessageparser/PhabricatorRepositorySvnCommitMessageParserWorker.php
diff --git a/src/applications/search/constants/field/PhabricatorSearchField.php b/src/applications/search/constants/PhabricatorSearchField.php
similarity index 100%
rename from src/applications/search/constants/field/PhabricatorSearchField.php
rename to src/applications/search/constants/PhabricatorSearchField.php
diff --git a/src/applications/search/constants/relationship/PhabricatorSearchRelationship.php b/src/applications/search/constants/PhabricatorSearchRelationship.php
similarity index 100%
rename from src/applications/search/constants/relationship/PhabricatorSearchRelationship.php
rename to src/applications/search/constants/PhabricatorSearchRelationship.php
diff --git a/src/applications/search/constants/scope/PhabricatorSearchScope.php b/src/applications/search/constants/PhabricatorSearchScope.php
similarity index 100%
rename from src/applications/search/constants/scope/PhabricatorSearchScope.php
rename to src/applications/search/constants/PhabricatorSearchScope.php
diff --git a/src/applications/search/controller/attach/PhabricatorSearchAttachController.php b/src/applications/search/controller/PhabricatorSearchAttachController.php
similarity index 100%
rename from src/applications/search/controller/attach/PhabricatorSearchAttachController.php
rename to src/applications/search/controller/PhabricatorSearchAttachController.php
diff --git a/src/applications/search/controller/base/PhabricatorSearchBaseController.php b/src/applications/search/controller/PhabricatorSearchBaseController.php
similarity index 100%
rename from src/applications/search/controller/base/PhabricatorSearchBaseController.php
rename to src/applications/search/controller/PhabricatorSearchBaseController.php
diff --git a/src/applications/search/controller/search/PhabricatorSearchController.php b/src/applications/search/controller/PhabricatorSearchController.php
similarity index 100%
rename from src/applications/search/controller/search/PhabricatorSearchController.php
rename to src/applications/search/controller/PhabricatorSearchController.php
diff --git a/src/applications/search/controller/index/PhabricatorSearchIndexController.php b/src/applications/search/controller/PhabricatorSearchIndexController.php
similarity index 100%
rename from src/applications/search/controller/index/PhabricatorSearchIndexController.php
rename to src/applications/search/controller/PhabricatorSearchIndexController.php
diff --git a/src/applications/search/controller/select/PhabricatorSearchSelectController.php b/src/applications/search/controller/PhabricatorSearchSelectController.php
similarity index 100%
rename from src/applications/search/controller/select/PhabricatorSearchSelectController.php
rename to src/applications/search/controller/PhabricatorSearchSelectController.php
diff --git a/src/applications/search/editor/attach/PhabricatorObjectAttachmentEditor.php b/src/applications/search/editor/PhabricatorObjectAttachmentEditor.php
similarity index 100%
rename from src/applications/search/editor/attach/PhabricatorObjectAttachmentEditor.php
rename to src/applications/search/editor/PhabricatorObjectAttachmentEditor.php
diff --git a/src/applications/search/engine/jumpnav/PhabricatorJumpNavHandler.php b/src/applications/search/engine/PhabricatorJumpNavHandler.php
similarity index 100%
rename from src/applications/search/engine/jumpnav/PhabricatorJumpNavHandler.php
rename to src/applications/search/engine/PhabricatorJumpNavHandler.php
diff --git a/src/applications/search/engine/base/PhabricatorSearchEngine.php b/src/applications/search/engine/PhabricatorSearchEngine.php
similarity index 100%
rename from src/applications/search/engine/base/PhabricatorSearchEngine.php
rename to src/applications/search/engine/PhabricatorSearchEngine.php
diff --git a/src/applications/search/engine/elastic/PhabricatorSearchEngineElastic.php b/src/applications/search/engine/PhabricatorSearchEngineElastic.php
similarity index 100%
rename from src/applications/search/engine/elastic/PhabricatorSearchEngineElastic.php
rename to src/applications/search/engine/PhabricatorSearchEngineElastic.php
diff --git a/src/applications/search/engine/mysql/PhabricatorSearchEngineMySQL.php b/src/applications/search/engine/PhabricatorSearchEngineMySQL.php
similarity index 100%
rename from src/applications/search/engine/mysql/PhabricatorSearchEngineMySQL.php
rename to src/applications/search/engine/PhabricatorSearchEngineMySQL.php
diff --git a/src/applications/search/index/abstractdocument/PhabricatorSearchAbstractDocument.php b/src/applications/search/index/PhabricatorSearchAbstractDocument.php
similarity index 100%
rename from src/applications/search/index/abstractdocument/PhabricatorSearchAbstractDocument.php
rename to src/applications/search/index/PhabricatorSearchAbstractDocument.php
diff --git a/src/applications/search/index/indexer/repository/PhabricatorSearchCommitIndexer.php b/src/applications/search/index/indexer/PhabricatorSearchCommitIndexer.php
similarity index 100%
rename from src/applications/search/index/indexer/repository/PhabricatorSearchCommitIndexer.php
rename to src/applications/search/index/indexer/PhabricatorSearchCommitIndexer.php
diff --git a/src/applications/search/index/indexer/differential/PhabricatorSearchDifferentialIndexer.php b/src/applications/search/index/indexer/PhabricatorSearchDifferentialIndexer.php
similarity index 100%
rename from src/applications/search/index/indexer/differential/PhabricatorSearchDifferentialIndexer.php
rename to src/applications/search/index/indexer/PhabricatorSearchDifferentialIndexer.php
diff --git a/src/applications/search/index/indexer/base/PhabricatorSearchDocumentIndexer.php b/src/applications/search/index/indexer/PhabricatorSearchDocumentIndexer.php
similarity index 100%
rename from src/applications/search/index/indexer/base/PhabricatorSearchDocumentIndexer.php
rename to src/applications/search/index/indexer/PhabricatorSearchDocumentIndexer.php
diff --git a/src/applications/search/index/indexer/maniphest/PhabricatorSearchManiphestIndexer.php b/src/applications/search/index/indexer/PhabricatorSearchManiphestIndexer.php
similarity index 100%
rename from src/applications/search/index/indexer/maniphest/PhabricatorSearchManiphestIndexer.php
rename to src/applications/search/index/indexer/PhabricatorSearchManiphestIndexer.php
diff --git a/src/applications/search/index/indexer/phriction/PhabricatorSearchPhrictionIndexer.php b/src/applications/search/index/indexer/PhabricatorSearchPhrictionIndexer.php
similarity index 100%
rename from src/applications/search/index/indexer/phriction/PhabricatorSearchPhrictionIndexer.php
rename to src/applications/search/index/indexer/PhabricatorSearchPhrictionIndexer.php
diff --git a/src/applications/search/index/indexer/user/PhabricatorSearchUserIndexer.php b/src/applications/search/index/indexer/PhabricatorSearchUserIndexer.php
similarity index 100%
rename from src/applications/search/index/indexer/user/PhabricatorSearchUserIndexer.php
rename to src/applications/search/index/indexer/PhabricatorSearchUserIndexer.php
diff --git a/src/applications/search/selector/default/PhabricatorDefaultSearchEngineSelector.php b/src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php
similarity index 100%
rename from src/applications/search/selector/default/PhabricatorDefaultSearchEngineSelector.php
rename to src/applications/search/selector/PhabricatorDefaultSearchEngineSelector.php
diff --git a/src/applications/search/selector/base/PhabricatorSearchEngineSelector.php b/src/applications/search/selector/PhabricatorSearchEngineSelector.php
similarity index 100%
rename from src/applications/search/selector/base/PhabricatorSearchEngineSelector.php
rename to src/applications/search/selector/PhabricatorSearchEngineSelector.php
diff --git a/src/applications/search/storage/base/PhabricatorSearchDAO.php b/src/applications/search/storage/PhabricatorSearchDAO.php
similarity index 100%
rename from src/applications/search/storage/base/PhabricatorSearchDAO.php
rename to src/applications/search/storage/PhabricatorSearchDAO.php
diff --git a/src/applications/search/storage/query/PhabricatorSearchQuery.php b/src/applications/search/storage/PhabricatorSearchQuery.php
similarity index 100%
rename from src/applications/search/storage/query/PhabricatorSearchQuery.php
rename to src/applications/search/storage/PhabricatorSearchQuery.php
diff --git a/src/applications/search/storage/document/document/PhabricatorSearchDocument.php b/src/applications/search/storage/document/PhabricatorSearchDocument.php
similarity index 100%
rename from src/applications/search/storage/document/document/PhabricatorSearchDocument.php
rename to src/applications/search/storage/document/PhabricatorSearchDocument.php
diff --git a/src/applications/search/storage/document/field/PhabricatorSearchDocumentField.php b/src/applications/search/storage/document/PhabricatorSearchDocumentField.php
similarity index 100%
rename from src/applications/search/storage/document/field/PhabricatorSearchDocumentField.php
rename to src/applications/search/storage/document/PhabricatorSearchDocumentField.php
diff --git a/src/applications/search/storage/document/relationship/PhabricatorSearchDocumentRelationship.php b/src/applications/search/storage/document/PhabricatorSearchDocumentRelationship.php
similarity index 100%
rename from src/applications/search/storage/document/relationship/PhabricatorSearchDocumentRelationship.php
rename to src/applications/search/storage/document/PhabricatorSearchDocumentRelationship.php
diff --git a/src/applications/search/view/searchresult/PhabricatorSearchResultView.php b/src/applications/search/view/PhabricatorSearchResultView.php
similarity index 100%
rename from src/applications/search/view/searchresult/PhabricatorSearchResultView.php
rename to src/applications/search/view/PhabricatorSearchResultView.php
diff --git a/src/applications/slowvote/controller/base/PhabricatorSlowvoteController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteController.php
similarity index 100%
rename from src/applications/slowvote/controller/base/PhabricatorSlowvoteController.php
rename to src/applications/slowvote/controller/PhabricatorSlowvoteController.php
diff --git a/src/applications/slowvote/controller/create/PhabricatorSlowvoteCreateController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteCreateController.php
similarity index 100%
rename from src/applications/slowvote/controller/create/PhabricatorSlowvoteCreateController.php
rename to src/applications/slowvote/controller/PhabricatorSlowvoteCreateController.php
diff --git a/src/applications/slowvote/controller/list/PhabricatorSlowvoteListController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteListController.php
similarity index 100%
rename from src/applications/slowvote/controller/list/PhabricatorSlowvoteListController.php
rename to src/applications/slowvote/controller/PhabricatorSlowvoteListController.php
diff --git a/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
similarity index 100%
rename from src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php
rename to src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
diff --git a/src/applications/slowvote/storage/choice/PhabricatorSlowvoteChoice.php b/src/applications/slowvote/storage/PhabricatorSlowvoteChoice.php
similarity index 100%
rename from src/applications/slowvote/storage/choice/PhabricatorSlowvoteChoice.php
rename to src/applications/slowvote/storage/PhabricatorSlowvoteChoice.php
diff --git a/src/applications/slowvote/storage/comment/PhabricatorSlowvoteComment.php b/src/applications/slowvote/storage/PhabricatorSlowvoteComment.php
similarity index 100%
rename from src/applications/slowvote/storage/comment/PhabricatorSlowvoteComment.php
rename to src/applications/slowvote/storage/PhabricatorSlowvoteComment.php
diff --git a/src/applications/slowvote/storage/base/PhabricatorSlowvoteDAO.php b/src/applications/slowvote/storage/PhabricatorSlowvoteDAO.php
similarity index 100%
rename from src/applications/slowvote/storage/base/PhabricatorSlowvoteDAO.php
rename to src/applications/slowvote/storage/PhabricatorSlowvoteDAO.php
diff --git a/src/applications/slowvote/storage/option/PhabricatorSlowvoteOption.php b/src/applications/slowvote/storage/PhabricatorSlowvoteOption.php
similarity index 100%
rename from src/applications/slowvote/storage/option/PhabricatorSlowvoteOption.php
rename to src/applications/slowvote/storage/PhabricatorSlowvoteOption.php
diff --git a/src/applications/slowvote/storage/poll/PhabricatorSlowvotePoll.php b/src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
similarity index 100%
rename from src/applications/slowvote/storage/poll/PhabricatorSlowvotePoll.php
rename to src/applications/slowvote/storage/PhabricatorSlowvotePoll.php
diff --git a/src/applications/status/base/PhabricatorStatusController.php b/src/applications/status/PhabricatorStatusController.php
similarity index 100%
rename from src/applications/status/base/PhabricatorStatusController.php
rename to src/applications/status/PhabricatorStatusController.php
diff --git a/src/applications/typeahead/controller/common/PhabricatorTypeaheadCommonDatasourceController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
similarity index 100%
rename from src/applications/typeahead/controller/common/PhabricatorTypeaheadCommonDatasourceController.php
rename to src/applications/typeahead/controller/PhabricatorTypeaheadCommonDatasourceController.php
diff --git a/src/applications/typeahead/controller/base/PhabricatorTypeaheadDatasourceController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadDatasourceController.php
similarity index 100%
rename from src/applications/typeahead/controller/base/PhabricatorTypeaheadDatasourceController.php
rename to src/applications/typeahead/controller/PhabricatorTypeaheadDatasourceController.php
diff --git a/src/applications/uiexample/controller/base/PhabricatorUIExampleController.php b/src/applications/uiexample/controller/PhabricatorUIExampleController.php
similarity index 100%
rename from src/applications/uiexample/controller/base/PhabricatorUIExampleController.php
rename to src/applications/uiexample/controller/PhabricatorUIExampleController.php
diff --git a/src/applications/uiexample/controller/render/PhabricatorUIExampleRenderController.php b/src/applications/uiexample/controller/PhabricatorUIExampleRenderController.php
similarity index 100%
rename from src/applications/uiexample/controller/render/PhabricatorUIExampleRenderController.php
rename to src/applications/uiexample/controller/PhabricatorUIExampleRenderController.php
diff --git a/src/applications/uiexample/examples/reactor/JavelinReactorExample.php b/src/applications/uiexample/examples/JavelinReactorExample.php
similarity index 100%
rename from src/applications/uiexample/examples/reactor/JavelinReactorExample.php
rename to src/applications/uiexample/examples/JavelinReactorExample.php
diff --git a/src/applications/uiexample/examples/client/JavelinViewExample.php b/src/applications/uiexample/examples/JavelinViewExample.php
similarity index 100%
rename from src/applications/uiexample/examples/client/JavelinViewExample.php
rename to src/applications/uiexample/examples/JavelinViewExample.php
diff --git a/src/applications/uiexample/examples/client/JavelinViewExampleServerView.php b/src/applications/uiexample/examples/JavelinViewExampleServerView.php
similarity index 100%
rename from src/applications/uiexample/examples/client/JavelinViewExampleServerView.php
rename to src/applications/uiexample/examples/JavelinViewExampleServerView.php
diff --git a/src/applications/uiexample/examples/error/PhabricatorErrorExample.php b/src/applications/uiexample/examples/PhabricatorErrorExample.php
similarity index 100%
rename from src/applications/uiexample/examples/error/PhabricatorErrorExample.php
rename to src/applications/uiexample/examples/PhabricatorErrorExample.php
diff --git a/src/applications/uiexample/examples/form/PhabricatorFormExample.php b/src/applications/uiexample/examples/PhabricatorFormExample.php
similarity index 100%
rename from src/applications/uiexample/examples/form/PhabricatorFormExample.php
rename to src/applications/uiexample/examples/PhabricatorFormExample.php
diff --git a/src/applications/uiexample/examples/sorttable/PhabricatorSortTableExample.php b/src/applications/uiexample/examples/PhabricatorSortTableExample.php
similarity index 100%
rename from src/applications/uiexample/examples/sorttable/PhabricatorSortTableExample.php
rename to src/applications/uiexample/examples/PhabricatorSortTableExample.php
diff --git a/src/applications/uiexample/examples/base/PhabricatorUIExample.php b/src/applications/uiexample/examples/PhabricatorUIExample.php
similarity index 100%
rename from src/applications/uiexample/examples/base/PhabricatorUIExample.php
rename to src/applications/uiexample/examples/PhabricatorUIExample.php
diff --git a/src/applications/uiexample/examples/listfilter/PhabricatorUIListFilterExample.php b/src/applications/uiexample/examples/PhabricatorUIListFilterExample.php
similarity index 100%
rename from src/applications/uiexample/examples/listfilter/PhabricatorUIListFilterExample.php
rename to src/applications/uiexample/examples/PhabricatorUIListFilterExample.php
diff --git a/src/applications/uiexample/examples/pager/PhabricatorUIPagerExample.php b/src/applications/uiexample/examples/PhabricatorUIPagerExample.php
similarity index 100%
rename from src/applications/uiexample/examples/pager/PhabricatorUIPagerExample.php
rename to src/applications/uiexample/examples/PhabricatorUIPagerExample.php
diff --git a/src/applications/uiexample/examples/tooltip/PhabricatorUITooltipExample.php b/src/applications/uiexample/examples/PhabricatorUITooltipExample.php
similarity index 100%
rename from src/applications/uiexample/examples/tooltip/PhabricatorUITooltipExample.php
rename to src/applications/uiexample/examples/PhabricatorUITooltipExample.php
diff --git a/src/applications/xhpastview/controller/base/PhabricatorXHPASTViewController.php b/src/applications/xhpastview/controller/PhabricatorXHPASTViewController.php
similarity index 100%
rename from src/applications/xhpastview/controller/base/PhabricatorXHPASTViewController.php
rename to src/applications/xhpastview/controller/PhabricatorXHPASTViewController.php
diff --git a/src/applications/xhpastview/controller/viewframe/PhabricatorXHPASTViewFrameController.php b/src/applications/xhpastview/controller/PhabricatorXHPASTViewFrameController.php
similarity index 100%
rename from src/applications/xhpastview/controller/viewframe/PhabricatorXHPASTViewFrameController.php
rename to src/applications/xhpastview/controller/PhabricatorXHPASTViewFrameController.php
diff --git a/src/applications/xhpastview/controller/viewframeset/PhabricatorXHPASTViewFramesetController.php b/src/applications/xhpastview/controller/PhabricatorXHPASTViewFramesetController.php
similarity index 100%
rename from src/applications/xhpastview/controller/viewframeset/PhabricatorXHPASTViewFramesetController.php
rename to src/applications/xhpastview/controller/PhabricatorXHPASTViewFramesetController.php
diff --git a/src/applications/xhpastview/controller/viewinput/PhabricatorXHPASTViewInputController.php b/src/applications/xhpastview/controller/PhabricatorXHPASTViewInputController.php
similarity index 100%
rename from src/applications/xhpastview/controller/viewinput/PhabricatorXHPASTViewInputController.php
rename to src/applications/xhpastview/controller/PhabricatorXHPASTViewInputController.php
diff --git a/src/applications/xhpastview/controller/viewpanel/PhabricatorXHPASTViewPanelController.php b/src/applications/xhpastview/controller/PhabricatorXHPASTViewPanelController.php
similarity index 100%
rename from src/applications/xhpastview/controller/viewpanel/PhabricatorXHPASTViewPanelController.php
rename to src/applications/xhpastview/controller/PhabricatorXHPASTViewPanelController.php
diff --git a/src/applications/xhpastview/controller/run/PhabricatorXHPASTViewRunController.php b/src/applications/xhpastview/controller/PhabricatorXHPASTViewRunController.php
similarity index 100%
rename from src/applications/xhpastview/controller/run/PhabricatorXHPASTViewRunController.php
rename to src/applications/xhpastview/controller/PhabricatorXHPASTViewRunController.php
diff --git a/src/applications/xhpastview/controller/viewstream/PhabricatorXHPASTViewStreamController.php b/src/applications/xhpastview/controller/PhabricatorXHPASTViewStreamController.php
similarity index 100%
rename from src/applications/xhpastview/controller/viewstream/PhabricatorXHPASTViewStreamController.php
rename to src/applications/xhpastview/controller/PhabricatorXHPASTViewStreamController.php
diff --git a/src/applications/xhpastview/controller/viewtree/PhabricatorXHPASTViewTreeController.php b/src/applications/xhpastview/controller/PhabricatorXHPASTViewTreeController.php
similarity index 100%
rename from src/applications/xhpastview/controller/viewtree/PhabricatorXHPASTViewTreeController.php
rename to src/applications/xhpastview/controller/PhabricatorXHPASTViewTreeController.php
diff --git a/src/applications/xhpastview/storage/base/PhabricatorXHPASTViewDAO.php b/src/applications/xhpastview/storage/PhabricatorXHPASTViewDAO.php
similarity index 100%
rename from src/applications/xhpastview/storage/base/PhabricatorXHPASTViewDAO.php
rename to src/applications/xhpastview/storage/PhabricatorXHPASTViewDAO.php
diff --git a/src/applications/xhpastview/storage/parsetree/PhabricatorXHPASTViewParseTree.php b/src/applications/xhpastview/storage/PhabricatorXHPASTViewParseTree.php
similarity index 100%
rename from src/applications/xhpastview/storage/parsetree/PhabricatorXHPASTViewParseTree.php
rename to src/applications/xhpastview/storage/PhabricatorXHPASTViewParseTree.php
diff --git a/src/applications/xhprof/controller/base/PhabricatorXHProfController.php b/src/applications/xhprof/controller/PhabricatorXHProfController.php
similarity index 100%
rename from src/applications/xhprof/controller/base/PhabricatorXHProfController.php
rename to src/applications/xhprof/controller/PhabricatorXHProfController.php
diff --git a/src/applications/xhprof/controller/profile/PhabricatorXHProfProfileController.php b/src/applications/xhprof/controller/PhabricatorXHProfProfileController.php
similarity index 100%
rename from src/applications/xhprof/controller/profile/PhabricatorXHProfProfileController.php
rename to src/applications/xhprof/controller/PhabricatorXHProfProfileController.php
diff --git a/src/applications/xhprof/view/symbol/PhabricatorXHProfProfileSymbolView.php b/src/applications/xhprof/view/PhabricatorXHProfProfileSymbolView.php
similarity index 100%
rename from src/applications/xhprof/view/symbol/PhabricatorXHProfProfileSymbolView.php
rename to src/applications/xhprof/view/PhabricatorXHProfProfileSymbolView.php
diff --git a/src/applications/xhprof/view/toplevel/PhabricatorXHProfProfileTopLevelView.php b/src/applications/xhprof/view/PhabricatorXHProfProfileTopLevelView.php
similarity index 100%
rename from src/applications/xhprof/view/toplevel/PhabricatorXHProfProfileTopLevelView.php
rename to src/applications/xhprof/view/PhabricatorXHProfProfileTopLevelView.php
diff --git a/src/applications/xhprof/view/base/PhabricatorXHProfProfileView.php b/src/applications/xhprof/view/PhabricatorXHProfProfileView.php
similarity index 100%
rename from src/applications/xhprof/view/base/PhabricatorXHProfProfileView.php
rename to src/applications/xhprof/view/PhabricatorXHProfProfileView.php
diff --git a/src/infrastructure/accesslog/PhabricatorAccessLog.php b/src/infrastructure/PhabricatorAccessLog.php
similarity index 100%
rename from src/infrastructure/accesslog/PhabricatorAccessLog.php
rename to src/infrastructure/PhabricatorAccessLog.php
diff --git a/src/infrastructure/env/PhabricatorEnv.php b/src/infrastructure/PhabricatorEnv.php
similarity index 100%
rename from src/infrastructure/env/PhabricatorEnv.php
rename to src/infrastructure/PhabricatorEnv.php
diff --git a/src/infrastructure/env/PhabricatorScopedEnv.php b/src/infrastructure/PhabricatorScopedEnv.php
similarity index 100%
rename from src/infrastructure/env/PhabricatorScopedEnv.php
rename to src/infrastructure/PhabricatorScopedEnv.php
diff --git a/src/infrastructure/setup/PhabricatorSetup.php b/src/infrastructure/PhabricatorSetup.php
similarity index 100%
rename from src/infrastructure/setup/PhabricatorSetup.php
rename to src/infrastructure/PhabricatorSetup.php
diff --git a/src/infrastructure/env/__tests__/PhabricatorEnvTestCase.php b/src/infrastructure/__tests__/PhabricatorEnvTestCase.php
similarity index 100%
rename from src/infrastructure/env/__tests__/PhabricatorEnvTestCase.php
rename to src/infrastructure/__tests__/PhabricatorEnvTestCase.php
diff --git a/src/infrastructure/celerity/api/CelerityAPI.php b/src/infrastructure/celerity/CelerityAPI.php
similarity index 100%
rename from src/infrastructure/celerity/api/CelerityAPI.php
rename to src/infrastructure/celerity/CelerityAPI.php
diff --git a/src/infrastructure/celerity/controller/CelerityResourceController.php b/src/infrastructure/celerity/CelerityResourceController.php
similarity index 100%
rename from src/infrastructure/celerity/controller/CelerityResourceController.php
rename to src/infrastructure/celerity/CelerityResourceController.php
diff --git a/src/infrastructure/celerity/graph/CelerityResourceGraph.php b/src/infrastructure/celerity/CelerityResourceGraph.php
similarity index 100%
rename from src/infrastructure/celerity/graph/CelerityResourceGraph.php
rename to src/infrastructure/celerity/CelerityResourceGraph.php
diff --git a/src/infrastructure/celerity/map/CelerityResourceMap.php b/src/infrastructure/celerity/CelerityResourceMap.php
similarity index 100%
rename from src/infrastructure/celerity/map/CelerityResourceMap.php
rename to src/infrastructure/celerity/CelerityResourceMap.php
diff --git a/src/infrastructure/celerity/transformer/CelerityResourceTransformer.php b/src/infrastructure/celerity/CelerityResourceTransformer.php
similarity index 100%
rename from src/infrastructure/celerity/transformer/CelerityResourceTransformer.php
rename to src/infrastructure/celerity/CelerityResourceTransformer.php
diff --git a/src/infrastructure/celerity/response/CelerityStaticResourceResponse.php b/src/infrastructure/celerity/CelerityStaticResourceResponse.php
similarity index 100%
rename from src/infrastructure/celerity/response/CelerityStaticResourceResponse.php
rename to src/infrastructure/celerity/CelerityStaticResourceResponse.php
diff --git a/src/infrastructure/celerity/transformer/__tests__/CelerityResourceTransformerTestCase.php b/src/infrastructure/celerity/__tests__/CelerityResourceTransformerTestCase.php
similarity index 97%
rename from src/infrastructure/celerity/transformer/__tests__/CelerityResourceTransformerTestCase.php
rename to src/infrastructure/celerity/__tests__/CelerityResourceTransformerTestCase.php
index 8d14a514da..10d3f3232d 100644
--- a/src/infrastructure/celerity/transformer/__tests__/CelerityResourceTransformerTestCase.php
+++ b/src/infrastructure/celerity/__tests__/CelerityResourceTransformerTestCase.php
@@ -22,7 +22,7 @@
 final class CelerityResourceTransformerTestCase extends PhabricatorTestCase {
 
   public function testTransformation() {
-    $files = dirname(__FILE__).'/data/';
+    $files = dirname(__FILE__).'/transformer/';
     foreach (Filesystem::listDirectory($files) as $file) {
       $name = basename($file);
       $data = Filesystem::readFile($files.'/'.$file);
diff --git a/src/infrastructure/celerity/transformer/__tests__/data/min.css b/src/infrastructure/celerity/__tests__/transformer/min.css
similarity index 100%
rename from src/infrastructure/celerity/transformer/__tests__/data/min.css
rename to src/infrastructure/celerity/__tests__/transformer/min.css
diff --git a/src/infrastructure/celerity/transformer/__tests__/data/xform.css b/src/infrastructure/celerity/__tests__/transformer/xform.css
similarity index 100%
rename from src/infrastructure/celerity/transformer/__tests__/data/xform.css
rename to src/infrastructure/celerity/__tests__/transformer/xform.css
diff --git a/src/infrastructure/celerity/api/utils.php b/src/infrastructure/celerity/api.php
similarity index 100%
rename from src/infrastructure/celerity/api/utils.php
rename to src/infrastructure/celerity/api.php
diff --git a/src/infrastructure/celerity/map/utils.php b/src/infrastructure/celerity/map.php
similarity index 100%
rename from src/infrastructure/celerity/map/utils.php
rename to src/infrastructure/celerity/map.php
diff --git a/src/infrastructure/daemon/base/PhabricatorDaemon.php b/src/infrastructure/daemon/PhabricatorDaemon.php
similarity index 100%
rename from src/infrastructure/daemon/base/PhabricatorDaemon.php
rename to src/infrastructure/daemon/PhabricatorDaemon.php
diff --git a/src/infrastructure/daemon/control/PhabricatorDaemonControl.php b/src/infrastructure/daemon/PhabricatorDaemonControl.php
similarity index 100%
rename from src/infrastructure/daemon/control/PhabricatorDaemonControl.php
rename to src/infrastructure/daemon/PhabricatorDaemonControl.php
diff --git a/src/infrastructure/daemon/garbagecollector/PhabricatorGarbageCollectorDaemon.php b/src/infrastructure/daemon/PhabricatorGarbageCollectorDaemon.php
similarity index 100%
rename from src/infrastructure/daemon/garbagecollector/PhabricatorGarbageCollectorDaemon.php
rename to src/infrastructure/daemon/PhabricatorGarbageCollectorDaemon.php
diff --git a/src/infrastructure/daemon/control/reference/PhabricatorDaemonReference.php b/src/infrastructure/daemon/control/PhabricatorDaemonReference.php
similarity index 100%
rename from src/infrastructure/daemon/control/reference/PhabricatorDaemonReference.php
rename to src/infrastructure/daemon/control/PhabricatorDaemonReference.php
diff --git a/src/infrastructure/daemon/irc/bot/PhabricatorIRCBot.php b/src/infrastructure/daemon/irc/PhabricatorIRCBot.php
similarity index 100%
rename from src/infrastructure/daemon/irc/bot/PhabricatorIRCBot.php
rename to src/infrastructure/daemon/irc/PhabricatorIRCBot.php
diff --git a/src/infrastructure/daemon/irc/message/PhabricatorIRCMessage.php b/src/infrastructure/daemon/irc/PhabricatorIRCMessage.php
similarity index 100%
rename from src/infrastructure/daemon/irc/message/PhabricatorIRCMessage.php
rename to src/infrastructure/daemon/irc/PhabricatorIRCMessage.php
diff --git a/src/infrastructure/daemon/irc/handler/differentialnotification/PhabricatorIRCDifferentialNotificationHandler.php b/src/infrastructure/daemon/irc/handler/PhabricatorIRCDifferentialNotificationHandler.php
similarity index 100%
rename from src/infrastructure/daemon/irc/handler/differentialnotification/PhabricatorIRCDifferentialNotificationHandler.php
rename to src/infrastructure/daemon/irc/handler/PhabricatorIRCDifferentialNotificationHandler.php
diff --git a/src/infrastructure/daemon/irc/handler/base/PhabricatorIRCHandler.php b/src/infrastructure/daemon/irc/handler/PhabricatorIRCHandler.php
similarity index 100%
rename from src/infrastructure/daemon/irc/handler/base/PhabricatorIRCHandler.php
rename to src/infrastructure/daemon/irc/handler/PhabricatorIRCHandler.php
diff --git a/src/infrastructure/daemon/irc/handler/log/PhabricatorIRCLogHandler.php b/src/infrastructure/daemon/irc/handler/PhabricatorIRCLogHandler.php
similarity index 100%
rename from src/infrastructure/daemon/irc/handler/log/PhabricatorIRCLogHandler.php
rename to src/infrastructure/daemon/irc/handler/PhabricatorIRCLogHandler.php
diff --git a/src/infrastructure/daemon/irc/handler/macro/PhabricatorIRCMacroHandler.php b/src/infrastructure/daemon/irc/handler/PhabricatorIRCMacroHandler.php
similarity index 100%
rename from src/infrastructure/daemon/irc/handler/macro/PhabricatorIRCMacroHandler.php
rename to src/infrastructure/daemon/irc/handler/PhabricatorIRCMacroHandler.php
diff --git a/src/infrastructure/daemon/irc/handler/objectname/PhabricatorIRCObjectNameHandler.php b/src/infrastructure/daemon/irc/handler/PhabricatorIRCObjectNameHandler.php
similarity index 100%
rename from src/infrastructure/daemon/irc/handler/objectname/PhabricatorIRCObjectNameHandler.php
rename to src/infrastructure/daemon/irc/handler/PhabricatorIRCObjectNameHandler.php
diff --git a/src/infrastructure/daemon/irc/handler/protocol/PhabricatorIRCProtocolHandler.php b/src/infrastructure/daemon/irc/handler/PhabricatorIRCProtocolHandler.php
similarity index 100%
rename from src/infrastructure/daemon/irc/handler/protocol/PhabricatorIRCProtocolHandler.php
rename to src/infrastructure/daemon/irc/handler/PhabricatorIRCProtocolHandler.php
diff --git a/src/infrastructure/daemon/irc/handler/whatsnew/PhabricatorIRCWhatsNewHandler.php b/src/infrastructure/daemon/irc/handler/PhabricatorIRCWhatsNewHandler.php
similarity index 100%
rename from src/infrastructure/daemon/irc/handler/whatsnew/PhabricatorIRCWhatsNewHandler.php
rename to src/infrastructure/daemon/irc/handler/PhabricatorIRCWhatsNewHandler.php
diff --git a/src/infrastructure/daemon/storage/base/PhabricatorDaemonDAO.php b/src/infrastructure/daemon/storage/PhabricatorDaemonDAO.php
similarity index 100%
rename from src/infrastructure/daemon/storage/base/PhabricatorDaemonDAO.php
rename to src/infrastructure/daemon/storage/PhabricatorDaemonDAO.php
diff --git a/src/infrastructure/daemon/storage/log/PhabricatorDaemonLog.php b/src/infrastructure/daemon/storage/PhabricatorDaemonLog.php
similarity index 100%
rename from src/infrastructure/daemon/storage/log/PhabricatorDaemonLog.php
rename to src/infrastructure/daemon/storage/PhabricatorDaemonLog.php
diff --git a/src/infrastructure/daemon/storage/event/PhabricatorDaemonLogEvent.php b/src/infrastructure/daemon/storage/PhabricatorDaemonLogEvent.php
similarity index 100%
rename from src/infrastructure/daemon/storage/event/PhabricatorDaemonLogEvent.php
rename to src/infrastructure/daemon/storage/PhabricatorDaemonLogEvent.php
diff --git a/src/infrastructure/daemon/timeline/cursor/iterator/PhabricatorTimelineIterator.php b/src/infrastructure/daemon/timeline/cursor/PhabricatorTimelineIterator.php
similarity index 100%
rename from src/infrastructure/daemon/timeline/cursor/iterator/PhabricatorTimelineIterator.php
rename to src/infrastructure/daemon/timeline/cursor/PhabricatorTimelineIterator.php
diff --git a/src/infrastructure/daemon/timeline/storage/cursor/PhabricatorTimelineCursor.php b/src/infrastructure/daemon/timeline/storage/PhabricatorTimelineCursor.php
similarity index 100%
rename from src/infrastructure/daemon/timeline/storage/cursor/PhabricatorTimelineCursor.php
rename to src/infrastructure/daemon/timeline/storage/PhabricatorTimelineCursor.php
diff --git a/src/infrastructure/daemon/timeline/storage/base/PhabricatorTimelineDAO.php b/src/infrastructure/daemon/timeline/storage/PhabricatorTimelineDAO.php
similarity index 100%
rename from src/infrastructure/daemon/timeline/storage/base/PhabricatorTimelineDAO.php
rename to src/infrastructure/daemon/timeline/storage/PhabricatorTimelineDAO.php
diff --git a/src/infrastructure/daemon/timeline/storage/event/PhabricatorTimelineEvent.php b/src/infrastructure/daemon/timeline/storage/PhabricatorTimelineEvent.php
similarity index 100%
rename from src/infrastructure/daemon/timeline/storage/event/PhabricatorTimelineEvent.php
rename to src/infrastructure/daemon/timeline/storage/PhabricatorTimelineEvent.php
diff --git a/src/infrastructure/daemon/timeline/storage/eventdata/PhabricatorTimelineEventData.php b/src/infrastructure/daemon/timeline/storage/PhabricatorTimelineEventData.php
similarity index 100%
rename from src/infrastructure/daemon/timeline/storage/eventdata/PhabricatorTimelineEventData.php
rename to src/infrastructure/daemon/timeline/storage/PhabricatorTimelineEventData.php
diff --git a/src/infrastructure/daemon/workers/taskmaster/PhabricatorTaskmasterDaemon.php b/src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php
similarity index 100%
rename from src/infrastructure/daemon/workers/taskmaster/PhabricatorTaskmasterDaemon.php
rename to src/infrastructure/daemon/workers/PhabricatorTaskmasterDaemon.php
diff --git a/src/infrastructure/daemon/workers/worker/PhabricatorWorker.php b/src/infrastructure/daemon/workers/PhabricatorWorker.php
similarity index 100%
rename from src/infrastructure/daemon/workers/worker/PhabricatorWorker.php
rename to src/infrastructure/daemon/workers/PhabricatorWorker.php
diff --git a/src/infrastructure/daemon/workers/storage/base/PhabricatorWorkerDAO.php b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerDAO.php
similarity index 100%
rename from src/infrastructure/daemon/workers/storage/base/PhabricatorWorkerDAO.php
rename to src/infrastructure/daemon/workers/storage/PhabricatorWorkerDAO.php
diff --git a/src/infrastructure/daemon/workers/storage/task/PhabricatorWorkerTask.php b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerTask.php
similarity index 100%
rename from src/infrastructure/daemon/workers/storage/task/PhabricatorWorkerTask.php
rename to src/infrastructure/daemon/workers/storage/PhabricatorWorkerTask.php
diff --git a/src/infrastructure/daemon/workers/storage/taskdata/PhabricatorWorkerTaskData.php b/src/infrastructure/daemon/workers/storage/PhabricatorWorkerTaskData.php
similarity index 100%
rename from src/infrastructure/daemon/workers/storage/taskdata/PhabricatorWorkerTaskData.php
rename to src/infrastructure/daemon/workers/storage/PhabricatorWorkerTaskData.php
diff --git a/src/infrastructure/daemon/workers/worker/goodfornothing/PhabricatorGoodForNothingWorker.php b/src/infrastructure/daemon/workers/worker/PhabricatorGoodForNothingWorker.php
similarity index 100%
rename from src/infrastructure/daemon/workers/worker/goodfornothing/PhabricatorGoodForNothingWorker.php
rename to src/infrastructure/daemon/workers/worker/PhabricatorGoodForNothingWorker.php
diff --git a/src/infrastructure/diff/response/PhabricatorChangesetResponse.php b/src/infrastructure/diff/PhabricatorChangesetResponse.php
similarity index 100%
rename from src/infrastructure/diff/response/PhabricatorChangesetResponse.php
rename to src/infrastructure/diff/PhabricatorChangesetResponse.php
diff --git a/src/infrastructure/diff/engine/PhabricatorDifferenceEngine.php b/src/infrastructure/diff/PhabricatorDifferenceEngine.php
similarity index 100%
rename from src/infrastructure/diff/engine/PhabricatorDifferenceEngine.php
rename to src/infrastructure/diff/PhabricatorDifferenceEngine.php
diff --git a/src/infrastructure/diff/controller/PhabricatorInlineCommentController.php b/src/infrastructure/diff/PhabricatorInlineCommentController.php
similarity index 100%
rename from src/infrastructure/diff/controller/PhabricatorInlineCommentController.php
rename to src/infrastructure/diff/PhabricatorInlineCommentController.php
diff --git a/src/infrastructure/diff/interface/inline/PhabricatorInlineCommentInterface.php b/src/infrastructure/diff/interface/PhabricatorInlineCommentInterface.php
similarity index 100%
rename from src/infrastructure/diff/interface/inline/PhabricatorInlineCommentInterface.php
rename to src/infrastructure/diff/interface/PhabricatorInlineCommentInterface.php
diff --git a/src/infrastructure/diff/view/inline/PhabricatorInlineSummaryView.php b/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
similarity index 100%
rename from src/infrastructure/diff/view/inline/PhabricatorInlineSummaryView.php
rename to src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
diff --git a/src/infrastructure/edges/constants/config/PhabricatorEdgeConfig.php b/src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
similarity index 100%
rename from src/infrastructure/edges/constants/config/PhabricatorEdgeConfig.php
rename to src/infrastructure/edges/constants/PhabricatorEdgeConfig.php
diff --git a/src/infrastructure/edges/constants/base/PhabricatorEdgeConstants.php b/src/infrastructure/edges/constants/PhabricatorEdgeConstants.php
similarity index 100%
rename from src/infrastructure/edges/constants/base/PhabricatorEdgeConstants.php
rename to src/infrastructure/edges/constants/PhabricatorEdgeConstants.php
diff --git a/src/infrastructure/edges/editor/edge/PhabricatorEdgeEditor.php b/src/infrastructure/edges/editor/PhabricatorEdgeEditor.php
similarity index 100%
rename from src/infrastructure/edges/editor/edge/PhabricatorEdgeEditor.php
rename to src/infrastructure/edges/editor/PhabricatorEdgeEditor.php
diff --git a/src/infrastructure/edges/query/edge/PhabricatorEdgeQuery.php b/src/infrastructure/edges/query/PhabricatorEdgeQuery.php
similarity index 100%
rename from src/infrastructure/edges/query/edge/PhabricatorEdgeQuery.php
rename to src/infrastructure/edges/query/PhabricatorEdgeQuery.php
diff --git a/src/infrastructure/events/event/PhabricatorEvent.php b/src/infrastructure/events/PhabricatorEvent.php
similarity index 100%
rename from src/infrastructure/events/event/PhabricatorEvent.php
rename to src/infrastructure/events/PhabricatorEvent.php
diff --git a/src/infrastructure/events/engine/PhabricatorEventEngine.php b/src/infrastructure/events/PhabricatorEventEngine.php
similarity index 100%
rename from src/infrastructure/events/engine/PhabricatorEventEngine.php
rename to src/infrastructure/events/PhabricatorEventEngine.php
diff --git a/src/infrastructure/events/constant/type/PhabricatorEventType.php b/src/infrastructure/events/constant/PhabricatorEventType.php
similarity index 100%
rename from src/infrastructure/events/constant/type/PhabricatorEventType.php
rename to src/infrastructure/events/constant/PhabricatorEventType.php
diff --git a/src/infrastructure/javelin/api/Javelin.php b/src/infrastructure/javelin/Javelin.php
similarity index 100%
rename from src/infrastructure/javelin/api/Javelin.php
rename to src/infrastructure/javelin/Javelin.php
diff --git a/src/infrastructure/javelin/markup/markup.php b/src/infrastructure/javelin/markup.php
similarity index 100%
rename from src/infrastructure/javelin/markup/markup.php
rename to src/infrastructure/javelin/markup.php
diff --git a/src/infrastructure/lint/engine/PhabricatorLintEngine.php b/src/infrastructure/lint/PhabricatorLintEngine.php
similarity index 100%
rename from src/infrastructure/lint/engine/PhabricatorLintEngine.php
rename to src/infrastructure/lint/PhabricatorLintEngine.php
diff --git a/src/infrastructure/lint/hook/xhpastsymbolname/PhabricatorSymbolNameLinter.php b/src/infrastructure/lint/hook/PhabricatorSymbolNameLinter.php
similarity index 100%
rename from src/infrastructure/lint/hook/xhpastsymbolname/PhabricatorSymbolNameLinter.php
rename to src/infrastructure/lint/hook/PhabricatorSymbolNameLinter.php
diff --git a/src/infrastructure/lint/linter/javelin/PhabricatorJavelinLinter.php b/src/infrastructure/lint/linter/PhabricatorJavelinLinter.php
similarity index 100%
rename from src/infrastructure/lint/linter/javelin/PhabricatorJavelinLinter.php
rename to src/infrastructure/lint/linter/PhabricatorJavelinLinter.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/differential/PhabricatorRemarkupRuleDifferential.php b/src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleDifferential.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/differential/PhabricatorRemarkupRuleDifferential.php
rename to src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleDifferential.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/diffusion/PhabricatorRemarkupRuleDiffusion.php b/src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleDiffusion.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/diffusion/PhabricatorRemarkupRuleDiffusion.php
rename to src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleDiffusion.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/embedobject/PhabricatorRemarkupRuleEmbedFile.php b/src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleEmbedFile.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/embedobject/PhabricatorRemarkupRuleEmbedFile.php
rename to src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleEmbedFile.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/imagemacro/PhabricatorRemarkupRuleImageMacro.php b/src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleImageMacro.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/imagemacro/PhabricatorRemarkupRuleImageMacro.php
rename to src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleImageMacro.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/maniphest/PhabricatorRemarkupRuleManiphest.php b/src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleManiphest.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/maniphest/PhabricatorRemarkupRuleManiphest.php
rename to src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleManiphest.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/mention/PhabricatorRemarkupRuleMention.php b/src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleMention.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/mention/PhabricatorRemarkupRuleMention.php
rename to src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleMention.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/handle/PhabricatorRemarkupRuleObjectHandle.php b/src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleObjectHandle.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/handle/PhabricatorRemarkupRuleObjectHandle.php
rename to src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleObjectHandle.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/objectname/PhabricatorRemarkupRuleObjectName.php b/src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleObjectName.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/objectname/PhabricatorRemarkupRuleObjectName.php
rename to src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleObjectName.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/paste/PhabricatorRemarkupRulePaste.php b/src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRulePaste.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/paste/PhabricatorRemarkupRulePaste.php
rename to src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRulePaste.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php b/src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRulePhriction.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/phriction/PhabricatorRemarkupRulePhriction.php
rename to src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRulePhriction.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/proxyimage/PhabricatorRemarkupRuleProxyImage.php b/src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleProxyImage.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/proxyimage/PhabricatorRemarkupRuleProxyImage.php
rename to src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleProxyImage.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/youtube/PhabricatorRemarkupRuleYoutube.php b/src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleYoutube.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/youtube/PhabricatorRemarkupRuleYoutube.php
rename to src/infrastructure/markup/remarkup/markuprule/PhabricatorRemarkupRuleYoutube.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/handle/differential/PhabricatorRemarkupRuleDifferentialHandle.php b/src/infrastructure/markup/remarkup/markuprule/handle/PhabricatorRemarkupRuleDifferentialHandle.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/handle/differential/PhabricatorRemarkupRuleDifferentialHandle.php
rename to src/infrastructure/markup/remarkup/markuprule/handle/PhabricatorRemarkupRuleDifferentialHandle.php
diff --git a/src/infrastructure/markup/remarkup/markuprule/handle/maniphest/PhabricatorRemarkupRuleManiphestHandle.php b/src/infrastructure/markup/remarkup/markuprule/handle/PhabricatorRemarkupRuleManiphestHandle.php
similarity index 100%
rename from src/infrastructure/markup/remarkup/markuprule/handle/maniphest/PhabricatorRemarkupRuleManiphestHandle.php
rename to src/infrastructure/markup/remarkup/markuprule/handle/PhabricatorRemarkupRuleManiphestHandle.php
diff --git a/src/infrastructure/query/offsetpaged/PhabricatorOffsetPagedQuery.php b/src/infrastructure/query/PhabricatorOffsetPagedQuery.php
similarity index 100%
rename from src/infrastructure/query/offsetpaged/PhabricatorOffsetPagedQuery.php
rename to src/infrastructure/query/PhabricatorOffsetPagedQuery.php
diff --git a/src/infrastructure/query/base/PhabricatorQuery.php b/src/infrastructure/query/PhabricatorQuery.php
similarity index 100%
rename from src/infrastructure/query/base/PhabricatorQuery.php
rename to src/infrastructure/query/PhabricatorQuery.php
diff --git a/src/infrastructure/query/policy/idpaged/PhabricatorIDPagedPolicyQuery.php b/src/infrastructure/query/policy/PhabricatorIDPagedPolicyQuery.php
similarity index 100%
rename from src/infrastructure/query/policy/idpaged/PhabricatorIDPagedPolicyQuery.php
rename to src/infrastructure/query/policy/PhabricatorIDPagedPolicyQuery.php
diff --git a/src/infrastructure/query/policy/base/PhabricatorPolicyQuery.php b/src/infrastructure/query/policy/PhabricatorPolicyQuery.php
similarity index 100%
rename from src/infrastructure/query/policy/base/PhabricatorPolicyQuery.php
rename to src/infrastructure/query/policy/PhabricatorPolicyQuery.php
diff --git a/src/infrastructure/setup/sql/phabricator/PhabricatorBuiltinPatchList.php b/src/infrastructure/setup/sql/PhabricatorBuiltinPatchList.php
similarity index 100%
rename from src/infrastructure/setup/sql/phabricator/PhabricatorBuiltinPatchList.php
rename to src/infrastructure/setup/sql/PhabricatorBuiltinPatchList.php
diff --git a/src/infrastructure/setup/sql/base/PhabricatorSQLPatchList.php b/src/infrastructure/setup/sql/PhabricatorSQLPatchList.php
similarity index 100%
rename from src/infrastructure/setup/sql/base/PhabricatorSQLPatchList.php
rename to src/infrastructure/setup/sql/PhabricatorSQLPatchList.php
diff --git a/src/infrastructure/setup/storage/management/PhabricatorStorageManagementAPI.php b/src/infrastructure/setup/storage/PhabricatorStorageManagementAPI.php
similarity index 100%
rename from src/infrastructure/setup/storage/management/PhabricatorStorageManagementAPI.php
rename to src/infrastructure/setup/storage/PhabricatorStorageManagementAPI.php
diff --git a/src/infrastructure/setup/storage/patch/PhabricatorStoragePatch.php b/src/infrastructure/setup/storage/PhabricatorStoragePatch.php
similarity index 100%
rename from src/infrastructure/setup/storage/patch/PhabricatorStoragePatch.php
rename to src/infrastructure/setup/storage/PhabricatorStoragePatch.php
diff --git a/src/infrastructure/setup/storage/workflow/databases/PhabricatorStorageManagementDatabasesWorkflow.php b/src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementDatabasesWorkflow.php
similarity index 100%
rename from src/infrastructure/setup/storage/workflow/databases/PhabricatorStorageManagementDatabasesWorkflow.php
rename to src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementDatabasesWorkflow.php
diff --git a/src/infrastructure/setup/storage/workflow/destroy/PhabricatorStorageManagementDestroyWorkflow.php b/src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementDestroyWorkflow.php
similarity index 100%
rename from src/infrastructure/setup/storage/workflow/destroy/PhabricatorStorageManagementDestroyWorkflow.php
rename to src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementDestroyWorkflow.php
diff --git a/src/infrastructure/setup/storage/workflow/dump/PhabricatorStorageManagementDumpWorkflow.php b/src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementDumpWorkflow.php
similarity index 100%
rename from src/infrastructure/setup/storage/workflow/dump/PhabricatorStorageManagementDumpWorkflow.php
rename to src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementDumpWorkflow.php
diff --git a/src/infrastructure/setup/storage/workflow/status/PhabricatorStorageManagementStatusWorkflow.php b/src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementStatusWorkflow.php
similarity index 100%
rename from src/infrastructure/setup/storage/workflow/status/PhabricatorStorageManagementStatusWorkflow.php
rename to src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementStatusWorkflow.php
diff --git a/src/infrastructure/setup/storage/workflow/upgrade/PhabricatorStorageManagementUpgradeWorkflow.php b/src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementUpgradeWorkflow.php
similarity index 100%
rename from src/infrastructure/setup/storage/workflow/upgrade/PhabricatorStorageManagementUpgradeWorkflow.php
rename to src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementUpgradeWorkflow.php
diff --git a/src/infrastructure/setup/storage/workflow/base/PhabricatorStorageManagementWorkflow.php b/src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementWorkflow.php
similarity index 100%
rename from src/infrastructure/setup/storage/workflow/base/PhabricatorStorageManagementWorkflow.php
rename to src/infrastructure/setup/storage/workflow/PhabricatorStorageManagementWorkflow.php
diff --git a/src/infrastructure/testing/testcase/PhabricatorTestCase.php b/src/infrastructure/testing/PhabricatorTestCase.php
similarity index 100%
rename from src/infrastructure/testing/testcase/PhabricatorTestCase.php
rename to src/infrastructure/testing/PhabricatorTestCase.php
diff --git a/src/infrastructure/testing/testcase/__tests__/PhabricatorTrivialTestCase.php b/src/infrastructure/testing/__tests__/PhabricatorTrivialTestCase.php
similarity index 100%
rename from src/infrastructure/testing/testcase/__tests__/PhabricatorTrivialTestCase.php
rename to src/infrastructure/testing/__tests__/PhabricatorTrivialTestCase.php
diff --git a/src/infrastructure/testing/fixture/storage/PhabricatorStorageFixtureScopeGuard.php b/src/infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php
similarity index 100%
rename from src/infrastructure/testing/fixture/storage/PhabricatorStorageFixtureScopeGuard.php
rename to src/infrastructure/testing/fixture/PhabricatorStorageFixtureScopeGuard.php
diff --git a/src/infrastructure/util/hash/PhabricatorHash.php b/src/infrastructure/util/PhabricatorHash.php
similarity index 100%
rename from src/infrastructure/util/hash/PhabricatorHash.php
rename to src/infrastructure/util/PhabricatorHash.php
diff --git a/src/infrastructure/util/slug/PhabricatorSlug.php b/src/infrastructure/util/PhabricatorSlug.php
similarity index 100%
rename from src/infrastructure/util/slug/PhabricatorSlug.php
rename to src/infrastructure/util/PhabricatorSlug.php
diff --git a/src/infrastructure/util/slug/__tests__/PhabricatorSlugTestCase.php b/src/infrastructure/util/__tests__/PhabricatorSlugTestCase.php
similarity index 100%
rename from src/infrastructure/util/slug/__tests__/PhabricatorSlugTestCase.php
rename to src/infrastructure/util/__tests__/PhabricatorSlugTestCase.php
diff --git a/src/storage/transaction/AphrontDatabaseTransactionState.php b/src/storage/AphrontDatabaseTransactionState.php
similarity index 100%
rename from src/storage/transaction/AphrontDatabaseTransactionState.php
rename to src/storage/AphrontDatabaseTransactionState.php
diff --git a/src/storage/qsprintf/__tests__/QueryFormattingTestCase.php b/src/storage/__tests__/QueryFormattingTestCase.php
similarity index 100%
rename from src/storage/qsprintf/__tests__/QueryFormattingTestCase.php
rename to src/storage/__tests__/QueryFormattingTestCase.php
diff --git a/src/storage/connection/base/AphrontDatabaseConnection.php b/src/storage/connection/AphrontDatabaseConnection.php
similarity index 100%
rename from src/storage/connection/base/AphrontDatabaseConnection.php
rename to src/storage/connection/AphrontDatabaseConnection.php
diff --git a/src/storage/connection/isolated/AphrontIsolatedDatabaseConnection.php b/src/storage/connection/AphrontIsolatedDatabaseConnection.php
similarity index 100%
rename from src/storage/connection/isolated/AphrontIsolatedDatabaseConnection.php
rename to src/storage/connection/AphrontIsolatedDatabaseConnection.php
diff --git a/src/storage/connection/isolated/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php b/src/storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php
similarity index 100%
rename from src/storage/connection/isolated/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php
rename to src/storage/connection/__tests__/AphrontIsolatedDatabaseConnectionTestCase.php
diff --git a/src/storage/connection/mysql/__tests__/AphrontMySQLDatabaseConnectionTestCase.php b/src/storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php
similarity index 100%
rename from src/storage/connection/mysql/__tests__/AphrontMySQLDatabaseConnectionTestCase.php
rename to src/storage/connection/__tests__/AphrontMySQLDatabaseConnectionTestCase.php
diff --git a/src/storage/connection/mysql/mysql/AphrontMySQLDatabaseConnection.php b/src/storage/connection/mysql/AphrontMySQLDatabaseConnection.php
similarity index 100%
rename from src/storage/connection/mysql/mysql/AphrontMySQLDatabaseConnection.php
rename to src/storage/connection/mysql/AphrontMySQLDatabaseConnection.php
diff --git a/src/storage/connection/mysql/base/AphrontMySQLDatabaseConnectionBase.php b/src/storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php
similarity index 100%
rename from src/storage/connection/mysql/base/AphrontMySQLDatabaseConnectionBase.php
rename to src/storage/connection/mysql/AphrontMySQLDatabaseConnectionBase.php
diff --git a/src/storage/connection/mysql/mysqli/AphrontMySQLiDatabaseConnection.php b/src/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php
similarity index 100%
rename from src/storage/connection/mysql/mysqli/AphrontMySQLiDatabaseConnection.php
rename to src/storage/connection/mysql/AphrontMySQLiDatabaseConnection.php
diff --git a/src/storage/exception/accessdenied/AphrontQueryAccessDeniedException.php b/src/storage/exception/AphrontQueryAccessDeniedException.php
similarity index 100%
rename from src/storage/exception/accessdenied/AphrontQueryAccessDeniedException.php
rename to src/storage/exception/AphrontQueryAccessDeniedException.php
diff --git a/src/storage/exception/connection/AphrontQueryConnectionException.php b/src/storage/exception/AphrontQueryConnectionException.php
similarity index 100%
rename from src/storage/exception/connection/AphrontQueryConnectionException.php
rename to src/storage/exception/AphrontQueryConnectionException.php
diff --git a/src/storage/exception/connectionlost/AphrontQueryConnectionLostException.php b/src/storage/exception/AphrontQueryConnectionLostException.php
similarity index 100%
rename from src/storage/exception/connectionlost/AphrontQueryConnectionLostException.php
rename to src/storage/exception/AphrontQueryConnectionLostException.php
diff --git a/src/storage/exception/count/AphrontQueryCountException.php b/src/storage/exception/AphrontQueryCountException.php
similarity index 100%
rename from src/storage/exception/count/AphrontQueryCountException.php
rename to src/storage/exception/AphrontQueryCountException.php
diff --git a/src/storage/exception/deadlock/AphrontQueryDeadlockException.php b/src/storage/exception/AphrontQueryDeadlockException.php
similarity index 100%
rename from src/storage/exception/deadlock/AphrontQueryDeadlockException.php
rename to src/storage/exception/AphrontQueryDeadlockException.php
diff --git a/src/storage/exception/duplicatekey/AphrontQueryDuplicateKeyException.php b/src/storage/exception/AphrontQueryDuplicateKeyException.php
similarity index 100%
rename from src/storage/exception/duplicatekey/AphrontQueryDuplicateKeyException.php
rename to src/storage/exception/AphrontQueryDuplicateKeyException.php
diff --git a/src/storage/exception/base/AphrontQueryException.php b/src/storage/exception/AphrontQueryException.php
similarity index 100%
rename from src/storage/exception/base/AphrontQueryException.php
rename to src/storage/exception/AphrontQueryException.php
diff --git a/src/storage/exception/objectmissing/AphrontQueryObjectMissingException.php b/src/storage/exception/AphrontQueryObjectMissingException.php
similarity index 100%
rename from src/storage/exception/objectmissing/AphrontQueryObjectMissingException.php
rename to src/storage/exception/AphrontQueryObjectMissingException.php
diff --git a/src/storage/exception/parameter/AphrontQueryParameterException.php b/src/storage/exception/AphrontQueryParameterException.php
similarity index 100%
rename from src/storage/exception/parameter/AphrontQueryParameterException.php
rename to src/storage/exception/AphrontQueryParameterException.php
diff --git a/src/storage/exception/recoverable/AphrontQueryRecoverableException.php b/src/storage/exception/AphrontQueryRecoverableException.php
similarity index 100%
rename from src/storage/exception/recoverable/AphrontQueryRecoverableException.php
rename to src/storage/exception/AphrontQueryRecoverableException.php
diff --git a/src/storage/exception/schema/AphrontQuerySchemaException.php b/src/storage/exception/AphrontQuerySchemaException.php
similarity index 100%
rename from src/storage/exception/schema/AphrontQuerySchemaException.php
rename to src/storage/exception/AphrontQuerySchemaException.php
diff --git a/src/storage/lisk/dao/LiskDAO.php b/src/storage/lisk/LiskDAO.php
similarity index 100%
rename from src/storage/lisk/dao/LiskDAO.php
rename to src/storage/lisk/LiskDAO.php
diff --git a/src/storage/lisk/dao/LiskDAOSet.php b/src/storage/lisk/LiskDAOSet.php
similarity index 100%
rename from src/storage/lisk/dao/LiskDAOSet.php
rename to src/storage/lisk/LiskDAOSet.php
diff --git a/src/storage/lisk/dao/LiskEphemeralObjectException.php b/src/storage/lisk/LiskEphemeralObjectException.php
similarity index 100%
rename from src/storage/lisk/dao/LiskEphemeralObjectException.php
rename to src/storage/lisk/LiskEphemeralObjectException.php
diff --git a/src/storage/lisk/dao/__tests__/LiskFixtureTestCase.php b/src/storage/lisk/__tests__/LiskFixtureTestCase.php
similarity index 100%
rename from src/storage/lisk/dao/__tests__/LiskFixtureTestCase.php
rename to src/storage/lisk/__tests__/LiskFixtureTestCase.php
diff --git a/src/storage/lisk/dao/__tests__/LiskIsolationTestCase.php b/src/storage/lisk/__tests__/LiskIsolationTestCase.php
similarity index 100%
rename from src/storage/lisk/dao/__tests__/LiskIsolationTestCase.php
rename to src/storage/lisk/__tests__/LiskIsolationTestCase.php
diff --git a/src/storage/lisk/dao/__tests__/LiskIsolationTestDAO.php b/src/storage/lisk/__tests__/LiskIsolationTestDAO.php
similarity index 100%
rename from src/storage/lisk/dao/__tests__/LiskIsolationTestDAO.php
rename to src/storage/lisk/__tests__/LiskIsolationTestDAO.php
diff --git a/src/storage/lisk/dao/__tests__/LiskIsolationTestDAOException.php b/src/storage/lisk/__tests__/LiskIsolationTestDAOException.php
similarity index 100%
rename from src/storage/lisk/dao/__tests__/LiskIsolationTestDAOException.php
rename to src/storage/lisk/__tests__/LiskIsolationTestDAOException.php
diff --git a/src/storage/qsprintf/qsprintf.php b/src/storage/qsprintf.php
similarity index 100%
rename from src/storage/qsprintf/qsprintf.php
rename to src/storage/qsprintf.php
diff --git a/src/storage/queryfx/queryfx.php b/src/storage/queryfx.php
similarity index 100%
rename from src/storage/queryfx/queryfx.php
rename to src/storage/queryfx.php
diff --git a/src/view/dialog/AphrontDialogView.php b/src/view/AphrontDialogView.php
similarity index 100%
rename from src/view/dialog/AphrontDialogView.php
rename to src/view/AphrontDialogView.php
diff --git a/src/view/javelin-view/AphrontJavelinView.php b/src/view/AphrontJavelinView.php
similarity index 100%
rename from src/view/javelin-view/AphrontJavelinView.php
rename to src/view/AphrontJavelinView.php
diff --git a/src/view/null/AphrontNullView.php b/src/view/AphrontNullView.php
similarity index 100%
rename from src/view/null/AphrontNullView.php
rename to src/view/AphrontNullView.php
diff --git a/src/view/base/AphrontView.php b/src/view/AphrontView.php
similarity index 100%
rename from src/view/base/AphrontView.php
rename to src/view/AphrontView.php
diff --git a/src/view/utils/__tests__/PhabricatorLocalTimeTestCase.php b/src/view/__tests__/PhabricatorLocalTimeTestCase.php
similarity index 100%
rename from src/view/utils/__tests__/PhabricatorLocalTimeTestCase.php
rename to src/view/__tests__/PhabricatorLocalTimeTestCase.php
diff --git a/src/view/utils/__tests__/PhabricatorUnitsTestCase.php b/src/view/__tests__/PhabricatorUnitsTestCase.php
similarity index 100%
rename from src/view/utils/__tests__/PhabricatorUnitsTestCase.php
rename to src/view/__tests__/PhabricatorUnitsTestCase.php
diff --git a/src/view/control/attachedfile/AphrontAttachedFileView.php b/src/view/control/AphrontAttachedFileView.php
similarity index 100%
rename from src/view/control/attachedfile/AphrontAttachedFileView.php
rename to src/view/control/AphrontAttachedFileView.php
diff --git a/src/view/control/idpager/AphrontIDPagerView.php b/src/view/control/AphrontIDPagerView.php
similarity index 100%
rename from src/view/control/idpager/AphrontIDPagerView.php
rename to src/view/control/AphrontIDPagerView.php
diff --git a/src/view/control/pager/AphrontPagerView.php b/src/view/control/AphrontPagerView.php
similarity index 100%
rename from src/view/control/pager/AphrontPagerView.php
rename to src/view/control/AphrontPagerView.php
diff --git a/src/view/control/table/AphrontTableView.php b/src/view/control/AphrontTableView.php
similarity index 100%
rename from src/view/control/table/AphrontTableView.php
rename to src/view/control/AphrontTableView.php
diff --git a/src/view/control/tokenizer/AphrontTokenizerTemplateView.php b/src/view/control/AphrontTokenizerTemplateView.php
similarity index 100%
rename from src/view/control/tokenizer/AphrontTokenizerTemplateView.php
rename to src/view/control/AphrontTokenizerTemplateView.php
diff --git a/src/view/control/typeahead/AphrontTypeaheadTemplateView.php b/src/view/control/AphrontTypeaheadTemplateView.php
similarity index 100%
rename from src/view/control/typeahead/AphrontTypeaheadTemplateView.php
rename to src/view/control/AphrontTypeaheadTemplateView.php
diff --git a/src/view/control/objectselector/PhabricatorObjectSelectorDialog.php b/src/view/control/PhabricatorObjectSelectorDialog.php
similarity index 100%
rename from src/view/control/objectselector/PhabricatorObjectSelectorDialog.php
rename to src/view/control/PhabricatorObjectSelectorDialog.php
diff --git a/src/view/form/error/AphrontErrorView.php b/src/view/form/AphrontErrorView.php
similarity index 100%
rename from src/view/form/error/AphrontErrorView.php
rename to src/view/form/AphrontErrorView.php
diff --git a/src/view/form/inset/AphrontFormInsetView.php b/src/view/form/AphrontFormInsetView.php
similarity index 100%
rename from src/view/form/inset/AphrontFormInsetView.php
rename to src/view/form/AphrontFormInsetView.php
diff --git a/src/view/form/layout/AphrontFormLayoutView.php b/src/view/form/AphrontFormLayoutView.php
similarity index 100%
rename from src/view/form/layout/AphrontFormLayoutView.php
rename to src/view/form/AphrontFormLayoutView.php
diff --git a/src/view/form/base/AphrontFormView.php b/src/view/form/AphrontFormView.php
similarity index 100%
rename from src/view/form/base/AphrontFormView.php
rename to src/view/form/AphrontFormView.php
diff --git a/src/view/form/control/checkbox/AphrontFormCheckboxControl.php b/src/view/form/control/AphrontFormCheckboxControl.php
similarity index 100%
rename from src/view/form/control/checkbox/AphrontFormCheckboxControl.php
rename to src/view/form/control/AphrontFormCheckboxControl.php
diff --git a/src/view/form/control/base/AphrontFormControl.php b/src/view/form/control/AphrontFormControl.php
similarity index 100%
rename from src/view/form/control/base/AphrontFormControl.php
rename to src/view/form/control/AphrontFormControl.php
diff --git a/src/view/form/control/date/AphrontFormDateControl.php b/src/view/form/control/AphrontFormDateControl.php
similarity index 100%
rename from src/view/form/control/date/AphrontFormDateControl.php
rename to src/view/form/control/AphrontFormDateControl.php
diff --git a/src/view/form/control/divider/AphrontFormDividerControl.php b/src/view/form/control/AphrontFormDividerControl.php
similarity index 100%
rename from src/view/form/control/divider/AphrontFormDividerControl.php
rename to src/view/form/control/AphrontFormDividerControl.php
diff --git a/src/view/form/control/draganddropupload/AphrontFormDragAndDropUploadControl.php b/src/view/form/control/AphrontFormDragAndDropUploadControl.php
similarity index 100%
rename from src/view/form/control/draganddropupload/AphrontFormDragAndDropUploadControl.php
rename to src/view/form/control/AphrontFormDragAndDropUploadControl.php
diff --git a/src/view/form/control/file/AphrontFormFileControl.php b/src/view/form/control/AphrontFormFileControl.php
similarity index 100%
rename from src/view/form/control/file/AphrontFormFileControl.php
rename to src/view/form/control/AphrontFormFileControl.php
diff --git a/src/view/form/control/markup/AphrontFormMarkupControl.php b/src/view/form/control/AphrontFormMarkupControl.php
similarity index 100%
rename from src/view/form/control/markup/AphrontFormMarkupControl.php
rename to src/view/form/control/AphrontFormMarkupControl.php
diff --git a/src/view/form/control/password/AphrontFormPasswordControl.php b/src/view/form/control/AphrontFormPasswordControl.php
similarity index 100%
rename from src/view/form/control/password/AphrontFormPasswordControl.php
rename to src/view/form/control/AphrontFormPasswordControl.php
diff --git a/src/view/form/control/policy/AphrontFormPolicyControl.php b/src/view/form/control/AphrontFormPolicyControl.php
similarity index 100%
rename from src/view/form/control/policy/AphrontFormPolicyControl.php
rename to src/view/form/control/AphrontFormPolicyControl.php
diff --git a/src/view/form/control/radio/AphrontFormRadioButtonControl.php b/src/view/form/control/AphrontFormRadioButtonControl.php
similarity index 100%
rename from src/view/form/control/radio/AphrontFormRadioButtonControl.php
rename to src/view/form/control/AphrontFormRadioButtonControl.php
diff --git a/src/view/form/control/recaptcha/AphrontFormRecaptchaControl.php b/src/view/form/control/AphrontFormRecaptchaControl.php
similarity index 100%
rename from src/view/form/control/recaptcha/AphrontFormRecaptchaControl.php
rename to src/view/form/control/AphrontFormRecaptchaControl.php
diff --git a/src/view/form/control/select/AphrontFormSelectControl.php b/src/view/form/control/AphrontFormSelectControl.php
similarity index 100%
rename from src/view/form/control/select/AphrontFormSelectControl.php
rename to src/view/form/control/AphrontFormSelectControl.php
diff --git a/src/view/form/control/static/AphrontFormStaticControl.php b/src/view/form/control/AphrontFormStaticControl.php
similarity index 100%
rename from src/view/form/control/static/AphrontFormStaticControl.php
rename to src/view/form/control/AphrontFormStaticControl.php
diff --git a/src/view/form/control/submit/AphrontFormSubmitControl.php b/src/view/form/control/AphrontFormSubmitControl.php
similarity index 100%
rename from src/view/form/control/submit/AphrontFormSubmitControl.php
rename to src/view/form/control/AphrontFormSubmitControl.php
diff --git a/src/view/form/control/textarea/AphrontFormTextAreaControl.php b/src/view/form/control/AphrontFormTextAreaControl.php
similarity index 100%
rename from src/view/form/control/textarea/AphrontFormTextAreaControl.php
rename to src/view/form/control/AphrontFormTextAreaControl.php
diff --git a/src/view/form/control/text/AphrontFormTextControl.php b/src/view/form/control/AphrontFormTextControl.php
similarity index 100%
rename from src/view/form/control/text/AphrontFormTextControl.php
rename to src/view/form/control/AphrontFormTextControl.php
diff --git a/src/view/form/control/togglebuttons/AphrontFormToggleButtonsControl.php b/src/view/form/control/AphrontFormToggleButtonsControl.php
similarity index 100%
rename from src/view/form/control/togglebuttons/AphrontFormToggleButtonsControl.php
rename to src/view/form/control/AphrontFormToggleButtonsControl.php
diff --git a/src/view/form/control/tokenizer/AphrontFormTokenizerControl.php b/src/view/form/control/AphrontFormTokenizerControl.php
similarity index 100%
rename from src/view/form/control/tokenizer/AphrontFormTokenizerControl.php
rename to src/view/form/control/AphrontFormTokenizerControl.php
diff --git a/src/view/layout/contextbar/AphrontContextBarView.php b/src/view/layout/AphrontContextBarView.php
similarity index 100%
rename from src/view/layout/contextbar/AphrontContextBarView.php
rename to src/view/layout/AphrontContextBarView.php
diff --git a/src/view/layout/crumbs/AphrontCrumbsView.php b/src/view/layout/AphrontCrumbsView.php
similarity index 100%
rename from src/view/layout/crumbs/AphrontCrumbsView.php
rename to src/view/layout/AphrontCrumbsView.php
diff --git a/src/view/layout/filepreview/AphrontFilePreviewView.php b/src/view/layout/AphrontFilePreviewView.php
similarity index 100%
rename from src/view/layout/filepreview/AphrontFilePreviewView.php
rename to src/view/layout/AphrontFilePreviewView.php
diff --git a/src/view/layout/listfilter/AphrontListFilterView.php b/src/view/layout/AphrontListFilterView.php
similarity index 100%
rename from src/view/layout/listfilter/AphrontListFilterView.php
rename to src/view/layout/AphrontListFilterView.php
diff --git a/src/view/layout/minipanel/AphrontMiniPanelView.php b/src/view/layout/AphrontMiniPanelView.php
similarity index 100%
rename from src/view/layout/minipanel/AphrontMiniPanelView.php
rename to src/view/layout/AphrontMiniPanelView.php
diff --git a/src/view/layout/more/AphrontMoreView.php b/src/view/layout/AphrontMoreView.php
similarity index 100%
rename from src/view/layout/more/AphrontMoreView.php
rename to src/view/layout/AphrontMoreView.php
diff --git a/src/view/layout/panel/AphrontPanelView.php b/src/view/layout/AphrontPanelView.php
similarity index 100%
rename from src/view/layout/panel/AphrontPanelView.php
rename to src/view/layout/AphrontPanelView.php
diff --git a/src/view/layout/sidenavfilter/AphrontSideNavFilterView.php b/src/view/layout/AphrontSideNavFilterView.php
similarity index 100%
rename from src/view/layout/sidenavfilter/AphrontSideNavFilterView.php
rename to src/view/layout/AphrontSideNavFilterView.php
diff --git a/src/view/layout/sidenav/AphrontSideNavView.php b/src/view/layout/AphrontSideNavView.php
similarity index 100%
rename from src/view/layout/sidenav/AphrontSideNavView.php
rename to src/view/layout/AphrontSideNavView.php
diff --git a/src/view/layout/profileheader/PhabricatorProfileHeaderView.php b/src/view/layout/PhabricatorProfileHeaderView.php
similarity index 100%
rename from src/view/layout/profileheader/PhabricatorProfileHeaderView.php
rename to src/view/layout/PhabricatorProfileHeaderView.php
diff --git a/src/view/layout/transaction/PhabricatorTransactionView.php b/src/view/layout/PhabricatorTransactionView.php
similarity index 100%
rename from src/view/layout/transaction/PhabricatorTransactionView.php
rename to src/view/layout/PhabricatorTransactionView.php
diff --git a/src/view/layout/headsup/actionlist/AphrontHeadsupActionListView.php b/src/view/layout/headsup/AphrontHeadsupActionListView.php
similarity index 100%
rename from src/view/layout/headsup/actionlist/AphrontHeadsupActionListView.php
rename to src/view/layout/headsup/AphrontHeadsupActionListView.php
diff --git a/src/view/layout/headsup/action/AphrontHeadsupActionView.php b/src/view/layout/headsup/AphrontHeadsupActionView.php
similarity index 100%
rename from src/view/layout/headsup/action/AphrontHeadsupActionView.php
rename to src/view/layout/headsup/AphrontHeadsupActionView.php
diff --git a/src/view/layout/headsup/panel/AphrontHeadsupView.php b/src/view/layout/headsup/AphrontHeadsupView.php
similarity index 100%
rename from src/view/layout/headsup/panel/AphrontHeadsupView.php
rename to src/view/layout/headsup/AphrontHeadsupView.php
diff --git a/src/view/page/base/AphrontPageView.php b/src/view/page/AphrontPageView.php
similarity index 100%
rename from src/view/page/base/AphrontPageView.php
rename to src/view/page/AphrontPageView.php
diff --git a/src/view/page/failure/AphrontRequestFailureView.php b/src/view/page/AphrontRequestFailureView.php
similarity index 100%
rename from src/view/page/failure/AphrontRequestFailureView.php
rename to src/view/page/AphrontRequestFailureView.php
diff --git a/src/view/page/standard/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
similarity index 100%
rename from src/view/page/standard/PhabricatorStandardPageView.php
rename to src/view/page/PhabricatorStandardPageView.php
diff --git a/src/view/utils/viewutils.php b/src/view/viewutils.php
similarity index 100%
rename from src/view/utils/viewutils.php
rename to src/view/viewutils.php
diff --git a/src/view/widget/keyboardshortcuts/AphrontKeyboardShortcutsAvailableView.php b/src/view/widget/AphrontKeyboardShortcutsAvailableView.php
similarity index 100%
rename from src/view/widget/keyboardshortcuts/AphrontKeyboardShortcutsAvailableView.php
rename to src/view/widget/AphrontKeyboardShortcutsAvailableView.php