diff --git a/Account/.gitignore b/Modules/Account/.gitignore
similarity index 100%
rename from Account/.gitignore
rename to Modules/Account/.gitignore
diff --git a/Account/.swiftpm/xcode/xcshareddata/xcschemes/Account.xcscheme b/Modules/Account/.swiftpm/xcode/xcshareddata/xcschemes/Account.xcscheme
similarity index 100%
rename from Account/.swiftpm/xcode/xcshareddata/xcschemes/Account.xcscheme
rename to Modules/Account/.swiftpm/xcode/xcshareddata/xcschemes/Account.xcscheme
diff --git a/Account/.swiftpm/xcode/xcshareddata/xcschemes/AccountTests.xcscheme b/Modules/Account/.swiftpm/xcode/xcshareddata/xcschemes/AccountTests.xcscheme
similarity index 100%
rename from Account/.swiftpm/xcode/xcshareddata/xcschemes/AccountTests.xcscheme
rename to Modules/Account/.swiftpm/xcode/xcshareddata/xcschemes/AccountTests.xcscheme
diff --git a/Account/Package.swift b/Modules/Account/Package.swift
similarity index 100%
rename from Account/Package.swift
rename to Modules/Account/Package.swift
diff --git a/Account/README.md b/Modules/Account/README.md
similarity index 100%
rename from Account/README.md
rename to Modules/Account/README.md
diff --git a/Account/Sources/Account/Account.swift b/Modules/Account/Sources/Account/Account.swift
similarity index 100%
rename from Account/Sources/Account/Account.swift
rename to Modules/Account/Sources/Account/Account.swift
diff --git a/Account/Sources/Account/AccountBehaviors.swift b/Modules/Account/Sources/Account/AccountBehaviors.swift
similarity index 100%
rename from Account/Sources/Account/AccountBehaviors.swift
rename to Modules/Account/Sources/Account/AccountBehaviors.swift
diff --git a/Account/Sources/Account/AccountDelegate.swift b/Modules/Account/Sources/Account/AccountDelegate.swift
similarity index 100%
rename from Account/Sources/Account/AccountDelegate.swift
rename to Modules/Account/Sources/Account/AccountDelegate.swift
diff --git a/Account/Sources/Account/AccountDelegates/CloudKitAccountDelegate.swift b/Modules/Account/Sources/Account/AccountDelegates/CloudKitAccountDelegate.swift
similarity index 100%
rename from Account/Sources/Account/AccountDelegates/CloudKitAccountDelegate.swift
rename to Modules/Account/Sources/Account/AccountDelegates/CloudKitAccountDelegate.swift
diff --git a/Account/Sources/Account/AccountDelegates/FeedbinAccountDelegate.swift b/Modules/Account/Sources/Account/AccountDelegates/FeedbinAccountDelegate.swift
similarity index 100%
rename from Account/Sources/Account/AccountDelegates/FeedbinAccountDelegate.swift
rename to Modules/Account/Sources/Account/AccountDelegates/FeedbinAccountDelegate.swift
diff --git a/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift b/Modules/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift
similarity index 100%
rename from Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift
rename to Modules/Account/Sources/Account/AccountDelegates/FeedlyAccountDelegate.swift
diff --git a/Account/Sources/Account/AccountDelegates/LocalAccountDelegate.swift b/Modules/Account/Sources/Account/AccountDelegates/LocalAccountDelegate.swift
similarity index 100%
rename from Account/Sources/Account/AccountDelegates/LocalAccountDelegate.swift
rename to Modules/Account/Sources/Account/AccountDelegates/LocalAccountDelegate.swift
diff --git a/Account/Sources/Account/AccountDelegates/NewsBlurAccountDelegate.swift b/Modules/Account/Sources/Account/AccountDelegates/NewsBlurAccountDelegate.swift
similarity index 100%
rename from Account/Sources/Account/AccountDelegates/NewsBlurAccountDelegate.swift
rename to Modules/Account/Sources/Account/AccountDelegates/NewsBlurAccountDelegate.swift
diff --git a/Account/Sources/Account/AccountDelegates/ReaderAPIAccountDelegate.swift b/Modules/Account/Sources/Account/AccountDelegates/ReaderAPIAccountDelegate.swift
similarity index 100%
rename from Account/Sources/Account/AccountDelegates/ReaderAPIAccountDelegate.swift
rename to Modules/Account/Sources/Account/AccountDelegates/ReaderAPIAccountDelegate.swift
diff --git a/Account/Sources/Account/AccountError.swift b/Modules/Account/Sources/Account/AccountError.swift
similarity index 100%
rename from Account/Sources/Account/AccountError.swift
rename to Modules/Account/Sources/Account/AccountError.swift
diff --git a/Account/Sources/Account/AccountManager.swift b/Modules/Account/Sources/Account/AccountManager.swift
similarity index 100%
rename from Account/Sources/Account/AccountManager.swift
rename to Modules/Account/Sources/Account/AccountManager.swift
diff --git a/Account/Sources/Account/AccountMetadata.swift b/Modules/Account/Sources/Account/AccountMetadata.swift
similarity index 100%
rename from Account/Sources/Account/AccountMetadata.swift
rename to Modules/Account/Sources/Account/AccountMetadata.swift
diff --git a/Account/Sources/Account/AccountMetadataFile.swift b/Modules/Account/Sources/Account/AccountMetadataFile.swift
similarity index 100%
rename from Account/Sources/Account/AccountMetadataFile.swift
rename to Modules/Account/Sources/Account/AccountMetadataFile.swift
diff --git a/Account/Sources/Account/AccountSyncError.swift b/Modules/Account/Sources/Account/AccountSyncError.swift
similarity index 100%
rename from Account/Sources/Account/AccountSyncError.swift
rename to Modules/Account/Sources/Account/AccountSyncError.swift
diff --git a/Account/Sources/Account/ArticleFetcher.swift b/Modules/Account/Sources/Account/ArticleFetcher.swift
similarity index 100%
rename from Account/Sources/Account/ArticleFetcher.swift
rename to Modules/Account/Sources/Account/ArticleFetcher.swift
diff --git a/Account/Sources/Account/CombinedRefreshProgress.swift b/Modules/Account/Sources/Account/CombinedRefreshProgress.swift
similarity index 100%
rename from Account/Sources/Account/CombinedRefreshProgress.swift
rename to Modules/Account/Sources/Account/CombinedRefreshProgress.swift
diff --git a/Account/Sources/Account/Container.swift b/Modules/Account/Sources/Account/Container.swift
similarity index 100%
rename from Account/Sources/Account/Container.swift
rename to Modules/Account/Sources/Account/Container.swift
diff --git a/Account/Sources/Account/ContainerIdentifier.swift b/Modules/Account/Sources/Account/ContainerIdentifier.swift
similarity index 100%
rename from Account/Sources/Account/ContainerIdentifier.swift
rename to Modules/Account/Sources/Account/ContainerIdentifier.swift
diff --git a/Account/Sources/Account/ContainerPath.swift b/Modules/Account/Sources/Account/ContainerPath.swift
similarity index 100%
rename from Account/Sources/Account/ContainerPath.swift
rename to Modules/Account/Sources/Account/ContainerPath.swift
diff --git a/Account/Sources/Account/DataExtensions.swift b/Modules/Account/Sources/Account/DataExtensions.swift
similarity index 100%
rename from Account/Sources/Account/DataExtensions.swift
rename to Modules/Account/Sources/Account/DataExtensions.swift
diff --git a/Account/Sources/Account/Feed.swift b/Modules/Account/Sources/Account/Feed.swift
similarity index 100%
rename from Account/Sources/Account/Feed.swift
rename to Modules/Account/Sources/Account/Feed.swift
diff --git a/Account/Sources/Account/FeedMetadata.swift b/Modules/Account/Sources/Account/FeedMetadata.swift
similarity index 100%
rename from Account/Sources/Account/FeedMetadata.swift
rename to Modules/Account/Sources/Account/FeedMetadata.swift
diff --git a/Account/Sources/Account/FeedMetadataFile.swift b/Modules/Account/Sources/Account/FeedMetadataFile.swift
similarity index 100%
rename from Account/Sources/Account/FeedMetadataFile.swift
rename to Modules/Account/Sources/Account/FeedMetadataFile.swift
diff --git a/Account/Sources/Account/Folder.swift b/Modules/Account/Sources/Account/Folder.swift
similarity index 100%
rename from Account/Sources/Account/Folder.swift
rename to Modules/Account/Sources/Account/Folder.swift
diff --git a/Account/Sources/Account/OPMLFile.swift b/Modules/Account/Sources/Account/OPMLFile.swift
similarity index 100%
rename from Account/Sources/Account/OPMLFile.swift
rename to Modules/Account/Sources/Account/OPMLFile.swift
diff --git a/Account/Sources/Account/OPMLNormalizer.swift b/Modules/Account/Sources/Account/OPMLNormalizer.swift
similarity index 100%
rename from Account/Sources/Account/OPMLNormalizer.swift
rename to Modules/Account/Sources/Account/OPMLNormalizer.swift
diff --git a/Account/Sources/Account/SingleArticleFetcher.swift b/Modules/Account/Sources/Account/SingleArticleFetcher.swift
similarity index 100%
rename from Account/Sources/Account/SingleArticleFetcher.swift
rename to Modules/Account/Sources/Account/SingleArticleFetcher.swift
diff --git a/Account/Sources/Account/URLRequest+Account.swift b/Modules/Account/Sources/Account/URLRequest+Account.swift
similarity index 100%
rename from Account/Sources/Account/URLRequest+Account.swift
rename to Modules/Account/Sources/Account/URLRequest+Account.swift
diff --git a/Account/Sources/Account/UnreadCountProvider.swift b/Modules/Account/Sources/Account/UnreadCountProvider.swift
similarity index 100%
rename from Account/Sources/Account/UnreadCountProvider.swift
rename to Modules/Account/Sources/Account/UnreadCountProvider.swift
diff --git a/Account/Tests/AccountTests/AccountCredentialsTest.swift b/Modules/Account/Tests/AccountTests/AccountCredentialsTest.swift
similarity index 100%
rename from Account/Tests/AccountTests/AccountCredentialsTest.swift
rename to Modules/Account/Tests/AccountTests/AccountCredentialsTest.swift
diff --git a/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderContentsSyncTest.swift b/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderContentsSyncTest.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderContentsSyncTest.swift
rename to Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderContentsSyncTest.swift
diff --git a/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderSyncTest.swift b/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderSyncTest.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderSyncTest.swift
rename to Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinFolderSyncTest.swift
diff --git a/Account/Tests/AccountTests/Feedbin/AccountFeedbinSyncTest.swift b/Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinSyncTest.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedbin/AccountFeedbinSyncTest.swift
rename to Modules/Account/Tests/AccountTests/Feedbin/AccountFeedbinSyncTest.swift
diff --git a/Account/Tests/AccountTests/Feedly/FeedlyCreateFeedsForCollectionFoldersOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyCreateFeedsForCollectionFoldersOperationTests.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/FeedlyCreateFeedsForCollectionFoldersOperationTests.swift
rename to Modules/Account/Tests/AccountTests/Feedly/FeedlyCreateFeedsForCollectionFoldersOperationTests.swift
diff --git a/Account/Tests/AccountTests/Feedly/FeedlyGetCollectionsOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetCollectionsOperationTests.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/FeedlyGetCollectionsOperationTests.swift
rename to Modules/Account/Tests/AccountTests/Feedly/FeedlyGetCollectionsOperationTests.swift
diff --git a/Account/Tests/AccountTests/Feedly/FeedlyGetStreamContentsOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyGetStreamContentsOperationTests.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/FeedlyGetStreamContentsOperationTests.swift
rename to Modules/Account/Tests/AccountTests/Feedly/FeedlyGetStreamContentsOperationTests.swift
diff --git a/Account/Tests/AccountTests/Feedly/FeedlyLogoutOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyLogoutOperationTests.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/FeedlyLogoutOperationTests.swift
rename to Modules/Account/Tests/AccountTests/Feedly/FeedlyLogoutOperationTests.swift
diff --git a/Account/Tests/AccountTests/Feedly/FeedlyMirrorCollectionsAsFoldersOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyMirrorCollectionsAsFoldersOperationTests.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/FeedlyMirrorCollectionsAsFoldersOperationTests.swift
rename to Modules/Account/Tests/AccountTests/Feedly/FeedlyMirrorCollectionsAsFoldersOperationTests.swift
diff --git a/Account/Tests/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift
rename to Modules/Account/Tests/AccountTests/Feedly/FeedlySendArticleStatusesOperationTests.swift
diff --git a/Account/Tests/AccountTests/Feedly/FeedlySyncAllMockResponseProvider.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlySyncAllMockResponseProvider.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/FeedlySyncAllMockResponseProvider.swift
rename to Modules/Account/Tests/AccountTests/Feedly/FeedlySyncAllMockResponseProvider.swift
diff --git a/Account/Tests/AccountTests/Feedly/FeedlySyncStreamContentsOperationTests.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlySyncStreamContentsOperationTests.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/FeedlySyncStreamContentsOperationTests.swift
rename to Modules/Account/Tests/AccountTests/Feedly/FeedlySyncStreamContentsOperationTests.swift
diff --git a/Account/Tests/AccountTests/Feedly/FeedlyTestSupport.swift b/Modules/Account/Tests/AccountTests/Feedly/FeedlyTestSupport.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/FeedlyTestSupport.swift
rename to Modules/Account/Tests/AccountTests/Feedly/FeedlyTestSupport.swift
diff --git a/Account/Tests/AccountTests/Feedly/TestGetCollectionsService.swift b/Modules/Account/Tests/AccountTests/Feedly/TestGetCollectionsService.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/TestGetCollectionsService.swift
rename to Modules/Account/Tests/AccountTests/Feedly/TestGetCollectionsService.swift
diff --git a/Account/Tests/AccountTests/Feedly/TestGetEntriesService.swift b/Modules/Account/Tests/AccountTests/Feedly/TestGetEntriesService.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/TestGetEntriesService.swift
rename to Modules/Account/Tests/AccountTests/Feedly/TestGetEntriesService.swift
diff --git a/Account/Tests/AccountTests/Feedly/TestGetPagedStreamContentsService.swift b/Modules/Account/Tests/AccountTests/Feedly/TestGetPagedStreamContentsService.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/TestGetPagedStreamContentsService.swift
rename to Modules/Account/Tests/AccountTests/Feedly/TestGetPagedStreamContentsService.swift
diff --git a/Account/Tests/AccountTests/Feedly/TestGetPagedStreamIdsService.swift b/Modules/Account/Tests/AccountTests/Feedly/TestGetPagedStreamIdsService.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/TestGetPagedStreamIdsService.swift
rename to Modules/Account/Tests/AccountTests/Feedly/TestGetPagedStreamIdsService.swift
diff --git a/Account/Tests/AccountTests/Feedly/TestGetStreamContentsService.swift b/Modules/Account/Tests/AccountTests/Feedly/TestGetStreamContentsService.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/TestGetStreamContentsService.swift
rename to Modules/Account/Tests/AccountTests/Feedly/TestGetStreamContentsService.swift
diff --git a/Account/Tests/AccountTests/Feedly/TestGetStreamIdsService.swift b/Modules/Account/Tests/AccountTests/Feedly/TestGetStreamIdsService.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/TestGetStreamIdsService.swift
rename to Modules/Account/Tests/AccountTests/Feedly/TestGetStreamIdsService.swift
diff --git a/Account/Tests/AccountTests/Feedly/TestMarkArticlesService.swift b/Modules/Account/Tests/AccountTests/Feedly/TestMarkArticlesService.swift
similarity index 100%
rename from Account/Tests/AccountTests/Feedly/TestMarkArticlesService.swift
rename to Modules/Account/Tests/AccountTests/Feedly/TestMarkArticlesService.swift
diff --git a/Account/Tests/AccountTests/JSON/feedly_collections_initial.json b/Modules/Account/Tests/AccountTests/JSON/feedly_collections_initial.json
similarity index 100%
rename from Account/Tests/AccountTests/JSON/feedly_collections_initial.json
rename to Modules/Account/Tests/AccountTests/JSON/feedly_collections_initial.json
diff --git a/Account/Tests/AccountTests/JSON/feedly_macintosh_initial.json b/Modules/Account/Tests/AccountTests/JSON/feedly_macintosh_initial.json
similarity index 100%
rename from Account/Tests/AccountTests/JSON/feedly_macintosh_initial.json
rename to Modules/Account/Tests/AccountTests/JSON/feedly_macintosh_initial.json
diff --git a/Account/Tests/AccountTests/JSON/feedly_unreads_1000.json b/Modules/Account/Tests/AccountTests/JSON/feedly_unreads_1000.json
similarity index 100%
rename from Account/Tests/AccountTests/JSON/feedly_unreads_1000.json
rename to Modules/Account/Tests/AccountTests/JSON/feedly_unreads_1000.json
diff --git a/Account/Tests/AccountTests/JSON/feedly_unreads_initial.json b/Modules/Account/Tests/AccountTests/JSON/feedly_unreads_initial.json
similarity index 100%
rename from Account/Tests/AccountTests/JSON/feedly_unreads_initial.json
rename to Modules/Account/Tests/AccountTests/JSON/feedly_unreads_initial.json
diff --git a/Account/Tests/AccountTests/JSON/subscriptions_add.json b/Modules/Account/Tests/AccountTests/JSON/subscriptions_add.json
similarity index 100%
rename from Account/Tests/AccountTests/JSON/subscriptions_add.json
rename to Modules/Account/Tests/AccountTests/JSON/subscriptions_add.json
diff --git a/Account/Tests/AccountTests/JSON/subscriptions_initial.json b/Modules/Account/Tests/AccountTests/JSON/subscriptions_initial.json
similarity index 100%
rename from Account/Tests/AccountTests/JSON/subscriptions_initial.json
rename to Modules/Account/Tests/AccountTests/JSON/subscriptions_initial.json
diff --git a/Account/Tests/AccountTests/JSON/taggings_add.json b/Modules/Account/Tests/AccountTests/JSON/taggings_add.json
similarity index 100%
rename from Account/Tests/AccountTests/JSON/taggings_add.json
rename to Modules/Account/Tests/AccountTests/JSON/taggings_add.json
diff --git a/Account/Tests/AccountTests/JSON/taggings_delete.json b/Modules/Account/Tests/AccountTests/JSON/taggings_delete.json
similarity index 100%
rename from Account/Tests/AccountTests/JSON/taggings_delete.json
rename to Modules/Account/Tests/AccountTests/JSON/taggings_delete.json
diff --git a/Account/Tests/AccountTests/JSON/taggings_initial.json b/Modules/Account/Tests/AccountTests/JSON/taggings_initial.json
similarity index 100%
rename from Account/Tests/AccountTests/JSON/taggings_initial.json
rename to Modules/Account/Tests/AccountTests/JSON/taggings_initial.json
diff --git a/Account/Tests/AccountTests/JSON/tags_add.json b/Modules/Account/Tests/AccountTests/JSON/tags_add.json
similarity index 100%
rename from Account/Tests/AccountTests/JSON/tags_add.json
rename to Modules/Account/Tests/AccountTests/JSON/tags_add.json
diff --git a/Account/Tests/AccountTests/JSON/tags_delete.json b/Modules/Account/Tests/AccountTests/JSON/tags_delete.json
similarity index 100%
rename from Account/Tests/AccountTests/JSON/tags_delete.json
rename to Modules/Account/Tests/AccountTests/JSON/tags_delete.json
diff --git a/Account/Tests/AccountTests/JSON/tags_initial.json b/Modules/Account/Tests/AccountTests/JSON/tags_initial.json
similarity index 100%
rename from Account/Tests/AccountTests/JSON/tags_initial.json
rename to Modules/Account/Tests/AccountTests/JSON/tags_initial.json
diff --git a/Account/Tests/AccountTests/TestAccountManager.swift b/Modules/Account/Tests/AccountTests/TestAccountManager.swift
similarity index 100%
rename from Account/Tests/AccountTests/TestAccountManager.swift
rename to Modules/Account/Tests/AccountTests/TestAccountManager.swift
diff --git a/Account/Tests/AccountTests/TestTransport.swift b/Modules/Account/Tests/AccountTests/TestTransport.swift
similarity index 100%
rename from Account/Tests/AccountTests/TestTransport.swift
rename to Modules/Account/Tests/AccountTests/TestTransport.swift
diff --git a/Account/Tests/LinuxMain.swift b/Modules/Account/Tests/LinuxMain.swift
similarity index 100%
rename from Account/Tests/LinuxMain.swift
rename to Modules/Account/Tests/LinuxMain.swift
diff --git a/AppKitExtras/.gitignore b/Modules/AppKitExtras/.gitignore
similarity index 100%
rename from AppKitExtras/.gitignore
rename to Modules/AppKitExtras/.gitignore
diff --git a/AppKitExtras/.swiftpm/xcode/xcshareddata/xcschemes/AppKitExtras.xcscheme b/Modules/AppKitExtras/.swiftpm/xcode/xcshareddata/xcschemes/AppKitExtras.xcscheme
similarity index 100%
rename from AppKitExtras/.swiftpm/xcode/xcshareddata/xcschemes/AppKitExtras.xcscheme
rename to Modules/AppKitExtras/.swiftpm/xcode/xcshareddata/xcschemes/AppKitExtras.xcscheme
diff --git a/AppKitExtras/.swiftpm/xcode/xcshareddata/xcschemes/AppKitExtrasTests.xcscheme b/Modules/AppKitExtras/.swiftpm/xcode/xcshareddata/xcschemes/AppKitExtrasTests.xcscheme
similarity index 100%
rename from AppKitExtras/.swiftpm/xcode/xcshareddata/xcschemes/AppKitExtrasTests.xcscheme
rename to Modules/AppKitExtras/.swiftpm/xcode/xcshareddata/xcschemes/AppKitExtrasTests.xcscheme
diff --git a/AppKitExtras/Package.swift b/Modules/AppKitExtras/Package.swift
similarity index 100%
rename from AppKitExtras/Package.swift
rename to Modules/AppKitExtras/Package.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/FourCharCode.swift b/Modules/AppKitExtras/Sources/AppKitExtras/FourCharCode.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/FourCharCode.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/FourCharCode.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/Keyboard.swift b/Modules/AppKitExtras/Sources/AppKitExtras/Keyboard.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/Keyboard.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/Keyboard.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/KeyboardDelegateProtocol.swift b/Modules/AppKitExtras/Sources/AppKitExtras/KeyboardDelegateProtocol.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/KeyboardDelegateProtocol.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/KeyboardDelegateProtocol.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/NSAppearance+RSCore.swift b/Modules/AppKitExtras/Sources/AppKitExtras/NSAppearance+RSCore.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/NSAppearance+RSCore.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/NSAppearance+RSCore.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/NSAppleEventDescriptor+RSCore.swift b/Modules/AppKitExtras/Sources/AppKitExtras/NSAppleEventDescriptor+RSCore.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/NSAppleEventDescriptor+RSCore.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/NSAppleEventDescriptor+RSCore.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/NSImage+RSCore.swift b/Modules/AppKitExtras/Sources/AppKitExtras/NSImage+RSCore.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/NSImage+RSCore.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/NSImage+RSCore.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/NSMenu+Extensions.swift b/Modules/AppKitExtras/Sources/AppKitExtras/NSMenu+Extensions.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/NSMenu+Extensions.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/NSMenu+Extensions.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/NSOutlineView+RSCore.swift b/Modules/AppKitExtras/Sources/AppKitExtras/NSOutlineView+RSCore.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/NSOutlineView+RSCore.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/NSOutlineView+RSCore.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/NSPasteboard+RSCore.swift b/Modules/AppKitExtras/Sources/AppKitExtras/NSPasteboard+RSCore.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/NSPasteboard+RSCore.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/NSPasteboard+RSCore.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/NSResponder-Extensions.swift b/Modules/AppKitExtras/Sources/AppKitExtras/NSResponder-Extensions.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/NSResponder-Extensions.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/NSResponder-Extensions.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/NSTableView+RSCore.swift b/Modules/AppKitExtras/Sources/AppKitExtras/NSTableView+RSCore.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/NSTableView+RSCore.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/NSTableView+RSCore.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/NSToolbar+RSCore.swift b/Modules/AppKitExtras/Sources/AppKitExtras/NSToolbar+RSCore.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/NSToolbar+RSCore.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/NSToolbar+RSCore.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/NSView+RSCore.swift b/Modules/AppKitExtras/Sources/AppKitExtras/NSView+RSCore.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/NSView+RSCore.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/NSView+RSCore.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/NSWindow-Extensions.swift b/Modules/AppKitExtras/Sources/AppKitExtras/NSWindow-Extensions.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/NSWindow-Extensions.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/NSWindow-Extensions.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/NSWindowController+RSCore.swift b/Modules/AppKitExtras/Sources/AppKitExtras/NSWindowController+RSCore.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/NSWindowController+RSCore.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/NSWindowController+RSCore.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/PasteboardWriterOwner.swift b/Modules/AppKitExtras/Sources/AppKitExtras/PasteboardWriterOwner.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/PasteboardWriterOwner.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/PasteboardWriterOwner.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/RSToolbarItem.swift b/Modules/AppKitExtras/Sources/AppKitExtras/RSToolbarItem.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/RSToolbarItem.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/RSToolbarItem.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/URLPasteboardWriter.swift b/Modules/AppKitExtras/Sources/AppKitExtras/URLPasteboardWriter.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/URLPasteboardWriter.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/URLPasteboardWriter.swift
diff --git a/AppKitExtras/Sources/AppKitExtras/UserApp.swift b/Modules/AppKitExtras/Sources/AppKitExtras/UserApp.swift
similarity index 100%
rename from AppKitExtras/Sources/AppKitExtras/UserApp.swift
rename to Modules/AppKitExtras/Sources/AppKitExtras/UserApp.swift
diff --git a/AppKitExtras/Tests/AppKitExtrasTests/NSMenuExtensionsTests.swift b/Modules/AppKitExtras/Tests/AppKitExtrasTests/NSMenuExtensionsTests.swift
similarity index 100%
rename from AppKitExtras/Tests/AppKitExtrasTests/NSMenuExtensionsTests.swift
rename to Modules/AppKitExtras/Tests/AppKitExtrasTests/NSMenuExtensionsTests.swift
diff --git a/ArticleExtractor/.gitignore b/Modules/ArticleExtractor/.gitignore
similarity index 100%
rename from ArticleExtractor/.gitignore
rename to Modules/ArticleExtractor/.gitignore
diff --git a/ArticleExtractor/Package.swift b/Modules/ArticleExtractor/Package.swift
similarity index 100%
rename from ArticleExtractor/Package.swift
rename to Modules/ArticleExtractor/Package.swift
diff --git a/ArticleExtractor/Sources/ArticleExtractor/ArticleExtractor.swift b/Modules/ArticleExtractor/Sources/ArticleExtractor/ArticleExtractor.swift
similarity index 100%
rename from ArticleExtractor/Sources/ArticleExtractor/ArticleExtractor.swift
rename to Modules/ArticleExtractor/Sources/ArticleExtractor/ArticleExtractor.swift
diff --git a/ArticleExtractor/Sources/ArticleExtractor/ExtractedArticle.swift b/Modules/ArticleExtractor/Sources/ArticleExtractor/ExtractedArticle.swift
similarity index 100%
rename from ArticleExtractor/Sources/ArticleExtractor/ExtractedArticle.swift
rename to Modules/ArticleExtractor/Sources/ArticleExtractor/ExtractedArticle.swift
diff --git a/ArticleExtractor/Tests/ArticleExtractorTests/ArticleExtractorTests.swift b/Modules/ArticleExtractor/Tests/ArticleExtractorTests/ArticleExtractorTests.swift
similarity index 100%
rename from ArticleExtractor/Tests/ArticleExtractorTests/ArticleExtractorTests.swift
rename to Modules/ArticleExtractor/Tests/ArticleExtractorTests/ArticleExtractorTests.swift
diff --git a/Articles/.gitignore b/Modules/Articles/.gitignore
similarity index 100%
rename from Articles/.gitignore
rename to Modules/Articles/.gitignore
diff --git a/Articles/.swiftpm/xcode/xcshareddata/xcschemes/Articles.xcscheme b/Modules/Articles/.swiftpm/xcode/xcshareddata/xcschemes/Articles.xcscheme
similarity index 100%
rename from Articles/.swiftpm/xcode/xcshareddata/xcschemes/Articles.xcscheme
rename to Modules/Articles/.swiftpm/xcode/xcshareddata/xcschemes/Articles.xcscheme
diff --git a/Articles/Package.swift b/Modules/Articles/Package.swift
similarity index 100%
rename from Articles/Package.swift
rename to Modules/Articles/Package.swift
diff --git a/Articles/README.md b/Modules/Articles/README.md
similarity index 100%
rename from Articles/README.md
rename to Modules/Articles/README.md
diff --git a/Articles/Sources/Articles/Article.swift b/Modules/Articles/Sources/Articles/Article.swift
similarity index 100%
rename from Articles/Sources/Articles/Article.swift
rename to Modules/Articles/Sources/Articles/Article.swift
diff --git a/Articles/Sources/Articles/ArticleStatus.swift b/Modules/Articles/Sources/Articles/ArticleStatus.swift
similarity index 100%
rename from Articles/Sources/Articles/ArticleStatus.swift
rename to Modules/Articles/Sources/Articles/ArticleStatus.swift
diff --git a/Articles/Sources/Articles/Author.swift b/Modules/Articles/Sources/Articles/Author.swift
similarity index 100%
rename from Articles/Sources/Articles/Author.swift
rename to Modules/Articles/Sources/Articles/Author.swift
diff --git a/Articles/Sources/Articles/DatabaseID.swift b/Modules/Articles/Sources/Articles/DatabaseID.swift
similarity index 100%
rename from Articles/Sources/Articles/DatabaseID.swift
rename to Modules/Articles/Sources/Articles/DatabaseID.swift
diff --git a/ArticlesDatabase/.gitignore b/Modules/ArticlesDatabase/.gitignore
similarity index 100%
rename from ArticlesDatabase/.gitignore
rename to Modules/ArticlesDatabase/.gitignore
diff --git a/ArticlesDatabase/.swiftpm/xcode/xcshareddata/xcschemes/ArticlesDatabase.xcscheme b/Modules/ArticlesDatabase/.swiftpm/xcode/xcshareddata/xcschemes/ArticlesDatabase.xcscheme
similarity index 100%
rename from ArticlesDatabase/.swiftpm/xcode/xcshareddata/xcschemes/ArticlesDatabase.xcscheme
rename to Modules/ArticlesDatabase/.swiftpm/xcode/xcshareddata/xcschemes/ArticlesDatabase.xcscheme
diff --git a/ArticlesDatabase/Package.swift b/Modules/ArticlesDatabase/Package.swift
similarity index 100%
rename from ArticlesDatabase/Package.swift
rename to Modules/ArticlesDatabase/Package.swift
diff --git a/ArticlesDatabase/README.md b/Modules/ArticlesDatabase/README.md
similarity index 100%
rename from ArticlesDatabase/README.md
rename to Modules/ArticlesDatabase/README.md
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift b/Modules/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift
similarity index 100%
rename from ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift
rename to Modules/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesDatabase.swift
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift b/Modules/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift
similarity index 100%
rename from ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift
rename to Modules/ArticlesDatabase/Sources/ArticlesDatabase/ArticlesTable.swift
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/AuthorsTable.swift b/Modules/ArticlesDatabase/Sources/ArticlesDatabase/AuthorsTable.swift
similarity index 100%
rename from ArticlesDatabase/Sources/ArticlesDatabase/AuthorsTable.swift
rename to Modules/ArticlesDatabase/Sources/ArticlesDatabase/AuthorsTable.swift
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/Constants.swift b/Modules/ArticlesDatabase/Sources/ArticlesDatabase/Constants.swift
similarity index 100%
rename from ArticlesDatabase/Sources/ArticlesDatabase/Constants.swift
rename to Modules/ArticlesDatabase/Sources/ArticlesDatabase/Constants.swift
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/Article+Database.swift b/Modules/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/Article+Database.swift
similarity index 100%
rename from ArticlesDatabase/Sources/ArticlesDatabase/Extensions/Article+Database.swift
rename to Modules/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/Article+Database.swift
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/ArticleStatus+Database.swift b/Modules/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/ArticleStatus+Database.swift
similarity index 100%
rename from ArticlesDatabase/Sources/ArticlesDatabase/Extensions/ArticleStatus+Database.swift
rename to Modules/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/ArticleStatus+Database.swift
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/Author+Database.swift b/Modules/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/Author+Database.swift
similarity index 100%
rename from ArticlesDatabase/Sources/ArticlesDatabase/Extensions/Author+Database.swift
rename to Modules/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/Author+Database.swift
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/DatabaseObject+Database.swift b/Modules/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/DatabaseObject+Database.swift
similarity index 100%
rename from ArticlesDatabase/Sources/ArticlesDatabase/Extensions/DatabaseObject+Database.swift
rename to Modules/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/DatabaseObject+Database.swift
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/ParsedArticle+Database.swift b/Modules/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/ParsedArticle+Database.swift
similarity index 100%
rename from ArticlesDatabase/Sources/ArticlesDatabase/Extensions/ParsedArticle+Database.swift
rename to Modules/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/ParsedArticle+Database.swift
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/RelatedObjectsMap+Database.swift b/Modules/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/RelatedObjectsMap+Database.swift
similarity index 100%
rename from ArticlesDatabase/Sources/ArticlesDatabase/Extensions/RelatedObjectsMap+Database.swift
rename to Modules/ArticlesDatabase/Sources/ArticlesDatabase/Extensions/RelatedObjectsMap+Database.swift
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/SearchTable.swift b/Modules/ArticlesDatabase/Sources/ArticlesDatabase/SearchTable.swift
similarity index 100%
rename from ArticlesDatabase/Sources/ArticlesDatabase/SearchTable.swift
rename to Modules/ArticlesDatabase/Sources/ArticlesDatabase/SearchTable.swift
diff --git a/ArticlesDatabase/Sources/ArticlesDatabase/StatusesTable.swift b/Modules/ArticlesDatabase/Sources/ArticlesDatabase/StatusesTable.swift
similarity index 100%
rename from ArticlesDatabase/Sources/ArticlesDatabase/StatusesTable.swift
rename to Modules/ArticlesDatabase/Sources/ArticlesDatabase/StatusesTable.swift
diff --git a/CloudKitSync/.gitignore b/Modules/CloudKitSync/.gitignore
similarity index 100%
rename from CloudKitSync/.gitignore
rename to Modules/CloudKitSync/.gitignore
diff --git a/CloudKitSync/.swiftpm/xcode/xcshareddata/xcschemes/CloudKitSync.xcscheme b/Modules/CloudKitSync/.swiftpm/xcode/xcshareddata/xcschemes/CloudKitSync.xcscheme
similarity index 100%
rename from CloudKitSync/.swiftpm/xcode/xcshareddata/xcschemes/CloudKitSync.xcscheme
rename to Modules/CloudKitSync/.swiftpm/xcode/xcshareddata/xcschemes/CloudKitSync.xcscheme
diff --git a/CloudKitSync/Package.swift b/Modules/CloudKitSync/Package.swift
similarity index 100%
rename from CloudKitSync/Package.swift
rename to Modules/CloudKitSync/Package.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/CKRecord+Extensions.swift b/Modules/CloudKitSync/Sources/CloudKitSync/CKRecord+Extensions.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/CKRecord+Extensions.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/CKRecord+Extensions.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitAccountZone.swift b/Modules/CloudKitSync/Sources/CloudKitSync/CloudKitAccountZone.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/CloudKitAccountZone.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/CloudKitAccountZone.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitArticleStatusUpdate.swift b/Modules/CloudKitSync/Sources/CloudKitSync/CloudKitArticleStatusUpdate.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/CloudKitArticleStatusUpdate.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/CloudKitArticleStatusUpdate.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZone.swift b/Modules/CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZone.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZone.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZone.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZoneDelegate.swift b/Modules/CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZoneDelegate.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZoneDelegate.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/CloudKitArticlesZoneDelegate.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitError.swift b/Modules/CloudKitSync/Sources/CloudKitSync/CloudKitError.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/CloudKitError.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/CloudKitError.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitReceiveStatusOperation.swift b/Modules/CloudKitSync/Sources/CloudKitSync/CloudKitReceiveStatusOperation.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/CloudKitReceiveStatusOperation.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/CloudKitReceiveStatusOperation.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitRemoteNotificationOperation.swift b/Modules/CloudKitSync/Sources/CloudKitSync/CloudKitRemoteNotificationOperation.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/CloudKitRemoteNotificationOperation.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/CloudKitRemoteNotificationOperation.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitSendStatusOperation.swift b/Modules/CloudKitSync/Sources/CloudKitSync/CloudKitSendStatusOperation.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/CloudKitSendStatusOperation.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/CloudKitSendStatusOperation.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitZone.swift b/Modules/CloudKitSync/Sources/CloudKitSync/CloudKitZone.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/CloudKitZone.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/CloudKitZone.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/CloudKitZoneResult.swift b/Modules/CloudKitSync/Sources/CloudKitSync/CloudKitZoneResult.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/CloudKitZoneResult.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/CloudKitZoneResult.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/MainThreadOperation.swift b/Modules/CloudKitSync/Sources/CloudKitSync/MainThreadOperation.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/MainThreadOperation.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/MainThreadOperation.swift
diff --git a/CloudKitSync/Sources/CloudKitSync/MainThreadOperationQueue.swift b/Modules/CloudKitSync/Sources/CloudKitSync/MainThreadOperationQueue.swift
similarity index 100%
rename from CloudKitSync/Sources/CloudKitSync/MainThreadOperationQueue.swift
rename to Modules/CloudKitSync/Sources/CloudKitSync/MainThreadOperationQueue.swift
diff --git a/CloudKitSync/Tests/CloudKitSyncTests/CloudKitSyncTests.swift b/Modules/CloudKitSync/Tests/CloudKitSyncTests/CloudKitSyncTests.swift
similarity index 100%
rename from CloudKitSync/Tests/CloudKitSyncTests/CloudKitSyncTests.swift
rename to Modules/CloudKitSync/Tests/CloudKitSyncTests/CloudKitSyncTests.swift
diff --git a/CommonErrors/.gitignore b/Modules/CommonErrors/.gitignore
similarity index 100%
rename from CommonErrors/.gitignore
rename to Modules/CommonErrors/.gitignore
diff --git a/CommonErrors/.swiftpm/xcode/xcshareddata/xcschemes/CommonErrors.xcscheme b/Modules/CommonErrors/.swiftpm/xcode/xcshareddata/xcschemes/CommonErrors.xcscheme
similarity index 100%
rename from CommonErrors/.swiftpm/xcode/xcshareddata/xcschemes/CommonErrors.xcscheme
rename to Modules/CommonErrors/.swiftpm/xcode/xcshareddata/xcschemes/CommonErrors.xcscheme
diff --git a/CommonErrors/Package.swift b/Modules/CommonErrors/Package.swift
similarity index 100%
rename from CommonErrors/Package.swift
rename to Modules/CommonErrors/Package.swift
diff --git a/CommonErrors/Sources/CommonErrors/CommonError.swift b/Modules/CommonErrors/Sources/CommonErrors/CommonError.swift
similarity index 100%
rename from CommonErrors/Sources/CommonErrors/CommonError.swift
rename to Modules/CommonErrors/Sources/CommonErrors/CommonError.swift
diff --git a/CommonErrors/Tests/CommonErrorsTests/CommonErrorsTests.swift b/Modules/CommonErrors/Tests/CommonErrorsTests/CommonErrorsTests.swift
similarity index 100%
rename from CommonErrors/Tests/CommonErrorsTests/CommonErrorsTests.swift
rename to Modules/CommonErrors/Tests/CommonErrorsTests/CommonErrorsTests.swift
diff --git a/Core/.gitignore b/Modules/Core/.gitignore
similarity index 100%
rename from Core/.gitignore
rename to Modules/Core/.gitignore
diff --git a/Core/.swiftpm/xcode/xcshareddata/xcschemes/Core.xcscheme b/Modules/Core/.swiftpm/xcode/xcshareddata/xcschemes/Core.xcscheme
similarity index 100%
rename from Core/.swiftpm/xcode/xcshareddata/xcschemes/Core.xcscheme
rename to Modules/Core/.swiftpm/xcode/xcshareddata/xcschemes/Core.xcscheme
diff --git a/Core/.swiftpm/xcode/xcshareddata/xcschemes/CoreTests.xcscheme b/Modules/Core/.swiftpm/xcode/xcshareddata/xcschemes/CoreTests.xcscheme
similarity index 100%
rename from Core/.swiftpm/xcode/xcshareddata/xcschemes/CoreTests.xcscheme
rename to Modules/Core/.swiftpm/xcode/xcshareddata/xcschemes/CoreTests.xcscheme
diff --git a/Core/Package.swift b/Modules/Core/Package.swift
similarity index 100%
rename from Core/Package.swift
rename to Modules/Core/Package.swift
diff --git a/Core/Sources/Core/AppConfig.swift b/Modules/Core/Sources/Core/AppConfig.swift
similarity index 100%
rename from Core/Sources/Core/AppConfig.swift
rename to Modules/Core/Sources/Core/AppConfig.swift
diff --git a/Core/Sources/Core/BatchUpdate.swift b/Modules/Core/Sources/Core/BatchUpdate.swift
similarity index 100%
rename from Core/Sources/Core/BatchUpdate.swift
rename to Modules/Core/Sources/Core/BatchUpdate.swift
diff --git a/Core/Sources/Core/BinaryDiskCache.swift b/Modules/Core/Sources/Core/BinaryDiskCache.swift
similarity index 100%
rename from Core/Sources/Core/BinaryDiskCache.swift
rename to Modules/Core/Sources/Core/BinaryDiskCache.swift
diff --git a/Core/Sources/Core/CoalescingQueue.swift b/Modules/Core/Sources/Core/CoalescingQueue.swift
similarity index 100%
rename from Core/Sources/Core/CoalescingQueue.swift
rename to Modules/Core/Sources/Core/CoalescingQueue.swift
diff --git a/Core/Sources/Core/DataFile.swift b/Modules/Core/Sources/Core/DataFile.swift
similarity index 100%
rename from Core/Sources/Core/DataFile.swift
rename to Modules/Core/Sources/Core/DataFile.swift
diff --git a/Core/Sources/Core/DisplayNameProvider.swift b/Modules/Core/Sources/Core/DisplayNameProvider.swift
similarity index 100%
rename from Core/Sources/Core/DisplayNameProvider.swift
rename to Modules/Core/Sources/Core/DisplayNameProvider.swift
diff --git a/Core/Sources/Core/MacroProcessor.swift b/Modules/Core/Sources/Core/MacroProcessor.swift
similarity index 100%
rename from Core/Sources/Core/MacroProcessor.swift
rename to Modules/Core/Sources/Core/MacroProcessor.swift
diff --git a/Core/Sources/Core/OPMLRepresentable.swift b/Modules/Core/Sources/Core/OPMLRepresentable.swift
similarity index 100%
rename from Core/Sources/Core/OPMLRepresentable.swift
rename to Modules/Core/Sources/Core/OPMLRepresentable.swift
diff --git a/Core/Sources/Core/Platform.swift b/Modules/Core/Sources/Core/Platform.swift
similarity index 100%
rename from Core/Sources/Core/Platform.swift
rename to Modules/Core/Sources/Core/Platform.swift
diff --git a/Core/Sources/Core/RSAppMovementMonitor.swift b/Modules/Core/Sources/Core/RSAppMovementMonitor.swift
similarity index 100%
rename from Core/Sources/Core/RSAppMovementMonitor.swift
rename to Modules/Core/Sources/Core/RSAppMovementMonitor.swift
diff --git a/Core/Sources/Core/RSImage.swift b/Modules/Core/Sources/Core/RSImage.swift
similarity index 100%
rename from Core/Sources/Core/RSImage.swift
rename to Modules/Core/Sources/Core/RSImage.swift
diff --git a/Core/Sources/Core/Renamable.swift b/Modules/Core/Sources/Core/Renamable.swift
similarity index 100%
rename from Core/Sources/Core/Renamable.swift
rename to Modules/Core/Sources/Core/Renamable.swift
diff --git a/Core/Sources/Core/SendToBlogEditorApp.swift b/Modules/Core/Sources/Core/SendToBlogEditorApp.swift
similarity index 100%
rename from Core/Sources/Core/SendToBlogEditorApp.swift
rename to Modules/Core/Sources/Core/SendToBlogEditorApp.swift
diff --git a/Core/Sources/Core/SendToCommand.swift b/Modules/Core/Sources/Core/SendToCommand.swift
similarity index 100%
rename from Core/Sources/Core/SendToCommand.swift
rename to Modules/Core/Sources/Core/SendToCommand.swift
diff --git a/Core/Sources/Core/UndoableCommand.swift b/Modules/Core/Sources/Core/UndoableCommand.swift
similarity index 100%
rename from Core/Sources/Core/UndoableCommand.swift
rename to Modules/Core/Sources/Core/UndoableCommand.swift
diff --git a/Core/Sources/CoreResources/AppKit/IndeterminateProgressWindowController.swift b/Modules/Core/Sources/CoreResources/AppKit/IndeterminateProgressWindowController.swift
similarity index 100%
rename from Core/Sources/CoreResources/AppKit/IndeterminateProgressWindowController.swift
rename to Modules/Core/Sources/CoreResources/AppKit/IndeterminateProgressWindowController.swift
diff --git a/Core/Sources/CoreResources/AppKit/WebViewWindowController.swift b/Modules/Core/Sources/CoreResources/AppKit/WebViewWindowController.swift
similarity index 100%
rename from Core/Sources/CoreResources/AppKit/WebViewWindowController.swift
rename to Modules/Core/Sources/CoreResources/AppKit/WebViewWindowController.swift
diff --git a/Core/Sources/CoreResources/Resources/IndeterminateProgressWindow.xib b/Modules/Core/Sources/CoreResources/Resources/IndeterminateProgressWindow.xib
similarity index 100%
rename from Core/Sources/CoreResources/Resources/IndeterminateProgressWindow.xib
rename to Modules/Core/Sources/CoreResources/Resources/IndeterminateProgressWindow.xib
diff --git a/Core/Sources/CoreResources/Resources/WebViewWindow.xib b/Modules/Core/Sources/CoreResources/Resources/WebViewWindow.xib
similarity index 100%
rename from Core/Sources/CoreResources/Resources/WebViewWindow.xib
rename to Modules/Core/Sources/CoreResources/Resources/WebViewWindow.xib
diff --git a/Core/Tests/CoreTests/MacroProcessorTests.swift b/Modules/Core/Tests/CoreTests/MacroProcessorTests.swift
similarity index 100%
rename from Core/Tests/CoreTests/MacroProcessorTests.swift
rename to Modules/Core/Tests/CoreTests/MacroProcessorTests.swift
diff --git a/Database/.gitignore b/Modules/Database/.gitignore
similarity index 100%
rename from Database/.gitignore
rename to Modules/Database/.gitignore
diff --git a/Database/Package.swift b/Modules/Database/Package.swift
similarity index 100%
rename from Database/Package.swift
rename to Modules/Database/Package.swift
diff --git a/Database/Sources/Database/Database.swift b/Modules/Database/Sources/Database/Database.swift
similarity index 100%
rename from Database/Sources/Database/Database.swift
rename to Modules/Database/Sources/Database/Database.swift
diff --git a/Database/Sources/Database/DatabaseObject.swift b/Modules/Database/Sources/Database/DatabaseObject.swift
similarity index 100%
rename from Database/Sources/Database/DatabaseObject.swift
rename to Modules/Database/Sources/Database/DatabaseObject.swift
diff --git a/Database/Sources/Database/DatabaseObjectCache.swift b/Modules/Database/Sources/Database/DatabaseObjectCache.swift
similarity index 100%
rename from Database/Sources/Database/DatabaseObjectCache.swift
rename to Modules/Database/Sources/Database/DatabaseObjectCache.swift
diff --git a/Database/Sources/Database/FMDatabase+Extras.swift b/Modules/Database/Sources/Database/FMDatabase+Extras.swift
similarity index 100%
rename from Database/Sources/Database/FMDatabase+Extras.swift
rename to Modules/Database/Sources/Database/FMDatabase+Extras.swift
diff --git a/Database/Sources/Database/FMResultSet+Extras.swift b/Modules/Database/Sources/Database/FMResultSet+Extras.swift
similarity index 100%
rename from Database/Sources/Database/FMResultSet+Extras.swift
rename to Modules/Database/Sources/Database/FMResultSet+Extras.swift
diff --git a/Database/Sources/Database/Related Objects/DatabaseLookupTable.swift b/Modules/Database/Sources/Database/Related Objects/DatabaseLookupTable.swift
similarity index 100%
rename from Database/Sources/Database/Related Objects/DatabaseLookupTable.swift
rename to Modules/Database/Sources/Database/Related Objects/DatabaseLookupTable.swift
diff --git a/Database/Sources/Database/Related Objects/DatabaseRelatedObjectsTable.swift b/Modules/Database/Sources/Database/Related Objects/DatabaseRelatedObjectsTable.swift
similarity index 100%
rename from Database/Sources/Database/Related Objects/DatabaseRelatedObjectsTable.swift
rename to Modules/Database/Sources/Database/Related Objects/DatabaseRelatedObjectsTable.swift
diff --git a/Database/Sources/Database/Related Objects/RelatedObjectIDsMap.swift b/Modules/Database/Sources/Database/Related Objects/RelatedObjectIDsMap.swift
similarity index 100%
rename from Database/Sources/Database/Related Objects/RelatedObjectIDsMap.swift
rename to Modules/Database/Sources/Database/Related Objects/RelatedObjectIDsMap.swift
diff --git a/Database/Sources/Database/Related Objects/RelatedObjectsMap.swift b/Modules/Database/Sources/Database/Related Objects/RelatedObjectsMap.swift
similarity index 100%
rename from Database/Sources/Database/Related Objects/RelatedObjectsMap.swift
rename to Modules/Database/Sources/Database/Related Objects/RelatedObjectsMap.swift
diff --git a/Database/Tests/DatabaseTests/DatabaseTests.swift b/Modules/Database/Tests/DatabaseTests/DatabaseTests.swift
similarity index 100%
rename from Database/Tests/DatabaseTests/DatabaseTests.swift
rename to Modules/Database/Tests/DatabaseTests/DatabaseTests.swift
diff --git a/FMDB/.gitignore b/Modules/FMDB/.gitignore
similarity index 100%
rename from FMDB/.gitignore
rename to Modules/FMDB/.gitignore
diff --git a/FMDB/Package.swift b/Modules/FMDB/Package.swift
similarity index 100%
rename from FMDB/Package.swift
rename to Modules/FMDB/Package.swift
diff --git a/FMDB/Sources/FMDB/FMDatabase+RSExtras.h b/Modules/FMDB/Sources/FMDB/FMDatabase+RSExtras.h
similarity index 100%
rename from FMDB/Sources/FMDB/FMDatabase+RSExtras.h
rename to Modules/FMDB/Sources/FMDB/FMDatabase+RSExtras.h
diff --git a/FMDB/Sources/FMDB/FMDatabase+RSExtras.m b/Modules/FMDB/Sources/FMDB/FMDatabase+RSExtras.m
similarity index 100%
rename from FMDB/Sources/FMDB/FMDatabase+RSExtras.m
rename to Modules/FMDB/Sources/FMDB/FMDatabase+RSExtras.m
diff --git a/FMDB/Sources/FMDB/FMDatabase.h b/Modules/FMDB/Sources/FMDB/FMDatabase.h
similarity index 100%
rename from FMDB/Sources/FMDB/FMDatabase.h
rename to Modules/FMDB/Sources/FMDB/FMDatabase.h
diff --git a/FMDB/Sources/FMDB/FMDatabase.m b/Modules/FMDB/Sources/FMDB/FMDatabase.m
similarity index 100%
rename from FMDB/Sources/FMDB/FMDatabase.m
rename to Modules/FMDB/Sources/FMDB/FMDatabase.m
diff --git a/FMDB/Sources/FMDB/FMDatabaseAdditions.h b/Modules/FMDB/Sources/FMDB/FMDatabaseAdditions.h
similarity index 100%
rename from FMDB/Sources/FMDB/FMDatabaseAdditions.h
rename to Modules/FMDB/Sources/FMDB/FMDatabaseAdditions.h
diff --git a/FMDB/Sources/FMDB/FMDatabaseAdditions.m b/Modules/FMDB/Sources/FMDB/FMDatabaseAdditions.m
similarity index 100%
rename from FMDB/Sources/FMDB/FMDatabaseAdditions.m
rename to Modules/FMDB/Sources/FMDB/FMDatabaseAdditions.m
diff --git a/FMDB/Sources/FMDB/FMResultSet+RSExtras.h b/Modules/FMDB/Sources/FMDB/FMResultSet+RSExtras.h
similarity index 100%
rename from FMDB/Sources/FMDB/FMResultSet+RSExtras.h
rename to Modules/FMDB/Sources/FMDB/FMResultSet+RSExtras.h
diff --git a/FMDB/Sources/FMDB/FMResultSet+RSExtras.m b/Modules/FMDB/Sources/FMDB/FMResultSet+RSExtras.m
similarity index 100%
rename from FMDB/Sources/FMDB/FMResultSet+RSExtras.m
rename to Modules/FMDB/Sources/FMDB/FMResultSet+RSExtras.m
diff --git a/FMDB/Sources/FMDB/FMResultSet.h b/Modules/FMDB/Sources/FMDB/FMResultSet.h
similarity index 100%
rename from FMDB/Sources/FMDB/FMResultSet.h
rename to Modules/FMDB/Sources/FMDB/FMResultSet.h
diff --git a/FMDB/Sources/FMDB/FMResultSet.m b/Modules/FMDB/Sources/FMDB/FMResultSet.m
similarity index 100%
rename from FMDB/Sources/FMDB/FMResultSet.m
rename to Modules/FMDB/Sources/FMDB/FMResultSet.m
diff --git a/FMDB/Sources/FMDB/NSString+RSDatabase.h b/Modules/FMDB/Sources/FMDB/NSString+RSDatabase.h
similarity index 100%
rename from FMDB/Sources/FMDB/NSString+RSDatabase.h
rename to Modules/FMDB/Sources/FMDB/NSString+RSDatabase.h
diff --git a/FMDB/Sources/FMDB/NSString+RSDatabase.m b/Modules/FMDB/Sources/FMDB/NSString+RSDatabase.m
similarity index 100%
rename from FMDB/Sources/FMDB/NSString+RSDatabase.m
rename to Modules/FMDB/Sources/FMDB/NSString+RSDatabase.m
diff --git a/FMDB/Sources/FMDB/include/FMDatabase.h b/Modules/FMDB/Sources/FMDB/include/FMDatabase.h
similarity index 100%
rename from FMDB/Sources/FMDB/include/FMDatabase.h
rename to Modules/FMDB/Sources/FMDB/include/FMDatabase.h
diff --git a/FMDB/Tests/FMDBTests/FMDBTests.swift b/Modules/FMDB/Tests/FMDBTests/FMDBTests.swift
similarity index 100%
rename from FMDB/Tests/FMDBTests/FMDBTests.swift
rename to Modules/FMDB/Tests/FMDBTests/FMDBTests.swift
diff --git a/FeedDownloader/.gitignore b/Modules/FeedDownloader/.gitignore
similarity index 100%
rename from FeedDownloader/.gitignore
rename to Modules/FeedDownloader/.gitignore
diff --git a/FeedDownloader/.swiftpm/xcode/xcshareddata/xcschemes/FeedDownloader.xcscheme b/Modules/FeedDownloader/.swiftpm/xcode/xcshareddata/xcschemes/FeedDownloader.xcscheme
similarity index 100%
rename from FeedDownloader/.swiftpm/xcode/xcshareddata/xcschemes/FeedDownloader.xcscheme
rename to Modules/FeedDownloader/.swiftpm/xcode/xcshareddata/xcschemes/FeedDownloader.xcscheme
diff --git a/FeedDownloader/Package.swift b/Modules/FeedDownloader/Package.swift
similarity index 100%
rename from FeedDownloader/Package.swift
rename to Modules/FeedDownloader/Package.swift
diff --git a/FeedDownloader/Sources/FeedDownloader/FeedDownloader.swift b/Modules/FeedDownloader/Sources/FeedDownloader/FeedDownloader.swift
similarity index 100%
rename from FeedDownloader/Sources/FeedDownloader/FeedDownloader.swift
rename to Modules/FeedDownloader/Sources/FeedDownloader/FeedDownloader.swift
diff --git a/FeedDownloader/Tests/FeedDownloaderTests/FeedDownloaderTests.swift b/Modules/FeedDownloader/Tests/FeedDownloaderTests/FeedDownloaderTests.swift
similarity index 100%
rename from FeedDownloader/Tests/FeedDownloaderTests/FeedDownloaderTests.swift
rename to Modules/FeedDownloader/Tests/FeedDownloaderTests/FeedDownloaderTests.swift
diff --git a/FeedFinder/.gitignore b/Modules/FeedFinder/.gitignore
similarity index 100%
rename from FeedFinder/.gitignore
rename to Modules/FeedFinder/.gitignore
diff --git a/FeedFinder/.swiftpm/xcode/xcshareddata/xcschemes/FeedFinder.xcscheme b/Modules/FeedFinder/.swiftpm/xcode/xcshareddata/xcschemes/FeedFinder.xcscheme
similarity index 100%
rename from FeedFinder/.swiftpm/xcode/xcshareddata/xcschemes/FeedFinder.xcscheme
rename to Modules/FeedFinder/.swiftpm/xcode/xcshareddata/xcschemes/FeedFinder.xcscheme
diff --git a/FeedFinder/Package.swift b/Modules/FeedFinder/Package.swift
similarity index 100%
rename from FeedFinder/Package.swift
rename to Modules/FeedFinder/Package.swift
diff --git a/FeedFinder/Sources/FeedFinder/FeedFinder.swift b/Modules/FeedFinder/Sources/FeedFinder/FeedFinder.swift
similarity index 100%
rename from FeedFinder/Sources/FeedFinder/FeedFinder.swift
rename to Modules/FeedFinder/Sources/FeedFinder/FeedFinder.swift
diff --git a/FeedFinder/Sources/FeedFinder/FeedSpecifier.swift b/Modules/FeedFinder/Sources/FeedFinder/FeedSpecifier.swift
similarity index 100%
rename from FeedFinder/Sources/FeedFinder/FeedSpecifier.swift
rename to Modules/FeedFinder/Sources/FeedFinder/FeedSpecifier.swift
diff --git a/FeedFinder/Sources/FeedFinder/HTMLFeedFinder.swift b/Modules/FeedFinder/Sources/FeedFinder/HTMLFeedFinder.swift
similarity index 100%
rename from FeedFinder/Sources/FeedFinder/HTMLFeedFinder.swift
rename to Modules/FeedFinder/Sources/FeedFinder/HTMLFeedFinder.swift
diff --git a/FeedFinder/Tests/FeedFinderTests/FeedFinderTests.swift b/Modules/FeedFinder/Tests/FeedFinderTests/FeedFinderTests.swift
similarity index 100%
rename from FeedFinder/Tests/FeedFinderTests/FeedFinderTests.swift
rename to Modules/FeedFinder/Tests/FeedFinderTests/FeedFinderTests.swift
diff --git a/Feedbin/.gitignore b/Modules/Feedbin/.gitignore
similarity index 100%
rename from Feedbin/.gitignore
rename to Modules/Feedbin/.gitignore
diff --git a/Feedbin/.swiftpm/xcode/xcshareddata/xcschemes/Feedbin.xcscheme b/Modules/Feedbin/.swiftpm/xcode/xcshareddata/xcschemes/Feedbin.xcscheme
similarity index 100%
rename from Feedbin/.swiftpm/xcode/xcshareddata/xcschemes/Feedbin.xcscheme
rename to Modules/Feedbin/.swiftpm/xcode/xcshareddata/xcschemes/Feedbin.xcscheme
diff --git a/Feedbin/Package.swift b/Modules/Feedbin/Package.swift
similarity index 100%
rename from Feedbin/Package.swift
rename to Modules/Feedbin/Package.swift
diff --git a/Feedbin/Sources/Feedbin/FeedbinAPICaller.swift b/Modules/Feedbin/Sources/Feedbin/FeedbinAPICaller.swift
similarity index 100%
rename from Feedbin/Sources/Feedbin/FeedbinAPICaller.swift
rename to Modules/Feedbin/Sources/Feedbin/FeedbinAPICaller.swift
diff --git a/Feedbin/Sources/Feedbin/FeedbinDate.swift b/Modules/Feedbin/Sources/Feedbin/FeedbinDate.swift
similarity index 100%
rename from Feedbin/Sources/Feedbin/FeedbinDate.swift
rename to Modules/Feedbin/Sources/Feedbin/FeedbinDate.swift
diff --git a/Feedbin/Sources/Feedbin/FeedbinEntry.swift b/Modules/Feedbin/Sources/Feedbin/FeedbinEntry.swift
similarity index 100%
rename from Feedbin/Sources/Feedbin/FeedbinEntry.swift
rename to Modules/Feedbin/Sources/Feedbin/FeedbinEntry.swift
diff --git a/Feedbin/Sources/Feedbin/FeedbinImportResult.swift b/Modules/Feedbin/Sources/Feedbin/FeedbinImportResult.swift
similarity index 100%
rename from Feedbin/Sources/Feedbin/FeedbinImportResult.swift
rename to Modules/Feedbin/Sources/Feedbin/FeedbinImportResult.swift
diff --git a/Feedbin/Sources/Feedbin/FeedbinStarredEntry.swift b/Modules/Feedbin/Sources/Feedbin/FeedbinStarredEntry.swift
similarity index 100%
rename from Feedbin/Sources/Feedbin/FeedbinStarredEntry.swift
rename to Modules/Feedbin/Sources/Feedbin/FeedbinStarredEntry.swift
diff --git a/Feedbin/Sources/Feedbin/FeedbinSubscription.swift b/Modules/Feedbin/Sources/Feedbin/FeedbinSubscription.swift
similarity index 100%
rename from Feedbin/Sources/Feedbin/FeedbinSubscription.swift
rename to Modules/Feedbin/Sources/Feedbin/FeedbinSubscription.swift
diff --git a/Feedbin/Sources/Feedbin/FeedbinTag.swift b/Modules/Feedbin/Sources/Feedbin/FeedbinTag.swift
similarity index 100%
rename from Feedbin/Sources/Feedbin/FeedbinTag.swift
rename to Modules/Feedbin/Sources/Feedbin/FeedbinTag.swift
diff --git a/Feedbin/Sources/Feedbin/FeedbinTagging.swift b/Modules/Feedbin/Sources/Feedbin/FeedbinTagging.swift
similarity index 100%
rename from Feedbin/Sources/Feedbin/FeedbinTagging.swift
rename to Modules/Feedbin/Sources/Feedbin/FeedbinTagging.swift
diff --git a/Feedbin/Sources/Feedbin/FeedbinUnreadEntry.swift b/Modules/Feedbin/Sources/Feedbin/FeedbinUnreadEntry.swift
similarity index 100%
rename from Feedbin/Sources/Feedbin/FeedbinUnreadEntry.swift
rename to Modules/Feedbin/Sources/Feedbin/FeedbinUnreadEntry.swift
diff --git a/Feedbin/Tests/FeedbinTests/FeedbinTests.swift b/Modules/Feedbin/Tests/FeedbinTests/FeedbinTests.swift
similarity index 100%
rename from Feedbin/Tests/FeedbinTests/FeedbinTests.swift
rename to Modules/Feedbin/Tests/FeedbinTests/FeedbinTests.swift
diff --git a/Feedly/.gitignore b/Modules/Feedly/.gitignore
similarity index 100%
rename from Feedly/.gitignore
rename to Modules/Feedly/.gitignore
diff --git a/Feedly/.swiftpm/xcode/xcshareddata/xcschemes/Feedly.xcscheme b/Modules/Feedly/.swiftpm/xcode/xcshareddata/xcschemes/Feedly.xcscheme
similarity index 84%
rename from Feedly/.swiftpm/xcode/xcshareddata/xcschemes/Feedly.xcscheme
rename to Modules/Feedly/.swiftpm/xcode/xcshareddata/xcschemes/Feedly.xcscheme
index ea291e35c..7e0083fe3 100644
--- a/Feedly/.swiftpm/xcode/xcshareddata/xcschemes/Feedly.xcscheme
+++ b/Modules/Feedly/.swiftpm/xcode/xcshareddata/xcschemes/Feedly.xcscheme
@@ -29,6 +29,18 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
       shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "FeedlyTests"
+               BuildableName = "FeedlyTests"
+               BlueprintName = "FeedlyTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
diff --git a/Feedly/Package.swift b/Modules/Feedly/Package.swift
similarity index 100%
rename from Feedly/Package.swift
rename to Modules/Feedly/Package.swift
diff --git a/Feedly/Sources/Feedly/FeedlyAPICaller.swift b/Modules/Feedly/Sources/Feedly/FeedlyAPICaller.swift
similarity index 100%
rename from Feedly/Sources/Feedly/FeedlyAPICaller.swift
rename to Modules/Feedly/Sources/Feedly/FeedlyAPICaller.swift
diff --git a/Feedly/Sources/Feedly/FeedlyAccountDelegateError.swift b/Modules/Feedly/Sources/Feedly/FeedlyAccountDelegateError.swift
similarity index 100%
rename from Feedly/Sources/Feedly/FeedlyAccountDelegateError.swift
rename to Modules/Feedly/Sources/Feedly/FeedlyAccountDelegateError.swift
diff --git a/Feedly/Sources/Feedly/FeedlyModel.swift b/Modules/Feedly/Sources/Feedly/FeedlyModel.swift
similarity index 100%
rename from Feedly/Sources/Feedly/FeedlyModel.swift
rename to Modules/Feedly/Sources/Feedly/FeedlyModel.swift
diff --git a/Feedly/Sources/Feedly/FeedlyUtilities.swift b/Modules/Feedly/Sources/Feedly/FeedlyUtilities.swift
similarity index 100%
rename from Feedly/Sources/Feedly/FeedlyUtilities.swift
rename to Modules/Feedly/Sources/Feedly/FeedlyUtilities.swift
diff --git a/Feedly/Sources/Feedly/OAuth/OAuth.swift b/Modules/Feedly/Sources/Feedly/OAuth/OAuth.swift
similarity index 100%
rename from Feedly/Sources/Feedly/OAuth/OAuth.swift
rename to Modules/Feedly/Sources/Feedly/OAuth/OAuth.swift
diff --git a/Feedly/Sources/Feedly/OAuth/OAuthAuthorizationClient+Feedly.swift b/Modules/Feedly/Sources/Feedly/OAuth/OAuthAuthorizationClient+Feedly.swift
similarity index 100%
rename from Feedly/Sources/Feedly/OAuth/OAuthAuthorizationClient+Feedly.swift
rename to Modules/Feedly/Sources/Feedly/OAuth/OAuthAuthorizationClient+Feedly.swift
diff --git a/Feedly/Sources/Feedly/OAuth/OAuthRefreshAccessTokenRequest.swift b/Modules/Feedly/Sources/Feedly/OAuth/OAuthRefreshAccessTokenRequest.swift
similarity index 100%
rename from Feedly/Sources/Feedly/OAuth/OAuthRefreshAccessTokenRequest.swift
rename to Modules/Feedly/Sources/Feedly/OAuth/OAuthRefreshAccessTokenRequest.swift
diff --git a/Feedly/Tests/FeedlyTests/FeedlyCollectionParserTests.swift b/Modules/Feedly/Tests/FeedlyTests/FeedlyCollectionParserTests.swift
similarity index 100%
rename from Feedly/Tests/FeedlyTests/FeedlyCollectionParserTests.swift
rename to Modules/Feedly/Tests/FeedlyTests/FeedlyCollectionParserTests.swift
diff --git a/Feedly/Tests/FeedlyTests/FeedlyEntryParserTests.swift b/Modules/Feedly/Tests/FeedlyTests/FeedlyEntryParserTests.swift
similarity index 100%
rename from Feedly/Tests/FeedlyTests/FeedlyEntryParserTests.swift
rename to Modules/Feedly/Tests/FeedlyTests/FeedlyEntryParserTests.swift
diff --git a/Feedly/Tests/FeedlyTests/FeedlyFeedParserTests.swift b/Modules/Feedly/Tests/FeedlyTests/FeedlyFeedParserTests.swift
similarity index 100%
rename from Feedly/Tests/FeedlyTests/FeedlyFeedParserTests.swift
rename to Modules/Feedly/Tests/FeedlyTests/FeedlyFeedParserTests.swift
diff --git a/Feedly/Tests/FeedlyTests/FeedlyResourceIDTests.swift b/Modules/Feedly/Tests/FeedlyTests/FeedlyResourceIDTests.swift
similarity index 100%
rename from Feedly/Tests/FeedlyTests/FeedlyResourceIDTests.swift
rename to Modules/Feedly/Tests/FeedlyTests/FeedlyResourceIDTests.swift
diff --git a/Feedly/Tests/FeedlyTests/FeedlyTextSanitizationTests.swift b/Modules/Feedly/Tests/FeedlyTests/FeedlyTextSanitizationTests.swift
similarity index 100%
rename from Feedly/Tests/FeedlyTests/FeedlyTextSanitizationTests.swift
rename to Modules/Feedly/Tests/FeedlyTests/FeedlyTextSanitizationTests.swift
diff --git a/Feedly/Tests/FeedlyTests/FeedlyUtilitiesTests.swift b/Modules/Feedly/Tests/FeedlyTests/FeedlyUtilitiesTests.swift
similarity index 100%
rename from Feedly/Tests/FeedlyTests/FeedlyUtilitiesTests.swift
rename to Modules/Feedly/Tests/FeedlyTests/FeedlyUtilitiesTests.swift
diff --git a/FoundationExtras/.gitignore b/Modules/FoundationExtras/.gitignore
similarity index 100%
rename from FoundationExtras/.gitignore
rename to Modules/FoundationExtras/.gitignore
diff --git a/FoundationExtras/Package.swift b/Modules/FoundationExtras/Package.swift
similarity index 100%
rename from FoundationExtras/Package.swift
rename to Modules/FoundationExtras/Package.swift
diff --git a/FoundationExtras/Sources/FoundationExtras/Array+Extensions.swift b/Modules/FoundationExtras/Sources/FoundationExtras/Array+Extensions.swift
similarity index 100%
rename from FoundationExtras/Sources/FoundationExtras/Array+Extensions.swift
rename to Modules/FoundationExtras/Sources/FoundationExtras/Array+Extensions.swift
diff --git a/FoundationExtras/Sources/FoundationExtras/Calendar+Extensions.swift b/Modules/FoundationExtras/Sources/FoundationExtras/Calendar+Extensions.swift
similarity index 100%
rename from FoundationExtras/Sources/FoundationExtras/Calendar+Extensions.swift
rename to Modules/FoundationExtras/Sources/FoundationExtras/Calendar+Extensions.swift
diff --git a/FoundationExtras/Sources/FoundationExtras/Data+RSCore.swift b/Modules/FoundationExtras/Sources/FoundationExtras/Data+RSCore.swift
similarity index 100%
rename from FoundationExtras/Sources/FoundationExtras/Data+RSCore.swift
rename to Modules/FoundationExtras/Sources/FoundationExtras/Data+RSCore.swift
diff --git a/FoundationExtras/Sources/FoundationExtras/Date+Extensions.swift b/Modules/FoundationExtras/Sources/FoundationExtras/Date+Extensions.swift
similarity index 100%
rename from FoundationExtras/Sources/FoundationExtras/Date+Extensions.swift
rename to Modules/FoundationExtras/Sources/FoundationExtras/Date+Extensions.swift
diff --git a/FoundationExtras/Sources/FoundationExtras/FileManager+RSCore.swift b/Modules/FoundationExtras/Sources/FoundationExtras/FileManager+RSCore.swift
similarity index 100%
rename from FoundationExtras/Sources/FoundationExtras/FileManager+RSCore.swift
rename to Modules/FoundationExtras/Sources/FoundationExtras/FileManager+RSCore.swift
diff --git a/FoundationExtras/Sources/FoundationExtras/Geometry.swift b/Modules/FoundationExtras/Sources/FoundationExtras/Geometry.swift
similarity index 100%
rename from FoundationExtras/Sources/FoundationExtras/Geometry.swift
rename to Modules/FoundationExtras/Sources/FoundationExtras/Geometry.swift
diff --git a/FoundationExtras/Sources/FoundationExtras/Set+Extensions.swift b/Modules/FoundationExtras/Sources/FoundationExtras/Set+Extensions.swift
similarity index 100%
rename from FoundationExtras/Sources/FoundationExtras/Set+Extensions.swift
rename to Modules/FoundationExtras/Sources/FoundationExtras/Set+Extensions.swift
diff --git a/FoundationExtras/Sources/FoundationExtras/String+RSCore.swift b/Modules/FoundationExtras/Sources/FoundationExtras/String+RSCore.swift
similarity index 100%
rename from FoundationExtras/Sources/FoundationExtras/String+RSCore.swift
rename to Modules/FoundationExtras/Sources/FoundationExtras/String+RSCore.swift
diff --git a/FoundationExtras/Tests/FoundationExtrasTests/ArrayExtensionsTests.swift b/Modules/FoundationExtras/Tests/FoundationExtrasTests/ArrayExtensionsTests.swift
similarity index 100%
rename from FoundationExtras/Tests/FoundationExtrasTests/ArrayExtensionsTests.swift
rename to Modules/FoundationExtras/Tests/FoundationExtrasTests/ArrayExtensionsTests.swift
diff --git a/FoundationExtras/Tests/FoundationExtrasTests/CalendarExtensionsTests.swift b/Modules/FoundationExtras/Tests/FoundationExtrasTests/CalendarExtensionsTests.swift
similarity index 100%
rename from FoundationExtras/Tests/FoundationExtrasTests/CalendarExtensionsTests.swift
rename to Modules/FoundationExtras/Tests/FoundationExtrasTests/CalendarExtensionsTests.swift
diff --git a/Images/.gitignore b/Modules/Images/.gitignore
similarity index 100%
rename from Images/.gitignore
rename to Modules/Images/.gitignore
diff --git a/Images/.swiftpm/xcode/xcshareddata/xcschemes/Images.xcscheme b/Modules/Images/.swiftpm/xcode/xcshareddata/xcschemes/Images.xcscheme
similarity index 100%
rename from Images/.swiftpm/xcode/xcshareddata/xcschemes/Images.xcscheme
rename to Modules/Images/.swiftpm/xcode/xcshareddata/xcschemes/Images.xcscheme
diff --git a/Images/Package.swift b/Modules/Images/Package.swift
similarity index 100%
rename from Images/Package.swift
rename to Modules/Images/Package.swift
diff --git a/Images/Sources/Images/AuthorAvatarDownloader.swift b/Modules/Images/Sources/Images/AuthorAvatarDownloader.swift
similarity index 100%
rename from Images/Sources/Images/AuthorAvatarDownloader.swift
rename to Modules/Images/Sources/Images/AuthorAvatarDownloader.swift
diff --git a/Images/Sources/Images/Favicons/ColorHash.swift b/Modules/Images/Sources/Images/Favicons/ColorHash.swift
similarity index 100%
rename from Images/Sources/Images/Favicons/ColorHash.swift
rename to Modules/Images/Sources/Images/Favicons/ColorHash.swift
diff --git a/Images/Sources/Images/Favicons/FaviconDownloader.swift b/Modules/Images/Sources/Images/Favicons/FaviconDownloader.swift
similarity index 100%
rename from Images/Sources/Images/Favicons/FaviconDownloader.swift
rename to Modules/Images/Sources/Images/Favicons/FaviconDownloader.swift
diff --git a/Images/Sources/Images/Favicons/FaviconGenerator.swift b/Modules/Images/Sources/Images/Favicons/FaviconGenerator.swift
similarity index 100%
rename from Images/Sources/Images/Favicons/FaviconGenerator.swift
rename to Modules/Images/Sources/Images/Favicons/FaviconGenerator.swift
diff --git a/Images/Sources/Images/Favicons/FaviconURLFinder.swift b/Modules/Images/Sources/Images/Favicons/FaviconURLFinder.swift
similarity index 100%
rename from Images/Sources/Images/Favicons/FaviconURLFinder.swift
rename to Modules/Images/Sources/Images/Favicons/FaviconURLFinder.swift
diff --git a/Images/Sources/Images/Favicons/SingleFaviconDownloader.swift b/Modules/Images/Sources/Images/Favicons/SingleFaviconDownloader.swift
similarity index 100%
rename from Images/Sources/Images/Favicons/SingleFaviconDownloader.swift
rename to Modules/Images/Sources/Images/Favicons/SingleFaviconDownloader.swift
diff --git a/Images/Sources/Images/FeaturedImageDownloader.swift b/Modules/Images/Sources/Images/FeaturedImageDownloader.swift
similarity index 100%
rename from Images/Sources/Images/FeaturedImageDownloader.swift
rename to Modules/Images/Sources/Images/FeaturedImageDownloader.swift
diff --git a/Images/Sources/Images/FeedIconDownloader.swift b/Modules/Images/Sources/Images/FeedIconDownloader.swift
similarity index 100%
rename from Images/Sources/Images/FeedIconDownloader.swift
rename to Modules/Images/Sources/Images/FeedIconDownloader.swift
diff --git a/Images/Sources/Images/IconImage.swift b/Modules/Images/Sources/Images/IconImage.swift
similarity index 100%
rename from Images/Sources/Images/IconImage.swift
rename to Modules/Images/Sources/Images/IconImage.swift
diff --git a/Images/Sources/Images/ImageDownloader.swift b/Modules/Images/Sources/Images/ImageDownloader.swift
similarity index 100%
rename from Images/Sources/Images/ImageDownloader.swift
rename to Modules/Images/Sources/Images/ImageDownloader.swift
diff --git a/Images/Sources/Images/RSHTMLMetadata+Extension.swift b/Modules/Images/Sources/Images/RSHTMLMetadata+Extension.swift
similarity index 100%
rename from Images/Sources/Images/RSHTMLMetadata+Extension.swift
rename to Modules/Images/Sources/Images/RSHTMLMetadata+Extension.swift
diff --git a/Images/Sources/Images/RSImage-Extensions.swift b/Modules/Images/Sources/Images/RSImage-Extensions.swift
similarity index 100%
rename from Images/Sources/Images/RSImage-Extensions.swift
rename to Modules/Images/Sources/Images/RSImage-Extensions.swift
diff --git a/Images/Tests/ImagesTests/ImagesTests.swift b/Modules/Images/Tests/ImagesTests/ImagesTests.swift
similarity index 100%
rename from Images/Tests/ImagesTests/ImagesTests.swift
rename to Modules/Images/Tests/ImagesTests/ImagesTests.swift
diff --git a/LocalAccount/.gitignore b/Modules/LocalAccount/.gitignore
similarity index 100%
rename from LocalAccount/.gitignore
rename to Modules/LocalAccount/.gitignore
diff --git a/LocalAccount/Package.swift b/Modules/LocalAccount/Package.swift
similarity index 100%
rename from LocalAccount/Package.swift
rename to Modules/LocalAccount/Package.swift
diff --git a/LocalAccount/Sources/LocalAccount/InitialFeedDownloader.swift b/Modules/LocalAccount/Sources/LocalAccount/InitialFeedDownloader.swift
similarity index 100%
rename from LocalAccount/Sources/LocalAccount/InitialFeedDownloader.swift
rename to Modules/LocalAccount/Sources/LocalAccount/InitialFeedDownloader.swift
diff --git a/LocalAccount/Tests/LocalAccountTests/LocalAccountTests.swift b/Modules/LocalAccount/Tests/LocalAccountTests/LocalAccountTests.swift
similarity index 100%
rename from LocalAccount/Tests/LocalAccountTests/LocalAccountTests.swift
rename to Modules/LocalAccount/Tests/LocalAccountTests/LocalAccountTests.swift
diff --git a/NewsBlur/.gitignore b/Modules/NewsBlur/.gitignore
similarity index 100%
rename from NewsBlur/.gitignore
rename to Modules/NewsBlur/.gitignore
diff --git a/NewsBlur/.swiftpm/xcode/xcshareddata/xcschemes/NewsBlur.xcscheme b/Modules/NewsBlur/.swiftpm/xcode/xcshareddata/xcschemes/NewsBlur.xcscheme
similarity index 100%
rename from NewsBlur/.swiftpm/xcode/xcshareddata/xcschemes/NewsBlur.xcscheme
rename to Modules/NewsBlur/.swiftpm/xcode/xcshareddata/xcschemes/NewsBlur.xcscheme
diff --git a/NewsBlur/Package.swift b/Modules/NewsBlur/Package.swift
similarity index 100%
rename from NewsBlur/Package.swift
rename to Modules/NewsBlur/Package.swift
diff --git a/NewsBlur/Sources/NewsBlur/Models/NewsBlurFeed.swift b/Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurFeed.swift
similarity index 100%
rename from NewsBlur/Sources/NewsBlur/Models/NewsBlurFeed.swift
rename to Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurFeed.swift
diff --git a/NewsBlur/Sources/NewsBlur/Models/NewsBlurFeedChange.swift b/Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurFeedChange.swift
similarity index 100%
rename from NewsBlur/Sources/NewsBlur/Models/NewsBlurFeedChange.swift
rename to Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurFeedChange.swift
diff --git a/NewsBlur/Sources/NewsBlur/Models/NewsBlurFolderChange.swift b/Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurFolderChange.swift
similarity index 100%
rename from NewsBlur/Sources/NewsBlur/Models/NewsBlurFolderChange.swift
rename to Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurFolderChange.swift
diff --git a/NewsBlur/Sources/NewsBlur/Models/NewsBlurGenericCodingKeys.swift b/Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurGenericCodingKeys.swift
similarity index 100%
rename from NewsBlur/Sources/NewsBlur/Models/NewsBlurGenericCodingKeys.swift
rename to Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurGenericCodingKeys.swift
diff --git a/NewsBlur/Sources/NewsBlur/Models/NewsBlurLoginResponse.swift b/Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurLoginResponse.swift
similarity index 100%
rename from NewsBlur/Sources/NewsBlur/Models/NewsBlurLoginResponse.swift
rename to Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurLoginResponse.swift
diff --git a/NewsBlur/Sources/NewsBlur/Models/NewsBlurStory.swift b/Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurStory.swift
similarity index 100%
rename from NewsBlur/Sources/NewsBlur/Models/NewsBlurStory.swift
rename to Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurStory.swift
diff --git a/NewsBlur/Sources/NewsBlur/Models/NewsBlurStoryHash.swift b/Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurStoryHash.swift
similarity index 100%
rename from NewsBlur/Sources/NewsBlur/Models/NewsBlurStoryHash.swift
rename to Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurStoryHash.swift
diff --git a/NewsBlur/Sources/NewsBlur/Models/NewsBlurStoryStatusChange.swift b/Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurStoryStatusChange.swift
similarity index 100%
rename from NewsBlur/Sources/NewsBlur/Models/NewsBlurStoryStatusChange.swift
rename to Modules/NewsBlur/Sources/NewsBlur/Models/NewsBlurStoryStatusChange.swift
diff --git a/NewsBlur/Sources/NewsBlur/NewsBlurAPICaller+Internal.swift b/Modules/NewsBlur/Sources/NewsBlur/NewsBlurAPICaller+Internal.swift
similarity index 100%
rename from NewsBlur/Sources/NewsBlur/NewsBlurAPICaller+Internal.swift
rename to Modules/NewsBlur/Sources/NewsBlur/NewsBlurAPICaller+Internal.swift
diff --git a/NewsBlur/Sources/NewsBlur/NewsBlurAPICaller.swift b/Modules/NewsBlur/Sources/NewsBlur/NewsBlurAPICaller.swift
similarity index 100%
rename from NewsBlur/Sources/NewsBlur/NewsBlurAPICaller.swift
rename to Modules/NewsBlur/Sources/NewsBlur/NewsBlurAPICaller.swift
diff --git a/NewsBlur/Sources/NewsBlur/URLRequest+NewsBlur.swift b/Modules/NewsBlur/Sources/NewsBlur/URLRequest+NewsBlur.swift
similarity index 100%
rename from NewsBlur/Sources/NewsBlur/URLRequest+NewsBlur.swift
rename to Modules/NewsBlur/Sources/NewsBlur/URLRequest+NewsBlur.swift
diff --git a/NewsBlur/Tests/NewsBlurTests/NewsBlurTests.swift b/Modules/NewsBlur/Tests/NewsBlurTests/NewsBlurTests.swift
similarity index 100%
rename from NewsBlur/Tests/NewsBlurTests/NewsBlurTests.swift
rename to Modules/NewsBlur/Tests/NewsBlurTests/NewsBlurTests.swift
diff --git a/Parser/.gitignore b/Modules/Parser/.gitignore
similarity index 100%
rename from Parser/.gitignore
rename to Modules/Parser/.gitignore
diff --git a/Parser/.swiftpm/xcode/xcshareddata/xcbaselines/ParserTests.xcbaseline/5AEA6FC6-AD2F-413E-9746-2017D27E25CE.plist b/Modules/Parser/.swiftpm/xcode/xcshareddata/xcbaselines/ParserTests.xcbaseline/5AEA6FC6-AD2F-413E-9746-2017D27E25CE.plist
similarity index 100%
rename from Parser/.swiftpm/xcode/xcshareddata/xcbaselines/ParserTests.xcbaseline/5AEA6FC6-AD2F-413E-9746-2017D27E25CE.plist
rename to Modules/Parser/.swiftpm/xcode/xcshareddata/xcbaselines/ParserTests.xcbaseline/5AEA6FC6-AD2F-413E-9746-2017D27E25CE.plist
diff --git a/Parser/.swiftpm/xcode/xcshareddata/xcbaselines/ParserTests.xcbaseline/Info.plist b/Modules/Parser/.swiftpm/xcode/xcshareddata/xcbaselines/ParserTests.xcbaseline/Info.plist
similarity index 100%
rename from Parser/.swiftpm/xcode/xcshareddata/xcbaselines/ParserTests.xcbaseline/Info.plist
rename to Modules/Parser/.swiftpm/xcode/xcshareddata/xcbaselines/ParserTests.xcbaseline/Info.plist
diff --git a/Parser/.swiftpm/xcode/xcshareddata/xcschemes/Parser.xcscheme b/Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/Parser.xcscheme
similarity index 100%
rename from Parser/.swiftpm/xcode/xcshareddata/xcschemes/Parser.xcscheme
rename to Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/Parser.xcscheme
diff --git a/Parser/.swiftpm/xcode/xcshareddata/xcschemes/ParserTests.xcscheme b/Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/ParserTests.xcscheme
similarity index 100%
rename from Parser/.swiftpm/xcode/xcshareddata/xcschemes/ParserTests.xcscheme
rename to Modules/Parser/.swiftpm/xcode/xcshareddata/xcschemes/ParserTests.xcscheme
diff --git a/Parser/Package.swift b/Modules/Parser/Package.swift
similarity index 100%
rename from Parser/Package.swift
rename to Modules/Parser/Package.swift
diff --git a/Parser/Sources/Parser/Feeds/FeedParser.swift b/Modules/Parser/Sources/Parser/Feeds/FeedParser.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/FeedParser.swift
rename to Modules/Parser/Sources/Parser/Feeds/FeedParser.swift
diff --git a/Parser/Sources/Parser/Feeds/FeedParserError.swift b/Modules/Parser/Sources/Parser/Feeds/FeedParserError.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/FeedParserError.swift
rename to Modules/Parser/Sources/Parser/Feeds/FeedParserError.swift
diff --git a/Parser/Sources/Parser/Feeds/FeedType.swift b/Modules/Parser/Sources/Parser/Feeds/FeedType.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/FeedType.swift
rename to Modules/Parser/Sources/Parser/Feeds/FeedType.swift
diff --git a/Parser/Sources/Parser/Feeds/JSON/JSONFeedParser.swift b/Modules/Parser/Sources/Parser/Feeds/JSON/JSONFeedParser.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/JSON/JSONFeedParser.swift
rename to Modules/Parser/Sources/Parser/Feeds/JSON/JSONFeedParser.swift
diff --git a/Parser/Sources/Parser/Feeds/JSON/RSSInJSONParser.swift b/Modules/Parser/Sources/Parser/Feeds/JSON/RSSInJSONParser.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/JSON/RSSInJSONParser.swift
rename to Modules/Parser/Sources/Parser/Feeds/JSON/RSSInJSONParser.swift
diff --git a/Parser/Sources/Parser/Feeds/ParsedAttachment.swift b/Modules/Parser/Sources/Parser/Feeds/ParsedAttachment.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/ParsedAttachment.swift
rename to Modules/Parser/Sources/Parser/Feeds/ParsedAttachment.swift
diff --git a/Parser/Sources/Parser/Feeds/ParsedAuthor.swift b/Modules/Parser/Sources/Parser/Feeds/ParsedAuthor.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/ParsedAuthor.swift
rename to Modules/Parser/Sources/Parser/Feeds/ParsedAuthor.swift
diff --git a/Parser/Sources/Parser/Feeds/ParsedFeed.swift b/Modules/Parser/Sources/Parser/Feeds/ParsedFeed.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/ParsedFeed.swift
rename to Modules/Parser/Sources/Parser/Feeds/ParsedFeed.swift
diff --git a/Parser/Sources/Parser/Feeds/ParsedHub.swift b/Modules/Parser/Sources/Parser/Feeds/ParsedHub.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/ParsedHub.swift
rename to Modules/Parser/Sources/Parser/Feeds/ParsedHub.swift
diff --git a/Parser/Sources/Parser/Feeds/ParsedItem.swift b/Modules/Parser/Sources/Parser/Feeds/ParsedItem.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/ParsedItem.swift
rename to Modules/Parser/Sources/Parser/Feeds/ParsedItem.swift
diff --git a/Parser/Sources/Parser/Feeds/XML/AtomParser.swift b/Modules/Parser/Sources/Parser/Feeds/XML/AtomParser.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/XML/AtomParser.swift
rename to Modules/Parser/Sources/Parser/Feeds/XML/AtomParser.swift
diff --git a/Parser/Sources/Parser/Feeds/XML/RSParsedFeedTransformer.swift b/Modules/Parser/Sources/Parser/Feeds/XML/RSParsedFeedTransformer.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/XML/RSParsedFeedTransformer.swift
rename to Modules/Parser/Sources/Parser/Feeds/XML/RSParsedFeedTransformer.swift
diff --git a/Parser/Sources/Parser/Feeds/XML/RSSParser.swift b/Modules/Parser/Sources/Parser/Feeds/XML/RSSParser.swift
similarity index 100%
rename from Parser/Sources/Parser/Feeds/XML/RSSParser.swift
rename to Modules/Parser/Sources/Parser/Feeds/XML/RSSParser.swift
diff --git a/Parser/Sources/Parser/JSON/JSONTypes.swift b/Modules/Parser/Sources/Parser/JSON/JSONTypes.swift
similarity index 100%
rename from Parser/Sources/Parser/JSON/JSONTypes.swift
rename to Modules/Parser/Sources/Parser/JSON/JSONTypes.swift
diff --git a/Parser/Sources/Parser/JSON/JSONUtilities.swift b/Modules/Parser/Sources/Parser/JSON/JSONUtilities.swift
similarity index 100%
rename from Parser/Sources/Parser/JSON/JSONUtilities.swift
rename to Modules/Parser/Sources/Parser/JSON/JSONUtilities.swift
diff --git a/Parser/Sources/Parser/ParserData+Parser.swift b/Modules/Parser/Sources/Parser/ParserData+Parser.swift
similarity index 100%
rename from Parser/Sources/Parser/ParserData+Parser.swift
rename to Modules/Parser/Sources/Parser/ParserData+Parser.swift
diff --git a/Parser/Sources/Parser/RSHTMLMetadata+Parser.swift b/Modules/Parser/Sources/Parser/RSHTMLMetadata+Parser.swift
similarity index 100%
rename from Parser/Sources/Parser/RSHTMLMetadata+Parser.swift
rename to Modules/Parser/Sources/Parser/RSHTMLMetadata+Parser.swift
diff --git a/Parser/Sources/Parser/Utilities/String+RSParser.swift b/Modules/Parser/Sources/Parser/Utilities/String+RSParser.swift
similarity index 100%
rename from Parser/Sources/Parser/Utilities/String+RSParser.swift
rename to Modules/Parser/Sources/Parser/Utilities/String+RSParser.swift
diff --git a/Parser/Tests/ParserTests/AtomParserTests.swift b/Modules/Parser/Tests/ParserTests/AtomParserTests.swift
similarity index 100%
rename from Parser/Tests/ParserTests/AtomParserTests.swift
rename to Modules/Parser/Tests/ParserTests/AtomParserTests.swift
diff --git a/Parser/Tests/ParserTests/EntityDecodingTests.swift b/Modules/Parser/Tests/ParserTests/EntityDecodingTests.swift
similarity index 100%
rename from Parser/Tests/ParserTests/EntityDecodingTests.swift
rename to Modules/Parser/Tests/ParserTests/EntityDecodingTests.swift
diff --git a/Parser/Tests/ParserTests/FeedParserTypeTests.swift b/Modules/Parser/Tests/ParserTests/FeedParserTypeTests.swift
similarity index 100%
rename from Parser/Tests/ParserTests/FeedParserTypeTests.swift
rename to Modules/Parser/Tests/ParserTests/FeedParserTypeTests.swift
diff --git a/Parser/Tests/ParserTests/HTMLLinkTests.swift b/Modules/Parser/Tests/ParserTests/HTMLLinkTests.swift
similarity index 100%
rename from Parser/Tests/ParserTests/HTMLLinkTests.swift
rename to Modules/Parser/Tests/ParserTests/HTMLLinkTests.swift
diff --git a/Parser/Tests/ParserTests/HTMLMetadataTests.swift b/Modules/Parser/Tests/ParserTests/HTMLMetadataTests.swift
similarity index 100%
rename from Parser/Tests/ParserTests/HTMLMetadataTests.swift
rename to Modules/Parser/Tests/ParserTests/HTMLMetadataTests.swift
diff --git a/Parser/Tests/ParserTests/Info.plist b/Modules/Parser/Tests/ParserTests/Info.plist
similarity index 100%
rename from Parser/Tests/ParserTests/Info.plist
rename to Modules/Parser/Tests/ParserTests/Info.plist
diff --git a/Parser/Tests/ParserTests/JSONFeedParserTests.swift b/Modules/Parser/Tests/ParserTests/JSONFeedParserTests.swift
similarity index 100%
rename from Parser/Tests/ParserTests/JSONFeedParserTests.swift
rename to Modules/Parser/Tests/ParserTests/JSONFeedParserTests.swift
diff --git a/Parser/Tests/ParserTests/OPMLTests.swift b/Modules/Parser/Tests/ParserTests/OPMLTests.swift
similarity index 100%
rename from Parser/Tests/ParserTests/OPMLTests.swift
rename to Modules/Parser/Tests/ParserTests/OPMLTests.swift
diff --git a/Parser/Tests/ParserTests/ParserTests.swift b/Modules/Parser/Tests/ParserTests/ParserTests.swift
similarity index 100%
rename from Parser/Tests/ParserTests/ParserTests.swift
rename to Modules/Parser/Tests/ParserTests/ParserTests.swift
diff --git a/Parser/Tests/ParserTests/RSDateParserTests.swift b/Modules/Parser/Tests/ParserTests/RSDateParserTests.swift
similarity index 100%
rename from Parser/Tests/ParserTests/RSDateParserTests.swift
rename to Modules/Parser/Tests/ParserTests/RSDateParserTests.swift
diff --git a/Parser/Tests/ParserTests/RSSInJSONParserTests.swift b/Modules/Parser/Tests/ParserTests/RSSInJSONParserTests.swift
similarity index 100%
rename from Parser/Tests/ParserTests/RSSInJSONParserTests.swift
rename to Modules/Parser/Tests/ParserTests/RSSInJSONParserTests.swift
diff --git a/Parser/Tests/ParserTests/RSSParserTests.swift b/Modules/Parser/Tests/ParserTests/RSSParserTests.swift
similarity index 100%
rename from Parser/Tests/ParserTests/RSSParserTests.swift
rename to Modules/Parser/Tests/ParserTests/RSSParserTests.swift
diff --git a/Parser/Tests/ParserTests/Resources/3960.json b/Modules/Parser/Tests/ParserTests/Resources/3960.json
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/3960.json
rename to Modules/Parser/Tests/ParserTests/Resources/3960.json
diff --git a/Parser/Tests/ParserTests/Resources/489.rss b/Modules/Parser/Tests/ParserTests/Resources/489.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/489.rss
rename to Modules/Parser/Tests/ParserTests/Resources/489.rss
diff --git a/Parser/Tests/ParserTests/Resources/4fsodonline.atom b/Modules/Parser/Tests/ParserTests/Resources/4fsodonline.atom
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/4fsodonline.atom
rename to Modules/Parser/Tests/ParserTests/Resources/4fsodonline.atom
diff --git a/Parser/Tests/ParserTests/Resources/DaringFireball.atom b/Modules/Parser/Tests/ParserTests/Resources/DaringFireball.atom
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/DaringFireball.atom
rename to Modules/Parser/Tests/ParserTests/Resources/DaringFireball.atom
diff --git a/Parser/Tests/ParserTests/Resources/DaringFireball.html b/Modules/Parser/Tests/ParserTests/Resources/DaringFireball.html
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/DaringFireball.html
rename to Modules/Parser/Tests/ParserTests/Resources/DaringFireball.html
diff --git a/Parser/Tests/ParserTests/Resources/DaringFireball.json b/Modules/Parser/Tests/ParserTests/Resources/DaringFireball.json
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/DaringFireball.json
rename to Modules/Parser/Tests/ParserTests/Resources/DaringFireball.json
diff --git a/Parser/Tests/ParserTests/Resources/DaringFireball.rss b/Modules/Parser/Tests/ParserTests/Resources/DaringFireball.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/DaringFireball.rss
rename to Modules/Parser/Tests/ParserTests/Resources/DaringFireball.rss
diff --git a/Parser/Tests/ParserTests/Resources/EMarley.rss b/Modules/Parser/Tests/ParserTests/Resources/EMarley.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/EMarley.rss
rename to Modules/Parser/Tests/ParserTests/Resources/EMarley.rss
diff --git a/Parser/Tests/ParserTests/Resources/KatieFloyd.rss b/Modules/Parser/Tests/ParserTests/Resources/KatieFloyd.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/KatieFloyd.rss
rename to Modules/Parser/Tests/ParserTests/Resources/KatieFloyd.rss
diff --git a/Parser/Tests/ParserTests/Resources/OneFootTsunami.atom b/Modules/Parser/Tests/ParserTests/Resources/OneFootTsunami.atom
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/OneFootTsunami.atom
rename to Modules/Parser/Tests/ParserTests/Resources/OneFootTsunami.atom
diff --git a/Parser/Tests/ParserTests/Resources/ScriptingNews.json b/Modules/Parser/Tests/ParserTests/Resources/ScriptingNews.json
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/ScriptingNews.json
rename to Modules/Parser/Tests/ParserTests/Resources/ScriptingNews.json
diff --git a/Parser/Tests/ParserTests/Resources/Subs.opml b/Modules/Parser/Tests/ParserTests/Resources/Subs.opml
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/Subs.opml
rename to Modules/Parser/Tests/ParserTests/Resources/Subs.opml
diff --git a/Parser/Tests/ParserTests/Resources/SubsNoTitleAttributes.opml b/Modules/Parser/Tests/ParserTests/Resources/SubsNoTitleAttributes.opml
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/SubsNoTitleAttributes.opml
rename to Modules/Parser/Tests/ParserTests/Resources/SubsNoTitleAttributes.opml
diff --git a/Parser/Tests/ParserTests/Resources/YouTubeTheVolvoRocks.html b/Modules/Parser/Tests/ParserTests/Resources/YouTubeTheVolvoRocks.html
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/YouTubeTheVolvoRocks.html
rename to Modules/Parser/Tests/ParserTests/Resources/YouTubeTheVolvoRocks.html
diff --git a/Parser/Tests/ParserTests/Resources/aktuality.rss b/Modules/Parser/Tests/ParserTests/Resources/aktuality.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/aktuality.rss
rename to Modules/Parser/Tests/ParserTests/Resources/aktuality.rss
diff --git a/Parser/Tests/ParserTests/Resources/allthis-partial.json b/Modules/Parser/Tests/ParserTests/Resources/allthis-partial.json
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/allthis-partial.json
rename to Modules/Parser/Tests/ParserTests/Resources/allthis-partial.json
diff --git a/Parser/Tests/ParserTests/Resources/allthis.atom b/Modules/Parser/Tests/ParserTests/Resources/allthis.atom
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/allthis.atom
rename to Modules/Parser/Tests/ParserTests/Resources/allthis.atom
diff --git a/Parser/Tests/ParserTests/Resources/allthis.json b/Modules/Parser/Tests/ParserTests/Resources/allthis.json
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/allthis.json
rename to Modules/Parser/Tests/ParserTests/Resources/allthis.json
diff --git a/Parser/Tests/ParserTests/Resources/atp.rss b/Modules/Parser/Tests/ParserTests/Resources/atp.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/atp.rss
rename to Modules/Parser/Tests/ParserTests/Resources/atp.rss
diff --git a/Parser/Tests/ParserTests/Resources/authors.json b/Modules/Parser/Tests/ParserTests/Resources/authors.json
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/authors.json
rename to Modules/Parser/Tests/ParserTests/Resources/authors.json
diff --git a/Parser/Tests/ParserTests/Resources/bio.rdf b/Modules/Parser/Tests/ParserTests/Resources/bio.rdf
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/bio.rdf
rename to Modules/Parser/Tests/ParserTests/Resources/bio.rdf
diff --git a/Parser/Tests/ParserTests/Resources/cloudblog.rss b/Modules/Parser/Tests/ParserTests/Resources/cloudblog.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/cloudblog.rss
rename to Modules/Parser/Tests/ParserTests/Resources/cloudblog.rss
diff --git a/Parser/Tests/ParserTests/Resources/coco.html b/Modules/Parser/Tests/ParserTests/Resources/coco.html
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/coco.html
rename to Modules/Parser/Tests/ParserTests/Resources/coco.html
diff --git a/Parser/Tests/ParserTests/Resources/curt.json b/Modules/Parser/Tests/ParserTests/Resources/curt.json
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/curt.json
rename to Modules/Parser/Tests/ParserTests/Resources/curt.json
diff --git a/Parser/Tests/ParserTests/Resources/dcrainmaker.xml b/Modules/Parser/Tests/ParserTests/Resources/dcrainmaker.xml
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/dcrainmaker.xml
rename to Modules/Parser/Tests/ParserTests/Resources/dcrainmaker.xml
diff --git a/Parser/Tests/ParserTests/Resources/donthitsave.xml b/Modules/Parser/Tests/ParserTests/Resources/donthitsave.xml
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/donthitsave.xml
rename to Modules/Parser/Tests/ParserTests/Resources/donthitsave.xml
diff --git a/Parser/Tests/ParserTests/Resources/expertopinionent.atom b/Modules/Parser/Tests/ParserTests/Resources/expertopinionent.atom
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/expertopinionent.atom
rename to Modules/Parser/Tests/ParserTests/Resources/expertopinionent.atom
diff --git a/Parser/Tests/ParserTests/Resources/furbo.html b/Modules/Parser/Tests/ParserTests/Resources/furbo.html
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/furbo.html
rename to Modules/Parser/Tests/ParserTests/Resources/furbo.html
diff --git a/Parser/Tests/ParserTests/Resources/inessential.html b/Modules/Parser/Tests/ParserTests/Resources/inessential.html
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/inessential.html
rename to Modules/Parser/Tests/ParserTests/Resources/inessential.html
diff --git a/Parser/Tests/ParserTests/Resources/inessential.json b/Modules/Parser/Tests/ParserTests/Resources/inessential.json
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/inessential.json
rename to Modules/Parser/Tests/ParserTests/Resources/inessential.json
diff --git a/Parser/Tests/ParserTests/Resources/kc0011.rss b/Modules/Parser/Tests/ParserTests/Resources/kc0011.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/kc0011.rss
rename to Modules/Parser/Tests/ParserTests/Resources/kc0011.rss
diff --git a/Parser/Tests/ParserTests/Resources/livemint.xml b/Modules/Parser/Tests/ParserTests/Resources/livemint.xml
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/livemint.xml
rename to Modules/Parser/Tests/ParserTests/Resources/livemint.xml
diff --git a/Parser/Tests/ParserTests/Resources/macworld.rss b/Modules/Parser/Tests/ParserTests/Resources/macworld.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/macworld.rss
rename to Modules/Parser/Tests/ParserTests/Resources/macworld.rss
diff --git a/Parser/Tests/ParserTests/Resources/manton.rss b/Modules/Parser/Tests/ParserTests/Resources/manton.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/manton.rss
rename to Modules/Parser/Tests/ParserTests/Resources/manton.rss
diff --git a/Parser/Tests/ParserTests/Resources/monkeydom.rss b/Modules/Parser/Tests/ParserTests/Resources/monkeydom.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/monkeydom.rss
rename to Modules/Parser/Tests/ParserTests/Resources/monkeydom.rss
diff --git a/Parser/Tests/ParserTests/Resources/natasha.xml b/Modules/Parser/Tests/ParserTests/Resources/natasha.xml
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/natasha.xml
rename to Modules/Parser/Tests/ParserTests/Resources/natasha.xml
diff --git a/Parser/Tests/ParserTests/Resources/phpxml.rss b/Modules/Parser/Tests/ParserTests/Resources/phpxml.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/phpxml.rss
rename to Modules/Parser/Tests/ParserTests/Resources/phpxml.rss
diff --git a/Parser/Tests/ParserTests/Resources/pxlnv.json b/Modules/Parser/Tests/ParserTests/Resources/pxlnv.json
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/pxlnv.json
rename to Modules/Parser/Tests/ParserTests/Resources/pxlnv.json
diff --git a/Parser/Tests/ParserTests/Resources/rose.json b/Modules/Parser/Tests/ParserTests/Resources/rose.json
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/rose.json
rename to Modules/Parser/Tests/ParserTests/Resources/rose.json
diff --git a/Parser/Tests/ParserTests/Resources/russcox.atom b/Modules/Parser/Tests/ParserTests/Resources/russcox.atom
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/russcox.atom
rename to Modules/Parser/Tests/ParserTests/Resources/russcox.atom
diff --git a/Parser/Tests/ParserTests/Resources/scriptingNews.rss b/Modules/Parser/Tests/ParserTests/Resources/scriptingNews.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/scriptingNews.rss
rename to Modules/Parser/Tests/ParserTests/Resources/scriptingNews.rss
diff --git a/Parser/Tests/ParserTests/Resources/sixcolors.html b/Modules/Parser/Tests/ParserTests/Resources/sixcolors.html
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/sixcolors.html
rename to Modules/Parser/Tests/ParserTests/Resources/sixcolors.html
diff --git a/Parser/Tests/ParserTests/Resources/theomnishow.rss b/Modules/Parser/Tests/ParserTests/Resources/theomnishow.rss
similarity index 100%
rename from Parser/Tests/ParserTests/Resources/theomnishow.rss
rename to Modules/Parser/Tests/ParserTests/Resources/theomnishow.rss
diff --git a/ParserObjc/.gitignore b/Modules/ParserObjC/.gitignore
similarity index 100%
rename from ParserObjc/.gitignore
rename to Modules/ParserObjC/.gitignore
diff --git a/ParserObjc/Package.swift b/Modules/ParserObjC/Package.swift
similarity index 100%
rename from ParserObjc/Package.swift
rename to Modules/ParserObjC/Package.swift
diff --git a/ParserObjc/Sources/ParserObjC/FeedParser.h b/Modules/ParserObjC/Sources/ParserObjC/FeedParser.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/FeedParser.h
rename to Modules/ParserObjC/Sources/ParserObjC/FeedParser.h
diff --git a/ParserObjc/Sources/ParserObjC/NSData+RSParser.h b/Modules/ParserObjC/Sources/ParserObjC/NSData+RSParser.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/NSData+RSParser.h
rename to Modules/ParserObjC/Sources/ParserObjC/NSData+RSParser.h
diff --git a/ParserObjc/Sources/ParserObjC/NSData+RSParser.m b/Modules/ParserObjC/Sources/ParserObjC/NSData+RSParser.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/NSData+RSParser.m
rename to Modules/ParserObjC/Sources/ParserObjC/NSData+RSParser.m
diff --git a/ParserObjc/Sources/ParserObjC/NSString+RSParser.h b/Modules/ParserObjC/Sources/ParserObjC/NSString+RSParser.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/NSString+RSParser.h
rename to Modules/ParserObjC/Sources/ParserObjC/NSString+RSParser.h
diff --git a/ParserObjc/Sources/ParserObjC/NSString+RSParser.m b/Modules/ParserObjC/Sources/ParserObjC/NSString+RSParser.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/NSString+RSParser.m
rename to Modules/ParserObjC/Sources/ParserObjC/NSString+RSParser.m
diff --git a/ParserObjc/Sources/ParserObjC/ParserData.h b/Modules/ParserObjC/Sources/ParserObjC/ParserData.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/ParserData.h
rename to Modules/ParserObjC/Sources/ParserObjC/ParserData.h
diff --git a/ParserObjc/Sources/ParserObjC/ParserData.m b/Modules/ParserObjC/Sources/ParserObjC/ParserData.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/ParserData.m
rename to Modules/ParserObjC/Sources/ParserObjC/ParserData.m
diff --git a/ParserObjc/Sources/ParserObjC/RSAtomParser.h b/Modules/ParserObjC/Sources/ParserObjC/RSAtomParser.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSAtomParser.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSAtomParser.h
diff --git a/ParserObjc/Sources/ParserObjC/RSAtomParser.m b/Modules/ParserObjC/Sources/ParserObjC/RSAtomParser.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSAtomParser.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSAtomParser.m
diff --git a/ParserObjc/Sources/ParserObjC/RSDateParser.h b/Modules/ParserObjC/Sources/ParserObjC/RSDateParser.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSDateParser.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSDateParser.h
diff --git a/ParserObjc/Sources/ParserObjC/RSDateParser.m b/Modules/ParserObjC/Sources/ParserObjC/RSDateParser.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSDateParser.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSDateParser.m
diff --git a/ParserObjc/Sources/ParserObjC/RSHTMLLinkParser.h b/Modules/ParserObjC/Sources/ParserObjC/RSHTMLLinkParser.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSHTMLLinkParser.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSHTMLLinkParser.h
diff --git a/ParserObjc/Sources/ParserObjC/RSHTMLLinkParser.m b/Modules/ParserObjC/Sources/ParserObjC/RSHTMLLinkParser.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSHTMLLinkParser.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSHTMLLinkParser.m
diff --git a/ParserObjc/Sources/ParserObjC/RSHTMLMetadata.h b/Modules/ParserObjC/Sources/ParserObjC/RSHTMLMetadata.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSHTMLMetadata.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSHTMLMetadata.h
diff --git a/ParserObjc/Sources/ParserObjC/RSHTMLMetadata.m b/Modules/ParserObjC/Sources/ParserObjC/RSHTMLMetadata.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSHTMLMetadata.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSHTMLMetadata.m
diff --git a/ParserObjc/Sources/ParserObjC/RSHTMLMetadataParser.h b/Modules/ParserObjC/Sources/ParserObjC/RSHTMLMetadataParser.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSHTMLMetadataParser.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSHTMLMetadataParser.h
diff --git a/ParserObjc/Sources/ParserObjC/RSHTMLMetadataParser.m b/Modules/ParserObjC/Sources/ParserObjC/RSHTMLMetadataParser.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSHTMLMetadataParser.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSHTMLMetadataParser.m
diff --git a/ParserObjc/Sources/ParserObjC/RSHTMLTag.h b/Modules/ParserObjC/Sources/ParserObjC/RSHTMLTag.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSHTMLTag.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSHTMLTag.h
diff --git a/ParserObjc/Sources/ParserObjC/RSHTMLTag.m b/Modules/ParserObjC/Sources/ParserObjC/RSHTMLTag.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSHTMLTag.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSHTMLTag.m
diff --git a/ParserObjc/Sources/ParserObjC/RSOPMLAttributes.h b/Modules/ParserObjC/Sources/ParserObjC/RSOPMLAttributes.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSOPMLAttributes.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSOPMLAttributes.h
diff --git a/ParserObjc/Sources/ParserObjC/RSOPMLAttributes.m b/Modules/ParserObjC/Sources/ParserObjC/RSOPMLAttributes.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSOPMLAttributes.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSOPMLAttributes.m
diff --git a/ParserObjc/Sources/ParserObjC/RSOPMLDocument.h b/Modules/ParserObjC/Sources/ParserObjC/RSOPMLDocument.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSOPMLDocument.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSOPMLDocument.h
diff --git a/ParserObjc/Sources/ParserObjC/RSOPMLDocument.m b/Modules/ParserObjC/Sources/ParserObjC/RSOPMLDocument.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSOPMLDocument.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSOPMLDocument.m
diff --git a/ParserObjc/Sources/ParserObjC/RSOPMLError.h b/Modules/ParserObjC/Sources/ParserObjC/RSOPMLError.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSOPMLError.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSOPMLError.h
diff --git a/ParserObjc/Sources/ParserObjC/RSOPMLError.m b/Modules/ParserObjC/Sources/ParserObjC/RSOPMLError.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSOPMLError.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSOPMLError.m
diff --git a/ParserObjc/Sources/ParserObjC/RSOPMLFeedSpecifier.h b/Modules/ParserObjC/Sources/ParserObjC/RSOPMLFeedSpecifier.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSOPMLFeedSpecifier.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSOPMLFeedSpecifier.h
diff --git a/ParserObjc/Sources/ParserObjC/RSOPMLFeedSpecifier.m b/Modules/ParserObjC/Sources/ParserObjC/RSOPMLFeedSpecifier.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSOPMLFeedSpecifier.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSOPMLFeedSpecifier.m
diff --git a/ParserObjc/Sources/ParserObjC/RSOPMLItem.h b/Modules/ParserObjC/Sources/ParserObjC/RSOPMLItem.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSOPMLItem.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSOPMLItem.h
diff --git a/ParserObjc/Sources/ParserObjC/RSOPMLItem.m b/Modules/ParserObjC/Sources/ParserObjC/RSOPMLItem.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSOPMLItem.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSOPMLItem.m
diff --git a/ParserObjc/Sources/ParserObjC/RSOPMLParser.h b/Modules/ParserObjC/Sources/ParserObjC/RSOPMLParser.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSOPMLParser.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSOPMLParser.h
diff --git a/ParserObjc/Sources/ParserObjC/RSOPMLParser.m b/Modules/ParserObjC/Sources/ParserObjC/RSOPMLParser.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSOPMLParser.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSOPMLParser.m
diff --git a/ParserObjc/Sources/ParserObjC/RSParsedArticle.h b/Modules/ParserObjC/Sources/ParserObjC/RSParsedArticle.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSParsedArticle.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSParsedArticle.h
diff --git a/ParserObjc/Sources/ParserObjC/RSParsedArticle.m b/Modules/ParserObjC/Sources/ParserObjC/RSParsedArticle.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSParsedArticle.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSParsedArticle.m
diff --git a/ParserObjc/Sources/ParserObjC/RSParsedAuthor.h b/Modules/ParserObjC/Sources/ParserObjC/RSParsedAuthor.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSParsedAuthor.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSParsedAuthor.h
diff --git a/ParserObjc/Sources/ParserObjC/RSParsedAuthor.m b/Modules/ParserObjC/Sources/ParserObjC/RSParsedAuthor.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSParsedAuthor.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSParsedAuthor.m
diff --git a/ParserObjc/Sources/ParserObjC/RSParsedEnclosure.h b/Modules/ParserObjC/Sources/ParserObjC/RSParsedEnclosure.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSParsedEnclosure.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSParsedEnclosure.h
diff --git a/ParserObjc/Sources/ParserObjC/RSParsedEnclosure.m b/Modules/ParserObjC/Sources/ParserObjC/RSParsedEnclosure.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSParsedEnclosure.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSParsedEnclosure.m
diff --git a/ParserObjc/Sources/ParserObjC/RSParsedFeed.h b/Modules/ParserObjC/Sources/ParserObjC/RSParsedFeed.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSParsedFeed.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSParsedFeed.h
diff --git a/ParserObjc/Sources/ParserObjC/RSParsedFeed.m b/Modules/ParserObjC/Sources/ParserObjC/RSParsedFeed.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSParsedFeed.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSParsedFeed.m
diff --git a/ParserObjc/Sources/ParserObjC/RSParserInternal.h b/Modules/ParserObjC/Sources/ParserObjC/RSParserInternal.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSParserInternal.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSParserInternal.h
diff --git a/ParserObjc/Sources/ParserObjC/RSParserInternal.m b/Modules/ParserObjC/Sources/ParserObjC/RSParserInternal.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSParserInternal.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSParserInternal.m
diff --git a/ParserObjc/Sources/ParserObjC/RSRSSParser.h b/Modules/ParserObjC/Sources/ParserObjC/RSRSSParser.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSRSSParser.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSRSSParser.h
diff --git a/ParserObjc/Sources/ParserObjC/RSRSSParser.m b/Modules/ParserObjC/Sources/ParserObjC/RSRSSParser.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSRSSParser.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSRSSParser.m
diff --git a/ParserObjc/Sources/ParserObjC/RSSAXHTMLParser.h b/Modules/ParserObjC/Sources/ParserObjC/RSSAXHTMLParser.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSSAXHTMLParser.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSSAXHTMLParser.h
diff --git a/ParserObjc/Sources/ParserObjC/RSSAXHTMLParser.m b/Modules/ParserObjC/Sources/ParserObjC/RSSAXHTMLParser.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSSAXHTMLParser.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSSAXHTMLParser.m
diff --git a/ParserObjc/Sources/ParserObjC/RSSAXParser.h b/Modules/ParserObjC/Sources/ParserObjC/RSSAXParser.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSSAXParser.h
rename to Modules/ParserObjC/Sources/ParserObjC/RSSAXParser.h
diff --git a/ParserObjc/Sources/ParserObjC/RSSAXParser.m b/Modules/ParserObjC/Sources/ParserObjC/RSSAXParser.m
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/RSSAXParser.m
rename to Modules/ParserObjC/Sources/ParserObjC/RSSAXParser.m
diff --git a/ParserObjc/Sources/ParserObjC/include/RSParser.h b/Modules/ParserObjC/Sources/ParserObjC/include/RSParser.h
similarity index 100%
rename from ParserObjc/Sources/ParserObjC/include/RSParser.h
rename to Modules/ParserObjC/Sources/ParserObjC/include/RSParser.h
diff --git a/ReaderAPI/.gitignore b/Modules/ReaderAPI/.gitignore
similarity index 100%
rename from ReaderAPI/.gitignore
rename to Modules/ReaderAPI/.gitignore
diff --git a/ReaderAPI/Package.swift b/Modules/ReaderAPI/Package.swift
similarity index 100%
rename from ReaderAPI/Package.swift
rename to Modules/ReaderAPI/Package.swift
diff --git a/ReaderAPI/Sources/ReaderAPI/ReaderAPICaller.swift b/Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPICaller.swift
similarity index 100%
rename from ReaderAPI/Sources/ReaderAPI/ReaderAPICaller.swift
rename to Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPICaller.swift
diff --git a/ReaderAPI/Sources/ReaderAPI/ReaderAPIEntry.swift b/Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPIEntry.swift
similarity index 100%
rename from ReaderAPI/Sources/ReaderAPI/ReaderAPIEntry.swift
rename to Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPIEntry.swift
diff --git a/ReaderAPI/Sources/ReaderAPI/ReaderAPIError.swift b/Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPIError.swift
similarity index 100%
rename from ReaderAPI/Sources/ReaderAPI/ReaderAPIError.swift
rename to Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPIError.swift
diff --git a/ReaderAPI/Sources/ReaderAPI/ReaderAPISubscription.swift b/Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPISubscription.swift
similarity index 100%
rename from ReaderAPI/Sources/ReaderAPI/ReaderAPISubscription.swift
rename to Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPISubscription.swift
diff --git a/ReaderAPI/Sources/ReaderAPI/ReaderAPITag.swift b/Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPITag.swift
similarity index 100%
rename from ReaderAPI/Sources/ReaderAPI/ReaderAPITag.swift
rename to Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPITag.swift
diff --git a/ReaderAPI/Sources/ReaderAPI/ReaderAPITagging.swift b/Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPITagging.swift
similarity index 100%
rename from ReaderAPI/Sources/ReaderAPI/ReaderAPITagging.swift
rename to Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPITagging.swift
diff --git a/ReaderAPI/Sources/ReaderAPI/ReaderAPIUnreadEntry.swift b/Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPIUnreadEntry.swift
similarity index 100%
rename from ReaderAPI/Sources/ReaderAPI/ReaderAPIUnreadEntry.swift
rename to Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPIUnreadEntry.swift
diff --git a/ReaderAPI/Sources/ReaderAPI/ReaderAPIVariant.swift b/Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPIVariant.swift
similarity index 100%
rename from ReaderAPI/Sources/ReaderAPI/ReaderAPIVariant.swift
rename to Modules/ReaderAPI/Sources/ReaderAPI/ReaderAPIVariant.swift
diff --git a/ReaderAPI/Sources/ReaderAPI/URLRequest+ReaderAPI.swift b/Modules/ReaderAPI/Sources/ReaderAPI/URLRequest+ReaderAPI.swift
similarity index 100%
rename from ReaderAPI/Sources/ReaderAPI/URLRequest+ReaderAPI.swift
rename to Modules/ReaderAPI/Sources/ReaderAPI/URLRequest+ReaderAPI.swift
diff --git a/ReaderAPI/Tests/ReaderAPITests/ReaderAPITests.swift b/Modules/ReaderAPI/Tests/ReaderAPITests/ReaderAPITests.swift
similarity index 100%
rename from ReaderAPI/Tests/ReaderAPITests/ReaderAPITests.swift
rename to Modules/ReaderAPI/Tests/ReaderAPITests/ReaderAPITests.swift
diff --git a/Secrets/.gitignore b/Modules/Secrets/.gitignore
similarity index 100%
rename from Secrets/.gitignore
rename to Modules/Secrets/.gitignore
diff --git a/Secrets/Package.swift b/Modules/Secrets/Package.swift
similarity index 100%
rename from Secrets/Package.swift
rename to Modules/Secrets/Package.swift
diff --git a/Secrets/README.md b/Modules/Secrets/README.md
similarity index 100%
rename from Secrets/README.md
rename to Modules/Secrets/README.md
diff --git a/Secrets/Sources/Secrets/Credentials.swift b/Modules/Secrets/Sources/Secrets/Credentials.swift
similarity index 100%
rename from Secrets/Sources/Secrets/Credentials.swift
rename to Modules/Secrets/Sources/Secrets/Credentials.swift
diff --git a/Secrets/Sources/Secrets/CredentialsManager.swift b/Modules/Secrets/Sources/Secrets/CredentialsManager.swift
similarity index 100%
rename from Secrets/Sources/Secrets/CredentialsManager.swift
rename to Modules/Secrets/Sources/Secrets/CredentialsManager.swift
diff --git a/Secrets/Sources/Secrets/SecretsProvider.swift b/Modules/Secrets/Sources/Secrets/SecretsProvider.swift
similarity index 100%
rename from Secrets/Sources/Secrets/SecretsProvider.swift
rename to Modules/Secrets/Sources/Secrets/SecretsProvider.swift
diff --git a/SyncDatabase/.gitignore b/Modules/SyncDatabase/.gitignore
similarity index 100%
rename from SyncDatabase/.gitignore
rename to Modules/SyncDatabase/.gitignore
diff --git a/SyncDatabase/.swiftpm/xcode/xcshareddata/xcschemes/SyncDatabase.xcscheme b/Modules/SyncDatabase/.swiftpm/xcode/xcshareddata/xcschemes/SyncDatabase.xcscheme
similarity index 100%
rename from SyncDatabase/.swiftpm/xcode/xcshareddata/xcschemes/SyncDatabase.xcscheme
rename to Modules/SyncDatabase/.swiftpm/xcode/xcshareddata/xcschemes/SyncDatabase.xcscheme
diff --git a/SyncDatabase/Package.swift b/Modules/SyncDatabase/Package.swift
similarity index 100%
rename from SyncDatabase/Package.swift
rename to Modules/SyncDatabase/Package.swift
diff --git a/SyncDatabase/README.md b/Modules/SyncDatabase/README.md
similarity index 100%
rename from SyncDatabase/README.md
rename to Modules/SyncDatabase/README.md
diff --git a/SyncDatabase/Sources/SyncDatabase/Constants.swift b/Modules/SyncDatabase/Sources/SyncDatabase/Constants.swift
similarity index 100%
rename from SyncDatabase/Sources/SyncDatabase/Constants.swift
rename to Modules/SyncDatabase/Sources/SyncDatabase/Constants.swift
diff --git a/SyncDatabase/Sources/SyncDatabase/SyncDatabase.swift b/Modules/SyncDatabase/Sources/SyncDatabase/SyncDatabase.swift
similarity index 100%
rename from SyncDatabase/Sources/SyncDatabase/SyncDatabase.swift
rename to Modules/SyncDatabase/Sources/SyncDatabase/SyncDatabase.swift
diff --git a/SyncDatabase/Sources/SyncDatabase/SyncStatus.swift b/Modules/SyncDatabase/Sources/SyncDatabase/SyncStatus.swift
similarity index 100%
rename from SyncDatabase/Sources/SyncDatabase/SyncStatus.swift
rename to Modules/SyncDatabase/Sources/SyncDatabase/SyncStatus.swift
diff --git a/SyncDatabase/Sources/SyncDatabase/SyncStatusTable.swift b/Modules/SyncDatabase/Sources/SyncDatabase/SyncStatusTable.swift
similarity index 100%
rename from SyncDatabase/Sources/SyncDatabase/SyncStatusTable.swift
rename to Modules/SyncDatabase/Sources/SyncDatabase/SyncStatusTable.swift
diff --git a/Tree/.gitignore b/Modules/Tree/.gitignore
similarity index 100%
rename from Tree/.gitignore
rename to Modules/Tree/.gitignore
diff --git a/Tree/.swiftpm/xcode/xcshareddata/xcschemes/Tree.xcscheme b/Modules/Tree/.swiftpm/xcode/xcshareddata/xcschemes/Tree.xcscheme
similarity index 100%
rename from Tree/.swiftpm/xcode/xcshareddata/xcschemes/Tree.xcscheme
rename to Modules/Tree/.swiftpm/xcode/xcshareddata/xcschemes/Tree.xcscheme
diff --git a/Tree/.swiftpm/xcode/xcshareddata/xcschemes/TreeTests.xcscheme b/Modules/Tree/.swiftpm/xcode/xcshareddata/xcschemes/TreeTests.xcscheme
similarity index 100%
rename from Tree/.swiftpm/xcode/xcshareddata/xcschemes/TreeTests.xcscheme
rename to Modules/Tree/.swiftpm/xcode/xcshareddata/xcschemes/TreeTests.xcscheme
diff --git a/Tree/Package.swift b/Modules/Tree/Package.swift
similarity index 100%
rename from Tree/Package.swift
rename to Modules/Tree/Package.swift
diff --git a/Tree/Sources/Tree/NSOutlineView+RSTree.swift b/Modules/Tree/Sources/Tree/NSOutlineView+RSTree.swift
similarity index 100%
rename from Tree/Sources/Tree/NSOutlineView+RSTree.swift
rename to Modules/Tree/Sources/Tree/NSOutlineView+RSTree.swift
diff --git a/Tree/Sources/Tree/Node.swift b/Modules/Tree/Sources/Tree/Node.swift
similarity index 100%
rename from Tree/Sources/Tree/Node.swift
rename to Modules/Tree/Sources/Tree/Node.swift
diff --git a/Tree/Sources/Tree/NodePath.swift b/Modules/Tree/Sources/Tree/NodePath.swift
similarity index 100%
rename from Tree/Sources/Tree/NodePath.swift
rename to Modules/Tree/Sources/Tree/NodePath.swift
diff --git a/Tree/Sources/Tree/RSTree.swift b/Modules/Tree/Sources/Tree/RSTree.swift
similarity index 100%
rename from Tree/Sources/Tree/RSTree.swift
rename to Modules/Tree/Sources/Tree/RSTree.swift
diff --git a/Tree/Sources/Tree/RootNodeRepresentedObject.swift b/Modules/Tree/Sources/Tree/RootNodeRepresentedObject.swift
similarity index 100%
rename from Tree/Sources/Tree/RootNodeRepresentedObject.swift
rename to Modules/Tree/Sources/Tree/RootNodeRepresentedObject.swift
diff --git a/Tree/Sources/Tree/TreeController.swift b/Modules/Tree/Sources/Tree/TreeController.swift
similarity index 100%
rename from Tree/Sources/Tree/TreeController.swift
rename to Modules/Tree/Sources/Tree/TreeController.swift
diff --git a/Tree/Tests/TreeTests/NodeTests.swift b/Modules/Tree/Tests/TreeTests/NodeTests.swift
similarity index 100%
rename from Tree/Tests/TreeTests/NodeTests.swift
rename to Modules/Tree/Tests/TreeTests/NodeTests.swift
diff --git a/UIKitExtras/.gitignore b/Modules/UIKitExtras/.gitignore
similarity index 100%
rename from UIKitExtras/.gitignore
rename to Modules/UIKitExtras/.gitignore
diff --git a/UIKitExtras/Package.swift b/Modules/UIKitExtras/Package.swift
similarity index 100%
rename from UIKitExtras/Package.swift
rename to Modules/UIKitExtras/Package.swift
diff --git a/UIKitExtras/Sources/UIKitExtras/Animations.swift b/Modules/UIKitExtras/Sources/UIKitExtras/Animations.swift
similarity index 100%
rename from UIKitExtras/Sources/UIKitExtras/Animations.swift
rename to Modules/UIKitExtras/Sources/UIKitExtras/Animations.swift
diff --git a/UIKitExtras/Sources/UIKitExtras/NonIntrinsicButton.swift b/Modules/UIKitExtras/Sources/UIKitExtras/NonIntrinsicButton.swift
similarity index 100%
rename from UIKitExtras/Sources/UIKitExtras/NonIntrinsicButton.swift
rename to Modules/UIKitExtras/Sources/UIKitExtras/NonIntrinsicButton.swift
diff --git a/UIKitExtras/Sources/UIKitExtras/NonIntrinsicImageView.swift b/Modules/UIKitExtras/Sources/UIKitExtras/NonIntrinsicImageView.swift
similarity index 100%
rename from UIKitExtras/Sources/UIKitExtras/NonIntrinsicImageView.swift
rename to Modules/UIKitExtras/Sources/UIKitExtras/NonIntrinsicImageView.swift
diff --git a/UIKitExtras/Sources/UIKitExtras/NonIntrinsicLabel.swift b/Modules/UIKitExtras/Sources/UIKitExtras/NonIntrinsicLabel.swift
similarity index 100%
rename from UIKitExtras/Sources/UIKitExtras/NonIntrinsicLabel.swift
rename to Modules/UIKitExtras/Sources/UIKitExtras/NonIntrinsicLabel.swift
diff --git a/UIKitExtras/Sources/UIKitExtras/RoundedProgressView.swift b/Modules/UIKitExtras/Sources/UIKitExtras/RoundedProgressView.swift
similarity index 100%
rename from UIKitExtras/Sources/UIKitExtras/RoundedProgressView.swift
rename to Modules/UIKitExtras/Sources/UIKitExtras/RoundedProgressView.swift
diff --git a/UIKitExtras/Sources/UIKitExtras/String+Extensions.swift b/Modules/UIKitExtras/Sources/UIKitExtras/String+Extensions.swift
similarity index 100%
rename from UIKitExtras/Sources/UIKitExtras/String+Extensions.swift
rename to Modules/UIKitExtras/Sources/UIKitExtras/String+Extensions.swift
diff --git a/UIKitExtras/Sources/UIKitExtras/TickMarkSlider.swift b/Modules/UIKitExtras/Sources/UIKitExtras/TickMarkSlider.swift
similarity index 100%
rename from UIKitExtras/Sources/UIKitExtras/TickMarkSlider.swift
rename to Modules/UIKitExtras/Sources/UIKitExtras/TickMarkSlider.swift
diff --git a/UIKitExtras/Sources/UIKitExtras/UIResponder+RSCore.swift b/Modules/UIKitExtras/Sources/UIKitExtras/UIResponder+RSCore.swift
similarity index 100%
rename from UIKitExtras/Sources/UIKitExtras/UIResponder+RSCore.swift
rename to Modules/UIKitExtras/Sources/UIKitExtras/UIResponder+RSCore.swift
diff --git a/UIKitExtras/Sources/UIKitExtras/UITableView+Extensions.swift b/Modules/UIKitExtras/Sources/UIKitExtras/UITableView+Extensions.swift
similarity index 100%
rename from UIKitExtras/Sources/UIKitExtras/UITableView+Extensions.swift
rename to Modules/UIKitExtras/Sources/UIKitExtras/UITableView+Extensions.swift
diff --git a/UIKitExtras/Sources/UIKitExtras/UIView+RSCore.swift b/Modules/UIKitExtras/Sources/UIKitExtras/UIView+RSCore.swift
similarity index 100%
rename from UIKitExtras/Sources/UIKitExtras/UIView+RSCore.swift
rename to Modules/UIKitExtras/Sources/UIKitExtras/UIView+RSCore.swift
diff --git a/UIKitExtras/Sources/UIKitExtras/UIViewController+RSCore.swift b/Modules/UIKitExtras/Sources/UIKitExtras/UIViewController+RSCore.swift
similarity index 100%
rename from UIKitExtras/Sources/UIKitExtras/UIViewController+RSCore.swift
rename to Modules/UIKitExtras/Sources/UIKitExtras/UIViewController+RSCore.swift
diff --git a/UIKitExtras/Tests/UIKitExtrasTests/UIKitExtrasTests.swift b/Modules/UIKitExtras/Tests/UIKitExtrasTests/UIKitExtrasTests.swift
similarity index 100%
rename from UIKitExtras/Tests/UIKitExtrasTests/UIKitExtrasTests.swift
rename to Modules/UIKitExtras/Tests/UIKitExtrasTests/UIKitExtrasTests.swift
diff --git a/Web/.gitignore b/Modules/Web/.gitignore
similarity index 100%
rename from Web/.gitignore
rename to Modules/Web/.gitignore
diff --git a/Web/.swiftpm/xcode/xcshareddata/xcschemes/Web.xcscheme b/Modules/Web/.swiftpm/xcode/xcshareddata/xcschemes/Web.xcscheme
similarity index 100%
rename from Web/.swiftpm/xcode/xcshareddata/xcschemes/Web.xcscheme
rename to Modules/Web/.swiftpm/xcode/xcshareddata/xcschemes/Web.xcscheme
diff --git a/Web/Package.swift b/Modules/Web/Package.swift
similarity index 100%
rename from Web/Package.swift
rename to Modules/Web/Package.swift
diff --git a/Web/Sources/Web/Dictionary+Web.swift b/Modules/Web/Sources/Web/Dictionary+Web.swift
similarity index 100%
rename from Web/Sources/Web/Dictionary+Web.swift
rename to Modules/Web/Sources/Web/Dictionary+Web.swift
diff --git a/Web/Sources/Web/DownloadObject.swift b/Modules/Web/Sources/Web/DownloadObject.swift
similarity index 100%
rename from Web/Sources/Web/DownloadObject.swift
rename to Modules/Web/Sources/Web/DownloadObject.swift
diff --git a/Web/Sources/Web/DownloadProgress.swift b/Modules/Web/Sources/Web/DownloadProgress.swift
similarity index 100%
rename from Web/Sources/Web/DownloadProgress.swift
rename to Modules/Web/Sources/Web/DownloadProgress.swift
diff --git a/Web/Sources/Web/DownloadSession.swift b/Modules/Web/Sources/Web/DownloadSession.swift
similarity index 100%
rename from Web/Sources/Web/DownloadSession.swift
rename to Modules/Web/Sources/Web/DownloadSession.swift
diff --git a/Web/Sources/Web/HTTPConditionalGetInfo.swift b/Modules/Web/Sources/Web/HTTPConditionalGetInfo.swift
similarity index 100%
rename from Web/Sources/Web/HTTPConditionalGetInfo.swift
rename to Modules/Web/Sources/Web/HTTPConditionalGetInfo.swift
diff --git a/Web/Sources/Web/HTTPDateInfo.swift b/Modules/Web/Sources/Web/HTTPDateInfo.swift
similarity index 100%
rename from Web/Sources/Web/HTTPDateInfo.swift
rename to Modules/Web/Sources/Web/HTTPDateInfo.swift
diff --git a/Web/Sources/Web/HTTPLinkPagingInfo.swift b/Modules/Web/Sources/Web/HTTPLinkPagingInfo.swift
similarity index 100%
rename from Web/Sources/Web/HTTPLinkPagingInfo.swift
rename to Modules/Web/Sources/Web/HTTPLinkPagingInfo.swift
diff --git a/Web/Sources/Web/HTTPMethod.swift b/Modules/Web/Sources/Web/HTTPMethod.swift
similarity index 100%
rename from Web/Sources/Web/HTTPMethod.swift
rename to Modules/Web/Sources/Web/HTTPMethod.swift
diff --git a/Web/Sources/Web/HTTPRequestHeader.swift b/Modules/Web/Sources/Web/HTTPRequestHeader.swift
similarity index 100%
rename from Web/Sources/Web/HTTPRequestHeader.swift
rename to Modules/Web/Sources/Web/HTTPRequestHeader.swift
diff --git a/Web/Sources/Web/HTTPResponseCode.swift b/Modules/Web/Sources/Web/HTTPResponseCode.swift
similarity index 100%
rename from Web/Sources/Web/HTTPResponseCode.swift
rename to Modules/Web/Sources/Web/HTTPResponseCode.swift
diff --git a/Web/Sources/Web/HTTPResponseHeader.swift b/Modules/Web/Sources/Web/HTTPResponseHeader.swift
similarity index 100%
rename from Web/Sources/Web/HTTPResponseHeader.swift
rename to Modules/Web/Sources/Web/HTTPResponseHeader.swift
diff --git a/Web/Sources/Web/MacWebBrowser.swift b/Modules/Web/Sources/Web/MacWebBrowser.swift
similarity index 100%
rename from Web/Sources/Web/MacWebBrowser.swift
rename to Modules/Web/Sources/Web/MacWebBrowser.swift
diff --git a/Web/Sources/Web/MimeType.swift b/Modules/Web/Sources/Web/MimeType.swift
similarity index 100%
rename from Web/Sources/Web/MimeType.swift
rename to Modules/Web/Sources/Web/MimeType.swift
diff --git a/Web/Sources/Web/OneShotDownload.swift b/Modules/Web/Sources/Web/OneShotDownload.swift
similarity index 100%
rename from Web/Sources/Web/OneShotDownload.swift
rename to Modules/Web/Sources/Web/OneShotDownload.swift
diff --git a/Web/Sources/Web/Reachability.swift b/Modules/Web/Sources/Web/Reachability.swift
similarity index 100%
rename from Web/Sources/Web/Reachability.swift
rename to Modules/Web/Sources/Web/Reachability.swift
diff --git a/Web/Sources/Web/URL+RSWeb.swift b/Modules/Web/Sources/Web/URL+RSWeb.swift
similarity index 100%
rename from Web/Sources/Web/URL+RSWeb.swift
rename to Modules/Web/Sources/Web/URL+RSWeb.swift
diff --git a/Web/Sources/Web/URLComponents+RSWeb.swift b/Modules/Web/Sources/Web/URLComponents+RSWeb.swift
similarity index 100%
rename from Web/Sources/Web/URLComponents+RSWeb.swift
rename to Modules/Web/Sources/Web/URLComponents+RSWeb.swift
diff --git a/Web/Sources/Web/URLResponse+RSWeb.swift b/Modules/Web/Sources/Web/URLResponse+RSWeb.swift
similarity index 100%
rename from Web/Sources/Web/URLResponse+RSWeb.swift
rename to Modules/Web/Sources/Web/URLResponse+RSWeb.swift
diff --git a/Web/Sources/Web/URLScheme.swift b/Modules/Web/Sources/Web/URLScheme.swift
similarity index 100%
rename from Web/Sources/Web/URLScheme.swift
rename to Modules/Web/Sources/Web/URLScheme.swift
diff --git a/Web/Sources/Web/UserAgent.swift b/Modules/Web/Sources/Web/UserAgent.swift
similarity index 100%
rename from Web/Sources/Web/UserAgent.swift
rename to Modules/Web/Sources/Web/UserAgent.swift
diff --git a/Web/Sources/Web/WebServices/Transport.swift b/Modules/Web/Sources/Web/WebServices/Transport.swift
similarity index 100%
rename from Web/Sources/Web/WebServices/Transport.swift
rename to Modules/Web/Sources/Web/WebServices/Transport.swift
diff --git a/Web/Sources/Web/WebServices/TransportJSON.swift b/Modules/Web/Sources/Web/WebServices/TransportJSON.swift
similarity index 100%
rename from Web/Sources/Web/WebServices/TransportJSON.swift
rename to Modules/Web/Sources/Web/WebServices/TransportJSON.swift
diff --git a/Web/Tests/WebTests/DictionaryWebTests.swift b/Modules/Web/Tests/WebTests/DictionaryWebTests.swift
similarity index 100%
rename from Web/Tests/WebTests/DictionaryWebTests.swift
rename to Modules/Web/Tests/WebTests/DictionaryWebTests.swift
diff --git a/NetNewsWire.xcodeproj/project.pbxproj b/NetNewsWire.xcodeproj/project.pbxproj
index cc87312d5..e3910b2d3 100644
--- a/NetNewsWire.xcodeproj/project.pbxproj
+++ b/NetNewsWire.xcodeproj/project.pbxproj
@@ -449,6 +449,8 @@
 		849C78922362AB04009A71E4 /* ExportOPMLWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849C78912362AB04009A71E4 /* ExportOPMLWindowController.swift */; };
 		849EE70F203919360082A1EA /* AppAssets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849EE70E203919360082A1EA /* AppAssets.swift */; };
 		849EE72120391F560082A1EA /* SharingServicePickerDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849EE72020391F560082A1EA /* SharingServicePickerDelegate.swift */; };
+		84A059DB2C3A49560041209B /* ReaderAPI in Resources */ = {isa = PBXBuildFile; fileRef = 84A059D92C3A49550041209B /* ReaderAPI */; };
+		84A059DC2C3A49560041209B /* ReaderAPI in Resources */ = {isa = PBXBuildFile; fileRef = 84A059D92C3A49550041209B /* ReaderAPI */; };
 		84A14FF320048CA70046AD9A /* SendToMicroBlogCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A14FF220048CA70046AD9A /* SendToMicroBlogCommand.swift */; };
 		84A1500520048DDF0046AD9A /* SendToMarsEditCommand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A1500420048DDF0046AD9A /* SendToMarsEditCommand.swift */; };
 		84A37CB5201ECD610087C5AF /* RenameWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A37CB4201ECD610087C5AF /* RenameWindowController.swift */; };
@@ -938,11 +940,6 @@
 		51C4528B2265095F00C03939 /* AddFolderViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddFolderViewController.swift; sourceTree = "<group>"; };
 		51C4CFEF24D37D1F00AF9874 /* Secrets.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Secrets.swift; sourceTree = "<group>"; };
 		51C9DE5723EA2EF4003D5A6D /* WrapperScriptMessageHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WrapperScriptMessageHandler.swift; sourceTree = "<group>"; };
-		51CD32A824D2CB25009ABAEF /* SyncDatabase */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SyncDatabase; sourceTree = "<group>"; };
-		51CD32C324D2CD57009ABAEF /* ArticlesDatabase */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ArticlesDatabase; sourceTree = "<group>"; };
-		51CD32C424D2CF1D009ABAEF /* Articles */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Articles; sourceTree = "<group>"; };
-		51CD32C624D2DEF9009ABAEF /* Account */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Account; sourceTree = "<group>"; };
-		51CD32C724D2E06C009ABAEF /* Secrets */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Secrets; sourceTree = "<group>"; };
 		51CE1C0823621EDA005548FC /* RefreshProgressView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RefreshProgressView.xib; sourceTree = "<group>"; };
 		51CE1C0A23622006005548FC /* RefreshProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefreshProgressView.swift; sourceTree = "<group>"; };
 		51D0214526ED617100FF2E0F /* core.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; path = core.css; sourceTree = "<group>"; };
@@ -1005,19 +1002,14 @@
 		840D617E2029031C009BC708 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		840D61952029031D009BC708 /* NetNewsWire_iOSTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetNewsWire_iOSTests.swift; sourceTree = "<group>"; };
 		840D61972029031D009BC708 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		8410C4A62BC221C900D4F799 /* CommonErrors */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = CommonErrors; sourceTree = "<group>"; };
-		841550F42B9E3F8000D4B345 /* Database */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Database; sourceTree = "<group>"; };
-		841550F52B9E4D6800D4B345 /* FMDB */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = FMDB; sourceTree = "<group>"; };
 		84162A142038C12C00035290 /* MarkCommandValidationStatus.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkCommandValidationStatus.swift; sourceTree = "<group>"; };
 		841ABA4D20145E7300980E11 /* NothingInspectorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NothingInspectorViewController.swift; sourceTree = "<group>"; };
 		841ABA5D20145E9200980E11 /* FolderInspectorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FolderInspectorViewController.swift; sourceTree = "<group>"; };
 		841ABA5F20145EC100980E11 /* BuiltinSmartFeedInspectorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuiltinSmartFeedInspectorViewController.swift; sourceTree = "<group>"; };
-		841CECD62BAD03C60001EE72 /* Tree */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Tree; sourceTree = "<group>"; };
 		84216D0222128B9D0049B9B9 /* DetailWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailWebViewController.swift; sourceTree = "<group>"; };
 		8426119D1FCB6ED40086A189 /* HTMLMetadataDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTMLMetadataDownloader.swift; sourceTree = "<group>"; };
 		842E45CD1ED8C308000A8B52 /* AppNotifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppNotifications.swift; sourceTree = "<group>"; };
 		842E45DC1ED8C54B000A8B52 /* Browser.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Browser.swift; sourceTree = "<group>"; };
-		843429CC2BFEE3B6003D6C70 /* FeedDownloader */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = FeedDownloader; sourceTree = "<group>"; };
 		843EA3EA2BFC293B003F2E97 /* Mac.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = Mac.xctestplan; sourceTree = "<group>"; };
 		84411E701FE5FBFA004B527F /* SmallIconProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmallIconProvider.swift; sourceTree = "<group>"; };
 		8444C8F11FED81840051386C /* OPMLExporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OPMLExporter.swift; sourceTree = "<group>"; };
@@ -1036,9 +1028,6 @@
 		845B14A51FC2299E0013CF92 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		845EE7B01FC2366500854A1F /* StarredFeedDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StarredFeedDelegate.swift; sourceTree = "<group>"; };
 		845EE7C01FC2488C00854A1F /* SmartFeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartFeed.swift; sourceTree = "<group>"; };
-		845F3D2B2BC268FE00AEBB68 /* CloudKitSync */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = CloudKitSync; sourceTree = "<group>"; };
-		846133952BFDA8BC00EE2D05 /* ParserObjC */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ParserObjC; sourceTree = "<group>"; };
-		846799F42BBD120A000854CB /* Parser */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Parser; sourceTree = "<group>"; };
 		84702AA31FA27AC0006B8943 /* MarkStatusCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkStatusCommand.swift; sourceTree = "<group>"; };
 		847120D62B8AE6AF00BBFC34 /* UTType+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UTType+Extensions.swift"; sourceTree = "<group>"; };
 		8472058020142E8900AD578B /* FeedInspectorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedInspectorViewController.swift; sourceTree = "<group>"; };
@@ -1090,17 +1079,39 @@
 		849C78912362AB04009A71E4 /* ExportOPMLWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExportOPMLWindowController.swift; sourceTree = "<group>"; };
 		849EE70E203919360082A1EA /* AppAssets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAssets.swift; sourceTree = "<group>"; };
 		849EE72020391F560082A1EA /* SharingServicePickerDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingServicePickerDelegate.swift; sourceTree = "<group>"; };
-		849FEDC32BBB225E0053FB21 /* Web */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Web; sourceTree = "<group>"; };
+		84A059D92C3A49550041209B /* ReaderAPI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ReaderAPI; sourceTree = "<group>"; };
+		84A059DD2C3A49D80041209B /* Images */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Images; sourceTree = "<group>"; };
+		84A059DE2C3A49DE0041209B /* ArticleExtractor */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ArticleExtractor; sourceTree = "<group>"; };
+		84A059DF2C3A49E80041209B /* FeedFinder */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = FeedFinder; sourceTree = "<group>"; };
+		84A059E02C3A49F30041209B /* Account */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Account; sourceTree = "<group>"; };
+		84A059E12C3A49FB0041209B /* FeedDownloader */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = FeedDownloader; sourceTree = "<group>"; };
+		84A059E22C3A4A060041209B /* LocalAccount */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = LocalAccount; sourceTree = "<group>"; };
+		84A059E32C3A4A0E0041209B /* Feedbin */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Feedbin; sourceTree = "<group>"; };
+		84A059E62C3A4A350041209B /* NewsBlur */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = NewsBlur; sourceTree = "<group>"; };
+		84A059E72C3A4A3A0041209B /* CloudKitSync */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = CloudKitSync; sourceTree = "<group>"; };
+		84A059E82C3A4A3E0041209B /* CommonErrors */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = CommonErrors; sourceTree = "<group>"; };
+		84A059E92C3A4A410041209B /* Secrets */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Secrets; sourceTree = "<group>"; };
+		84A059EA2C3A4A450041209B /* Articles */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Articles; sourceTree = "<group>"; };
+		84A059EB2C3A4A490041209B /* ArticlesDatabase */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ArticlesDatabase; sourceTree = "<group>"; };
+		84A059EC2C3A4A4C0041209B /* SyncDatabase */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = SyncDatabase; sourceTree = "<group>"; };
+		84A059ED2C3A4A520041209B /* Database */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Database; sourceTree = "<group>"; };
+		84A059EE2C3A4A570041209B /* FMDB */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = FMDB; sourceTree = "<group>"; };
+		84A059EF2C3A4A5B0041209B /* Web */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Web; sourceTree = "<group>"; };
+		84A059F02C3A4A5F0041209B /* Parser */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Parser; sourceTree = "<group>"; };
+		84A059F12C3A4A620041209B /* ParserObjC */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ParserObjC; sourceTree = "<group>"; };
+		84A059F22C3A4A670041209B /* Core */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Core; sourceTree = "<group>"; };
+		84A059F32C3A4A6C0041209B /* Tree */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Tree; sourceTree = "<group>"; };
+		84A059F42C3A4AA30041209B /* UIKitExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = UIKitExtras; sourceTree = "<group>"; };
+		84A059F52C3A4AB20041209B /* AppKitExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = AppKitExtras; sourceTree = "<group>"; };
+		84A059F62C3A4AB90041209B /* FoundationExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = FoundationExtras; sourceTree = "<group>"; };
 		84A14FF220048CA70046AD9A /* SendToMicroBlogCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendToMicroBlogCommand.swift; sourceTree = "<group>"; };
 		84A1500420048DDF0046AD9A /* SendToMarsEditCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendToMarsEditCommand.swift; sourceTree = "<group>"; };
 		84A37CB4201ECD610087C5AF /* RenameWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RenameWindowController.swift; sourceTree = "<group>"; };
 		84A3EE52223B667F00557320 /* DefaultFeeds.opml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = DefaultFeeds.opml; sourceTree = "<group>"; };
-		84A699132BC34E8500605AB8 /* ArticleExtractor */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ArticleExtractor; sourceTree = "<group>"; };
-		84A699182BC3524C00605AB8 /* LocalAccount */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = LocalAccount; sourceTree = "<group>"; };
-		84A699192BC36EDB00605AB8 /* Feedly */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Feedly; sourceTree = "<group>"; };
 		84AD1EA92031617300BC20B7 /* PasteboardFolder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteboardFolder.swift; sourceTree = "<group>"; };
 		84AD1EB92031649C00BC20B7 /* SmartFeedPasteboardWriter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartFeedPasteboardWriter.swift; sourceTree = "<group>"; };
 		84AD1EBB2032AF5C00BC20B7 /* SidebarOutlineDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SidebarOutlineDataSource.swift; sourceTree = "<group>"; };
+		84ADC0BB2C3A4BA300C8CF44 /* Feedly */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Feedly; sourceTree = "<group>"; };
 		84B7178B201E66580091657D /* SidebarViewController+ContextualMenus.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "SidebarViewController+ContextualMenus.swift"; sourceTree = "<group>"; };
 		84B99C9C1FAE83C600ECDEDB /* DeleteCommand.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeleteCommand.swift; sourceTree = "<group>"; };
 		84BAE64821CEDAF20046DB56 /* CrashReporterWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CrashReporterWindow.xib; sourceTree = "<group>"; };
@@ -1129,15 +1140,9 @@
 		84CAFCAE22BC8C35007694F0 /* FetchRequestOperation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FetchRequestOperation.swift; sourceTree = "<group>"; };
 		84CBDDAE1FD3674C005A61AA /* Technotes */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Technotes; sourceTree = "<group>"; };
 		84CC88171FE59CBF00644329 /* SmartFeedsController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartFeedsController.swift; sourceTree = "<group>"; };
-		84CC98D92BC1DD25006A05C9 /* ReaderAPI */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = ReaderAPI; sourceTree = "<group>"; };
 		84D2200922B0BC4B0019E085 /* CONTRIBUTING.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = "<group>"; };
 		84D52E941FE588BB00D14F5B /* DetailStatusBarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DetailStatusBarView.swift; sourceTree = "<group>"; };
-		84DC5FF82BCE308500F04682 /* Images */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Images; sourceTree = "<group>"; };
 		84DC5FFD2BCE37A300F04682 /* AppDelegate+Shared.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+Shared.swift"; sourceTree = "<group>"; };
-		84DCA50D2BAB643700792720 /* FoundationExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = FoundationExtras; sourceTree = "<group>"; };
-		84DCA50E2BABB5D800792720 /* AppKitExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = AppKitExtras; sourceTree = "<group>"; };
-		84DCA5102BABB6A100792720 /* UIKitExtras */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = UIKitExtras; sourceTree = "<group>"; };
-		84DCA5232BABBA8100792720 /* Core */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Core; sourceTree = "<group>"; };
 		84DEE56422C32CA4005FC42C /* SmartFeedDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SmartFeedDelegate.swift; sourceTree = "<group>"; };
 		84E185B2203B74E500F69BFA /* SingleLineTextFieldSizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SingleLineTextFieldSizer.swift; sourceTree = "<group>"; };
 		84E185C2203BB12600F69BFA /* MultilineTextFieldSizer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultilineTextFieldSizer.swift; sourceTree = "<group>"; };
@@ -1168,9 +1173,6 @@
 		84F9EAE1213660A100CF2DE4 /* testGenericScript.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = testGenericScript.applescript; sourceTree = "<group>"; };
 		84F9EAE2213660A100CF2DE4 /* establishMainWindowStartingState.applescript */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.applescript; path = establishMainWindowStartingState.applescript; sourceTree = "<group>"; };
 		84F9EAE4213660A100CF2DE4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
-		84FB9FAC2BC33AFE00B7AFC3 /* NewsBlur */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = NewsBlur; sourceTree = "<group>"; };
-		84FB9FAD2BC344F800B7AFC3 /* Feedbin */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Feedbin; sourceTree = "<group>"; };
-		84FB9FAE2BC3494B00B7AFC3 /* FeedFinder */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = FeedFinder; sourceTree = "<group>"; };
 		B24E9ABA245AB88300DA5718 /* NSAttributedString+NetNewsWire.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSAttributedString+NetNewsWire.swift"; sourceTree = "<group>"; };
 		B24EFD482330FF99006C6242 /* NetNewsWire-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NetNewsWire-Bridging-Header.h"; sourceTree = "<group>"; };
 		B24EFD5923310109006C6242 /* WKPreferencesPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKPreferencesPrivate.h; sourceTree = "<group>"; };
@@ -2006,32 +2008,7 @@
 				D5907CDA2002F084005947E5 /* xcconfig */,
 				849C64611ED37A5D003D8FC0 /* Products */,
 				51C452B22265141B00C03939 /* Frameworks */,
-				84DC5FF82BCE308500F04682 /* Images */,
-				84A699132BC34E8500605AB8 /* ArticleExtractor */,
-				84FB9FAE2BC3494B00B7AFC3 /* FeedFinder */,
-				51CD32C624D2DEF9009ABAEF /* Account */,
-				843429CC2BFEE3B6003D6C70 /* FeedDownloader */,
-				84A699182BC3524C00605AB8 /* LocalAccount */,
-				84FB9FAD2BC344F800B7AFC3 /* Feedbin */,
-				84A699192BC36EDB00605AB8 /* Feedly */,
-				84FB9FAC2BC33AFE00B7AFC3 /* NewsBlur */,
-				84CC98D92BC1DD25006A05C9 /* ReaderAPI */,
-				845F3D2B2BC268FE00AEBB68 /* CloudKitSync */,
-				8410C4A62BC221C900D4F799 /* CommonErrors */,
-				51CD32C724D2E06C009ABAEF /* Secrets */,
-				51CD32C424D2CF1D009ABAEF /* Articles */,
-				51CD32C324D2CD57009ABAEF /* ArticlesDatabase */,
-				51CD32A824D2CB25009ABAEF /* SyncDatabase */,
-				841550F42B9E3F8000D4B345 /* Database */,
-				841550F52B9E4D6800D4B345 /* FMDB */,
-				849FEDC32BBB225E0053FB21 /* Web */,
-				846799F42BBD120A000854CB /* Parser */,
-				846133952BFDA8BC00EE2D05 /* ParserObjC */,
-				84DCA5232BABBA8100792720 /* Core */,
-				841CECD62BAD03C60001EE72 /* Tree */,
-				84DCA5102BABB6A100792720 /* UIKitExtras */,
-				84DCA50E2BABB5D800792720 /* AppKitExtras */,
-				84DCA50D2BAB643700792720 /* FoundationExtras */,
+				84A059DA2C3A49550041209B /* Modules */,
 			);
 			sourceTree = "<group>";
 			usesTabs = 1;
@@ -2054,6 +2031,39 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		84A059DA2C3A49550041209B /* Modules */ = {
+			isa = PBXGroup;
+			children = (
+				84A059DE2C3A49DE0041209B /* ArticleExtractor */,
+				84A059DD2C3A49D80041209B /* Images */,
+				84A059DF2C3A49E80041209B /* FeedFinder */,
+				84A059E02C3A49F30041209B /* Account */,
+				84A059E12C3A49FB0041209B /* FeedDownloader */,
+				84A059E22C3A4A060041209B /* LocalAccount */,
+				84A059E32C3A4A0E0041209B /* Feedbin */,
+				84A059E62C3A4A350041209B /* NewsBlur */,
+				84A059D92C3A49550041209B /* ReaderAPI */,
+				84ADC0BB2C3A4BA300C8CF44 /* Feedly */,
+				84A059E72C3A4A3A0041209B /* CloudKitSync */,
+				84A059E82C3A4A3E0041209B /* CommonErrors */,
+				84A059E92C3A4A410041209B /* Secrets */,
+				84A059EA2C3A4A450041209B /* Articles */,
+				84A059EB2C3A4A490041209B /* ArticlesDatabase */,
+				84A059EC2C3A4A4C0041209B /* SyncDatabase */,
+				84A059ED2C3A4A520041209B /* Database */,
+				84A059EE2C3A4A570041209B /* FMDB */,
+				84A059EF2C3A4A5B0041209B /* Web */,
+				84A059F02C3A4A5F0041209B /* Parser */,
+				84A059F12C3A4A620041209B /* ParserObjC */,
+				84A059F22C3A4A670041209B /* Core */,
+				84A059F32C3A4A6C0041209B /* Tree */,
+				84A059F42C3A4AA30041209B /* UIKitExtras */,
+				84A059F52C3A4AB20041209B /* AppKitExtras */,
+				84A059F62C3A4AB90041209B /* FoundationExtras */,
+			);
+			path = Modules;
+			sourceTree = "<group>";
+		};
 		84A37CB3201ECD610087C5AF /* Renaming */ = {
 			isa = PBXGroup;
 			children = (
@@ -2894,6 +2904,7 @@
 				51F85BF12272524100C787DC /* Credits.rtf in Resources */,
 				84A3EE61223B667F00557320 /* DefaultFeeds.opml in Resources */,
 				B27EEBFB244D15F3000932E6 /* stylesheet.css in Resources */,
+				84A059DC2C3A49560041209B /* ReaderAPI in Resources */,
 				511D43CF231FA62200FB1562 /* DetailKeyboardShortcuts.plist in Resources */,
 				51A1699A235E10D700EB091F /* Settings.storyboard in Resources */,
 				49F40DF92335B71000552BF4 /* newsfoot.js in Resources */,
@@ -2912,6 +2923,7 @@
 			files = (
 				849ADEE623598189000E1B81 /* NNW3OpenPanelAccessoryView.xib in Resources */,
 				844B5B651FEA11F200C7C76A /* GlobalKeyboardShortcuts.plist in Resources */,
+				84A059DB2C3A49560041209B /* ReaderAPI in Resources */,
 				5127B23A222B4849006D641D /* DetailKeyboardShortcuts.plist in Resources */,
 				845479881FEB77C000AD8B59 /* TimelineKeyboardShortcuts.plist in Resources */,
 				848362FF2262A30E00DA1D35 /* template.html in Resources */,