diff --git a/.rubocop.yml b/.rubocop.yml index edc7325c..e9e046fe 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -14,3 +14,4 @@ Naming/FileName: Metrics/BlockLength: Exclude: - 'fastlane/Fastfile' + - 'WordPressKit.podspec' diff --git a/Gemfile.lock b/Gemfile.lock index cdbf7638..27c0c38d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,11 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.6) + CFPropertyList (3.0.7) + base64 + nkf rexml - activesupport (7.1.2) + activesupport (7.1.3.2) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -39,16 +41,16 @@ GEM aws-eventstream (~> 1, >= 1.0.2) babosa (1.0.4) base64 (0.2.0) - bigdecimal (3.1.5) + bigdecimal (3.1.7) claide (1.1.0) claide-plugins (0.9.2) cork nap open4 (~> 1.3) - cocoapods (1.14.3) + cocoapods (1.15.2) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.14.3) + cocoapods-core (= 1.15.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -65,7 +67,7 @@ GEM xcodeproj (>= 1.23.0, < 2.0) cocoapods-check (1.1.0) cocoapods (~> 1.0) - cocoapods-core (1.14.3) + cocoapods-core (1.15.2) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -88,7 +90,7 @@ GEM colored2 (3.1.2) commander (4.6.0) highline (~> 2.0.0) - concurrent-ruby (1.2.2) + concurrent-ruby (1.2.3) connection_pool (2.4.1) cork (0.3.0) colored2 (~> 3.1) @@ -133,8 +135,7 @@ GEM rake (>= 12.0.0, < 14.0.0) domain_name (0.6.20231109) dotenv (2.8.1) - drb (2.2.0) - ruby2_keywords + drb (2.2.1) emoji_regex (3.2.3) escape (0.0.4) ethon (0.16.0) @@ -260,7 +261,7 @@ GEM http-cookie (1.0.5) domain_name (~> 0.5) httpclient (2.8.3) - i18n (1.14.1) + i18n (1.14.4) concurrent-ruby (~> 1.0) jmespath (1.6.2) json (2.7.1) @@ -272,7 +273,7 @@ GEM language_server-protocol (3.17.0.3) mini_magick (4.12.0) mini_mime (1.1.5) - minitest (5.20.0) + minitest (5.22.3) molinillo (0.8.0) multi_json (1.15.0) multipart-post (2.3.0) @@ -281,6 +282,7 @@ GEM nap (1.1.0) naturally (2.2.1) netrc (0.11.0) + nkf (0.2.0) no_proxy_fix (0.1.2) octokit (8.1.0) base64 @@ -354,7 +356,7 @@ GEM unicode-display_width (2.5.0) webrick (1.8.1) word_wrap (1.0.0) - xcodeproj (1.23.0) + xcodeproj (1.24.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/Podfile.lock b/Podfile.lock index d0ff8f04..83a6a853 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -56,4 +56,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 64af6d71574c7a92d01a9446aa874e066917ebe5 -COCOAPODS: 1.14.3 +COCOAPODS: 1.15.2 diff --git a/WordPressKit/Info.plist b/Sources/WordPressKit/Info.plist similarity index 100% rename from WordPressKit/Info.plist rename to Sources/WordPressKit/Info.plist diff --git a/WordPressKit/WPKitLogging.h b/Sources/WordPressKit/Logging/WPKitLogging.h similarity index 100% rename from WordPressKit/WPKitLogging.h rename to Sources/WordPressKit/Logging/WPKitLogging.h diff --git a/WordPressKit/WPKitLogging.m b/Sources/WordPressKit/Logging/WPKitLogging.m similarity index 100% rename from WordPressKit/WPKitLogging.m rename to Sources/WordPressKit/Logging/WPKitLogging.m diff --git a/WordPressKit/WPKitLogging.swift b/Sources/WordPressKit/Logging/WPKitLogging.swift similarity index 100% rename from WordPressKit/WPKitLogging.swift rename to Sources/WordPressKit/Logging/WPKitLogging.swift diff --git a/WordPressKit/AccountSettings.swift b/Sources/WordPressKit/Models/AccountSettings.swift similarity index 100% rename from WordPressKit/AccountSettings.swift rename to Sources/WordPressKit/Models/AccountSettings.swift diff --git a/WordPressKit/Activity.swift b/Sources/WordPressKit/Models/Activity.swift similarity index 100% rename from WordPressKit/Activity.swift rename to Sources/WordPressKit/Models/Activity.swift diff --git a/WordPressKit/AtomicLogs.swift b/Sources/WordPressKit/Models/Atomic/AtomicLogs.swift similarity index 100% rename from WordPressKit/AtomicLogs.swift rename to Sources/WordPressKit/Models/Atomic/AtomicLogs.swift diff --git a/WordPressKit/AutomatedTransferStatus.swift b/Sources/WordPressKit/Models/AutomatedTransferStatus.swift similarity index 100% rename from WordPressKit/AutomatedTransferStatus.swift rename to Sources/WordPressKit/Models/AutomatedTransferStatus.swift diff --git a/WordPressKit/BlazeCampaign.swift b/Sources/WordPressKit/Models/Blaze/BlazeCampaign.swift similarity index 100% rename from WordPressKit/BlazeCampaign.swift rename to Sources/WordPressKit/Models/Blaze/BlazeCampaign.swift diff --git a/WordPressKit/BlazeCampaignsSearchResponse.swift b/Sources/WordPressKit/Models/Blaze/BlazeCampaignsSearchResponse.swift similarity index 100% rename from WordPressKit/BlazeCampaignsSearchResponse.swift rename to Sources/WordPressKit/Models/Blaze/BlazeCampaignsSearchResponse.swift diff --git a/WordPressKit/DomainContactInformation.swift b/Sources/WordPressKit/Models/DomainContactInformation.swift similarity index 100% rename from WordPressKit/DomainContactInformation.swift rename to Sources/WordPressKit/Models/DomainContactInformation.swift diff --git a/WordPressKit/EditorSettings.swift b/Sources/WordPressKit/Models/EditorSettings.swift similarity index 100% rename from WordPressKit/EditorSettings.swift rename to Sources/WordPressKit/Models/EditorSettings.swift diff --git a/WordPressKit/Date+endOfDay.swift b/Sources/WordPressKit/Models/Extensions/Date+endOfDay.swift similarity index 100% rename from WordPressKit/Date+endOfDay.swift rename to Sources/WordPressKit/Models/Extensions/Date+endOfDay.swift diff --git a/WordPressKit/Decodable+Dictionary.swift b/Sources/WordPressKit/Models/Extensions/Decodable+Dictionary.swift similarity index 100% rename from WordPressKit/Decodable+Dictionary.swift rename to Sources/WordPressKit/Models/Extensions/Decodable+Dictionary.swift diff --git a/WordPressKit/Enum+UnknownCaseRepresentable.swift b/Sources/WordPressKit/Models/Extensions/Enum+UnknownCaseRepresentable.swift similarity index 100% rename from WordPressKit/Enum+UnknownCaseRepresentable.swift rename to Sources/WordPressKit/Models/Extensions/Enum+UnknownCaseRepresentable.swift diff --git a/WordPressKit/NSAttributedString+extensions.swift b/Sources/WordPressKit/Models/Extensions/NSAttributedString+extensions.swift similarity index 100% rename from WordPressKit/NSAttributedString+extensions.swift rename to Sources/WordPressKit/Models/Extensions/NSAttributedString+extensions.swift diff --git a/WordPressKit/NSMutableParagraphStyle+extensions.swift b/Sources/WordPressKit/Models/Extensions/NSMutableParagraphStyle+extensions.swift similarity index 100% rename from WordPressKit/NSMutableParagraphStyle+extensions.swift rename to Sources/WordPressKit/Models/Extensions/NSMutableParagraphStyle+extensions.swift diff --git a/WordPressKit/FeatureFlag.swift b/Sources/WordPressKit/Models/FeatureFlag.swift similarity index 100% rename from WordPressKit/FeatureFlag.swift rename to Sources/WordPressKit/Models/FeatureFlag.swift diff --git a/WordPressKit/Jetpack Scan/JetpackCredentials.swift b/Sources/WordPressKit/Models/Jetpack Scan/JetpackCredentials.swift similarity index 100% rename from WordPressKit/Jetpack Scan/JetpackCredentials.swift rename to Sources/WordPressKit/Models/Jetpack Scan/JetpackCredentials.swift diff --git a/WordPressKit/Jetpack Scan/JetpackScan.swift b/Sources/WordPressKit/Models/Jetpack Scan/JetpackScan.swift similarity index 100% rename from WordPressKit/Jetpack Scan/JetpackScan.swift rename to Sources/WordPressKit/Models/Jetpack Scan/JetpackScan.swift diff --git a/WordPressKit/Jetpack Scan/JetpackScanHistory.swift b/Sources/WordPressKit/Models/Jetpack Scan/JetpackScanHistory.swift similarity index 100% rename from WordPressKit/Jetpack Scan/JetpackScanHistory.swift rename to Sources/WordPressKit/Models/Jetpack Scan/JetpackScanHistory.swift diff --git a/WordPressKit/Jetpack Scan/JetpackScanThreat.swift b/Sources/WordPressKit/Models/Jetpack Scan/JetpackScanThreat.swift similarity index 100% rename from WordPressKit/Jetpack Scan/JetpackScanThreat.swift rename to Sources/WordPressKit/Models/Jetpack Scan/JetpackScanThreat.swift diff --git a/WordPressKit/Jetpack Scan/JetpackThreatFixStatus.swift b/Sources/WordPressKit/Models/Jetpack Scan/JetpackThreatFixStatus.swift similarity index 100% rename from WordPressKit/Jetpack Scan/JetpackThreatFixStatus.swift rename to Sources/WordPressKit/Models/Jetpack Scan/JetpackThreatFixStatus.swift diff --git a/WordPressKit/JetpackBackup.swift b/Sources/WordPressKit/Models/JetpackBackup.swift similarity index 100% rename from WordPressKit/JetpackBackup.swift rename to Sources/WordPressKit/Models/JetpackBackup.swift diff --git a/WordPressKit/JetpackRestoreTypes.swift b/Sources/WordPressKit/Models/JetpackRestoreTypes.swift similarity index 100% rename from WordPressKit/JetpackRestoreTypes.swift rename to Sources/WordPressKit/Models/JetpackRestoreTypes.swift diff --git a/WordPressKit/KeyringConnection.swift b/Sources/WordPressKit/Models/KeyringConnection.swift similarity index 100% rename from WordPressKit/KeyringConnection.swift rename to Sources/WordPressKit/Models/KeyringConnection.swift diff --git a/WordPressKit/KeyringConnectionExternalUser.swift b/Sources/WordPressKit/Models/KeyringConnectionExternalUser.swift similarity index 100% rename from WordPressKit/KeyringConnectionExternalUser.swift rename to Sources/WordPressKit/Models/KeyringConnectionExternalUser.swift diff --git a/WordPressKit/PluginDirectoryEntry.swift b/Sources/WordPressKit/Models/Plugins/PluginDirectoryEntry.swift similarity index 100% rename from WordPressKit/PluginDirectoryEntry.swift rename to Sources/WordPressKit/Models/Plugins/PluginDirectoryEntry.swift diff --git a/WordPressKit/PluginDirectoryFeedPage.swift b/Sources/WordPressKit/Models/Plugins/PluginDirectoryFeedPage.swift similarity index 100% rename from WordPressKit/PluginDirectoryFeedPage.swift rename to Sources/WordPressKit/Models/Plugins/PluginDirectoryFeedPage.swift diff --git a/WordPressKit/PluginState.swift b/Sources/WordPressKit/Models/Plugins/PluginState.swift similarity index 100% rename from WordPressKit/PluginState.swift rename to Sources/WordPressKit/Models/Plugins/PluginState.swift diff --git a/WordPressKit/SitePlugin.swift b/Sources/WordPressKit/Models/Plugins/SitePlugin.swift similarity index 100% rename from WordPressKit/SitePlugin.swift rename to Sources/WordPressKit/Models/Plugins/SitePlugin.swift diff --git a/WordPressKit/SitePluginCapabilities.swift b/Sources/WordPressKit/Models/Plugins/SitePluginCapabilities.swift similarity index 100% rename from WordPressKit/SitePluginCapabilities.swift rename to Sources/WordPressKit/Models/Plugins/SitePluginCapabilities.swift diff --git a/WordPressKit/ReaderFeed.swift b/Sources/WordPressKit/Models/ReaderFeed.swift similarity index 100% rename from WordPressKit/ReaderFeed.swift rename to Sources/WordPressKit/Models/ReaderFeed.swift diff --git a/WordPressKit/RemoteBlockEditorSettings.swift b/Sources/WordPressKit/Models/RemoteBlockEditorSettings.swift similarity index 100% rename from WordPressKit/RemoteBlockEditorSettings.swift rename to Sources/WordPressKit/Models/RemoteBlockEditorSettings.swift diff --git a/WordPressKit/RemoteBlog.swift b/Sources/WordPressKit/Models/RemoteBlog.swift similarity index 100% rename from WordPressKit/RemoteBlog.swift rename to Sources/WordPressKit/Models/RemoteBlog.swift diff --git a/WordPressKit/RemoteBlogJetpackModulesSettings.swift b/Sources/WordPressKit/Models/RemoteBlogJetpackModulesSettings.swift similarity index 100% rename from WordPressKit/RemoteBlogJetpackModulesSettings.swift rename to Sources/WordPressKit/Models/RemoteBlogJetpackModulesSettings.swift diff --git a/WordPressKit/RemoteBlogJetpackMonitorSettings.swift b/Sources/WordPressKit/Models/RemoteBlogJetpackMonitorSettings.swift similarity index 100% rename from WordPressKit/RemoteBlogJetpackMonitorSettings.swift rename to Sources/WordPressKit/Models/RemoteBlogJetpackMonitorSettings.swift diff --git a/WordPressKit/RemoteBlogJetpackSettings.swift b/Sources/WordPressKit/Models/RemoteBlogJetpackSettings.swift similarity index 100% rename from WordPressKit/RemoteBlogJetpackSettings.swift rename to Sources/WordPressKit/Models/RemoteBlogJetpackSettings.swift diff --git a/WordPressKit/RemoteBlogOptionsHelper.swift b/Sources/WordPressKit/Models/RemoteBlogOptionsHelper.swift similarity index 100% rename from WordPressKit/RemoteBlogOptionsHelper.swift rename to Sources/WordPressKit/Models/RemoteBlogOptionsHelper.swift diff --git a/WordPressKit/RemoteBlogSettings.swift b/Sources/WordPressKit/Models/RemoteBlogSettings.swift similarity index 100% rename from WordPressKit/RemoteBlogSettings.swift rename to Sources/WordPressKit/Models/RemoteBlogSettings.swift diff --git a/WordPressKit/RemoteBloggingPrompt.swift b/Sources/WordPressKit/Models/RemoteBloggingPrompt.swift similarity index 100% rename from WordPressKit/RemoteBloggingPrompt.swift rename to Sources/WordPressKit/Models/RemoteBloggingPrompt.swift diff --git a/WordPressKit/RemoteBloggingPromptsSettings.swift b/Sources/WordPressKit/Models/RemoteBloggingPromptsSettings.swift similarity index 100% rename from WordPressKit/RemoteBloggingPromptsSettings.swift rename to Sources/WordPressKit/Models/RemoteBloggingPromptsSettings.swift diff --git a/WordPressKit/RemoteComment.h b/Sources/WordPressKit/Models/RemoteComment.h similarity index 100% rename from WordPressKit/RemoteComment.h rename to Sources/WordPressKit/Models/RemoteComment.h diff --git a/WordPressKit/RemoteComment.m b/Sources/WordPressKit/Models/RemoteComment.m similarity index 100% rename from WordPressKit/RemoteComment.m rename to Sources/WordPressKit/Models/RemoteComment.m diff --git a/WordPressKit/RemoteCommentV2.swift b/Sources/WordPressKit/Models/RemoteCommentV2.swift similarity index 100% rename from WordPressKit/RemoteCommentV2.swift rename to Sources/WordPressKit/Models/RemoteCommentV2.swift diff --git a/WordPressKit/RemoteDomain.swift b/Sources/WordPressKit/Models/RemoteDomain.swift similarity index 100% rename from WordPressKit/RemoteDomain.swift rename to Sources/WordPressKit/Models/RemoteDomain.swift diff --git a/WordPressKit/RemoteGravatarProfile.swift b/Sources/WordPressKit/Models/RemoteGravatarProfile.swift similarity index 100% rename from WordPressKit/RemoteGravatarProfile.swift rename to Sources/WordPressKit/Models/RemoteGravatarProfile.swift diff --git a/WordPressKit/RemoteHomepageType.swift b/Sources/WordPressKit/Models/RemoteHomepageType.swift similarity index 100% rename from WordPressKit/RemoteHomepageType.swift rename to Sources/WordPressKit/Models/RemoteHomepageType.swift diff --git a/WordPressKit/RemoteInviteLink.swift b/Sources/WordPressKit/Models/RemoteInviteLink.swift similarity index 100% rename from WordPressKit/RemoteInviteLink.swift rename to Sources/WordPressKit/Models/RemoteInviteLink.swift diff --git a/WordPressKit/RemoteMedia.h b/Sources/WordPressKit/Models/RemoteMedia.h similarity index 100% rename from WordPressKit/RemoteMedia.h rename to Sources/WordPressKit/Models/RemoteMedia.h diff --git a/WordPressKit/RemoteMedia.m b/Sources/WordPressKit/Models/RemoteMedia.m similarity index 100% rename from WordPressKit/RemoteMedia.m rename to Sources/WordPressKit/Models/RemoteMedia.m diff --git a/WordPressKit/RemoteMenu.swift b/Sources/WordPressKit/Models/RemoteMenu.swift similarity index 100% rename from WordPressKit/RemoteMenu.swift rename to Sources/WordPressKit/Models/RemoteMenu.swift diff --git a/WordPressKit/RemoteMenuItem.swift b/Sources/WordPressKit/Models/RemoteMenuItem.swift similarity index 100% rename from WordPressKit/RemoteMenuItem.swift rename to Sources/WordPressKit/Models/RemoteMenuItem.swift diff --git a/WordPressKit/RemoteMenuLocation.swift b/Sources/WordPressKit/Models/RemoteMenuLocation.swift similarity index 100% rename from WordPressKit/RemoteMenuLocation.swift rename to Sources/WordPressKit/Models/RemoteMenuLocation.swift diff --git a/WordPressKit/RemoteNotification.swift b/Sources/WordPressKit/Models/RemoteNotification.swift similarity index 100% rename from WordPressKit/RemoteNotification.swift rename to Sources/WordPressKit/Models/RemoteNotification.swift diff --git a/WordPressKit/RemoteNotificationSettings.swift b/Sources/WordPressKit/Models/RemoteNotificationSettings.swift similarity index 100% rename from WordPressKit/RemoteNotificationSettings.swift rename to Sources/WordPressKit/Models/RemoteNotificationSettings.swift diff --git a/WordPressKit/RemotePageLayouts.swift b/Sources/WordPressKit/Models/RemotePageLayouts.swift similarity index 100% rename from WordPressKit/RemotePageLayouts.swift rename to Sources/WordPressKit/Models/RemotePageLayouts.swift diff --git a/WordPressKit/RemotePerson.swift b/Sources/WordPressKit/Models/RemotePerson.swift similarity index 100% rename from WordPressKit/RemotePerson.swift rename to Sources/WordPressKit/Models/RemotePerson.swift diff --git a/WordPressKit/RemotePlan_ApiVersion1_3.swift b/Sources/WordPressKit/Models/RemotePlan_ApiVersion1_3.swift similarity index 100% rename from WordPressKit/RemotePlan_ApiVersion1_3.swift rename to Sources/WordPressKit/Models/RemotePlan_ApiVersion1_3.swift diff --git a/WordPressKit/RemotePost.h b/Sources/WordPressKit/Models/RemotePost.h similarity index 100% rename from WordPressKit/RemotePost.h rename to Sources/WordPressKit/Models/RemotePost.h diff --git a/WordPressKit/RemotePost.m b/Sources/WordPressKit/Models/RemotePost.m similarity index 100% rename from WordPressKit/RemotePost.m rename to Sources/WordPressKit/Models/RemotePost.m diff --git a/WordPressKit/RemotePostAutosave.swift b/Sources/WordPressKit/Models/RemotePostAutosave.swift similarity index 100% rename from WordPressKit/RemotePostAutosave.swift rename to Sources/WordPressKit/Models/RemotePostAutosave.swift diff --git a/WordPressKit/RemotePostCategory.h b/Sources/WordPressKit/Models/RemotePostCategory.h similarity index 100% rename from WordPressKit/RemotePostCategory.h rename to Sources/WordPressKit/Models/RemotePostCategory.h diff --git a/WordPressKit/RemotePostCategory.m b/Sources/WordPressKit/Models/RemotePostCategory.m similarity index 100% rename from WordPressKit/RemotePostCategory.m rename to Sources/WordPressKit/Models/RemotePostCategory.m diff --git a/WordPressKit/RemotePostParameters.swift b/Sources/WordPressKit/Models/RemotePostParameters.swift similarity index 100% rename from WordPressKit/RemotePostParameters.swift rename to Sources/WordPressKit/Models/RemotePostParameters.swift diff --git a/WordPressKit/RemotePostTag.h b/Sources/WordPressKit/Models/RemotePostTag.h similarity index 100% rename from WordPressKit/RemotePostTag.h rename to Sources/WordPressKit/Models/RemotePostTag.h diff --git a/WordPressKit/RemotePostTag.m b/Sources/WordPressKit/Models/RemotePostTag.m similarity index 100% rename from WordPressKit/RemotePostTag.m rename to Sources/WordPressKit/Models/RemotePostTag.m diff --git a/WordPressKit/RemotePostType.h b/Sources/WordPressKit/Models/RemotePostType.h similarity index 100% rename from WordPressKit/RemotePostType.h rename to Sources/WordPressKit/Models/RemotePostType.h diff --git a/WordPressKit/RemotePostType.m b/Sources/WordPressKit/Models/RemotePostType.m similarity index 100% rename from WordPressKit/RemotePostType.m rename to Sources/WordPressKit/Models/RemotePostType.m diff --git a/WordPressKit/RemoteProfile.swift b/Sources/WordPressKit/Models/RemoteProfile.swift similarity index 100% rename from WordPressKit/RemoteProfile.swift rename to Sources/WordPressKit/Models/RemoteProfile.swift diff --git a/WordPressKit/RemotePublicizeConnection.swift b/Sources/WordPressKit/Models/RemotePublicizeConnection.swift similarity index 100% rename from WordPressKit/RemotePublicizeConnection.swift rename to Sources/WordPressKit/Models/RemotePublicizeConnection.swift diff --git a/WordPressKit/RemotePublicizeInfo.swift b/Sources/WordPressKit/Models/RemotePublicizeInfo.swift similarity index 100% rename from WordPressKit/RemotePublicizeInfo.swift rename to Sources/WordPressKit/Models/RemotePublicizeInfo.swift diff --git a/WordPressKit/RemotePublicizeService.swift b/Sources/WordPressKit/Models/RemotePublicizeService.swift similarity index 100% rename from WordPressKit/RemotePublicizeService.swift rename to Sources/WordPressKit/Models/RemotePublicizeService.swift diff --git a/WordPressKit/RemoteReaderCard.swift b/Sources/WordPressKit/Models/RemoteReaderCard.swift similarity index 100% rename from WordPressKit/RemoteReaderCard.swift rename to Sources/WordPressKit/Models/RemoteReaderCard.swift diff --git a/WordPressKit/RemoteReaderCrossPostMeta.swift b/Sources/WordPressKit/Models/RemoteReaderCrossPostMeta.swift similarity index 100% rename from WordPressKit/RemoteReaderCrossPostMeta.swift rename to Sources/WordPressKit/Models/RemoteReaderCrossPostMeta.swift diff --git a/WordPressKit/RemoteReaderInterest.swift b/Sources/WordPressKit/Models/RemoteReaderInterest.swift similarity index 100% rename from WordPressKit/RemoteReaderInterest.swift rename to Sources/WordPressKit/Models/RemoteReaderInterest.swift diff --git a/WordPressKit/RemoteReaderPost.h b/Sources/WordPressKit/Models/RemoteReaderPost.h similarity index 100% rename from WordPressKit/RemoteReaderPost.h rename to Sources/WordPressKit/Models/RemoteReaderPost.h diff --git a/WordPressKit/RemoteReaderPost.m b/Sources/WordPressKit/Models/RemoteReaderPost.m similarity index 100% rename from WordPressKit/RemoteReaderPost.m rename to Sources/WordPressKit/Models/RemoteReaderPost.m diff --git a/WordPressKit/RemoteReaderPost.swift b/Sources/WordPressKit/Models/RemoteReaderPost.swift similarity index 100% rename from WordPressKit/RemoteReaderPost.swift rename to Sources/WordPressKit/Models/RemoteReaderPost.swift diff --git a/WordPressKit/RemoteReaderSimplePost.swift b/Sources/WordPressKit/Models/RemoteReaderSimplePost.swift similarity index 100% rename from WordPressKit/RemoteReaderSimplePost.swift rename to Sources/WordPressKit/Models/RemoteReaderSimplePost.swift diff --git a/WordPressKit/RemoteReaderSite.swift b/Sources/WordPressKit/Models/RemoteReaderSite.swift similarity index 100% rename from WordPressKit/RemoteReaderSite.swift rename to Sources/WordPressKit/Models/RemoteReaderSite.swift diff --git a/WordPressKit/RemoteReaderSiteInfo.swift b/Sources/WordPressKit/Models/RemoteReaderSiteInfo.swift similarity index 100% rename from WordPressKit/RemoteReaderSiteInfo.swift rename to Sources/WordPressKit/Models/RemoteReaderSiteInfo.swift diff --git a/WordPressKit/RemoteReaderSiteInfoSubscription.swift b/Sources/WordPressKit/Models/RemoteReaderSiteInfoSubscription.swift similarity index 100% rename from WordPressKit/RemoteReaderSiteInfoSubscription.swift rename to Sources/WordPressKit/Models/RemoteReaderSiteInfoSubscription.swift diff --git a/WordPressKit/RemoteReaderTopic.swift b/Sources/WordPressKit/Models/RemoteReaderTopic.swift similarity index 100% rename from WordPressKit/RemoteReaderTopic.swift rename to Sources/WordPressKit/Models/RemoteReaderTopic.swift diff --git a/WordPressKit/RemoteShareAppContent.swift b/Sources/WordPressKit/Models/RemoteShareAppContent.swift similarity index 100% rename from WordPressKit/RemoteShareAppContent.swift rename to Sources/WordPressKit/Models/RemoteShareAppContent.swift diff --git a/WordPressKit/RemoteSharingButton.swift b/Sources/WordPressKit/Models/RemoteSharingButton.swift similarity index 100% rename from WordPressKit/RemoteSharingButton.swift rename to Sources/WordPressKit/Models/RemoteSharingButton.swift diff --git a/WordPressKit/RemoteSiteDesign.swift b/Sources/WordPressKit/Models/RemoteSiteDesign.swift similarity index 100% rename from WordPressKit/RemoteSiteDesign.swift rename to Sources/WordPressKit/Models/RemoteSiteDesign.swift diff --git a/WordPressKit/RemoteSourcePostAttribution.h b/Sources/WordPressKit/Models/RemoteSourcePostAttribution.h similarity index 100% rename from WordPressKit/RemoteSourcePostAttribution.h rename to Sources/WordPressKit/Models/RemoteSourcePostAttribution.h diff --git a/WordPressKit/RemoteSourcePostAttribution.m b/Sources/WordPressKit/Models/RemoteSourcePostAttribution.m similarity index 100% rename from WordPressKit/RemoteSourcePostAttribution.m rename to Sources/WordPressKit/Models/RemoteSourcePostAttribution.m diff --git a/WordPressKit/RemoteTaxonomyPaging.h b/Sources/WordPressKit/Models/RemoteTaxonomyPaging.h similarity index 100% rename from WordPressKit/RemoteTaxonomyPaging.h rename to Sources/WordPressKit/Models/RemoteTaxonomyPaging.h diff --git a/WordPressKit/RemoteTaxonomyPaging.m b/Sources/WordPressKit/Models/RemoteTaxonomyPaging.m similarity index 100% rename from WordPressKit/RemoteTaxonomyPaging.m rename to Sources/WordPressKit/Models/RemoteTaxonomyPaging.m diff --git a/WordPressKit/RemoteTheme.h b/Sources/WordPressKit/Models/RemoteTheme.h similarity index 100% rename from WordPressKit/RemoteTheme.h rename to Sources/WordPressKit/Models/RemoteTheme.h diff --git a/WordPressKit/RemoteTheme.m b/Sources/WordPressKit/Models/RemoteTheme.m similarity index 100% rename from WordPressKit/RemoteTheme.m rename to Sources/WordPressKit/Models/RemoteTheme.m diff --git a/WordPressKit/RemoteUser+Likes.swift b/Sources/WordPressKit/Models/RemoteUser+Likes.swift similarity index 100% rename from WordPressKit/RemoteUser+Likes.swift rename to Sources/WordPressKit/Models/RemoteUser+Likes.swift diff --git a/WordPressKit/RemoteUser.h b/Sources/WordPressKit/Models/RemoteUser.h similarity index 100% rename from WordPressKit/RemoteUser.h rename to Sources/WordPressKit/Models/RemoteUser.h diff --git a/WordPressKit/RemoteUser.m b/Sources/WordPressKit/Models/RemoteUser.m similarity index 100% rename from WordPressKit/RemoteUser.m rename to Sources/WordPressKit/Models/RemoteUser.m diff --git a/WordPressKit/RemoteVideoPressVideo.swift b/Sources/WordPressKit/Models/RemoteVideoPressVideo.swift similarity index 100% rename from WordPressKit/RemoteVideoPressVideo.swift rename to Sources/WordPressKit/Models/RemoteVideoPressVideo.swift diff --git a/WordPressKit/RemoteWpcomPlan.swift b/Sources/WordPressKit/Models/RemoteWpcomPlan.swift similarity index 100% rename from WordPressKit/RemoteWpcomPlan.swift rename to Sources/WordPressKit/Models/RemoteWpcomPlan.swift diff --git a/WordPressKit/RemoteDiff.swift b/Sources/WordPressKit/Models/Revisions/RemoteDiff.swift similarity index 100% rename from WordPressKit/RemoteDiff.swift rename to Sources/WordPressKit/Models/Revisions/RemoteDiff.swift diff --git a/WordPressKit/RemoteRevision.swift b/Sources/WordPressKit/Models/Revisions/RemoteRevision.swift similarity index 100% rename from WordPressKit/RemoteRevision.swift rename to Sources/WordPressKit/Models/Revisions/RemoteRevision.swift diff --git a/WordPressKit/SessionDetails.swift b/Sources/WordPressKit/Models/SessionDetails.swift similarity index 100% rename from WordPressKit/SessionDetails.swift rename to Sources/WordPressKit/Models/SessionDetails.swift diff --git a/WordPressKit/SocialLogin2FANonceInfo.swift b/Sources/WordPressKit/Models/SocialLogin2FANonceInfo.swift similarity index 100% rename from WordPressKit/SocialLogin2FANonceInfo.swift rename to Sources/WordPressKit/Models/SocialLogin2FANonceInfo.swift diff --git a/WordPressKit/Insights/StatsAllAnnualInsight.swift b/Sources/WordPressKit/Models/Stats/Insights/StatsAllAnnualInsight.swift similarity index 100% rename from WordPressKit/Insights/StatsAllAnnualInsight.swift rename to Sources/WordPressKit/Models/Stats/Insights/StatsAllAnnualInsight.swift diff --git a/WordPressKit/Insights/StatsAllTimesInsight.swift b/Sources/WordPressKit/Models/Stats/Insights/StatsAllTimesInsight.swift similarity index 100% rename from WordPressKit/Insights/StatsAllTimesInsight.swift rename to Sources/WordPressKit/Models/Stats/Insights/StatsAllTimesInsight.swift diff --git a/WordPressKit/Insights/StatsAnnualAndMostPopularTimeInsight.swift b/Sources/WordPressKit/Models/Stats/Insights/StatsAnnualAndMostPopularTimeInsight.swift similarity index 100% rename from WordPressKit/Insights/StatsAnnualAndMostPopularTimeInsight.swift rename to Sources/WordPressKit/Models/Stats/Insights/StatsAnnualAndMostPopularTimeInsight.swift diff --git a/WordPressKit/Insights/StatsCommentsInsight.swift b/Sources/WordPressKit/Models/Stats/Insights/StatsCommentsInsight.swift similarity index 100% rename from WordPressKit/Insights/StatsCommentsInsight.swift rename to Sources/WordPressKit/Models/Stats/Insights/StatsCommentsInsight.swift diff --git a/WordPressKit/Insights/StatsDotComFollowersInsight.swift b/Sources/WordPressKit/Models/Stats/Insights/StatsDotComFollowersInsight.swift similarity index 100% rename from WordPressKit/Insights/StatsDotComFollowersInsight.swift rename to Sources/WordPressKit/Models/Stats/Insights/StatsDotComFollowersInsight.swift diff --git a/WordPressKit/Insights/StatsEmailFollowersInsight.swift b/Sources/WordPressKit/Models/Stats/Insights/StatsEmailFollowersInsight.swift similarity index 100% rename from WordPressKit/Insights/StatsEmailFollowersInsight.swift rename to Sources/WordPressKit/Models/Stats/Insights/StatsEmailFollowersInsight.swift diff --git a/WordPressKit/Insights/StatsLastPostInsight.swift b/Sources/WordPressKit/Models/Stats/Insights/StatsLastPostInsight.swift similarity index 100% rename from WordPressKit/Insights/StatsLastPostInsight.swift rename to Sources/WordPressKit/Models/Stats/Insights/StatsLastPostInsight.swift diff --git a/WordPressKit/Insights/StatsPostingStreakInsight.swift b/Sources/WordPressKit/Models/Stats/Insights/StatsPostingStreakInsight.swift similarity index 100% rename from WordPressKit/Insights/StatsPostingStreakInsight.swift rename to Sources/WordPressKit/Models/Stats/Insights/StatsPostingStreakInsight.swift diff --git a/WordPressKit/Insights/StatsPublicizeInsight.swift b/Sources/WordPressKit/Models/Stats/Insights/StatsPublicizeInsight.swift similarity index 100% rename from WordPressKit/Insights/StatsPublicizeInsight.swift rename to Sources/WordPressKit/Models/Stats/Insights/StatsPublicizeInsight.swift diff --git a/WordPressKit/Insights/StatsTagsAndCategoriesInsight.swift b/Sources/WordPressKit/Models/Stats/Insights/StatsTagsAndCategoriesInsight.swift similarity index 100% rename from WordPressKit/Insights/StatsTagsAndCategoriesInsight.swift rename to Sources/WordPressKit/Models/Stats/Insights/StatsTagsAndCategoriesInsight.swift diff --git a/WordPressKit/Insights/StatsTodayInsight.swift b/Sources/WordPressKit/Models/Stats/Insights/StatsTodayInsight.swift similarity index 100% rename from WordPressKit/Insights/StatsTodayInsight.swift rename to Sources/WordPressKit/Models/Stats/Insights/StatsTodayInsight.swift diff --git a/WordPressKit/StatsPostDetails.swift b/Sources/WordPressKit/Models/Stats/StatsPostDetails.swift similarity index 100% rename from WordPressKit/StatsPostDetails.swift rename to Sources/WordPressKit/Models/Stats/StatsPostDetails.swift diff --git a/WordPressKit/Time Interval/StatsFileDownloadsTimeIntervalData.swift b/Sources/WordPressKit/Models/Stats/Time Interval/StatsFileDownloadsTimeIntervalData.swift similarity index 100% rename from WordPressKit/Time Interval/StatsFileDownloadsTimeIntervalData.swift rename to Sources/WordPressKit/Models/Stats/Time Interval/StatsFileDownloadsTimeIntervalData.swift diff --git a/WordPressKit/Time Interval/StatsPublishedPostsTimeIntervalData.swift b/Sources/WordPressKit/Models/Stats/Time Interval/StatsPublishedPostsTimeIntervalData.swift similarity index 100% rename from WordPressKit/Time Interval/StatsPublishedPostsTimeIntervalData.swift rename to Sources/WordPressKit/Models/Stats/Time Interval/StatsPublishedPostsTimeIntervalData.swift diff --git a/WordPressKit/Time Interval/StatsSearchTermTimeIntervalData.swift b/Sources/WordPressKit/Models/Stats/Time Interval/StatsSearchTermTimeIntervalData.swift similarity index 100% rename from WordPressKit/Time Interval/StatsSearchTermTimeIntervalData.swift rename to Sources/WordPressKit/Models/Stats/Time Interval/StatsSearchTermTimeIntervalData.swift diff --git a/WordPressKit/Time Interval/StatsSummaryTimeIntervalData.swift b/Sources/WordPressKit/Models/Stats/Time Interval/StatsSummaryTimeIntervalData.swift similarity index 100% rename from WordPressKit/Time Interval/StatsSummaryTimeIntervalData.swift rename to Sources/WordPressKit/Models/Stats/Time Interval/StatsSummaryTimeIntervalData.swift diff --git a/WordPressKit/Time Interval/StatsTopAuthorsTimeIntervalData.swift b/Sources/WordPressKit/Models/Stats/Time Interval/StatsTopAuthorsTimeIntervalData.swift similarity index 100% rename from WordPressKit/Time Interval/StatsTopAuthorsTimeIntervalData.swift rename to Sources/WordPressKit/Models/Stats/Time Interval/StatsTopAuthorsTimeIntervalData.swift diff --git a/WordPressKit/Time Interval/StatsTopClicksTimeIntervalData.swift b/Sources/WordPressKit/Models/Stats/Time Interval/StatsTopClicksTimeIntervalData.swift similarity index 100% rename from WordPressKit/Time Interval/StatsTopClicksTimeIntervalData.swift rename to Sources/WordPressKit/Models/Stats/Time Interval/StatsTopClicksTimeIntervalData.swift diff --git a/WordPressKit/Time Interval/StatsTopCountryTimeIntervalData.swift b/Sources/WordPressKit/Models/Stats/Time Interval/StatsTopCountryTimeIntervalData.swift similarity index 100% rename from WordPressKit/Time Interval/StatsTopCountryTimeIntervalData.swift rename to Sources/WordPressKit/Models/Stats/Time Interval/StatsTopCountryTimeIntervalData.swift diff --git a/WordPressKit/Time Interval/StatsTopPostsTimeIntervalData.swift b/Sources/WordPressKit/Models/Stats/Time Interval/StatsTopPostsTimeIntervalData.swift similarity index 100% rename from WordPressKit/Time Interval/StatsTopPostsTimeIntervalData.swift rename to Sources/WordPressKit/Models/Stats/Time Interval/StatsTopPostsTimeIntervalData.swift diff --git a/WordPressKit/Time Interval/StatsTopReferrersTimeIntervalData.swift b/Sources/WordPressKit/Models/Stats/Time Interval/StatsTopReferrersTimeIntervalData.swift similarity index 100% rename from WordPressKit/Time Interval/StatsTopReferrersTimeIntervalData.swift rename to Sources/WordPressKit/Models/Stats/Time Interval/StatsTopReferrersTimeIntervalData.swift diff --git a/WordPressKit/Time Interval/StatsTopVideosTimeIntervalData.swift b/Sources/WordPressKit/Models/Stats/Time Interval/StatsTopVideosTimeIntervalData.swift similarity index 100% rename from WordPressKit/Time Interval/StatsTopVideosTimeIntervalData.swift rename to Sources/WordPressKit/Models/Stats/Time Interval/StatsTopVideosTimeIntervalData.swift diff --git a/WordPressKit/Time Interval/StatsTotalsSummaryData.swift b/Sources/WordPressKit/Models/Stats/Time Interval/StatsTotalsSummaryData.swift similarity index 100% rename from WordPressKit/Time Interval/StatsTotalsSummaryData.swift rename to Sources/WordPressKit/Models/Stats/Time Interval/StatsTotalsSummaryData.swift diff --git a/WordPressKit/WPCountry.swift b/Sources/WordPressKit/Models/WPCountry.swift similarity index 100% rename from WordPressKit/WPCountry.swift rename to Sources/WordPressKit/Models/WPCountry.swift diff --git a/WordPressKit/WPState.swift b/Sources/WordPressKit/Models/WPState.swift similarity index 100% rename from WordPressKit/WPState.swift rename to Sources/WordPressKit/Models/WPState.swift diff --git a/WordPressKit/WPTimeZone.swift b/Sources/WordPressKit/Models/WPTimeZone.swift similarity index 100% rename from WordPressKit/WPTimeZone.swift rename to Sources/WordPressKit/Models/WPTimeZone.swift diff --git a/WordPressKit/WebauthChallengeInfo.swift b/Sources/WordPressKit/Models/WebauthChallengeInfo.swift similarity index 100% rename from WordPressKit/WebauthChallengeInfo.swift rename to Sources/WordPressKit/Models/WebauthChallengeInfo.swift diff --git a/WordPressKit/Private/WPKit-Swift.h b/Sources/WordPressKit/Private/WPKit-Swift.h similarity index 100% rename from WordPressKit/Private/WPKit-Swift.h rename to Sources/WordPressKit/Private/WPKit-Swift.h diff --git a/WordPressKit/AccountServiceRemote.h b/Sources/WordPressKit/Services/AccountServiceRemote.h similarity index 100% rename from WordPressKit/AccountServiceRemote.h rename to Sources/WordPressKit/Services/AccountServiceRemote.h diff --git a/WordPressKit/AccountServiceRemoteREST+SocialService.swift b/Sources/WordPressKit/Services/AccountServiceRemoteREST+SocialService.swift similarity index 100% rename from WordPressKit/AccountServiceRemoteREST+SocialService.swift rename to Sources/WordPressKit/Services/AccountServiceRemoteREST+SocialService.swift diff --git a/WordPressKit/AccountServiceRemoteREST.h b/Sources/WordPressKit/Services/AccountServiceRemoteREST.h similarity index 100% rename from WordPressKit/AccountServiceRemoteREST.h rename to Sources/WordPressKit/Services/AccountServiceRemoteREST.h diff --git a/WordPressKit/AccountServiceRemoteREST.m b/Sources/WordPressKit/Services/AccountServiceRemoteREST.m similarity index 100% rename from WordPressKit/AccountServiceRemoteREST.m rename to Sources/WordPressKit/Services/AccountServiceRemoteREST.m diff --git a/WordPressKit/AccountSettingsRemote.swift b/Sources/WordPressKit/Services/AccountSettingsRemote.swift similarity index 100% rename from WordPressKit/AccountSettingsRemote.swift rename to Sources/WordPressKit/Services/AccountSettingsRemote.swift diff --git a/WordPressKit/ActivityServiceRemote.swift b/Sources/WordPressKit/Services/ActivityServiceRemote.swift similarity index 100% rename from WordPressKit/ActivityServiceRemote.swift rename to Sources/WordPressKit/Services/ActivityServiceRemote.swift diff --git a/WordPressKit/ActivityServiceRemote_ApiVersion1_0.swift b/Sources/WordPressKit/Services/ActivityServiceRemote_ApiVersion1_0.swift similarity index 100% rename from WordPressKit/ActivityServiceRemote_ApiVersion1_0.swift rename to Sources/WordPressKit/Services/ActivityServiceRemote_ApiVersion1_0.swift diff --git a/WordPressKit/AnnouncementServiceRemote.swift b/Sources/WordPressKit/Services/AnnouncementServiceRemote.swift similarity index 100% rename from WordPressKit/AnnouncementServiceRemote.swift rename to Sources/WordPressKit/Services/AnnouncementServiceRemote.swift diff --git a/WordPressKit/AtomicAuthenticationServiceRemote.swift b/Sources/WordPressKit/Services/AtomicAuthenticationServiceRemote.swift similarity index 100% rename from WordPressKit/AtomicAuthenticationServiceRemote.swift rename to Sources/WordPressKit/Services/AtomicAuthenticationServiceRemote.swift diff --git a/WordPressKit/AtomicSiteServiceRemote.swift b/Sources/WordPressKit/Services/AtomicSiteServiceRemote.swift similarity index 100% rename from WordPressKit/AtomicSiteServiceRemote.swift rename to Sources/WordPressKit/Services/AtomicSiteServiceRemote.swift diff --git a/WordPressKit/AutomatedTransferService.swift b/Sources/WordPressKit/Services/AutomatedTransferService.swift similarity index 100% rename from WordPressKit/AutomatedTransferService.swift rename to Sources/WordPressKit/Services/AutomatedTransferService.swift diff --git a/WordPressKit/BlazeServiceRemote.swift b/Sources/WordPressKit/Services/BlazeServiceRemote.swift similarity index 100% rename from WordPressKit/BlazeServiceRemote.swift rename to Sources/WordPressKit/Services/BlazeServiceRemote.swift diff --git a/WordPressKit/BlockEditorSettingsServiceRemote.swift b/Sources/WordPressKit/Services/BlockEditorSettingsServiceRemote.swift similarity index 100% rename from WordPressKit/BlockEditorSettingsServiceRemote.swift rename to Sources/WordPressKit/Services/BlockEditorSettingsServiceRemote.swift diff --git a/WordPressKit/BlogJetpackSettingsServiceRemote.swift b/Sources/WordPressKit/Services/BlogJetpackSettingsServiceRemote.swift similarity index 100% rename from WordPressKit/BlogJetpackSettingsServiceRemote.swift rename to Sources/WordPressKit/Services/BlogJetpackSettingsServiceRemote.swift diff --git a/WordPressKit/BlogServiceRemote.h b/Sources/WordPressKit/Services/BlogServiceRemote.h similarity index 100% rename from WordPressKit/BlogServiceRemote.h rename to Sources/WordPressKit/Services/BlogServiceRemote.h diff --git a/WordPressKit/BlogServiceRemoteREST.h b/Sources/WordPressKit/Services/BlogServiceRemoteREST.h similarity index 100% rename from WordPressKit/BlogServiceRemoteREST.h rename to Sources/WordPressKit/Services/BlogServiceRemoteREST.h diff --git a/WordPressKit/BlogServiceRemoteREST.m b/Sources/WordPressKit/Services/BlogServiceRemoteREST.m similarity index 100% rename from WordPressKit/BlogServiceRemoteREST.m rename to Sources/WordPressKit/Services/BlogServiceRemoteREST.m diff --git a/WordPressKit/BlogServiceRemoteXMLRPC.h b/Sources/WordPressKit/Services/BlogServiceRemoteXMLRPC.h similarity index 100% rename from WordPressKit/BlogServiceRemoteXMLRPC.h rename to Sources/WordPressKit/Services/BlogServiceRemoteXMLRPC.h diff --git a/WordPressKit/BlogServiceRemoteXMLRPC.m b/Sources/WordPressKit/Services/BlogServiceRemoteXMLRPC.m similarity index 100% rename from WordPressKit/BlogServiceRemoteXMLRPC.m rename to Sources/WordPressKit/Services/BlogServiceRemoteXMLRPC.m diff --git a/WordPressKit/BloggingPromptsServiceRemote.swift b/Sources/WordPressKit/Services/BloggingPromptsServiceRemote.swift similarity index 100% rename from WordPressKit/BloggingPromptsServiceRemote.swift rename to Sources/WordPressKit/Services/BloggingPromptsServiceRemote.swift diff --git a/WordPressKit/CommentServiceRemote.h b/Sources/WordPressKit/Services/CommentServiceRemote.h similarity index 100% rename from WordPressKit/CommentServiceRemote.h rename to Sources/WordPressKit/Services/CommentServiceRemote.h diff --git a/WordPressKit/CommentServiceRemoteREST+ApiV2.swift b/Sources/WordPressKit/Services/CommentServiceRemoteREST+ApiV2.swift similarity index 100% rename from WordPressKit/CommentServiceRemoteREST+ApiV2.swift rename to Sources/WordPressKit/Services/CommentServiceRemoteREST+ApiV2.swift diff --git a/WordPressKit/CommentServiceRemoteREST.h b/Sources/WordPressKit/Services/CommentServiceRemoteREST.h similarity index 100% rename from WordPressKit/CommentServiceRemoteREST.h rename to Sources/WordPressKit/Services/CommentServiceRemoteREST.h diff --git a/WordPressKit/CommentServiceRemoteREST.m b/Sources/WordPressKit/Services/CommentServiceRemoteREST.m similarity index 100% rename from WordPressKit/CommentServiceRemoteREST.m rename to Sources/WordPressKit/Services/CommentServiceRemoteREST.m diff --git a/WordPressKit/CommentServiceRemoteXMLRPC.h b/Sources/WordPressKit/Services/CommentServiceRemoteXMLRPC.h similarity index 100% rename from WordPressKit/CommentServiceRemoteXMLRPC.h rename to Sources/WordPressKit/Services/CommentServiceRemoteXMLRPC.h diff --git a/WordPressKit/CommentServiceRemoteXMLRPC.m b/Sources/WordPressKit/Services/CommentServiceRemoteXMLRPC.m similarity index 100% rename from WordPressKit/CommentServiceRemoteXMLRPC.m rename to Sources/WordPressKit/Services/CommentServiceRemoteXMLRPC.m diff --git a/WordPressKit/DashboardServiceRemote.swift b/Sources/WordPressKit/Services/DashboardServiceRemote.swift similarity index 100% rename from WordPressKit/DashboardServiceRemote.swift rename to Sources/WordPressKit/Services/DashboardServiceRemote.swift diff --git a/WordPressKit/Domains/DomainsServiceRemote+AllDomains.swift b/Sources/WordPressKit/Services/Domains/DomainsServiceRemote+AllDomains.swift similarity index 100% rename from WordPressKit/Domains/DomainsServiceRemote+AllDomains.swift rename to Sources/WordPressKit/Services/Domains/DomainsServiceRemote+AllDomains.swift diff --git a/WordPressKit/Domains/DomainsServiceRemote.swift b/Sources/WordPressKit/Services/Domains/DomainsServiceRemote.swift similarity index 100% rename from WordPressKit/Domains/DomainsServiceRemote.swift rename to Sources/WordPressKit/Services/Domains/DomainsServiceRemote.swift diff --git a/WordPressKit/EditorServiceRemote.swift b/Sources/WordPressKit/Services/EditorServiceRemote.swift similarity index 100% rename from WordPressKit/EditorServiceRemote.swift rename to Sources/WordPressKit/Services/EditorServiceRemote.swift diff --git a/WordPressKit/FeatureFlagRemote.swift b/Sources/WordPressKit/Services/FeatureFlagRemote.swift similarity index 100% rename from WordPressKit/FeatureFlagRemote.swift rename to Sources/WordPressKit/Services/FeatureFlagRemote.swift diff --git a/WordPressKit/GravatarServiceRemote.swift b/Sources/WordPressKit/Services/GravatarServiceRemote.swift similarity index 100% rename from WordPressKit/GravatarServiceRemote.swift rename to Sources/WordPressKit/Services/GravatarServiceRemote.swift diff --git a/WordPressKit/HomepageSettingsServiceRemote.swift b/Sources/WordPressKit/Services/HomepageSettingsServiceRemote.swift similarity index 100% rename from WordPressKit/HomepageSettingsServiceRemote.swift rename to Sources/WordPressKit/Services/HomepageSettingsServiceRemote.swift diff --git a/WordPressKit/IPLocationRemote.swift b/Sources/WordPressKit/Services/IPLocationRemote.swift similarity index 100% rename from WordPressKit/IPLocationRemote.swift rename to Sources/WordPressKit/Services/IPLocationRemote.swift diff --git a/WordPressKit/JSONDecoderExtension.swift b/Sources/WordPressKit/Services/JSONDecoderExtension.swift similarity index 100% rename from WordPressKit/JSONDecoderExtension.swift rename to Sources/WordPressKit/Services/JSONDecoderExtension.swift diff --git a/WordPressKit/JetpackBackupServiceRemote.swift b/Sources/WordPressKit/Services/JetpackBackupServiceRemote.swift similarity index 100% rename from WordPressKit/JetpackBackupServiceRemote.swift rename to Sources/WordPressKit/Services/JetpackBackupServiceRemote.swift diff --git a/WordPressKit/JetpackCapabilitiesServiceRemote.swift b/Sources/WordPressKit/Services/JetpackCapabilitiesServiceRemote.swift similarity index 100% rename from WordPressKit/JetpackCapabilitiesServiceRemote.swift rename to Sources/WordPressKit/Services/JetpackCapabilitiesServiceRemote.swift diff --git a/WordPressKit/JetpackProxyServiceRemote.swift b/Sources/WordPressKit/Services/JetpackProxyServiceRemote.swift similarity index 100% rename from WordPressKit/JetpackProxyServiceRemote.swift rename to Sources/WordPressKit/Services/JetpackProxyServiceRemote.swift diff --git a/WordPressKit/JetpackScanServiceRemote.swift b/Sources/WordPressKit/Services/JetpackScanServiceRemote.swift similarity index 100% rename from WordPressKit/JetpackScanServiceRemote.swift rename to Sources/WordPressKit/Services/JetpackScanServiceRemote.swift diff --git a/WordPressKit/JetpackServiceRemote.swift b/Sources/WordPressKit/Services/JetpackServiceRemote.swift similarity index 100% rename from WordPressKit/JetpackServiceRemote.swift rename to Sources/WordPressKit/Services/JetpackServiceRemote.swift diff --git a/WordPressKit/JetpackSocialServiceRemote.swift b/Sources/WordPressKit/Services/JetpackSocialServiceRemote.swift similarity index 100% rename from WordPressKit/JetpackSocialServiceRemote.swift rename to Sources/WordPressKit/Services/JetpackSocialServiceRemote.swift diff --git a/WordPressKit/MediaServiceRemote.h b/Sources/WordPressKit/Services/MediaServiceRemote.h similarity index 100% rename from WordPressKit/MediaServiceRemote.h rename to Sources/WordPressKit/Services/MediaServiceRemote.h diff --git a/WordPressKit/MediaServiceRemoteREST.h b/Sources/WordPressKit/Services/MediaServiceRemoteREST.h similarity index 100% rename from WordPressKit/MediaServiceRemoteREST.h rename to Sources/WordPressKit/Services/MediaServiceRemoteREST.h diff --git a/WordPressKit/MediaServiceRemoteREST.m b/Sources/WordPressKit/Services/MediaServiceRemoteREST.m similarity index 100% rename from WordPressKit/MediaServiceRemoteREST.m rename to Sources/WordPressKit/Services/MediaServiceRemoteREST.m diff --git a/WordPressKit/MediaServiceRemoteXMLRPC.h b/Sources/WordPressKit/Services/MediaServiceRemoteXMLRPC.h similarity index 100% rename from WordPressKit/MediaServiceRemoteXMLRPC.h rename to Sources/WordPressKit/Services/MediaServiceRemoteXMLRPC.h diff --git a/WordPressKit/MediaServiceRemoteXMLRPC.m b/Sources/WordPressKit/Services/MediaServiceRemoteXMLRPC.m similarity index 100% rename from WordPressKit/MediaServiceRemoteXMLRPC.m rename to Sources/WordPressKit/Services/MediaServiceRemoteXMLRPC.m diff --git a/WordPressKit/MenusServiceRemote.h b/Sources/WordPressKit/Services/MenusServiceRemote.h similarity index 100% rename from WordPressKit/MenusServiceRemote.h rename to Sources/WordPressKit/Services/MenusServiceRemote.h diff --git a/WordPressKit/MenusServiceRemote.m b/Sources/WordPressKit/Services/MenusServiceRemote.m similarity index 100% rename from WordPressKit/MenusServiceRemote.m rename to Sources/WordPressKit/Services/MenusServiceRemote.m diff --git a/WordPressKit/NotificationSettingsServiceRemote.swift b/Sources/WordPressKit/Services/NotificationSettingsServiceRemote.swift similarity index 100% rename from WordPressKit/NotificationSettingsServiceRemote.swift rename to Sources/WordPressKit/Services/NotificationSettingsServiceRemote.swift diff --git a/WordPressKit/NotificationSyncServiceRemote.swift b/Sources/WordPressKit/Services/NotificationSyncServiceRemote.swift similarity index 100% rename from WordPressKit/NotificationSyncServiceRemote.swift rename to Sources/WordPressKit/Services/NotificationSyncServiceRemote.swift diff --git a/WordPressKit/PageLayoutServiceRemote.swift b/Sources/WordPressKit/Services/PageLayoutServiceRemote.swift similarity index 100% rename from WordPressKit/PageLayoutServiceRemote.swift rename to Sources/WordPressKit/Services/PageLayoutServiceRemote.swift diff --git a/WordPressKit/PeopleServiceRemote.swift b/Sources/WordPressKit/Services/PeopleServiceRemote.swift similarity index 100% rename from WordPressKit/PeopleServiceRemote.swift rename to Sources/WordPressKit/Services/PeopleServiceRemote.swift diff --git a/WordPressKit/Plans/PlanServiceRemote.swift b/Sources/WordPressKit/Services/Plans/PlanServiceRemote.swift similarity index 100% rename from WordPressKit/Plans/PlanServiceRemote.swift rename to Sources/WordPressKit/Services/Plans/PlanServiceRemote.swift diff --git a/WordPressKit/Plans/PlanServiceRemote_ApiVersion1_3.swift b/Sources/WordPressKit/Services/Plans/PlanServiceRemote_ApiVersion1_3.swift similarity index 100% rename from WordPressKit/Plans/PlanServiceRemote_ApiVersion1_3.swift rename to Sources/WordPressKit/Services/Plans/PlanServiceRemote_ApiVersion1_3.swift diff --git a/WordPressKit/Plugin Management/JetpackPluginManagementClient.swift b/Sources/WordPressKit/Services/Plugin Management/JetpackPluginManagementClient.swift similarity index 100% rename from WordPressKit/Plugin Management/JetpackPluginManagementClient.swift rename to Sources/WordPressKit/Services/Plugin Management/JetpackPluginManagementClient.swift diff --git a/WordPressKit/Plugin Management/PluginManagementClient.swift b/Sources/WordPressKit/Services/Plugin Management/PluginManagementClient.swift similarity index 100% rename from WordPressKit/Plugin Management/PluginManagementClient.swift rename to Sources/WordPressKit/Services/Plugin Management/PluginManagementClient.swift diff --git a/WordPressKit/Plugin Management/SelfHostedPluginManagementClient.swift b/Sources/WordPressKit/Services/Plugin Management/SelfHostedPluginManagementClient.swift similarity index 100% rename from WordPressKit/Plugin Management/SelfHostedPluginManagementClient.swift rename to Sources/WordPressKit/Services/Plugin Management/SelfHostedPluginManagementClient.swift diff --git a/WordPressKit/PluginDirectoryServiceRemote.swift b/Sources/WordPressKit/Services/PluginDirectoryServiceRemote.swift similarity index 100% rename from WordPressKit/PluginDirectoryServiceRemote.swift rename to Sources/WordPressKit/Services/PluginDirectoryServiceRemote.swift diff --git a/WordPressKit/PluginServiceRemote.swift b/Sources/WordPressKit/Services/PluginServiceRemote.swift similarity index 100% rename from WordPressKit/PluginServiceRemote.swift rename to Sources/WordPressKit/Services/PluginServiceRemote.swift diff --git a/WordPressKit/PostServiceRemote.h b/Sources/WordPressKit/Services/PostServiceRemote.h similarity index 100% rename from WordPressKit/PostServiceRemote.h rename to Sources/WordPressKit/Services/PostServiceRemote.h diff --git a/WordPressKit/PostServiceRemoteExtended.swift b/Sources/WordPressKit/Services/PostServiceRemoteExtended.swift similarity index 100% rename from WordPressKit/PostServiceRemoteExtended.swift rename to Sources/WordPressKit/Services/PostServiceRemoteExtended.swift diff --git a/WordPressKit/PostServiceRemoteOptions.h b/Sources/WordPressKit/Services/PostServiceRemoteOptions.h similarity index 100% rename from WordPressKit/PostServiceRemoteOptions.h rename to Sources/WordPressKit/Services/PostServiceRemoteOptions.h diff --git a/WordPressKit/PostServiceRemoteREST+Extended.swift b/Sources/WordPressKit/Services/PostServiceRemoteREST+Extended.swift similarity index 100% rename from WordPressKit/PostServiceRemoteREST+Extended.swift rename to Sources/WordPressKit/Services/PostServiceRemoteREST+Extended.swift diff --git a/WordPressKit/PostServiceRemoteREST+Revisions.swift b/Sources/WordPressKit/Services/PostServiceRemoteREST+Revisions.swift similarity index 100% rename from WordPressKit/PostServiceRemoteREST+Revisions.swift rename to Sources/WordPressKit/Services/PostServiceRemoteREST+Revisions.swift diff --git a/WordPressKit/PostServiceRemoteREST.h b/Sources/WordPressKit/Services/PostServiceRemoteREST.h similarity index 100% rename from WordPressKit/PostServiceRemoteREST.h rename to Sources/WordPressKit/Services/PostServiceRemoteREST.h diff --git a/WordPressKit/PostServiceRemoteREST.m b/Sources/WordPressKit/Services/PostServiceRemoteREST.m similarity index 100% rename from WordPressKit/PostServiceRemoteREST.m rename to Sources/WordPressKit/Services/PostServiceRemoteREST.m diff --git a/WordPressKit/PostServiceRemoteXMLRPC+Extended.swift b/Sources/WordPressKit/Services/PostServiceRemoteXMLRPC+Extended.swift similarity index 100% rename from WordPressKit/PostServiceRemoteXMLRPC+Extended.swift rename to Sources/WordPressKit/Services/PostServiceRemoteXMLRPC+Extended.swift diff --git a/WordPressKit/PostServiceRemoteXMLRPC.h b/Sources/WordPressKit/Services/PostServiceRemoteXMLRPC.h similarity index 100% rename from WordPressKit/PostServiceRemoteXMLRPC.h rename to Sources/WordPressKit/Services/PostServiceRemoteXMLRPC.h diff --git a/WordPressKit/PostServiceRemoteXMLRPC.m b/Sources/WordPressKit/Services/PostServiceRemoteXMLRPC.m similarity index 100% rename from WordPressKit/PostServiceRemoteXMLRPC.m rename to Sources/WordPressKit/Services/PostServiceRemoteXMLRPC.m diff --git a/WordPressKit/ProductServiceRemote.swift b/Sources/WordPressKit/Services/ProductServiceRemote.swift similarity index 100% rename from WordPressKit/ProductServiceRemote.swift rename to Sources/WordPressKit/Services/ProductServiceRemote.swift diff --git a/WordPressKit/PushAuthenticationServiceRemote.swift b/Sources/WordPressKit/Services/PushAuthenticationServiceRemote.swift similarity index 100% rename from WordPressKit/PushAuthenticationServiceRemote.swift rename to Sources/WordPressKit/Services/PushAuthenticationServiceRemote.swift diff --git a/WordPressKit/QR Login/QRLoginServiceRemote.swift b/Sources/WordPressKit/Services/QR Login/QRLoginServiceRemote.swift similarity index 100% rename from WordPressKit/QR Login/QRLoginServiceRemote.swift rename to Sources/WordPressKit/Services/QR Login/QRLoginServiceRemote.swift diff --git a/WordPressKit/QR Login/QRLoginValidationResponse.swift b/Sources/WordPressKit/Services/QR Login/QRLoginValidationResponse.swift similarity index 100% rename from WordPressKit/QR Login/QRLoginValidationResponse.swift rename to Sources/WordPressKit/Services/QR Login/QRLoginValidationResponse.swift diff --git a/WordPressKit/ReaderPostServiceRemote+Cards.swift b/Sources/WordPressKit/Services/ReaderPostServiceRemote+Cards.swift similarity index 100% rename from WordPressKit/ReaderPostServiceRemote+Cards.swift rename to Sources/WordPressKit/Services/ReaderPostServiceRemote+Cards.swift diff --git a/WordPressKit/ReaderPostServiceRemote+RelatedPosts.swift b/Sources/WordPressKit/Services/ReaderPostServiceRemote+RelatedPosts.swift similarity index 100% rename from WordPressKit/ReaderPostServiceRemote+RelatedPosts.swift rename to Sources/WordPressKit/Services/ReaderPostServiceRemote+RelatedPosts.swift diff --git a/WordPressKit/ReaderPostServiceRemote+Subscriptions.swift b/Sources/WordPressKit/Services/ReaderPostServiceRemote+Subscriptions.swift similarity index 100% rename from WordPressKit/ReaderPostServiceRemote+Subscriptions.swift rename to Sources/WordPressKit/Services/ReaderPostServiceRemote+Subscriptions.swift diff --git a/WordPressKit/ReaderPostServiceRemote+V2.swift b/Sources/WordPressKit/Services/ReaderPostServiceRemote+V2.swift similarity index 100% rename from WordPressKit/ReaderPostServiceRemote+V2.swift rename to Sources/WordPressKit/Services/ReaderPostServiceRemote+V2.swift diff --git a/WordPressKit/ReaderPostServiceRemote.h b/Sources/WordPressKit/Services/ReaderPostServiceRemote.h similarity index 100% rename from WordPressKit/ReaderPostServiceRemote.h rename to Sources/WordPressKit/Services/ReaderPostServiceRemote.h diff --git a/WordPressKit/ReaderPostServiceRemote.m b/Sources/WordPressKit/Services/ReaderPostServiceRemote.m similarity index 100% rename from WordPressKit/ReaderPostServiceRemote.m rename to Sources/WordPressKit/Services/ReaderPostServiceRemote.m diff --git a/WordPressKit/ReaderServiceDeliveryFrequency.swift b/Sources/WordPressKit/Services/ReaderServiceDeliveryFrequency.swift similarity index 100% rename from WordPressKit/ReaderServiceDeliveryFrequency.swift rename to Sources/WordPressKit/Services/ReaderServiceDeliveryFrequency.swift diff --git a/WordPressKit/ReaderSiteSearchServiceRemote.swift b/Sources/WordPressKit/Services/ReaderSiteSearchServiceRemote.swift similarity index 100% rename from WordPressKit/ReaderSiteSearchServiceRemote.swift rename to Sources/WordPressKit/Services/ReaderSiteSearchServiceRemote.swift diff --git a/WordPressKit/ReaderSiteServiceRemote.h b/Sources/WordPressKit/Services/ReaderSiteServiceRemote.h similarity index 100% rename from WordPressKit/ReaderSiteServiceRemote.h rename to Sources/WordPressKit/Services/ReaderSiteServiceRemote.h diff --git a/WordPressKit/ReaderSiteServiceRemote.m b/Sources/WordPressKit/Services/ReaderSiteServiceRemote.m similarity index 100% rename from WordPressKit/ReaderSiteServiceRemote.m rename to Sources/WordPressKit/Services/ReaderSiteServiceRemote.m diff --git a/WordPressKit/ReaderTopicServiceError.swift b/Sources/WordPressKit/Services/ReaderTopicServiceError.swift similarity index 100% rename from WordPressKit/ReaderTopicServiceError.swift rename to Sources/WordPressKit/Services/ReaderTopicServiceError.swift diff --git a/WordPressKit/ReaderTopicServiceRemote+Interests.swift b/Sources/WordPressKit/Services/ReaderTopicServiceRemote+Interests.swift similarity index 100% rename from WordPressKit/ReaderTopicServiceRemote+Interests.swift rename to Sources/WordPressKit/Services/ReaderTopicServiceRemote+Interests.swift diff --git a/WordPressKit/ReaderTopicServiceRemote+Subscription.swift b/Sources/WordPressKit/Services/ReaderTopicServiceRemote+Subscription.swift similarity index 100% rename from WordPressKit/ReaderTopicServiceRemote+Subscription.swift rename to Sources/WordPressKit/Services/ReaderTopicServiceRemote+Subscription.swift diff --git a/WordPressKit/ReaderTopicServiceRemote.h b/Sources/WordPressKit/Services/ReaderTopicServiceRemote.h similarity index 100% rename from WordPressKit/ReaderTopicServiceRemote.h rename to Sources/WordPressKit/Services/ReaderTopicServiceRemote.h diff --git a/WordPressKit/ReaderTopicServiceRemote.m b/Sources/WordPressKit/Services/ReaderTopicServiceRemote.m similarity index 100% rename from WordPressKit/ReaderTopicServiceRemote.m rename to Sources/WordPressKit/Services/ReaderTopicServiceRemote.m diff --git a/WordPressKit/RemoteConfigRemote.swift b/Sources/WordPressKit/Services/RemoteConfigRemote.swift similarity index 100% rename from WordPressKit/RemoteConfigRemote.swift rename to Sources/WordPressKit/Services/RemoteConfigRemote.swift diff --git a/WordPressKit/ServiceRemoteWordPressComREST.h b/Sources/WordPressKit/Services/ServiceRemoteWordPressComREST.h similarity index 100% rename from WordPressKit/ServiceRemoteWordPressComREST.h rename to Sources/WordPressKit/Services/ServiceRemoteWordPressComREST.h diff --git a/WordPressKit/ServiceRemoteWordPressComREST.m b/Sources/WordPressKit/Services/ServiceRemoteWordPressComREST.m similarity index 100% rename from WordPressKit/ServiceRemoteWordPressComREST.m rename to Sources/WordPressKit/Services/ServiceRemoteWordPressComREST.m diff --git a/WordPressKit/ServiceRemoteWordPressXMLRPC.h b/Sources/WordPressKit/Services/ServiceRemoteWordPressXMLRPC.h similarity index 100% rename from WordPressKit/ServiceRemoteWordPressXMLRPC.h rename to Sources/WordPressKit/Services/ServiceRemoteWordPressXMLRPC.h diff --git a/WordPressKit/ServiceRemoteWordPressXMLRPC.m b/Sources/WordPressKit/Services/ServiceRemoteWordPressXMLRPC.m similarity index 100% rename from WordPressKit/ServiceRemoteWordPressXMLRPC.m rename to Sources/WordPressKit/Services/ServiceRemoteWordPressXMLRPC.m diff --git a/WordPressKit/ServiceRequest.swift b/Sources/WordPressKit/Services/ServiceRequest.swift similarity index 100% rename from WordPressKit/ServiceRequest.swift rename to Sources/WordPressKit/Services/ServiceRequest.swift diff --git a/WordPressKit/ShareAppContentServiceRemote.swift b/Sources/WordPressKit/Services/ShareAppContentServiceRemote.swift similarity index 100% rename from WordPressKit/ShareAppContentServiceRemote.swift rename to Sources/WordPressKit/Services/ShareAppContentServiceRemote.swift diff --git a/WordPressKit/SharingServiceRemote.swift b/Sources/WordPressKit/Services/SharingServiceRemote.swift similarity index 100% rename from WordPressKit/SharingServiceRemote.swift rename to Sources/WordPressKit/Services/SharingServiceRemote.swift diff --git a/WordPressKit/SiteDesignServiceRemote.swift b/Sources/WordPressKit/Services/SiteDesignServiceRemote.swift similarity index 100% rename from WordPressKit/SiteDesignServiceRemote.swift rename to Sources/WordPressKit/Services/SiteDesignServiceRemote.swift diff --git a/WordPressKit/SiteManagementServiceRemote.swift b/Sources/WordPressKit/Services/SiteManagementServiceRemote.swift similarity index 100% rename from WordPressKit/SiteManagementServiceRemote.swift rename to Sources/WordPressKit/Services/SiteManagementServiceRemote.swift diff --git a/WordPressKit/SiteServiceRemoteWordPressComREST.h b/Sources/WordPressKit/Services/SiteServiceRemoteWordPressComREST.h similarity index 100% rename from WordPressKit/SiteServiceRemoteWordPressComREST.h rename to Sources/WordPressKit/Services/SiteServiceRemoteWordPressComREST.h diff --git a/WordPressKit/SiteServiceRemoteWordPressComREST.m b/Sources/WordPressKit/Services/SiteServiceRemoteWordPressComREST.m similarity index 100% rename from WordPressKit/SiteServiceRemoteWordPressComREST.m rename to Sources/WordPressKit/Services/SiteServiceRemoteWordPressComREST.m diff --git a/WordPressKit/StatsServiceRemoteV2.swift b/Sources/WordPressKit/Services/StatsServiceRemoteV2.swift similarity index 100% rename from WordPressKit/StatsServiceRemoteV2.swift rename to Sources/WordPressKit/Services/StatsServiceRemoteV2.swift diff --git a/WordPressKit/TaxonomyServiceRemote.h b/Sources/WordPressKit/Services/TaxonomyServiceRemote.h similarity index 100% rename from WordPressKit/TaxonomyServiceRemote.h rename to Sources/WordPressKit/Services/TaxonomyServiceRemote.h diff --git a/WordPressKit/TaxonomyServiceRemoteREST.h b/Sources/WordPressKit/Services/TaxonomyServiceRemoteREST.h similarity index 100% rename from WordPressKit/TaxonomyServiceRemoteREST.h rename to Sources/WordPressKit/Services/TaxonomyServiceRemoteREST.h diff --git a/WordPressKit/TaxonomyServiceRemoteREST.m b/Sources/WordPressKit/Services/TaxonomyServiceRemoteREST.m similarity index 100% rename from WordPressKit/TaxonomyServiceRemoteREST.m rename to Sources/WordPressKit/Services/TaxonomyServiceRemoteREST.m diff --git a/WordPressKit/TaxonomyServiceRemoteXMLRPC.h b/Sources/WordPressKit/Services/TaxonomyServiceRemoteXMLRPC.h similarity index 100% rename from WordPressKit/TaxonomyServiceRemoteXMLRPC.h rename to Sources/WordPressKit/Services/TaxonomyServiceRemoteXMLRPC.h diff --git a/WordPressKit/TaxonomyServiceRemoteXMLRPC.m b/Sources/WordPressKit/Services/TaxonomyServiceRemoteXMLRPC.m similarity index 100% rename from WordPressKit/TaxonomyServiceRemoteXMLRPC.m rename to Sources/WordPressKit/Services/TaxonomyServiceRemoteXMLRPC.m diff --git a/WordPressKit/ThemeServiceRemote.h b/Sources/WordPressKit/Services/ThemeServiceRemote.h similarity index 100% rename from WordPressKit/ThemeServiceRemote.h rename to Sources/WordPressKit/Services/ThemeServiceRemote.h diff --git a/WordPressKit/ThemeServiceRemote.m b/Sources/WordPressKit/Services/ThemeServiceRemote.m similarity index 100% rename from WordPressKit/ThemeServiceRemote.m rename to Sources/WordPressKit/Services/ThemeServiceRemote.m diff --git a/WordPressKit/TimeZoneServiceRemote.swift b/Sources/WordPressKit/Services/TimeZoneServiceRemote.swift similarity index 100% rename from WordPressKit/TimeZoneServiceRemote.swift rename to Sources/WordPressKit/Services/TimeZoneServiceRemote.swift diff --git a/WordPressKit/TransactionsServiceRemote.swift b/Sources/WordPressKit/Services/TransactionsServiceRemote.swift similarity index 100% rename from WordPressKit/TransactionsServiceRemote.swift rename to Sources/WordPressKit/Services/TransactionsServiceRemote.swift diff --git a/WordPressKit/UsersServiceRemoteXMLRPC.swift b/Sources/WordPressKit/Services/UsersServiceRemoteXMLRPC.swift similarity index 100% rename from WordPressKit/UsersServiceRemoteXMLRPC.swift rename to Sources/WordPressKit/Services/UsersServiceRemoteXMLRPC.swift diff --git a/WordPressKit/WordPressComServiceRemote+SiteCreation.swift b/Sources/WordPressKit/Services/WordPressComServiceRemote+SiteCreation.swift similarity index 100% rename from WordPressKit/WordPressComServiceRemote+SiteCreation.swift rename to Sources/WordPressKit/Services/WordPressComServiceRemote+SiteCreation.swift diff --git a/WordPressKit/WordPressComServiceRemote+SiteSegments.swift b/Sources/WordPressKit/Services/WordPressComServiceRemote+SiteSegments.swift similarity index 100% rename from WordPressKit/WordPressComServiceRemote+SiteSegments.swift rename to Sources/WordPressKit/Services/WordPressComServiceRemote+SiteSegments.swift diff --git a/WordPressKit/WordPressComServiceRemote+SiteVerticals.swift b/Sources/WordPressKit/Services/WordPressComServiceRemote+SiteVerticals.swift similarity index 100% rename from WordPressKit/WordPressComServiceRemote+SiteVerticals.swift rename to Sources/WordPressKit/Services/WordPressComServiceRemote+SiteVerticals.swift diff --git a/WordPressKit/WordPressComServiceRemote+SiteVerticalsPrompt.swift b/Sources/WordPressKit/Services/WordPressComServiceRemote+SiteVerticalsPrompt.swift similarity index 100% rename from WordPressKit/WordPressComServiceRemote+SiteVerticalsPrompt.swift rename to Sources/WordPressKit/Services/WordPressComServiceRemote+SiteVerticalsPrompt.swift diff --git a/WordPressKit/WordPressComServiceRemote.h b/Sources/WordPressKit/Services/WordPressComServiceRemote.h similarity index 100% rename from WordPressKit/WordPressComServiceRemote.h rename to Sources/WordPressKit/Services/WordPressComServiceRemote.h diff --git a/WordPressKit/WordPressComServiceRemote.m b/Sources/WordPressKit/Services/WordPressComServiceRemote.m similarity index 100% rename from WordPressKit/WordPressComServiceRemote.m rename to Sources/WordPressKit/Services/WordPressComServiceRemote.m diff --git a/WordPressKit/AppTransportSecuritySettings.swift b/Sources/WordPressKit/Utility/AppTransportSecuritySettings.swift similarity index 100% rename from WordPressKit/AppTransportSecuritySettings.swift rename to Sources/WordPressKit/Utility/AppTransportSecuritySettings.swift diff --git a/WordPressKit/ChecksumUtil.swift b/Sources/WordPressKit/Utility/ChecksumUtil.swift similarity index 100% rename from WordPressKit/ChecksumUtil.swift rename to Sources/WordPressKit/Utility/ChecksumUtil.swift diff --git a/WordPressKit/Constants.h b/Sources/WordPressKit/Utility/Constants.h similarity index 100% rename from WordPressKit/Constants.h rename to Sources/WordPressKit/Utility/Constants.h diff --git a/WordPressKit/Constants.m b/Sources/WordPressKit/Utility/Constants.m similarity index 100% rename from WordPressKit/Constants.m rename to Sources/WordPressKit/Utility/Constants.m diff --git a/WordPressKit/Either.swift b/Sources/WordPressKit/Utility/Either.swift similarity index 100% rename from WordPressKit/Either.swift rename to Sources/WordPressKit/Utility/Either.swift diff --git a/WordPressKit/HTTPProtocolHelpers.swift b/Sources/WordPressKit/Utility/HTTPProtocolHelpers.swift similarity index 100% rename from WordPressKit/HTTPProtocolHelpers.swift rename to Sources/WordPressKit/Utility/HTTPProtocolHelpers.swift diff --git a/WordPressKit/MultipartForm.swift b/Sources/WordPressKit/Utility/MultipartForm.swift similarity index 100% rename from WordPressKit/MultipartForm.swift rename to Sources/WordPressKit/Utility/MultipartForm.swift diff --git a/WordPressKit/NSCharacterSet+URLEncode.swift b/Sources/WordPressKit/Utility/NSCharacterSet+URLEncode.swift similarity index 100% rename from WordPressKit/NSCharacterSet+URLEncode.swift rename to Sources/WordPressKit/Utility/NSCharacterSet+URLEncode.swift diff --git a/WordPressKit/NSMutableDictionary+Helpers.h b/Sources/WordPressKit/Utility/NSMutableDictionary+Helpers.h similarity index 100% rename from WordPressKit/NSMutableDictionary+Helpers.h rename to Sources/WordPressKit/Utility/NSMutableDictionary+Helpers.h diff --git a/WordPressKit/NSMutableDictionary+Helpers.m b/Sources/WordPressKit/Utility/NSMutableDictionary+Helpers.m similarity index 100% rename from WordPressKit/NSMutableDictionary+Helpers.m rename to Sources/WordPressKit/Utility/NSMutableDictionary+Helpers.m diff --git a/WordPressKit/NSString+MD5.h b/Sources/WordPressKit/Utility/NSString+MD5.h similarity index 100% rename from WordPressKit/NSString+MD5.h rename to Sources/WordPressKit/Utility/NSString+MD5.h diff --git a/WordPressKit/NSString+MD5.m b/Sources/WordPressKit/Utility/NSString+MD5.m similarity index 100% rename from WordPressKit/NSString+MD5.m rename to Sources/WordPressKit/Utility/NSString+MD5.m diff --git a/WordPressKit/ObjectValidation.swift b/Sources/WordPressKit/Utility/ObjectValidation.swift similarity index 100% rename from WordPressKit/ObjectValidation.swift rename to Sources/WordPressKit/Utility/ObjectValidation.swift diff --git a/WordPressKit/Result+Callback.swift b/Sources/WordPressKit/Utility/Result+Callback.swift similarity index 100% rename from WordPressKit/Result+Callback.swift rename to Sources/WordPressKit/Utility/Result+Callback.swift diff --git a/WordPressKit/ZendeskMetadata.swift b/Sources/WordPressKit/Utility/ZendeskMetadata.swift similarity index 100% rename from WordPressKit/ZendeskMetadata.swift rename to Sources/WordPressKit/Utility/ZendeskMetadata.swift diff --git a/WordPressKit/Date+WordPressCom.swift b/Sources/WordPressKit/WordPressAPI/Date+WordPressCom.swift similarity index 100% rename from WordPressKit/Date+WordPressCom.swift rename to Sources/WordPressKit/WordPressAPI/Date+WordPressCom.swift diff --git a/WordPressKit/DateFormatter+WordPressCom.swift b/Sources/WordPressKit/WordPressAPI/DateFormatter+WordPressCom.swift similarity index 100% rename from WordPressKit/DateFormatter+WordPressCom.swift rename to Sources/WordPressKit/WordPressAPI/DateFormatter+WordPressCom.swift diff --git a/WordPressKit/HTTPAuthenticationAlertController.swift b/Sources/WordPressKit/WordPressAPI/HTTPAuthenticationAlertController.swift similarity index 100% rename from WordPressKit/HTTPAuthenticationAlertController.swift rename to Sources/WordPressKit/WordPressAPI/HTTPAuthenticationAlertController.swift diff --git a/WordPressKit/HTTPClient.swift b/Sources/WordPressKit/WordPressAPI/HTTPClient.swift similarity index 100% rename from WordPressKit/HTTPClient.swift rename to Sources/WordPressKit/WordPressAPI/HTTPClient.swift diff --git a/WordPressKit/HTTPRequestBuilder.swift b/Sources/WordPressKit/WordPressAPI/HTTPRequestBuilder.swift similarity index 100% rename from WordPressKit/HTTPRequestBuilder.swift rename to Sources/WordPressKit/WordPressAPI/HTTPRequestBuilder.swift diff --git a/WordPressKit/NSDate+WordPressCom.swift b/Sources/WordPressKit/WordPressAPI/NSDate+WordPressCom.swift similarity index 100% rename from WordPressKit/NSDate+WordPressCom.swift rename to Sources/WordPressKit/WordPressAPI/NSDate+WordPressCom.swift diff --git a/WordPressKit/NonceRetrieval.swift b/Sources/WordPressKit/WordPressAPI/NonceRetrieval.swift similarity index 100% rename from WordPressKit/NonceRetrieval.swift rename to Sources/WordPressKit/WordPressAPI/NonceRetrieval.swift diff --git a/WordPressKit/WordPressAPIError+NSErrorBrdige.swift b/Sources/WordPressKit/WordPressAPI/WordPressAPIError+NSErrorBrdige.swift similarity index 100% rename from WordPressKit/WordPressAPIError+NSErrorBrdige.swift rename to Sources/WordPressKit/WordPressAPI/WordPressAPIError+NSErrorBrdige.swift diff --git a/WordPressKit/WordPressAPIError.swift b/Sources/WordPressKit/WordPressAPI/WordPressAPIError.swift similarity index 100% rename from WordPressKit/WordPressAPIError.swift rename to Sources/WordPressKit/WordPressAPI/WordPressAPIError.swift diff --git a/WordPressKit/WordPressComOAuthClient.swift b/Sources/WordPressKit/WordPressAPI/WordPressComOAuthClient.swift similarity index 100% rename from WordPressKit/WordPressComOAuthClient.swift rename to Sources/WordPressKit/WordPressAPI/WordPressComOAuthClient.swift diff --git a/WordPressKit/WordPressComRESTAPIInterfacing.h b/Sources/WordPressKit/WordPressAPI/WordPressComRESTAPIInterfacing.h similarity index 100% rename from WordPressKit/WordPressComRESTAPIInterfacing.h rename to Sources/WordPressKit/WordPressAPI/WordPressComRESTAPIInterfacing.h diff --git a/WordPressKit/WordPressComRestApi.swift b/Sources/WordPressKit/WordPressAPI/WordPressComRestApi.swift similarity index 100% rename from WordPressKit/WordPressComRestApi.swift rename to Sources/WordPressKit/WordPressAPI/WordPressComRestApi.swift diff --git a/WordPressKit/WordPressOrgRestApi.swift b/Sources/WordPressKit/WordPressAPI/WordPressOrgRestApi.swift similarity index 100% rename from WordPressKit/WordPressOrgRestApi.swift rename to Sources/WordPressKit/WordPressAPI/WordPressOrgRestApi.swift diff --git a/WordPressKit/WordPressOrgXMLRPCApi.swift b/Sources/WordPressKit/WordPressAPI/WordPressOrgXMLRPCApi.swift similarity index 100% rename from WordPressKit/WordPressOrgXMLRPCApi.swift rename to Sources/WordPressKit/WordPressAPI/WordPressOrgXMLRPCApi.swift diff --git a/WordPressKit/WordPressOrgXMLRPCValidator.swift b/Sources/WordPressKit/WordPressAPI/WordPressOrgXMLRPCValidator.swift similarity index 100% rename from WordPressKit/WordPressOrgXMLRPCValidator.swift rename to Sources/WordPressKit/WordPressAPI/WordPressOrgXMLRPCValidator.swift diff --git a/WordPressKit/WordPressRSDParser.swift b/Sources/WordPressKit/WordPressAPI/WordPressRSDParser.swift similarity index 100% rename from WordPressKit/WordPressRSDParser.swift rename to Sources/WordPressKit/WordPressAPI/WordPressRSDParser.swift diff --git a/WordPressKit/WordPressKit.h b/Sources/WordPressKit/WordPressKit.h similarity index 100% rename from WordPressKit/WordPressKit.h rename to Sources/WordPressKit/WordPressKit.h diff --git a/WordPressKitTests/Fakes/FakeInfoDictionaryObjectProvider.swift b/Tests/WordPressKitTests/Fakes/FakeInfoDictionaryObjectProvider.swift similarity index 100% rename from WordPressKitTests/Fakes/FakeInfoDictionaryObjectProvider.swift rename to Tests/WordPressKitTests/Fakes/FakeInfoDictionaryObjectProvider.swift diff --git a/WordPressKitTests/Info.plist b/Tests/WordPressKitTests/Info.plist similarity index 100% rename from WordPressKitTests/Info.plist rename to Tests/WordPressKitTests/Info.plist diff --git a/WordPressKitTests/Mock Data/BlockEditorSettings/get_wp_v2_themes_twentytwentyone-no-colors.json b/Tests/WordPressKitTests/Mock Data/BlockEditorSettings/get_wp_v2_themes_twentytwentyone-no-colors.json similarity index 100% rename from WordPressKitTests/Mock Data/BlockEditorSettings/get_wp_v2_themes_twentytwentyone-no-colors.json rename to Tests/WordPressKitTests/Mock Data/BlockEditorSettings/get_wp_v2_themes_twentytwentyone-no-colors.json diff --git a/WordPressKitTests/Mock Data/BlockEditorSettings/get_wp_v2_themes_twentytwentyone.json b/Tests/WordPressKitTests/Mock Data/BlockEditorSettings/get_wp_v2_themes_twentytwentyone.json similarity index 100% rename from WordPressKitTests/Mock Data/BlockEditorSettings/get_wp_v2_themes_twentytwentyone.json rename to Tests/WordPressKitTests/Mock Data/BlockEditorSettings/get_wp_v2_themes_twentytwentyone.json diff --git a/WordPressKitTests/Mock Data/BlockEditorSettings/wp-block-editor-v1-settings-success-NotThemeJSON.json b/Tests/WordPressKitTests/Mock Data/BlockEditorSettings/wp-block-editor-v1-settings-success-NotThemeJSON.json similarity index 100% rename from WordPressKitTests/Mock Data/BlockEditorSettings/wp-block-editor-v1-settings-success-NotThemeJSON.json rename to Tests/WordPressKitTests/Mock Data/BlockEditorSettings/wp-block-editor-v1-settings-success-NotThemeJSON.json diff --git a/WordPressKitTests/Mock Data/BlockEditorSettings/wp-block-editor-v1-settings-success-ThemeJSON.json b/Tests/WordPressKitTests/Mock Data/BlockEditorSettings/wp-block-editor-v1-settings-success-ThemeJSON.json similarity index 100% rename from WordPressKitTests/Mock Data/BlockEditorSettings/wp-block-editor-v1-settings-success-ThemeJSON.json rename to Tests/WordPressKitTests/Mock Data/BlockEditorSettings/wp-block-editor-v1-settings-success-ThemeJSON.json diff --git a/WordPressKitTests/Mock Data/Domains/get-all-domains-response.json b/Tests/WordPressKitTests/Mock Data/Domains/get-all-domains-response.json similarity index 100% rename from WordPressKitTests/Mock Data/Domains/get-all-domains-response.json rename to Tests/WordPressKitTests/Mock Data/Domains/get-all-domains-response.json diff --git a/WordPressKitTests/Mock Data/WordPressComAuthenticateWithIDToken2FANeededSuccess.json b/Tests/WordPressKitTests/Mock Data/WordPressComAuthenticateWithIDToken2FANeededSuccess.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComAuthenticateWithIDToken2FANeededSuccess.json rename to Tests/WordPressKitTests/Mock Data/WordPressComAuthenticateWithIDToken2FANeededSuccess.json diff --git a/WordPressKitTests/Mock Data/WordPressComAuthenticateWithIDTokenBearerTokenSuccess.json b/Tests/WordPressKitTests/Mock Data/WordPressComAuthenticateWithIDTokenBearerTokenSuccess.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComAuthenticateWithIDTokenBearerTokenSuccess.json rename to Tests/WordPressKitTests/Mock Data/WordPressComAuthenticateWithIDTokenBearerTokenSuccess.json diff --git a/WordPressKitTests/Mock Data/WordPressComAuthenticateWithIDTokenExistingUserNeedsConnection.json b/Tests/WordPressKitTests/Mock Data/WordPressComAuthenticateWithIDTokenExistingUserNeedsConnection.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComAuthenticateWithIDTokenExistingUserNeedsConnection.json rename to Tests/WordPressKitTests/Mock Data/WordPressComAuthenticateWithIDTokenExistingUserNeedsConnection.json diff --git a/WordPressKitTests/Mock Data/WordPressComOAuthAuthenticateSignature.json b/Tests/WordPressKitTests/Mock Data/WordPressComOAuthAuthenticateSignature.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComOAuthAuthenticateSignature.json rename to Tests/WordPressKitTests/Mock Data/WordPressComOAuthAuthenticateSignature.json diff --git a/WordPressKitTests/Mock Data/WordPressComOAuthNeeds2FAFail.json b/Tests/WordPressKitTests/Mock Data/WordPressComOAuthNeeds2FAFail.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComOAuthNeeds2FAFail.json rename to Tests/WordPressKitTests/Mock Data/WordPressComOAuthNeeds2FAFail.json diff --git a/WordPressKitTests/Mock Data/WordPressComOAuthNeedsWebauthnMFA.json b/Tests/WordPressKitTests/Mock Data/WordPressComOAuthNeedsWebauthnMFA.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComOAuthNeedsWebauthnMFA.json rename to Tests/WordPressKitTests/Mock Data/WordPressComOAuthNeedsWebauthnMFA.json diff --git a/WordPressKitTests/Mock Data/WordPressComOAuthRequestChallenge.json b/Tests/WordPressKitTests/Mock Data/WordPressComOAuthRequestChallenge.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComOAuthRequestChallenge.json rename to Tests/WordPressKitTests/Mock Data/WordPressComOAuthRequestChallenge.json diff --git a/WordPressKitTests/Mock Data/WordPressComOAuthSuccess.json b/Tests/WordPressKitTests/Mock Data/WordPressComOAuthSuccess.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComOAuthSuccess.json rename to Tests/WordPressKitTests/Mock Data/WordPressComOAuthSuccess.json diff --git a/WordPressKitTests/Mock Data/WordPressComOAuthWrongPasswordFail.json b/Tests/WordPressKitTests/Mock Data/WordPressComOAuthWrongPasswordFail.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComOAuthWrongPasswordFail.json rename to Tests/WordPressKitTests/Mock Data/WordPressComOAuthWrongPasswordFail.json diff --git a/WordPressKitTests/Mock Data/WordPressComRestApiFailInvalidInput.json b/Tests/WordPressKitTests/Mock Data/WordPressComRestApiFailInvalidInput.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComRestApiFailInvalidInput.json rename to Tests/WordPressKitTests/Mock Data/WordPressComRestApiFailInvalidInput.json diff --git a/WordPressKitTests/Mock Data/WordPressComRestApiFailInvalidJSON.json b/Tests/WordPressKitTests/Mock Data/WordPressComRestApiFailInvalidJSON.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComRestApiFailInvalidJSON.json rename to Tests/WordPressKitTests/Mock Data/WordPressComRestApiFailInvalidJSON.json diff --git a/WordPressKitTests/Mock Data/WordPressComRestApiFailRequestInvalidToken.json b/Tests/WordPressKitTests/Mock Data/WordPressComRestApiFailRequestInvalidToken.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComRestApiFailRequestInvalidToken.json rename to Tests/WordPressKitTests/Mock Data/WordPressComRestApiFailRequestInvalidToken.json diff --git a/WordPressKitTests/Mock Data/WordPressComRestApiFailThrottled.json b/Tests/WordPressKitTests/Mock Data/WordPressComRestApiFailThrottled.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComRestApiFailThrottled.json rename to Tests/WordPressKitTests/Mock Data/WordPressComRestApiFailThrottled.json diff --git a/WordPressKitTests/Mock Data/WordPressComRestApiFailUnauthorized.json b/Tests/WordPressKitTests/Mock Data/WordPressComRestApiFailUnauthorized.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComRestApiFailUnauthorized.json rename to Tests/WordPressKitTests/Mock Data/WordPressComRestApiFailUnauthorized.json diff --git a/WordPressKitTests/Mock Data/WordPressComRestApiMedia.json b/Tests/WordPressKitTests/Mock Data/WordPressComRestApiMedia.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComRestApiMedia.json rename to Tests/WordPressKitTests/Mock Data/WordPressComRestApiMedia.json diff --git a/WordPressKitTests/Mock Data/WordPressComRestApiMultipleErrors.json b/Tests/WordPressKitTests/Mock Data/WordPressComRestApiMultipleErrors.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComRestApiMultipleErrors.json rename to Tests/WordPressKitTests/Mock Data/WordPressComRestApiMultipleErrors.json diff --git a/WordPressKitTests/Mock Data/WordPressComSocial2FACodeSuccess.json b/Tests/WordPressKitTests/Mock Data/WordPressComSocial2FACodeSuccess.json similarity index 100% rename from WordPressKitTests/Mock Data/WordPressComSocial2FACodeSuccess.json rename to Tests/WordPressKitTests/Mock Data/WordPressComSocial2FACodeSuccess.json diff --git a/WordPressKitTests/Mock Data/activity-groups-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/activity-groups-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-groups-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/activity-groups-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/activity-groups-success.json b/Tests/WordPressKitTests/Mock Data/activity-groups-success.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-groups-success.json rename to Tests/WordPressKitTests/Mock Data/activity-groups-success.json diff --git a/WordPressKitTests/Mock Data/activity-log-auth-failure.json b/Tests/WordPressKitTests/Mock Data/activity-log-auth-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-log-auth-failure.json rename to Tests/WordPressKitTests/Mock Data/activity-log-auth-failure.json diff --git a/WordPressKitTests/Mock Data/activity-log-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/activity-log-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-log-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/activity-log-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/activity-log-success-1.json b/Tests/WordPressKitTests/Mock Data/activity-log-success-1.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-log-success-1.json rename to Tests/WordPressKitTests/Mock Data/activity-log-success-1.json diff --git a/WordPressKitTests/Mock Data/activity-log-success-2.json b/Tests/WordPressKitTests/Mock Data/activity-log-success-2.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-log-success-2.json rename to Tests/WordPressKitTests/Mock Data/activity-log-success-2.json diff --git a/WordPressKitTests/Mock Data/activity-log-success-3.json b/Tests/WordPressKitTests/Mock Data/activity-log-success-3.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-log-success-3.json rename to Tests/WordPressKitTests/Mock Data/activity-log-success-3.json diff --git a/WordPressKitTests/Mock Data/activity-restore-success.json b/Tests/WordPressKitTests/Mock Data/activity-restore-success.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-restore-success.json rename to Tests/WordPressKitTests/Mock Data/activity-restore-success.json diff --git a/WordPressKitTests/Mock Data/activity-rewind-status-restore-failure.json b/Tests/WordPressKitTests/Mock Data/activity-rewind-status-restore-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-rewind-status-restore-failure.json rename to Tests/WordPressKitTests/Mock Data/activity-rewind-status-restore-failure.json diff --git a/WordPressKitTests/Mock Data/activity-rewind-status-restore-finished.json b/Tests/WordPressKitTests/Mock Data/activity-rewind-status-restore-finished.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-rewind-status-restore-finished.json rename to Tests/WordPressKitTests/Mock Data/activity-rewind-status-restore-finished.json diff --git a/WordPressKitTests/Mock Data/activity-rewind-status-restore-in-progress.json b/Tests/WordPressKitTests/Mock Data/activity-rewind-status-restore-in-progress.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-rewind-status-restore-in-progress.json rename to Tests/WordPressKitTests/Mock Data/activity-rewind-status-restore-in-progress.json diff --git a/WordPressKitTests/Mock Data/activity-rewind-status-restore-queued.json b/Tests/WordPressKitTests/Mock Data/activity-rewind-status-restore-queued.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-rewind-status-restore-queued.json rename to Tests/WordPressKitTests/Mock Data/activity-rewind-status-restore-queued.json diff --git a/WordPressKitTests/Mock Data/activity-rewind-status-success.json b/Tests/WordPressKitTests/Mock Data/activity-rewind-status-success.json similarity index 100% rename from WordPressKitTests/Mock Data/activity-rewind-status-success.json rename to Tests/WordPressKitTests/Mock Data/activity-rewind-status-success.json diff --git a/WordPressKitTests/Mock Data/atomic-get-auth-cookie-success.json b/Tests/WordPressKitTests/Mock Data/atomic-get-auth-cookie-success.json similarity index 100% rename from WordPressKitTests/Mock Data/atomic-get-auth-cookie-success.json rename to Tests/WordPressKitTests/Mock Data/atomic-get-auth-cookie-success.json diff --git a/WordPressKitTests/Mock Data/auth-send-login-email-invalid-client-failure.json b/Tests/WordPressKitTests/Mock Data/auth-send-login-email-invalid-client-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/auth-send-login-email-invalid-client-failure.json rename to Tests/WordPressKitTests/Mock Data/auth-send-login-email-invalid-client-failure.json diff --git a/WordPressKitTests/Mock Data/auth-send-login-email-invalid-secret-failure.json b/Tests/WordPressKitTests/Mock Data/auth-send-login-email-invalid-secret-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/auth-send-login-email-invalid-secret-failure.json rename to Tests/WordPressKitTests/Mock Data/auth-send-login-email-invalid-secret-failure.json diff --git a/WordPressKitTests/Mock Data/auth-send-login-email-no-user-failure.json b/Tests/WordPressKitTests/Mock Data/auth-send-login-email-no-user-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/auth-send-login-email-no-user-failure.json rename to Tests/WordPressKitTests/Mock Data/auth-send-login-email-no-user-failure.json diff --git a/WordPressKitTests/Mock Data/auth-send-login-email-success.json b/Tests/WordPressKitTests/Mock Data/auth-send-login-email-success.json similarity index 100% rename from WordPressKitTests/Mock Data/auth-send-login-email-success.json rename to Tests/WordPressKitTests/Mock Data/auth-send-login-email-success.json diff --git a/WordPressKitTests/Mock Data/auth-send-verification-email-already-verified-failure.json b/Tests/WordPressKitTests/Mock Data/auth-send-verification-email-already-verified-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/auth-send-verification-email-already-verified-failure.json rename to Tests/WordPressKitTests/Mock Data/auth-send-verification-email-already-verified-failure.json diff --git a/WordPressKitTests/Mock Data/auth-send-verification-email-success.json b/Tests/WordPressKitTests/Mock Data/auth-send-verification-email-success.json similarity index 100% rename from WordPressKitTests/Mock Data/auth-send-verification-email-success.json rename to Tests/WordPressKitTests/Mock Data/auth-send-verification-email-success.json diff --git a/WordPressKitTests/Mock Data/backup-get-backup-status-complete-without-download-id-success.json b/Tests/WordPressKitTests/Mock Data/backup-get-backup-status-complete-without-download-id-success.json similarity index 100% rename from WordPressKitTests/Mock Data/backup-get-backup-status-complete-without-download-id-success.json rename to Tests/WordPressKitTests/Mock Data/backup-get-backup-status-complete-without-download-id-success.json diff --git a/WordPressKitTests/Mock Data/blaze-campaigns-search.json b/Tests/WordPressKitTests/Mock Data/blaze-campaigns-search.json similarity index 100% rename from WordPressKitTests/Mock Data/blaze-campaigns-search.json rename to Tests/WordPressKitTests/Mock Data/blaze-campaigns-search.json diff --git a/WordPressKitTests/Mock Data/blogging-prompts-settings-fetch-success.json b/Tests/WordPressKitTests/Mock Data/blogging-prompts-settings-fetch-success.json similarity index 100% rename from WordPressKitTests/Mock Data/blogging-prompts-settings-fetch-success.json rename to Tests/WordPressKitTests/Mock Data/blogging-prompts-settings-fetch-success.json diff --git a/WordPressKitTests/Mock Data/blogging-prompts-settings-update-empty-response.json b/Tests/WordPressKitTests/Mock Data/blogging-prompts-settings-update-empty-response.json similarity index 100% rename from WordPressKitTests/Mock Data/blogging-prompts-settings-update-empty-response.json rename to Tests/WordPressKitTests/Mock Data/blogging-prompts-settings-update-empty-response.json diff --git a/WordPressKitTests/Mock Data/blogging-prompts-settings-update-with-response.json b/Tests/WordPressKitTests/Mock Data/blogging-prompts-settings-update-with-response.json similarity index 100% rename from WordPressKitTests/Mock Data/blogging-prompts-settings-update-with-response.json rename to Tests/WordPressKitTests/Mock Data/blogging-prompts-settings-update-with-response.json diff --git a/WordPressKitTests/Mock Data/blogging-prompts-success.json b/Tests/WordPressKitTests/Mock Data/blogging-prompts-success.json similarity index 100% rename from WordPressKitTests/Mock Data/blogging-prompts-success.json rename to Tests/WordPressKitTests/Mock Data/blogging-prompts-success.json diff --git a/WordPressKitTests/Mock Data/comment-likes-success.json b/Tests/WordPressKitTests/Mock Data/comment-likes-success.json similarity index 100% rename from WordPressKitTests/Mock Data/comment-likes-success.json rename to Tests/WordPressKitTests/Mock Data/comment-likes-success.json diff --git a/WordPressKitTests/Mock Data/comments-v2-edit-context-success.json b/Tests/WordPressKitTests/Mock Data/comments-v2-edit-context-success.json similarity index 100% rename from WordPressKitTests/Mock Data/comments-v2-edit-context-success.json rename to Tests/WordPressKitTests/Mock Data/comments-v2-edit-context-success.json diff --git a/WordPressKitTests/Mock Data/comments-v2-view-context-success.json b/Tests/WordPressKitTests/Mock Data/comments-v2-view-context-success.json similarity index 100% rename from WordPressKitTests/Mock Data/comments-v2-view-context-success.json rename to Tests/WordPressKitTests/Mock Data/comments-v2-view-context-success.json diff --git a/WordPressKitTests/Mock Data/common-starter-site-designs-empty-designs.json b/Tests/WordPressKitTests/Mock Data/common-starter-site-designs-empty-designs.json similarity index 100% rename from WordPressKitTests/Mock Data/common-starter-site-designs-empty-designs.json rename to Tests/WordPressKitTests/Mock Data/common-starter-site-designs-empty-designs.json diff --git a/WordPressKitTests/Mock Data/common-starter-site-designs-malformed.json b/Tests/WordPressKitTests/Mock Data/common-starter-site-designs-malformed.json similarity index 100% rename from WordPressKitTests/Mock Data/common-starter-site-designs-malformed.json rename to Tests/WordPressKitTests/Mock Data/common-starter-site-designs-malformed.json diff --git a/WordPressKitTests/Mock Data/common-starter-site-designs-success.json b/Tests/WordPressKitTests/Mock Data/common-starter-site-designs-success.json similarity index 100% rename from WordPressKitTests/Mock Data/common-starter-site-designs-success.json rename to Tests/WordPressKitTests/Mock Data/common-starter-site-designs-success.json diff --git a/WordPressKitTests/Mock Data/dashboard-200-with-drafts-and-scheduled-posts.json b/Tests/WordPressKitTests/Mock Data/dashboard-200-with-drafts-and-scheduled-posts.json similarity index 100% rename from WordPressKitTests/Mock Data/dashboard-200-with-drafts-and-scheduled-posts.json rename to Tests/WordPressKitTests/Mock Data/dashboard-200-with-drafts-and-scheduled-posts.json diff --git a/WordPressKitTests/Mock Data/dashboard-400-invalid-card.json b/Tests/WordPressKitTests/Mock Data/dashboard-400-invalid-card.json similarity index 100% rename from WordPressKitTests/Mock Data/dashboard-400-invalid-card.json rename to Tests/WordPressKitTests/Mock Data/dashboard-400-invalid-card.json diff --git a/WordPressKitTests/Mock Data/domain-contact-information-response-success.json b/Tests/WordPressKitTests/Mock Data/domain-contact-information-response-success.json similarity index 100% rename from WordPressKitTests/Mock Data/domain-contact-information-response-success.json rename to Tests/WordPressKitTests/Mock Data/domain-contact-information-response-success.json diff --git a/WordPressKitTests/Mock Data/domain-service-all-domain-types.json b/Tests/WordPressKitTests/Mock Data/domain-service-all-domain-types.json similarity index 100% rename from WordPressKitTests/Mock Data/domain-service-all-domain-types.json rename to Tests/WordPressKitTests/Mock Data/domain-service-all-domain-types.json diff --git a/WordPressKitTests/Mock Data/domain-service-bad-json.json b/Tests/WordPressKitTests/Mock Data/domain-service-bad-json.json similarity index 100% rename from WordPressKitTests/Mock Data/domain-service-bad-json.json rename to Tests/WordPressKitTests/Mock Data/domain-service-bad-json.json diff --git a/WordPressKitTests/Mock Data/domain-service-empty.json b/Tests/WordPressKitTests/Mock Data/domain-service-empty.json similarity index 100% rename from WordPressKitTests/Mock Data/domain-service-empty.json rename to Tests/WordPressKitTests/Mock Data/domain-service-empty.json diff --git a/WordPressKitTests/Mock Data/domain-service-invalid-query.json b/Tests/WordPressKitTests/Mock Data/domain-service-invalid-query.json similarity index 100% rename from WordPressKitTests/Mock Data/domain-service-invalid-query.json rename to Tests/WordPressKitTests/Mock Data/domain-service-invalid-query.json diff --git a/WordPressKitTests/Mock Data/empty-array.json b/Tests/WordPressKitTests/Mock Data/empty-array.json similarity index 100% rename from WordPressKitTests/Mock Data/empty-array.json rename to Tests/WordPressKitTests/Mock Data/empty-array.json diff --git a/WordPressKitTests/Mock Data/empty.json b/Tests/WordPressKitTests/Mock Data/empty.json similarity index 100% rename from WordPressKitTests/Mock Data/empty.json rename to Tests/WordPressKitTests/Mock Data/empty.json diff --git a/WordPressKitTests/Mock Data/get-multiple-themes-v1.2.json b/Tests/WordPressKitTests/Mock Data/get-multiple-themes-v1.2.json similarity index 100% rename from WordPressKitTests/Mock Data/get-multiple-themes-v1.2.json rename to Tests/WordPressKitTests/Mock Data/get-multiple-themes-v1.2.json diff --git a/WordPressKitTests/Mock Data/get-purchased-themes-v1.1.json b/Tests/WordPressKitTests/Mock Data/get-purchased-themes-v1.1.json similarity index 100% rename from WordPressKitTests/Mock Data/get-purchased-themes-v1.1.json rename to Tests/WordPressKitTests/Mock Data/get-purchased-themes-v1.1.json diff --git a/WordPressKitTests/Mock Data/get-single-theme-v1.1.json b/Tests/WordPressKitTests/Mock Data/get-single-theme-v1.1.json similarity index 100% rename from WordPressKitTests/Mock Data/get-single-theme-v1.1.json rename to Tests/WordPressKitTests/Mock Data/get-single-theme-v1.1.json diff --git a/WordPressKitTests/Mock Data/is-available-email-failure.json b/Tests/WordPressKitTests/Mock Data/is-available-email-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/is-available-email-failure.json rename to Tests/WordPressKitTests/Mock Data/is-available-email-failure.json diff --git a/WordPressKitTests/Mock Data/is-available-email-success.json b/Tests/WordPressKitTests/Mock Data/is-available-email-success.json similarity index 100% rename from WordPressKitTests/Mock Data/is-available-email-success.json rename to Tests/WordPressKitTests/Mock Data/is-available-email-success.json diff --git a/WordPressKitTests/Mock Data/is-available-username-failure.json b/Tests/WordPressKitTests/Mock Data/is-available-username-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/is-available-username-failure.json rename to Tests/WordPressKitTests/Mock Data/is-available-username-failure.json diff --git a/WordPressKitTests/Mock Data/is-available-username-success.json b/Tests/WordPressKitTests/Mock Data/is-available-username-success.json similarity index 100% rename from WordPressKitTests/Mock Data/is-available-username-success.json rename to Tests/WordPressKitTests/Mock Data/is-available-username-success.json diff --git a/WordPressKitTests/Mock Data/is-passwordless-account-no-account-found.json b/Tests/WordPressKitTests/Mock Data/is-passwordless-account-no-account-found.json similarity index 100% rename from WordPressKitTests/Mock Data/is-passwordless-account-no-account-found.json rename to Tests/WordPressKitTests/Mock Data/is-passwordless-account-no-account-found.json diff --git a/WordPressKitTests/Mock Data/is-passwordless-account-success.json b/Tests/WordPressKitTests/Mock Data/is-passwordless-account-success.json similarity index 100% rename from WordPressKitTests/Mock Data/is-passwordless-account-success.json rename to Tests/WordPressKitTests/Mock Data/is-passwordless-account-success.json diff --git a/WordPressKitTests/Mock Data/jetpack-capabilities-107159616-success.json b/Tests/WordPressKitTests/Mock Data/jetpack-capabilities-107159616-success.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-capabilities-107159616-success.json rename to Tests/WordPressKitTests/Mock Data/jetpack-capabilities-107159616-success.json diff --git a/WordPressKitTests/Mock Data/jetpack-capabilities-34197361-success.json b/Tests/WordPressKitTests/Mock Data/jetpack-capabilities-34197361-success.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-capabilities-34197361-success.json rename to Tests/WordPressKitTests/Mock Data/jetpack-capabilities-34197361-success.json diff --git a/WordPressKitTests/Mock Data/jetpack-capabilities-malformed.json b/Tests/WordPressKitTests/Mock Data/jetpack-capabilities-malformed.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-capabilities-malformed.json rename to Tests/WordPressKitTests/Mock Data/jetpack-capabilities-malformed.json diff --git a/WordPressKitTests/Mock Data/jetpack-scan-enqueue-failure.json b/Tests/WordPressKitTests/Mock Data/jetpack-scan-enqueue-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-scan-enqueue-failure.json rename to Tests/WordPressKitTests/Mock Data/jetpack-scan-enqueue-failure.json diff --git a/WordPressKitTests/Mock Data/jetpack-scan-enqueue-success.json b/Tests/WordPressKitTests/Mock Data/jetpack-scan-enqueue-success.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-scan-enqueue-success.json rename to Tests/WordPressKitTests/Mock Data/jetpack-scan-enqueue-success.json diff --git a/WordPressKitTests/Mock Data/jetpack-scan-idle-success-no-threats.json b/Tests/WordPressKitTests/Mock Data/jetpack-scan-idle-success-no-threats.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-scan-idle-success-no-threats.json rename to Tests/WordPressKitTests/Mock Data/jetpack-scan-idle-success-no-threats.json diff --git a/WordPressKitTests/Mock Data/jetpack-scan-idle-success-threats.json b/Tests/WordPressKitTests/Mock Data/jetpack-scan-idle-success-threats.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-scan-idle-success-threats.json rename to Tests/WordPressKitTests/Mock Data/jetpack-scan-idle-success-threats.json diff --git a/WordPressKitTests/Mock Data/jetpack-scan-in-progress.json b/Tests/WordPressKitTests/Mock Data/jetpack-scan-in-progress.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-scan-in-progress.json rename to Tests/WordPressKitTests/Mock Data/jetpack-scan-in-progress.json diff --git a/WordPressKitTests/Mock Data/jetpack-scan-unavailable.json b/Tests/WordPressKitTests/Mock Data/jetpack-scan-unavailable.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-scan-unavailable.json rename to Tests/WordPressKitTests/Mock Data/jetpack-scan-unavailable.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-check-site-failure-data.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-check-site-failure-data.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-check-site-failure-data.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-check-site-failure-data.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-check-site-success-no-jetpack.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-check-site-success-no-jetpack.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-check-site-success-no-jetpack.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-check-site-success-no-jetpack.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-check-site-success.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-check-site-success.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-check-site-success.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-check-site-success.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-error-activation-failure.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-error-activation-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-error-activation-failure.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-error-activation-failure.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-error-activation-install.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-error-activation-install.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-error-activation-install.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-error-activation-install.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-error-activation-response.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-error-activation-response.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-error-activation-response.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-error-activation-response.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-error-forbidden.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-error-forbidden.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-error-forbidden.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-error-forbidden.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-error-install-failure.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-error-install-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-error-install-failure.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-error-install-failure.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-error-install-response.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-error-install-response.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-error-install-response.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-error-install-response.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-error-invalid-credentials.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-error-invalid-credentials.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-error-invalid-credentials.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-error-invalid-credentials.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-error-login-failure.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-error-login-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-error-login-failure.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-error-login-failure.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-error-site-is-jetpack.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-error-site-is-jetpack.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-error-site-is-jetpack.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-error-site-is-jetpack.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-error-unknown.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-error-unknown.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-error-unknown.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-error-unknown.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-failure.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-failure.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-failure.json diff --git a/WordPressKitTests/Mock Data/jetpack-service-success.json b/Tests/WordPressKitTests/Mock Data/jetpack-service-success.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-service-success.json rename to Tests/WordPressKitTests/Mock Data/jetpack-service-success.json diff --git a/WordPressKitTests/Mock Data/jetpack-social-403.json b/Tests/WordPressKitTests/Mock Data/jetpack-social-403.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-social-403.json rename to Tests/WordPressKitTests/Mock Data/jetpack-social-403.json diff --git a/WordPressKitTests/Mock Data/jetpack-social-no-publicize.json b/Tests/WordPressKitTests/Mock Data/jetpack-social-no-publicize.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-social-no-publicize.json rename to Tests/WordPressKitTests/Mock Data/jetpack-social-no-publicize.json diff --git a/WordPressKitTests/Mock Data/jetpack-social-with-publicize.json b/Tests/WordPressKitTests/Mock Data/jetpack-social-with-publicize.json similarity index 100% rename from WordPressKitTests/Mock Data/jetpack-social-with-publicize.json rename to Tests/WordPressKitTests/Mock Data/jetpack-social-with-publicize.json diff --git a/WordPressKitTests/Mock Data/me-auth-failure.json b/Tests/WordPressKitTests/Mock Data/me-auth-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/me-auth-failure.json rename to Tests/WordPressKitTests/Mock Data/me-auth-failure.json diff --git a/WordPressKitTests/Mock Data/me-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/me-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/me-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/me-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/me-settings-close-account-failure.json b/Tests/WordPressKitTests/Mock Data/me-settings-close-account-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/me-settings-close-account-failure.json rename to Tests/WordPressKitTests/Mock Data/me-settings-close-account-failure.json diff --git a/WordPressKitTests/Mock Data/me-settings-close-account-success.json b/Tests/WordPressKitTests/Mock Data/me-settings-close-account-success.json similarity index 100% rename from WordPressKitTests/Mock Data/me-settings-close-account-success.json rename to Tests/WordPressKitTests/Mock Data/me-settings-close-account-success.json diff --git a/WordPressKitTests/Mock Data/me-sites-auth-failure.json b/Tests/WordPressKitTests/Mock Data/me-sites-auth-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/me-sites-auth-failure.json rename to Tests/WordPressKitTests/Mock Data/me-sites-auth-failure.json diff --git a/WordPressKitTests/Mock Data/me-sites-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/me-sites-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/me-sites-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/me-sites-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/me-sites-empty-success.json b/Tests/WordPressKitTests/Mock Data/me-sites-empty-success.json similarity index 100% rename from WordPressKitTests/Mock Data/me-sites-empty-success.json rename to Tests/WordPressKitTests/Mock Data/me-sites-empty-success.json diff --git a/WordPressKitTests/Mock Data/me-sites-success.json b/Tests/WordPressKitTests/Mock Data/me-sites-success.json similarity index 100% rename from WordPressKitTests/Mock Data/me-sites-success.json rename to Tests/WordPressKitTests/Mock Data/me-sites-success.json diff --git a/WordPressKitTests/Mock Data/me-sites-visibility-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/me-sites-visibility-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/me-sites-visibility-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/me-sites-visibility-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/me-sites-visibility-failure.json b/Tests/WordPressKitTests/Mock Data/me-sites-visibility-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/me-sites-visibility-failure.json rename to Tests/WordPressKitTests/Mock Data/me-sites-visibility-failure.json diff --git a/WordPressKitTests/Mock Data/me-sites-visibility-success.json b/Tests/WordPressKitTests/Mock Data/me-sites-visibility-success.json similarity index 100% rename from WordPressKitTests/Mock Data/me-sites-visibility-success.json rename to Tests/WordPressKitTests/Mock Data/me-sites-visibility-success.json diff --git a/WordPressKitTests/Mock Data/me-success.json b/Tests/WordPressKitTests/Mock Data/me-success.json similarity index 100% rename from WordPressKitTests/Mock Data/me-success.json rename to Tests/WordPressKitTests/Mock Data/me-success.json diff --git a/WordPressKitTests/Mock Data/notifications-last-seen.json b/Tests/WordPressKitTests/Mock Data/notifications-last-seen.json similarity index 100% rename from WordPressKitTests/Mock Data/notifications-last-seen.json rename to Tests/WordPressKitTests/Mock Data/notifications-last-seen.json diff --git a/WordPressKitTests/Mock Data/notifications-load-all.json b/Tests/WordPressKitTests/Mock Data/notifications-load-all.json similarity index 100% rename from WordPressKitTests/Mock Data/notifications-load-all.json rename to Tests/WordPressKitTests/Mock Data/notifications-load-all.json diff --git a/WordPressKitTests/Mock Data/notifications-load-hash.json b/Tests/WordPressKitTests/Mock Data/notifications-load-hash.json similarity index 100% rename from WordPressKitTests/Mock Data/notifications-load-hash.json rename to Tests/WordPressKitTests/Mock Data/notifications-load-hash.json diff --git a/WordPressKitTests/Mock Data/notifications-mark-as-read.json b/Tests/WordPressKitTests/Mock Data/notifications-mark-as-read.json similarity index 100% rename from WordPressKitTests/Mock Data/notifications-mark-as-read.json rename to Tests/WordPressKitTests/Mock Data/notifications-mark-as-read.json diff --git a/WordPressKitTests/Mock Data/page-layout-blog-layouts-malformed.json b/Tests/WordPressKitTests/Mock Data/page-layout-blog-layouts-malformed.json similarity index 100% rename from WordPressKitTests/Mock Data/page-layout-blog-layouts-malformed.json rename to Tests/WordPressKitTests/Mock Data/page-layout-blog-layouts-malformed.json diff --git a/WordPressKitTests/Mock Data/page-layout-blog-layouts-success.json b/Tests/WordPressKitTests/Mock Data/page-layout-blog-layouts-success.json similarity index 100% rename from WordPressKitTests/Mock Data/page-layout-blog-layouts-success.json rename to Tests/WordPressKitTests/Mock Data/page-layout-blog-layouts-success.json diff --git a/WordPressKitTests/Mock Data/people-send-invitation-failure.json b/Tests/WordPressKitTests/Mock Data/people-send-invitation-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/people-send-invitation-failure.json rename to Tests/WordPressKitTests/Mock Data/people-send-invitation-failure.json diff --git a/WordPressKitTests/Mock Data/people-send-invitation-success.json b/Tests/WordPressKitTests/Mock Data/people-send-invitation-success.json similarity index 100% rename from WordPressKitTests/Mock Data/people-send-invitation-success.json rename to Tests/WordPressKitTests/Mock Data/people-send-invitation-success.json diff --git a/WordPressKitTests/Mock Data/people-validate-invitation-failure.json b/Tests/WordPressKitTests/Mock Data/people-validate-invitation-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/people-validate-invitation-failure.json rename to Tests/WordPressKitTests/Mock Data/people-validate-invitation-failure.json diff --git a/WordPressKitTests/Mock Data/people-validate-invitation-success.json b/Tests/WordPressKitTests/Mock Data/people-validate-invitation-success.json similarity index 100% rename from WordPressKitTests/Mock Data/people-validate-invitation-success.json rename to Tests/WordPressKitTests/Mock Data/people-validate-invitation-success.json diff --git a/WordPressKitTests/Mock Data/plans-me-sites-success.json b/Tests/WordPressKitTests/Mock Data/plans-me-sites-success.json similarity index 100% rename from WordPressKitTests/Mock Data/plans-me-sites-success.json rename to Tests/WordPressKitTests/Mock Data/plans-me-sites-success.json diff --git a/WordPressKitTests/Mock Data/plans-mobile-success.json b/Tests/WordPressKitTests/Mock Data/plans-mobile-success.json similarity index 100% rename from WordPressKitTests/Mock Data/plans-mobile-success.json rename to Tests/WordPressKitTests/Mock Data/plans-mobile-success.json diff --git a/WordPressKitTests/Mock Data/plugin-directory-jetpack-beta.json b/Tests/WordPressKitTests/Mock Data/plugin-directory-jetpack-beta.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-directory-jetpack-beta.json rename to Tests/WordPressKitTests/Mock Data/plugin-directory-jetpack-beta.json diff --git a/WordPressKitTests/Mock Data/plugin-directory-jetpack.json b/Tests/WordPressKitTests/Mock Data/plugin-directory-jetpack.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-directory-jetpack.json rename to Tests/WordPressKitTests/Mock Data/plugin-directory-jetpack.json diff --git a/WordPressKitTests/Mock Data/plugin-directory-new.json b/Tests/WordPressKitTests/Mock Data/plugin-directory-new.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-directory-new.json rename to Tests/WordPressKitTests/Mock Data/plugin-directory-new.json diff --git a/WordPressKitTests/Mock Data/plugin-directory-popular.json b/Tests/WordPressKitTests/Mock Data/plugin-directory-popular.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-directory-popular.json rename to Tests/WordPressKitTests/Mock Data/plugin-directory-popular.json diff --git a/WordPressKitTests/Mock Data/plugin-directory-rename-xml-rpc.json b/Tests/WordPressKitTests/Mock Data/plugin-directory-rename-xml-rpc.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-directory-rename-xml-rpc.json rename to Tests/WordPressKitTests/Mock Data/plugin-directory-rename-xml-rpc.json diff --git a/WordPressKitTests/Mock Data/plugin-install-already-installed.json b/Tests/WordPressKitTests/Mock Data/plugin-install-already-installed.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-install-already-installed.json rename to Tests/WordPressKitTests/Mock Data/plugin-install-already-installed.json diff --git a/WordPressKitTests/Mock Data/plugin-install-generic-error.json b/Tests/WordPressKitTests/Mock Data/plugin-install-generic-error.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-install-generic-error.json rename to Tests/WordPressKitTests/Mock Data/plugin-install-generic-error.json diff --git a/WordPressKitTests/Mock Data/plugin-install-succeeds.json b/Tests/WordPressKitTests/Mock Data/plugin-install-succeeds.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-install-succeeds.json rename to Tests/WordPressKitTests/Mock Data/plugin-install-succeeds.json diff --git a/WordPressKitTests/Mock Data/plugin-modify-malformed-response.json b/Tests/WordPressKitTests/Mock Data/plugin-modify-malformed-response.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-modify-malformed-response.json rename to Tests/WordPressKitTests/Mock Data/plugin-modify-malformed-response.json diff --git a/WordPressKitTests/Mock Data/plugin-service-remote-auth-failure.json b/Tests/WordPressKitTests/Mock Data/plugin-service-remote-auth-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-service-remote-auth-failure.json rename to Tests/WordPressKitTests/Mock Data/plugin-service-remote-auth-failure.json diff --git a/WordPressKitTests/Mock Data/plugin-service-remote-featured-malformed.json b/Tests/WordPressKitTests/Mock Data/plugin-service-remote-featured-malformed.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-service-remote-featured-malformed.json rename to Tests/WordPressKitTests/Mock Data/plugin-service-remote-featured-malformed.json diff --git a/WordPressKitTests/Mock Data/plugin-service-remote-featured-plugins-invalid.json b/Tests/WordPressKitTests/Mock Data/plugin-service-remote-featured-plugins-invalid.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-service-remote-featured-plugins-invalid.json rename to Tests/WordPressKitTests/Mock Data/plugin-service-remote-featured-plugins-invalid.json diff --git a/WordPressKitTests/Mock Data/plugin-service-remote-featured.json b/Tests/WordPressKitTests/Mock Data/plugin-service-remote-featured.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-service-remote-featured.json rename to Tests/WordPressKitTests/Mock Data/plugin-service-remote-featured.json diff --git a/WordPressKitTests/Mock Data/plugin-state-contact-form-7.json b/Tests/WordPressKitTests/Mock Data/plugin-state-contact-form-7.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-state-contact-form-7.json rename to Tests/WordPressKitTests/Mock Data/plugin-state-contact-form-7.json diff --git a/WordPressKitTests/Mock Data/plugin-state-jetpack.json b/Tests/WordPressKitTests/Mock Data/plugin-state-jetpack.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-state-jetpack.json rename to Tests/WordPressKitTests/Mock Data/plugin-state-jetpack.json diff --git a/WordPressKitTests/Mock Data/plugin-update-gutenberg-needs-update.json b/Tests/WordPressKitTests/Mock Data/plugin-update-gutenberg-needs-update.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-update-gutenberg-needs-update.json rename to Tests/WordPressKitTests/Mock Data/plugin-update-gutenberg-needs-update.json diff --git a/WordPressKitTests/Mock Data/plugin-update-jetpack-already-updated.json b/Tests/WordPressKitTests/Mock Data/plugin-update-jetpack-already-updated.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-update-jetpack-already-updated.json rename to Tests/WordPressKitTests/Mock Data/plugin-update-jetpack-already-updated.json diff --git a/WordPressKitTests/Mock Data/plugin-update-response-malformed.json b/Tests/WordPressKitTests/Mock Data/plugin-update-response-malformed.json similarity index 100% rename from WordPressKitTests/Mock Data/plugin-update-response-malformed.json rename to Tests/WordPressKitTests/Mock Data/plugin-update-response-malformed.json diff --git a/WordPressKitTests/Mock Data/post-autosave-mapping-success.json b/Tests/WordPressKitTests/Mock Data/post-autosave-mapping-success.json similarity index 100% rename from WordPressKitTests/Mock Data/post-autosave-mapping-success.json rename to Tests/WordPressKitTests/Mock Data/post-autosave-mapping-success.json diff --git a/WordPressKitTests/Mock Data/post-likes-failure.json b/Tests/WordPressKitTests/Mock Data/post-likes-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/post-likes-failure.json rename to Tests/WordPressKitTests/Mock Data/post-likes-failure.json diff --git a/WordPressKitTests/Mock Data/post-likes-success.json b/Tests/WordPressKitTests/Mock Data/post-likes-success.json similarity index 100% rename from WordPressKitTests/Mock Data/post-likes-success.json rename to Tests/WordPressKitTests/Mock Data/post-likes-success.json diff --git a/WordPressKitTests/Mock Data/post-revisions-failure.json b/Tests/WordPressKitTests/Mock Data/post-revisions-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/post-revisions-failure.json rename to Tests/WordPressKitTests/Mock Data/post-revisions-failure.json diff --git a/WordPressKitTests/Mock Data/post-revisions-mapping-success.json b/Tests/WordPressKitTests/Mock Data/post-revisions-mapping-success.json similarity index 100% rename from WordPressKitTests/Mock Data/post-revisions-mapping-success.json rename to Tests/WordPressKitTests/Mock Data/post-revisions-mapping-success.json diff --git a/WordPressKitTests/Mock Data/post-revisions-success.json b/Tests/WordPressKitTests/Mock Data/post-revisions-success.json similarity index 100% rename from WordPressKitTests/Mock Data/post-revisions-success.json rename to Tests/WordPressKitTests/Mock Data/post-revisions-success.json diff --git a/WordPressKitTests/Mock Data/qrlogin-authenticate-200.json b/Tests/WordPressKitTests/Mock Data/qrlogin-authenticate-200.json similarity index 100% rename from WordPressKitTests/Mock Data/qrlogin-authenticate-200.json rename to Tests/WordPressKitTests/Mock Data/qrlogin-authenticate-200.json diff --git a/WordPressKitTests/Mock Data/qrlogin-authenticate-failed-400.json b/Tests/WordPressKitTests/Mock Data/qrlogin-authenticate-failed-400.json similarity index 100% rename from WordPressKitTests/Mock Data/qrlogin-authenticate-failed-400.json rename to Tests/WordPressKitTests/Mock Data/qrlogin-authenticate-failed-400.json diff --git a/WordPressKitTests/Mock Data/qrlogin-validate-200.json b/Tests/WordPressKitTests/Mock Data/qrlogin-validate-200.json similarity index 100% rename from WordPressKitTests/Mock Data/qrlogin-validate-200.json rename to Tests/WordPressKitTests/Mock Data/qrlogin-validate-200.json diff --git a/WordPressKitTests/Mock Data/qrlogin-validate-400.json b/Tests/WordPressKitTests/Mock Data/qrlogin-validate-400.json similarity index 100% rename from WordPressKitTests/Mock Data/qrlogin-validate-400.json rename to Tests/WordPressKitTests/Mock Data/qrlogin-validate-400.json diff --git a/WordPressKitTests/Mock Data/qrlogin-validate-expired-401.json b/Tests/WordPressKitTests/Mock Data/qrlogin-validate-expired-401.json similarity index 100% rename from WordPressKitTests/Mock Data/qrlogin-validate-expired-401.json rename to Tests/WordPressKitTests/Mock Data/qrlogin-validate-expired-401.json diff --git a/WordPressKitTests/Mock Data/reader-cards-success.json b/Tests/WordPressKitTests/Mock Data/reader-cards-success.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-cards-success.json rename to Tests/WordPressKitTests/Mock Data/reader-cards-success.json diff --git a/WordPressKitTests/Mock Data/reader-interests-success.json b/Tests/WordPressKitTests/Mock Data/reader-interests-success.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-interests-success.json rename to Tests/WordPressKitTests/Mock Data/reader-interests-success.json diff --git a/WordPressKitTests/Mock Data/reader-post-comments-subscribe-failure.json b/Tests/WordPressKitTests/Mock Data/reader-post-comments-subscribe-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-post-comments-subscribe-failure.json rename to Tests/WordPressKitTests/Mock Data/reader-post-comments-subscribe-failure.json diff --git a/WordPressKitTests/Mock Data/reader-post-comments-subscribe-success.json b/Tests/WordPressKitTests/Mock Data/reader-post-comments-subscribe-success.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-post-comments-subscribe-success.json rename to Tests/WordPressKitTests/Mock Data/reader-post-comments-subscribe-success.json diff --git a/WordPressKitTests/Mock Data/reader-post-comments-subscription-status-success.json b/Tests/WordPressKitTests/Mock Data/reader-post-comments-subscription-status-success.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-post-comments-subscription-status-success.json rename to Tests/WordPressKitTests/Mock Data/reader-post-comments-subscription-status-success.json diff --git a/WordPressKitTests/Mock Data/reader-post-comments-unsubscribe-success.json b/Tests/WordPressKitTests/Mock Data/reader-post-comments-unsubscribe-success.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-post-comments-unsubscribe-success.json rename to Tests/WordPressKitTests/Mock Data/reader-post-comments-unsubscribe-success.json diff --git a/WordPressKitTests/Mock Data/reader-post-comments-update-notification-success.json b/Tests/WordPressKitTests/Mock Data/reader-post-comments-update-notification-success.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-post-comments-update-notification-success.json rename to Tests/WordPressKitTests/Mock Data/reader-post-comments-update-notification-success.json diff --git a/WordPressKitTests/Mock Data/reader-post-related-posts-success.json b/Tests/WordPressKitTests/Mock Data/reader-post-related-posts-success.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-post-related-posts-success.json rename to Tests/WordPressKitTests/Mock Data/reader-post-related-posts-success.json diff --git a/WordPressKitTests/Mock Data/reader-posts-success.json b/Tests/WordPressKitTests/Mock Data/reader-posts-success.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-posts-success.json rename to Tests/WordPressKitTests/Mock Data/reader-posts-success.json diff --git a/WordPressKitTests/Mock Data/reader-site-search-blog-id-fallback.json b/Tests/WordPressKitTests/Mock Data/reader-site-search-blog-id-fallback.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-site-search-blog-id-fallback.json rename to Tests/WordPressKitTests/Mock Data/reader-site-search-blog-id-fallback.json diff --git a/WordPressKitTests/Mock Data/reader-site-search-failure.json b/Tests/WordPressKitTests/Mock Data/reader-site-search-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-site-search-failure.json rename to Tests/WordPressKitTests/Mock Data/reader-site-search-failure.json diff --git a/WordPressKitTests/Mock Data/reader-site-search-no-blog-or-feed-id.json b/Tests/WordPressKitTests/Mock Data/reader-site-search-no-blog-or-feed-id.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-site-search-no-blog-or-feed-id.json rename to Tests/WordPressKitTests/Mock Data/reader-site-search-no-blog-or-feed-id.json diff --git a/WordPressKitTests/Mock Data/reader-site-search-success-hasmore.json b/Tests/WordPressKitTests/Mock Data/reader-site-search-success-hasmore.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-site-search-success-hasmore.json rename to Tests/WordPressKitTests/Mock Data/reader-site-search-success-hasmore.json diff --git a/WordPressKitTests/Mock Data/reader-site-search-success-no-data.json b/Tests/WordPressKitTests/Mock Data/reader-site-search-success-no-data.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-site-search-success-no-data.json rename to Tests/WordPressKitTests/Mock Data/reader-site-search-success-no-data.json diff --git a/WordPressKitTests/Mock Data/reader-site-search-success-no-icon.json b/Tests/WordPressKitTests/Mock Data/reader-site-search-success-no-icon.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-site-search-success-no-icon.json rename to Tests/WordPressKitTests/Mock Data/reader-site-search-success-no-icon.json diff --git a/WordPressKitTests/Mock Data/reader-site-search-success.json b/Tests/WordPressKitTests/Mock Data/reader-site-search-success.json similarity index 100% rename from WordPressKitTests/Mock Data/reader-site-search-success.json rename to Tests/WordPressKitTests/Mock Data/reader-site-search-success.json diff --git a/WordPressKitTests/Mock Data/remote-notification.json b/Tests/WordPressKitTests/Mock Data/remote-notification.json similarity index 100% rename from WordPressKitTests/Mock Data/remote-notification.json rename to Tests/WordPressKitTests/Mock Data/remote-notification.json diff --git a/WordPressKitTests/Mock Data/rest-site-settings.json b/Tests/WordPressKitTests/Mock Data/rest-site-settings.json similarity index 100% rename from WordPressKitTests/Mock Data/rest-site-settings.json rename to Tests/WordPressKitTests/Mock Data/rest-site-settings.json diff --git a/WordPressKitTests/Mock Data/self-hosted-plugins-get.json b/Tests/WordPressKitTests/Mock Data/self-hosted-plugins-get.json similarity index 100% rename from WordPressKitTests/Mock Data/self-hosted-plugins-get.json rename to Tests/WordPressKitTests/Mock Data/self-hosted-plugins-get.json diff --git a/WordPressKitTests/Mock Data/self-hosted-plugins-install.json b/Tests/WordPressKitTests/Mock Data/self-hosted-plugins-install.json similarity index 100% rename from WordPressKitTests/Mock Data/self-hosted-plugins-install.json rename to Tests/WordPressKitTests/Mock Data/self-hosted-plugins-install.json diff --git a/WordPressKitTests/Mock Data/share-app-content-success.json b/Tests/WordPressKitTests/Mock Data/share-app-content-success.json similarity index 100% rename from WordPressKitTests/Mock Data/share-app-content-success.json rename to Tests/WordPressKitTests/Mock Data/share-app-content-success.json diff --git a/WordPressKitTests/Mock Data/site-active-purchases-auth-failure.json b/Tests/WordPressKitTests/Mock Data/site-active-purchases-auth-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-active-purchases-auth-failure.json rename to Tests/WordPressKitTests/Mock Data/site-active-purchases-auth-failure.json diff --git a/WordPressKitTests/Mock Data/site-active-purchases-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/site-active-purchases-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-active-purchases-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/site-active-purchases-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/site-active-purchases-empty-response.json b/Tests/WordPressKitTests/Mock Data/site-active-purchases-empty-response.json similarity index 100% rename from WordPressKitTests/Mock Data/site-active-purchases-empty-response.json rename to Tests/WordPressKitTests/Mock Data/site-active-purchases-empty-response.json diff --git a/WordPressKitTests/Mock Data/site-active-purchases-none-active-success.json b/Tests/WordPressKitTests/Mock Data/site-active-purchases-none-active-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-active-purchases-none-active-success.json rename to Tests/WordPressKitTests/Mock Data/site-active-purchases-none-active-success.json diff --git a/WordPressKitTests/Mock Data/site-active-purchases-two-active-success.json b/Tests/WordPressKitTests/Mock Data/site-active-purchases-two-active-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-active-purchases-two-active-success.json rename to Tests/WordPressKitTests/Mock Data/site-active-purchases-two-active-success.json diff --git a/WordPressKitTests/Mock Data/site-comment-success.json b/Tests/WordPressKitTests/Mock Data/site-comment-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-comment-success.json rename to Tests/WordPressKitTests/Mock Data/site-comment-success.json diff --git a/WordPressKitTests/Mock Data/site-comments-success.json b/Tests/WordPressKitTests/Mock Data/site-comments-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-comments-success.json rename to Tests/WordPressKitTests/Mock Data/site-comments-success.json diff --git a/WordPressKitTests/Mock Data/site-creation-success.json b/Tests/WordPressKitTests/Mock Data/site-creation-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-creation-success.json rename to Tests/WordPressKitTests/Mock Data/site-creation-success.json diff --git a/WordPressKitTests/Mock Data/site-delete-auth-failure.json b/Tests/WordPressKitTests/Mock Data/site-delete-auth-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-delete-auth-failure.json rename to Tests/WordPressKitTests/Mock Data/site-delete-auth-failure.json diff --git a/WordPressKitTests/Mock Data/site-delete-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/site-delete-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-delete-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/site-delete-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/site-delete-missing-status-failure.json b/Tests/WordPressKitTests/Mock Data/site-delete-missing-status-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-delete-missing-status-failure.json rename to Tests/WordPressKitTests/Mock Data/site-delete-missing-status-failure.json diff --git a/WordPressKitTests/Mock Data/site-delete-success.json b/Tests/WordPressKitTests/Mock Data/site-delete-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-delete-success.json rename to Tests/WordPressKitTests/Mock Data/site-delete-success.json diff --git a/WordPressKitTests/Mock Data/site-delete-unexpected-json-failure.json b/Tests/WordPressKitTests/Mock Data/site-delete-unexpected-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-delete-unexpected-json-failure.json rename to Tests/WordPressKitTests/Mock Data/site-delete-unexpected-json-failure.json diff --git a/WordPressKitTests/Mock Data/site-email-followers-get-auth-failure.json b/Tests/WordPressKitTests/Mock Data/site-email-followers-get-auth-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-email-followers-get-auth-failure.json rename to Tests/WordPressKitTests/Mock Data/site-email-followers-get-auth-failure.json diff --git a/WordPressKitTests/Mock Data/site-email-followers-get-failure.json b/Tests/WordPressKitTests/Mock Data/site-email-followers-get-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-email-followers-get-failure.json rename to Tests/WordPressKitTests/Mock Data/site-email-followers-get-failure.json diff --git a/WordPressKitTests/Mock Data/site-email-followers-get-success-more-pages.json b/Tests/WordPressKitTests/Mock Data/site-email-followers-get-success-more-pages.json similarity index 100% rename from WordPressKitTests/Mock Data/site-email-followers-get-success-more-pages.json rename to Tests/WordPressKitTests/Mock Data/site-email-followers-get-success-more-pages.json diff --git a/WordPressKitTests/Mock Data/site-email-followers-get-success.json b/Tests/WordPressKitTests/Mock Data/site-email-followers-get-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-email-followers-get-success.json rename to Tests/WordPressKitTests/Mock Data/site-email-followers-get-success.json diff --git a/WordPressKitTests/Mock Data/site-export-auth-failure.json b/Tests/WordPressKitTests/Mock Data/site-export-auth-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-export-auth-failure.json rename to Tests/WordPressKitTests/Mock Data/site-export-auth-failure.json diff --git a/WordPressKitTests/Mock Data/site-export-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/site-export-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-export-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/site-export-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/site-export-failure.json b/Tests/WordPressKitTests/Mock Data/site-export-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-export-failure.json rename to Tests/WordPressKitTests/Mock Data/site-export-failure.json diff --git a/WordPressKitTests/Mock Data/site-export-missing-status-failure.json b/Tests/WordPressKitTests/Mock Data/site-export-missing-status-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-export-missing-status-failure.json rename to Tests/WordPressKitTests/Mock Data/site-export-missing-status-failure.json diff --git a/WordPressKitTests/Mock Data/site-export-success.json b/Tests/WordPressKitTests/Mock Data/site-export-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-export-success.json rename to Tests/WordPressKitTests/Mock Data/site-export-success.json diff --git a/WordPressKitTests/Mock Data/site-followers-delete-auth-failure.json b/Tests/WordPressKitTests/Mock Data/site-followers-delete-auth-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-followers-delete-auth-failure.json rename to Tests/WordPressKitTests/Mock Data/site-followers-delete-auth-failure.json diff --git a/WordPressKitTests/Mock Data/site-followers-delete-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/site-followers-delete-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-followers-delete-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/site-followers-delete-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/site-followers-delete-failure.json b/Tests/WordPressKitTests/Mock Data/site-followers-delete-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-followers-delete-failure.json rename to Tests/WordPressKitTests/Mock Data/site-followers-delete-failure.json diff --git a/WordPressKitTests/Mock Data/site-followers-delete-success.json b/Tests/WordPressKitTests/Mock Data/site-followers-delete-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-followers-delete-success.json rename to Tests/WordPressKitTests/Mock Data/site-followers-delete-success.json diff --git a/WordPressKitTests/Mock Data/site-plans-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/site-plans-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-plans-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/site-plans-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/site-plans-v3-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/site-plans-v3-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-plans-v3-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/site-plans-v3-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/site-plans-v3-empty-failure.json b/Tests/WordPressKitTests/Mock Data/site-plans-v3-empty-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-plans-v3-empty-failure.json rename to Tests/WordPressKitTests/Mock Data/site-plans-v3-empty-failure.json diff --git a/WordPressKitTests/Mock Data/site-plans-v3-success.json b/Tests/WordPressKitTests/Mock Data/site-plans-v3-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-plans-v3-success.json rename to Tests/WordPressKitTests/Mock Data/site-plans-v3-success.json diff --git a/WordPressKitTests/Mock Data/site-plugins-error.json b/Tests/WordPressKitTests/Mock Data/site-plugins-error.json similarity index 100% rename from WordPressKitTests/Mock Data/site-plugins-error.json rename to Tests/WordPressKitTests/Mock Data/site-plugins-error.json diff --git a/WordPressKitTests/Mock Data/site-plugins-malformed.json b/Tests/WordPressKitTests/Mock Data/site-plugins-malformed.json similarity index 100% rename from WordPressKitTests/Mock Data/site-plugins-malformed.json rename to Tests/WordPressKitTests/Mock Data/site-plugins-malformed.json diff --git a/WordPressKitTests/Mock Data/site-plugins-success.json b/Tests/WordPressKitTests/Mock Data/site-plugins-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-plugins-success.json rename to Tests/WordPressKitTests/Mock Data/site-plugins-success.json diff --git a/WordPressKitTests/Mock Data/site-quick-start-failure.json b/Tests/WordPressKitTests/Mock Data/site-quick-start-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-quick-start-failure.json rename to Tests/WordPressKitTests/Mock Data/site-quick-start-failure.json diff --git a/WordPressKitTests/Mock Data/site-quick-start-success.json b/Tests/WordPressKitTests/Mock Data/site-quick-start-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-quick-start-success.json rename to Tests/WordPressKitTests/Mock Data/site-quick-start-success.json diff --git a/WordPressKitTests/Mock Data/site-roles-auth-failure.json b/Tests/WordPressKitTests/Mock Data/site-roles-auth-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-roles-auth-failure.json rename to Tests/WordPressKitTests/Mock Data/site-roles-auth-failure.json diff --git a/WordPressKitTests/Mock Data/site-roles-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/site-roles-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-roles-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/site-roles-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/site-roles-success.json b/Tests/WordPressKitTests/Mock Data/site-roles-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-roles-success.json rename to Tests/WordPressKitTests/Mock Data/site-roles-success.json diff --git a/WordPressKitTests/Mock Data/site-segments-multiple.json b/Tests/WordPressKitTests/Mock Data/site-segments-multiple.json similarity index 100% rename from WordPressKitTests/Mock Data/site-segments-multiple.json rename to Tests/WordPressKitTests/Mock Data/site-segments-multiple.json diff --git a/WordPressKitTests/Mock Data/site-segments-single.json b/Tests/WordPressKitTests/Mock Data/site-segments-single.json similarity index 100% rename from WordPressKitTests/Mock Data/site-segments-single.json rename to Tests/WordPressKitTests/Mock Data/site-segments-single.json diff --git a/WordPressKitTests/Mock Data/site-users-delete-auth-failure.json b/Tests/WordPressKitTests/Mock Data/site-users-delete-auth-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-users-delete-auth-failure.json rename to Tests/WordPressKitTests/Mock Data/site-users-delete-auth-failure.json diff --git a/WordPressKitTests/Mock Data/site-users-delete-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/site-users-delete-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-users-delete-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/site-users-delete-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/site-users-delete-not-member-failure.json b/Tests/WordPressKitTests/Mock Data/site-users-delete-not-member-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-users-delete-not-member-failure.json rename to Tests/WordPressKitTests/Mock Data/site-users-delete-not-member-failure.json diff --git a/WordPressKitTests/Mock Data/site-users-delete-site-owner-failure.json b/Tests/WordPressKitTests/Mock Data/site-users-delete-site-owner-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-users-delete-site-owner-failure.json rename to Tests/WordPressKitTests/Mock Data/site-users-delete-site-owner-failure.json diff --git a/WordPressKitTests/Mock Data/site-users-delete-success.json b/Tests/WordPressKitTests/Mock Data/site-users-delete-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-users-delete-success.json rename to Tests/WordPressKitTests/Mock Data/site-users-delete-success.json diff --git a/WordPressKitTests/Mock Data/site-users-update-role-bad-json-failure.json b/Tests/WordPressKitTests/Mock Data/site-users-update-role-bad-json-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-users-update-role-bad-json-failure.json rename to Tests/WordPressKitTests/Mock Data/site-users-update-role-bad-json-failure.json diff --git a/WordPressKitTests/Mock Data/site-users-update-role-success.json b/Tests/WordPressKitTests/Mock Data/site-users-update-role-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-users-update-role-success.json rename to Tests/WordPressKitTests/Mock Data/site-users-update-role-success.json diff --git a/WordPressKitTests/Mock Data/site-users-update-role-unknown-site-failure.json b/Tests/WordPressKitTests/Mock Data/site-users-update-role-unknown-site-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-users-update-role-unknown-site-failure.json rename to Tests/WordPressKitTests/Mock Data/site-users-update-role-unknown-site-failure.json diff --git a/WordPressKitTests/Mock Data/site-users-update-role-unknown-user-failure.json b/Tests/WordPressKitTests/Mock Data/site-users-update-role-unknown-user-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-users-update-role-unknown-user-failure.json rename to Tests/WordPressKitTests/Mock Data/site-users-update-role-unknown-user-failure.json diff --git a/WordPressKitTests/Mock Data/site-verticals-empty.json b/Tests/WordPressKitTests/Mock Data/site-verticals-empty.json similarity index 100% rename from WordPressKitTests/Mock Data/site-verticals-empty.json rename to Tests/WordPressKitTests/Mock Data/site-verticals-empty.json diff --git a/WordPressKitTests/Mock Data/site-verticals-multiple.json b/Tests/WordPressKitTests/Mock Data/site-verticals-multiple.json similarity index 100% rename from WordPressKitTests/Mock Data/site-verticals-multiple.json rename to Tests/WordPressKitTests/Mock Data/site-verticals-multiple.json diff --git a/WordPressKitTests/Mock Data/site-verticals-prompt.json b/Tests/WordPressKitTests/Mock Data/site-verticals-prompt.json similarity index 100% rename from WordPressKitTests/Mock Data/site-verticals-prompt.json rename to Tests/WordPressKitTests/Mock Data/site-verticals-prompt.json diff --git a/WordPressKitTests/Mock Data/site-verticals-single.json b/Tests/WordPressKitTests/Mock Data/site-verticals-single.json similarity index 100% rename from WordPressKitTests/Mock Data/site-verticals-single.json rename to Tests/WordPressKitTests/Mock Data/site-verticals-single.json diff --git a/WordPressKitTests/Mock Data/site-viewers-delete-auth-failure.json b/Tests/WordPressKitTests/Mock Data/site-viewers-delete-auth-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-viewers-delete-auth-failure.json rename to Tests/WordPressKitTests/Mock Data/site-viewers-delete-auth-failure.json diff --git a/WordPressKitTests/Mock Data/site-viewers-delete-bad-json.json b/Tests/WordPressKitTests/Mock Data/site-viewers-delete-bad-json.json similarity index 100% rename from WordPressKitTests/Mock Data/site-viewers-delete-bad-json.json rename to Tests/WordPressKitTests/Mock Data/site-viewers-delete-bad-json.json diff --git a/WordPressKitTests/Mock Data/site-viewers-delete-failure.json b/Tests/WordPressKitTests/Mock Data/site-viewers-delete-failure.json similarity index 100% rename from WordPressKitTests/Mock Data/site-viewers-delete-failure.json rename to Tests/WordPressKitTests/Mock Data/site-viewers-delete-failure.json diff --git a/WordPressKitTests/Mock Data/site-viewers-delete-success.json b/Tests/WordPressKitTests/Mock Data/site-viewers-delete-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-viewers-delete-success.json rename to Tests/WordPressKitTests/Mock Data/site-viewers-delete-success.json diff --git a/WordPressKitTests/Mock Data/site-zendesk-metadata-success.json b/Tests/WordPressKitTests/Mock Data/site-zendesk-metadata-success.json similarity index 100% rename from WordPressKitTests/Mock Data/site-zendesk-metadata-success.json rename to Tests/WordPressKitTests/Mock Data/site-zendesk-metadata-success.json diff --git a/WordPressKitTests/Mock Data/sites-external-services.json b/Tests/WordPressKitTests/Mock Data/sites-external-services.json similarity index 100% rename from WordPressKitTests/Mock Data/sites-external-services.json rename to Tests/WordPressKitTests/Mock Data/sites-external-services.json diff --git a/WordPressKitTests/Mock Data/sites-invites-links-disable-empty.json b/Tests/WordPressKitTests/Mock Data/sites-invites-links-disable-empty.json similarity index 100% rename from WordPressKitTests/Mock Data/sites-invites-links-disable-empty.json rename to Tests/WordPressKitTests/Mock Data/sites-invites-links-disable-empty.json diff --git a/WordPressKitTests/Mock Data/sites-invites-links-disable.json b/Tests/WordPressKitTests/Mock Data/sites-invites-links-disable.json similarity index 100% rename from WordPressKitTests/Mock Data/sites-invites-links-disable.json rename to Tests/WordPressKitTests/Mock Data/sites-invites-links-disable.json diff --git a/WordPressKitTests/Mock Data/sites-invites-links-generate.json b/Tests/WordPressKitTests/Mock Data/sites-invites-links-generate.json similarity index 100% rename from WordPressKitTests/Mock Data/sites-invites-links-generate.json rename to Tests/WordPressKitTests/Mock Data/sites-invites-links-generate.json diff --git a/WordPressKitTests/Mock Data/sites-invites.json b/Tests/WordPressKitTests/Mock Data/sites-invites.json similarity index 100% rename from WordPressKitTests/Mock Data/sites-invites.json rename to Tests/WordPressKitTests/Mock Data/sites-invites.json diff --git a/WordPressKitTests/Mock Data/sites-site-active-features.json b/Tests/WordPressKitTests/Mock Data/sites-site-active-features.json similarity index 100% rename from WordPressKitTests/Mock Data/sites-site-active-features.json rename to Tests/WordPressKitTests/Mock Data/sites-site-active-features.json diff --git a/WordPressKitTests/Mock Data/sites-site-no-active-features.json b/Tests/WordPressKitTests/Mock Data/sites-site-no-active-features.json similarity index 100% rename from WordPressKitTests/Mock Data/sites-site-no-active-features.json rename to Tests/WordPressKitTests/Mock Data/sites-site-no-active-features.json diff --git a/WordPressKitTests/Mock Data/stats-clicks-data.json b/Tests/WordPressKitTests/Mock Data/stats-clicks-data.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-clicks-data.json rename to Tests/WordPressKitTests/Mock Data/stats-clicks-data.json diff --git a/WordPressKitTests/Mock Data/stats-countries-data.json b/Tests/WordPressKitTests/Mock Data/stats-countries-data.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-countries-data.json rename to Tests/WordPressKitTests/Mock Data/stats-countries-data.json diff --git a/WordPressKitTests/Mock Data/stats-file-downloads.json b/Tests/WordPressKitTests/Mock Data/stats-file-downloads.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-file-downloads.json rename to Tests/WordPressKitTests/Mock Data/stats-file-downloads.json diff --git a/WordPressKitTests/Mock Data/stats-post-details.json b/Tests/WordPressKitTests/Mock Data/stats-post-details.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-post-details.json rename to Tests/WordPressKitTests/Mock Data/stats-post-details.json diff --git a/WordPressKitTests/Mock Data/stats-posts-data.json b/Tests/WordPressKitTests/Mock Data/stats-posts-data.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-posts-data.json rename to Tests/WordPressKitTests/Mock Data/stats-posts-data.json diff --git a/WordPressKitTests/Mock Data/stats-published-posts.json b/Tests/WordPressKitTests/Mock Data/stats-published-posts.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-published-posts.json rename to Tests/WordPressKitTests/Mock Data/stats-published-posts.json diff --git a/WordPressKitTests/Mock Data/stats-referrer-data.json b/Tests/WordPressKitTests/Mock Data/stats-referrer-data.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-referrer-data.json rename to Tests/WordPressKitTests/Mock Data/stats-referrer-data.json diff --git a/WordPressKitTests/Mock Data/stats-referrer-mark-as-spam.json b/Tests/WordPressKitTests/Mock Data/stats-referrer-mark-as-spam.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-referrer-mark-as-spam.json rename to Tests/WordPressKitTests/Mock Data/stats-referrer-mark-as-spam.json diff --git a/WordPressKitTests/Mock Data/stats-search-term-result.json b/Tests/WordPressKitTests/Mock Data/stats-search-term-result.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-search-term-result.json rename to Tests/WordPressKitTests/Mock Data/stats-search-term-result.json diff --git a/WordPressKitTests/Mock Data/stats-streak-result.json b/Tests/WordPressKitTests/Mock Data/stats-streak-result.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-streak-result.json rename to Tests/WordPressKitTests/Mock Data/stats-streak-result.json diff --git a/WordPressKitTests/Mock Data/stats-summary.json b/Tests/WordPressKitTests/Mock Data/stats-summary.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-summary.json rename to Tests/WordPressKitTests/Mock Data/stats-summary.json diff --git a/WordPressKitTests/Mock Data/stats-top-authors.json b/Tests/WordPressKitTests/Mock Data/stats-top-authors.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-top-authors.json rename to Tests/WordPressKitTests/Mock Data/stats-top-authors.json diff --git a/WordPressKitTests/Mock Data/stats-videos-data.json b/Tests/WordPressKitTests/Mock Data/stats-videos-data.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-videos-data.json rename to Tests/WordPressKitTests/Mock Data/stats-videos-data.json diff --git a/WordPressKitTests/Mock Data/stats-visits-day.json b/Tests/WordPressKitTests/Mock Data/stats-visits-day.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-visits-day.json rename to Tests/WordPressKitTests/Mock Data/stats-visits-day.json diff --git a/WordPressKitTests/Mock Data/stats-visits-month-unit-week.json b/Tests/WordPressKitTests/Mock Data/stats-visits-month-unit-week.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-visits-month-unit-week.json rename to Tests/WordPressKitTests/Mock Data/stats-visits-month-unit-week.json diff --git a/WordPressKitTests/Mock Data/stats-visits-month.json b/Tests/WordPressKitTests/Mock Data/stats-visits-month.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-visits-month.json rename to Tests/WordPressKitTests/Mock Data/stats-visits-month.json diff --git a/WordPressKitTests/Mock Data/stats-visits-week.json b/Tests/WordPressKitTests/Mock Data/stats-visits-week.json similarity index 100% rename from WordPressKitTests/Mock Data/stats-visits-week.json rename to Tests/WordPressKitTests/Mock Data/stats-visits-week.json diff --git a/WordPressKitTests/Mock Data/supported-countries-success.json b/Tests/WordPressKitTests/Mock Data/supported-countries-success.json similarity index 100% rename from WordPressKitTests/Mock Data/supported-countries-success.json rename to Tests/WordPressKitTests/Mock Data/supported-countries-success.json diff --git a/WordPressKitTests/Mock Data/supported-states-empty.json b/Tests/WordPressKitTests/Mock Data/supported-states-empty.json similarity index 100% rename from WordPressKitTests/Mock Data/supported-states-empty.json rename to Tests/WordPressKitTests/Mock Data/supported-states-empty.json diff --git a/WordPressKitTests/Mock Data/supported-states-success.json b/Tests/WordPressKitTests/Mock Data/supported-states-success.json similarity index 100% rename from WordPressKitTests/Mock Data/supported-states-success.json rename to Tests/WordPressKitTests/Mock Data/supported-states-success.json diff --git a/WordPressKitTests/Mock Data/timezones.json b/Tests/WordPressKitTests/Mock Data/timezones.json similarity index 100% rename from WordPressKitTests/Mock Data/timezones.json rename to Tests/WordPressKitTests/Mock Data/timezones.json diff --git a/WordPressKitTests/Mock Data/validate-domain-contact-information-response-fail.json b/Tests/WordPressKitTests/Mock Data/validate-domain-contact-information-response-fail.json similarity index 100% rename from WordPressKitTests/Mock Data/validate-domain-contact-information-response-fail.json rename to Tests/WordPressKitTests/Mock Data/validate-domain-contact-information-response-fail.json diff --git a/WordPressKitTests/Mock Data/validate-domain-contact-information-response-success.json b/Tests/WordPressKitTests/Mock Data/validate-domain-contact-information-response-success.json similarity index 100% rename from WordPressKitTests/Mock Data/validate-domain-contact-information-response-success.json rename to Tests/WordPressKitTests/Mock Data/validate-domain-contact-information-response-success.json diff --git a/WordPressKitTests/Mock Data/videopress-private-video.json b/Tests/WordPressKitTests/Mock Data/videopress-private-video.json similarity index 100% rename from WordPressKitTests/Mock Data/videopress-private-video.json rename to Tests/WordPressKitTests/Mock Data/videopress-private-video.json diff --git a/WordPressKitTests/Mock Data/videopress-public-video.json b/Tests/WordPressKitTests/Mock Data/videopress-public-video.json similarity index 100% rename from WordPressKitTests/Mock Data/videopress-public-video.json rename to Tests/WordPressKitTests/Mock Data/videopress-public-video.json diff --git a/WordPressKitTests/Mock Data/videopress-site-default-video.json b/Tests/WordPressKitTests/Mock Data/videopress-site-default-video.json similarity index 100% rename from WordPressKitTests/Mock Data/videopress-site-default-video.json rename to Tests/WordPressKitTests/Mock Data/videopress-site-default-video.json diff --git a/WordPressKitTests/Mock Data/videopress-token.json b/Tests/WordPressKitTests/Mock Data/videopress-token.json similarity index 100% rename from WordPressKitTests/Mock Data/videopress-token.json rename to Tests/WordPressKitTests/Mock Data/videopress-token.json diff --git a/WordPressKitTests/Mock Data/wp-admin-post-new.html b/Tests/WordPressKitTests/Mock Data/wp-admin-post-new.html similarity index 100% rename from WordPressKitTests/Mock Data/wp-admin-post-new.html rename to Tests/WordPressKitTests/Mock Data/wp-admin-post-new.html diff --git a/WordPressKitTests/Mock Data/wp-forbidden.json b/Tests/WordPressKitTests/Mock Data/wp-forbidden.json similarity index 100% rename from WordPressKitTests/Mock Data/wp-forbidden.json rename to Tests/WordPressKitTests/Mock Data/wp-forbidden.json diff --git a/WordPressKitTests/Mock Data/wp-pages.json b/Tests/WordPressKitTests/Mock Data/wp-pages.json similarity index 100% rename from WordPressKitTests/Mock Data/wp-pages.json rename to Tests/WordPressKitTests/Mock Data/wp-pages.json diff --git a/WordPressKitTests/Mock Data/wp-reusable-blocks.json b/Tests/WordPressKitTests/Mock Data/wp-reusable-blocks.json similarity index 100% rename from WordPressKitTests/Mock Data/wp-reusable-blocks.json rename to Tests/WordPressKitTests/Mock Data/wp-reusable-blocks.json diff --git a/WordPressKitTests/Mock Data/xmlrpc-bad-username-password-error.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-bad-username-password-error.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-bad-username-password-error.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-bad-username-password-error.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-malformed-request-xml-error.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-malformed-request-xml-error.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-malformed-request-xml-error.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-malformed-request-xml-error.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-bad-xml-failure.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-bad-xml-failure.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-bad-xml-failure.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-bad-xml-failure.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-change-format-failure.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-change-format-failure.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-change-format-failure.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-change-format-failure.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-change-type-failure.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-change-type-failure.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-change-type-failure.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-change-type-failure.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-success.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-success.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-success.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-editpost-success.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-metaweblog-newpost-bad-xml-failure.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-newpost-bad-xml-failure.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-metaweblog-newpost-bad-xml-failure.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-newpost-bad-xml-failure.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-metaweblog-newpost-invalid-posttype-failure.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-newpost-invalid-posttype-failure.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-metaweblog-newpost-invalid-posttype-failure.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-newpost-invalid-posttype-failure.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-metaweblog-newpost-success.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-newpost-success.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-metaweblog-newpost-success.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-metaweblog-newpost-success.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-response-getpost.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-response-getpost.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-response-getpost.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-response-getpost.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-response-getprofile.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-response-getprofile.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-response-getprofile.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-response-getprofile.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-response-invalid.html b/Tests/WordPressKitTests/Mock Data/xmlrpc-response-invalid.html similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-response-invalid.html rename to Tests/WordPressKitTests/Mock Data/xmlrpc-response-invalid.html diff --git a/WordPressKitTests/Mock Data/xmlrpc-response-list-methods.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-response-list-methods.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-response-list-methods.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-response-list-methods.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-response-mobile-plugin-redirect.html b/Tests/WordPressKitTests/Mock Data/xmlrpc-response-mobile-plugin-redirect.html similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-response-mobile-plugin-redirect.html rename to Tests/WordPressKitTests/Mock Data/xmlrpc-response-mobile-plugin-redirect.html diff --git a/WordPressKitTests/Mock Data/xmlrpc-response-valid-but-unexpected-dictionary.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-response-valid-but-unexpected-dictionary.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-response-valid-but-unexpected-dictionary.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-response-valid-but-unexpected-dictionary.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-site-comment-success.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-site-comment-success.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-site-comment-success.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-site-comment-success.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-site-comments-success.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-site-comments-success.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-site-comments-success.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-site-comments-success.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-wp-getpost-bad-xml-failure.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-wp-getpost-bad-xml-failure.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-wp-getpost-bad-xml-failure.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-wp-getpost-bad-xml-failure.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-wp-getpost-invalid-id-failure.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-wp-getpost-invalid-id-failure.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-wp-getpost-invalid-id-failure.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-wp-getpost-invalid-id-failure.xml diff --git a/WordPressKitTests/Mock Data/xmlrpc-wp-getpost-success.xml b/Tests/WordPressKitTests/Mock Data/xmlrpc-wp-getpost-success.xml similarity index 100% rename from WordPressKitTests/Mock Data/xmlrpc-wp-getpost-success.xml rename to Tests/WordPressKitTests/Mock Data/xmlrpc-wp-getpost-success.xml diff --git a/WordPressKitTests/AccountServiceRemoteRESTTests.swift b/Tests/WordPressKitTests/Tests/AccountServiceRemoteRESTTests.swift similarity index 100% rename from WordPressKitTests/AccountServiceRemoteRESTTests.swift rename to Tests/WordPressKitTests/Tests/AccountServiceRemoteRESTTests.swift diff --git a/WordPressKitTests/AccountSettingsRemoteTests.swift b/Tests/WordPressKitTests/Tests/AccountSettingsRemoteTests.swift similarity index 100% rename from WordPressKitTests/AccountSettingsRemoteTests.swift rename to Tests/WordPressKitTests/Tests/AccountSettingsRemoteTests.swift diff --git a/WordPressKitTests/ActivityServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/ActivityServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/ActivityServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/ActivityServiceRemoteTests.swift diff --git a/WordPressKitTests/ActivityTests.swift b/Tests/WordPressKitTests/Tests/ActivityTests.swift similarity index 100% rename from WordPressKitTests/ActivityTests.swift rename to Tests/WordPressKitTests/Tests/ActivityTests.swift diff --git a/WordPressKitTests/AllDomainsResultDomainTests.swift b/Tests/WordPressKitTests/Tests/AllDomainsResultDomainTests.swift similarity index 100% rename from WordPressKitTests/AllDomainsResultDomainTests.swift rename to Tests/WordPressKitTests/Tests/AllDomainsResultDomainTests.swift diff --git a/WordPressKitTests/AnnouncementServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/AnnouncementServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/AnnouncementServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/AnnouncementServiceRemoteTests.swift diff --git a/WordPressKitTests/AtomicAuthenticationServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/AtomicAuthenticationServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/AtomicAuthenticationServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/AtomicAuthenticationServiceRemoteTests.swift diff --git a/WordPressKitTests/BlazeServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/BlazeServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/BlazeServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/BlazeServiceRemoteTests.swift diff --git a/WordPressKitTests/BlockEditorSettingsServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/BlockEditorSettingsServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/BlockEditorSettingsServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/BlockEditorSettingsServiceRemoteTests.swift diff --git a/WordPressKitTests/BlogServiceRemote+ActiveFeaturesTests.swift b/Tests/WordPressKitTests/Tests/BlogServiceRemote+ActiveFeaturesTests.swift similarity index 100% rename from WordPressKitTests/BlogServiceRemote+ActiveFeaturesTests.swift rename to Tests/WordPressKitTests/Tests/BlogServiceRemote+ActiveFeaturesTests.swift diff --git a/WordPressKitTests/BlogServiceRemoteRESTTests.m b/Tests/WordPressKitTests/Tests/BlogServiceRemoteRESTTests.m similarity index 100% rename from WordPressKitTests/BlogServiceRemoteRESTTests.m rename to Tests/WordPressKitTests/Tests/BlogServiceRemoteRESTTests.m diff --git a/WordPressKitTests/BloggingPromptsServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/BloggingPromptsServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/BloggingPromptsServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/BloggingPromptsServiceRemoteTests.swift diff --git a/WordPressKitTests/CommentServiceRemoteREST+APIv2Tests.swift b/Tests/WordPressKitTests/Tests/CommentServiceRemoteREST+APIv2Tests.swift similarity index 100% rename from WordPressKitTests/CommentServiceRemoteREST+APIv2Tests.swift rename to Tests/WordPressKitTests/Tests/CommentServiceRemoteREST+APIv2Tests.swift diff --git a/WordPressKitTests/CommentServiceRemoteRESTLikesTests.swift b/Tests/WordPressKitTests/Tests/CommentServiceRemoteRESTLikesTests.swift similarity index 100% rename from WordPressKitTests/CommentServiceRemoteRESTLikesTests.swift rename to Tests/WordPressKitTests/Tests/CommentServiceRemoteRESTLikesTests.swift diff --git a/WordPressKitTests/CommentServiceRemoteRESTTests.swift b/Tests/WordPressKitTests/Tests/CommentServiceRemoteRESTTests.swift similarity index 100% rename from WordPressKitTests/CommentServiceRemoteRESTTests.swift rename to Tests/WordPressKitTests/Tests/CommentServiceRemoteRESTTests.swift diff --git a/WordPressKitTests/CommentServiceRemoteXMLRPCTests.swift b/Tests/WordPressKitTests/Tests/CommentServiceRemoteXMLRPCTests.swift similarity index 100% rename from WordPressKitTests/CommentServiceRemoteXMLRPCTests.swift rename to Tests/WordPressKitTests/Tests/CommentServiceRemoteXMLRPCTests.swift diff --git a/WordPressKitTests/DashboardServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/DashboardServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/DashboardServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/DashboardServiceRemoteTests.swift diff --git a/WordPressKitTests/Date+WordPressComTests.swift b/Tests/WordPressKitTests/Tests/Date+WordPressComTests.swift similarity index 100% rename from WordPressKitTests/Date+WordPressComTests.swift rename to Tests/WordPressKitTests/Tests/Date+WordPressComTests.swift diff --git a/WordPressKitTests/DateFormatter+WordPressComTests.swift b/Tests/WordPressKitTests/Tests/DateFormatter+WordPressComTests.swift similarity index 100% rename from WordPressKitTests/DateFormatter+WordPressComTests.swift rename to Tests/WordPressKitTests/Tests/DateFormatter+WordPressComTests.swift diff --git a/WordPressKitTests/DomainsServiceRemoteRESTTests.swift b/Tests/WordPressKitTests/Tests/DomainsServiceRemoteRESTTests.swift similarity index 100% rename from WordPressKitTests/DomainsServiceRemoteRESTTests.swift rename to Tests/WordPressKitTests/Tests/DomainsServiceRemoteRESTTests.swift diff --git a/WordPressKitTests/DynamicMockProvider.swift b/Tests/WordPressKitTests/Tests/DynamicMockProvider.swift similarity index 100% rename from WordPressKitTests/DynamicMockProvider.swift rename to Tests/WordPressKitTests/Tests/DynamicMockProvider.swift diff --git a/WordPressKitTests/EditorServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/EditorServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/EditorServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/EditorServiceRemoteTests.swift diff --git a/WordPressKitTests/Extensions/Decodable+DictionaryTests.swift b/Tests/WordPressKitTests/Tests/Extensions/Decodable+DictionaryTests.swift similarity index 100% rename from WordPressKitTests/Extensions/Decodable+DictionaryTests.swift rename to Tests/WordPressKitTests/Tests/Extensions/Decodable+DictionaryTests.swift diff --git a/WordPressKitTests/IPLocationRemoteTests.swift b/Tests/WordPressKitTests/Tests/IPLocationRemoteTests.swift similarity index 100% rename from WordPressKitTests/IPLocationRemoteTests.swift rename to Tests/WordPressKitTests/Tests/IPLocationRemoteTests.swift diff --git a/WordPressKitTests/JSONLoader.swift b/Tests/WordPressKitTests/Tests/JSONLoader.swift similarity index 100% rename from WordPressKitTests/JSONLoader.swift rename to Tests/WordPressKitTests/Tests/JSONLoader.swift diff --git a/WordPressKitTests/JetpackBackupServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/JetpackBackupServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/JetpackBackupServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/JetpackBackupServiceRemoteTests.swift diff --git a/WordPressKitTests/JetpackCapabilitiesServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/JetpackCapabilitiesServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/JetpackCapabilitiesServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/JetpackCapabilitiesServiceRemoteTests.swift diff --git a/WordPressKitTests/JetpackProxyServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/JetpackProxyServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/JetpackProxyServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/JetpackProxyServiceRemoteTests.swift diff --git a/WordPressKitTests/JetpackServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/JetpackServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/JetpackServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/JetpackServiceRemoteTests.swift diff --git a/WordPressKitTests/LoadMediaLibraryTests.swift b/Tests/WordPressKitTests/Tests/LoadMediaLibraryTests.swift similarity index 100% rename from WordPressKitTests/LoadMediaLibraryTests.swift rename to Tests/WordPressKitTests/Tests/LoadMediaLibraryTests.swift diff --git a/WordPressKitTests/MediaLibraryTestSupport.swift b/Tests/WordPressKitTests/Tests/MediaLibraryTestSupport.swift similarity index 100% rename from WordPressKitTests/MediaLibraryTestSupport.swift rename to Tests/WordPressKitTests/Tests/MediaLibraryTestSupport.swift diff --git a/WordPressKitTests/MediaServiceRemoteRESTTests.swift b/Tests/WordPressKitTests/Tests/MediaServiceRemoteRESTTests.swift similarity index 100% rename from WordPressKitTests/MediaServiceRemoteRESTTests.swift rename to Tests/WordPressKitTests/Tests/MediaServiceRemoteRESTTests.swift diff --git a/WordPressKitTests/MenusServiceRemoteTests.m b/Tests/WordPressKitTests/Tests/MenusServiceRemoteTests.m similarity index 100% rename from WordPressKitTests/MenusServiceRemoteTests.m rename to Tests/WordPressKitTests/Tests/MenusServiceRemoteTests.m diff --git a/WordPressKitTests/MockPluginDirectoryEntryProvider.swift b/Tests/WordPressKitTests/Tests/MockPluginDirectoryEntryProvider.swift similarity index 100% rename from WordPressKitTests/MockPluginDirectoryEntryProvider.swift rename to Tests/WordPressKitTests/Tests/MockPluginDirectoryEntryProvider.swift diff --git a/WordPressKitTests/MockPluginStateProvider.swift b/Tests/WordPressKitTests/Tests/MockPluginStateProvider.swift similarity index 100% rename from WordPressKitTests/MockPluginStateProvider.swift rename to Tests/WordPressKitTests/Tests/MockPluginStateProvider.swift diff --git a/WordPressKitTests/MockServiceRequest.swift b/Tests/WordPressKitTests/Tests/MockServiceRequest.swift similarity index 100% rename from WordPressKitTests/MockServiceRequest.swift rename to Tests/WordPressKitTests/Tests/MockServiceRequest.swift diff --git a/WordPressKitTests/MockWordPressComRestApi.swift b/Tests/WordPressKitTests/Tests/MockWordPressComRestApi.swift similarity index 100% rename from WordPressKitTests/MockWordPressComRestApi.swift rename to Tests/WordPressKitTests/Tests/MockWordPressComRestApi.swift diff --git a/WordPressKitTests/Models/RemotePersonTests.swift b/Tests/WordPressKitTests/Tests/Models/RemotePersonTests.swift similarity index 100% rename from WordPressKitTests/Models/RemotePersonTests.swift rename to Tests/WordPressKitTests/Tests/Models/RemotePersonTests.swift diff --git a/WordPressKitTests/Models/RemoteVideoPressVideoTests.swift b/Tests/WordPressKitTests/Tests/Models/RemoteVideoPressVideoTests.swift similarity index 100% rename from WordPressKitTests/Models/RemoteVideoPressVideoTests.swift rename to Tests/WordPressKitTests/Tests/Models/RemoteVideoPressVideoTests.swift diff --git a/WordPressKitTests/Models/Stats/V2/Insights/StatsDotComFollowersInsightTests.swift b/Tests/WordPressKitTests/Tests/Models/Stats/V2/Insights/StatsDotComFollowersInsightTests.swift similarity index 100% rename from WordPressKitTests/Models/Stats/V2/Insights/StatsDotComFollowersInsightTests.swift rename to Tests/WordPressKitTests/Tests/Models/Stats/V2/Insights/StatsDotComFollowersInsightTests.swift diff --git a/WordPressKitTests/NSDate+WordPressComTests.swift b/Tests/WordPressKitTests/Tests/NSDate+WordPressComTests.swift similarity index 100% rename from WordPressKitTests/NSDate+WordPressComTests.swift rename to Tests/WordPressKitTests/Tests/NSDate+WordPressComTests.swift diff --git a/WordPressKitTests/NotificationSyncServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/NotificationSyncServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/NotificationSyncServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/NotificationSyncServiceRemoteTests.swift diff --git a/WordPressKitTests/PageLayoutServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/PageLayoutServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/PageLayoutServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/PageLayoutServiceRemoteTests.swift diff --git a/WordPressKitTests/PeopleServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/PeopleServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/PeopleServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/PeopleServiceRemoteTests.swift diff --git a/WordPressKitTests/PlanServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/PlanServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/PlanServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/PlanServiceRemoteTests.swift diff --git a/WordPressKitTests/PluginDirectoryTests.swift b/Tests/WordPressKitTests/Tests/PluginDirectoryTests.swift similarity index 100% rename from WordPressKitTests/PluginDirectoryTests.swift rename to Tests/WordPressKitTests/Tests/PluginDirectoryTests.swift diff --git a/WordPressKitTests/PluginServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/PluginServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/PluginServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/PluginServiceRemoteTests.swift diff --git a/WordPressKitTests/PluginStateTests.swift b/Tests/WordPressKitTests/Tests/PluginStateTests.swift similarity index 100% rename from WordPressKitTests/PluginStateTests.swift rename to Tests/WordPressKitTests/Tests/PluginStateTests.swift diff --git a/WordPressKitTests/PostServiceRemoteRESTAutosaveTests.swift b/Tests/WordPressKitTests/Tests/PostServiceRemoteRESTAutosaveTests.swift similarity index 100% rename from WordPressKitTests/PostServiceRemoteRESTAutosaveTests.swift rename to Tests/WordPressKitTests/Tests/PostServiceRemoteRESTAutosaveTests.swift diff --git a/WordPressKitTests/PostServiceRemoteRESTLikesTests.swift b/Tests/WordPressKitTests/Tests/PostServiceRemoteRESTLikesTests.swift similarity index 100% rename from WordPressKitTests/PostServiceRemoteRESTLikesTests.swift rename to Tests/WordPressKitTests/Tests/PostServiceRemoteRESTLikesTests.swift diff --git a/WordPressKitTests/PostServiceRemoteRESTRevisionsTest.swift b/Tests/WordPressKitTests/Tests/PostServiceRemoteRESTRevisionsTest.swift similarity index 100% rename from WordPressKitTests/PostServiceRemoteRESTRevisionsTest.swift rename to Tests/WordPressKitTests/Tests/PostServiceRemoteRESTRevisionsTest.swift diff --git a/WordPressKitTests/PostServiceRemoteRESTTests.m b/Tests/WordPressKitTests/Tests/PostServiceRemoteRESTTests.m similarity index 100% rename from WordPressKitTests/PostServiceRemoteRESTTests.m rename to Tests/WordPressKitTests/Tests/PostServiceRemoteRESTTests.m diff --git a/WordPressKitTests/PostServiceRemoteXMLRPCTests.swift b/Tests/WordPressKitTests/Tests/PostServiceRemoteXMLRPCTests.swift similarity index 100% rename from WordPressKitTests/PostServiceRemoteXMLRPCTests.swift rename to Tests/WordPressKitTests/Tests/PostServiceRemoteXMLRPCTests.swift diff --git a/WordPressKitTests/PushAuthenticationServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/PushAuthenticationServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/PushAuthenticationServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/PushAuthenticationServiceRemoteTests.swift diff --git a/WordPressKitTests/Scan/QRLoginServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/QRLoginServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/Scan/QRLoginServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/QRLoginServiceRemoteTests.swift diff --git a/WordPressKitTests/RESTTestable.swift b/Tests/WordPressKitTests/Tests/RESTTestable.swift similarity index 100% rename from WordPressKitTests/RESTTestable.swift rename to Tests/WordPressKitTests/Tests/RESTTestable.swift diff --git a/WordPressKitTests/ReaderPostServiceRemote+CardsTests.swift b/Tests/WordPressKitTests/Tests/ReaderPostServiceRemote+CardsTests.swift similarity index 100% rename from WordPressKitTests/ReaderPostServiceRemote+CardsTests.swift rename to Tests/WordPressKitTests/Tests/ReaderPostServiceRemote+CardsTests.swift diff --git a/WordPressKitTests/ReaderPostServiceRemote+FetchEndpointTests.swift b/Tests/WordPressKitTests/Tests/ReaderPostServiceRemote+FetchEndpointTests.swift similarity index 100% rename from WordPressKitTests/ReaderPostServiceRemote+FetchEndpointTests.swift rename to Tests/WordPressKitTests/Tests/ReaderPostServiceRemote+FetchEndpointTests.swift diff --git a/WordPressKitTests/ReaderPostServiceRemote+RelatedPostsTests.swift b/Tests/WordPressKitTests/Tests/ReaderPostServiceRemote+RelatedPostsTests.swift similarity index 100% rename from WordPressKitTests/ReaderPostServiceRemote+RelatedPostsTests.swift rename to Tests/WordPressKitTests/Tests/ReaderPostServiceRemote+RelatedPostsTests.swift diff --git a/WordPressKitTests/ReaderPostServiceRemote+SubscriptionTests.swift b/Tests/WordPressKitTests/Tests/ReaderPostServiceRemote+SubscriptionTests.swift similarity index 100% rename from WordPressKitTests/ReaderPostServiceRemote+SubscriptionTests.swift rename to Tests/WordPressKitTests/Tests/ReaderPostServiceRemote+SubscriptionTests.swift diff --git a/WordPressKitTests/ReaderPostServiceRemoteTests.m b/Tests/WordPressKitTests/Tests/ReaderPostServiceRemoteTests.m similarity index 100% rename from WordPressKitTests/ReaderPostServiceRemoteTests.m rename to Tests/WordPressKitTests/Tests/ReaderPostServiceRemoteTests.m diff --git a/WordPressKitTests/ReaderSiteSearchServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/ReaderSiteSearchServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/ReaderSiteSearchServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/ReaderSiteSearchServiceRemoteTests.swift diff --git a/WordPressKitTests/ReaderSiteServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/ReaderSiteServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/ReaderSiteServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/ReaderSiteServiceRemoteTests.swift diff --git a/WordPressKitTests/ReaderTopicServiceRemote+InterestsTests.swift b/Tests/WordPressKitTests/Tests/ReaderTopicServiceRemote+InterestsTests.swift similarity index 100% rename from WordPressKitTests/ReaderTopicServiceRemote+InterestsTests.swift rename to Tests/WordPressKitTests/Tests/ReaderTopicServiceRemote+InterestsTests.swift diff --git a/WordPressKitTests/ReaderTopicServiceRemoteTest+Subscriptions.swift b/Tests/WordPressKitTests/Tests/ReaderTopicServiceRemoteTest+Subscriptions.swift similarity index 100% rename from WordPressKitTests/ReaderTopicServiceRemoteTest+Subscriptions.swift rename to Tests/WordPressKitTests/Tests/ReaderTopicServiceRemoteTest+Subscriptions.swift diff --git a/WordPressKitTests/ReaderTopicServiceRemoteTests.m b/Tests/WordPressKitTests/Tests/ReaderTopicServiceRemoteTests.m similarity index 100% rename from WordPressKitTests/ReaderTopicServiceRemoteTests.m rename to Tests/WordPressKitTests/Tests/ReaderTopicServiceRemoteTests.m diff --git a/WordPressKitTests/RemoteNotificationTests.swift b/Tests/WordPressKitTests/Tests/RemoteNotificationTests.swift similarity index 100% rename from WordPressKitTests/RemoteNotificationTests.swift rename to Tests/WordPressKitTests/Tests/RemoteNotificationTests.swift diff --git a/WordPressKitTests/RemoteReaderPostTests+V2.swift b/Tests/WordPressKitTests/Tests/RemoteReaderPostTests+V2.swift similarity index 100% rename from WordPressKitTests/RemoteReaderPostTests+V2.swift rename to Tests/WordPressKitTests/Tests/RemoteReaderPostTests+V2.swift diff --git a/WordPressKitTests/RemoteReaderPostTests.m b/Tests/WordPressKitTests/Tests/RemoteReaderPostTests.m similarity index 100% rename from WordPressKitTests/RemoteReaderPostTests.m rename to Tests/WordPressKitTests/Tests/RemoteReaderPostTests.m diff --git a/WordPressKitTests/RemoteReaderSiteInfoSubscriptionTests.swift b/Tests/WordPressKitTests/Tests/RemoteReaderSiteInfoSubscriptionTests.swift similarity index 100% rename from WordPressKitTests/RemoteReaderSiteInfoSubscriptionTests.swift rename to Tests/WordPressKitTests/Tests/RemoteReaderSiteInfoSubscriptionTests.swift diff --git a/WordPressKitTests/RemoteTestCase.swift b/Tests/WordPressKitTests/Tests/RemoteTestCase.swift similarity index 100% rename from WordPressKitTests/RemoteTestCase.swift rename to Tests/WordPressKitTests/Tests/RemoteTestCase.swift diff --git a/WordPressKitTests/Scan/JetpackScanServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/Scan/JetpackScanServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/Scan/JetpackScanServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/Scan/JetpackScanServiceRemoteTests.swift diff --git a/WordPressKitTests/SelfHostedPluginManagementClientTests.swift b/Tests/WordPressKitTests/Tests/SelfHostedPluginManagementClientTests.swift similarity index 100% rename from WordPressKitTests/SelfHostedPluginManagementClientTests.swift rename to Tests/WordPressKitTests/Tests/SelfHostedPluginManagementClientTests.swift diff --git a/WordPressKitTests/ServiceRemoteRESTTests.m b/Tests/WordPressKitTests/Tests/ServiceRemoteRESTTests.m similarity index 100% rename from WordPressKitTests/ServiceRemoteRESTTests.m rename to Tests/WordPressKitTests/Tests/ServiceRemoteRESTTests.m diff --git a/WordPressKitTests/ServiceRequestTest.swift b/Tests/WordPressKitTests/Tests/ServiceRequestTest.swift similarity index 100% rename from WordPressKitTests/ServiceRequestTest.swift rename to Tests/WordPressKitTests/Tests/ServiceRequestTest.swift diff --git a/WordPressKitTests/ShareAppContentServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/ShareAppContentServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/ShareAppContentServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/ShareAppContentServiceRemoteTests.swift diff --git a/WordPressKitTests/SharingServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/SharingServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/SharingServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/SharingServiceRemoteTests.swift diff --git a/WordPressKitTests/SiteCreationRequestEncodingTests.swift b/Tests/WordPressKitTests/Tests/SiteCreationRequestEncodingTests.swift similarity index 100% rename from WordPressKitTests/SiteCreationRequestEncodingTests.swift rename to Tests/WordPressKitTests/Tests/SiteCreationRequestEncodingTests.swift diff --git a/WordPressKitTests/SiteCreationResponseDecodingTests.swift b/Tests/WordPressKitTests/Tests/SiteCreationResponseDecodingTests.swift similarity index 100% rename from WordPressKitTests/SiteCreationResponseDecodingTests.swift rename to Tests/WordPressKitTests/Tests/SiteCreationResponseDecodingTests.swift diff --git a/WordPressKitTests/SiteCreationSegmentsTests.swift b/Tests/WordPressKitTests/Tests/SiteCreationSegmentsTests.swift similarity index 100% rename from WordPressKitTests/SiteCreationSegmentsTests.swift rename to Tests/WordPressKitTests/Tests/SiteCreationSegmentsTests.swift diff --git a/WordPressKitTests/SiteDesignServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/SiteDesignServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/SiteDesignServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/SiteDesignServiceRemoteTests.swift diff --git a/WordPressKitTests/SiteManagementServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/SiteManagementServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/SiteManagementServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/SiteManagementServiceRemoteTests.swift diff --git a/WordPressKitTests/SitePluginTests.swift b/Tests/WordPressKitTests/Tests/SitePluginTests.swift similarity index 100% rename from WordPressKitTests/SitePluginTests.swift rename to Tests/WordPressKitTests/Tests/SitePluginTests.swift diff --git a/WordPressKitTests/SiteSegmentsResponseDecodingTests.swift b/Tests/WordPressKitTests/Tests/SiteSegmentsResponseDecodingTests.swift similarity index 100% rename from WordPressKitTests/SiteSegmentsResponseDecodingTests.swift rename to Tests/WordPressKitTests/Tests/SiteSegmentsResponseDecodingTests.swift diff --git a/WordPressKitTests/SiteVerticalsPromptResponseDecodingTests.swift b/Tests/WordPressKitTests/Tests/SiteVerticalsPromptResponseDecodingTests.swift similarity index 100% rename from WordPressKitTests/SiteVerticalsPromptResponseDecodingTests.swift rename to Tests/WordPressKitTests/Tests/SiteVerticalsPromptResponseDecodingTests.swift diff --git a/WordPressKitTests/SiteVerticalsRequestEncodingTests.swift b/Tests/WordPressKitTests/Tests/SiteVerticalsRequestEncodingTests.swift similarity index 100% rename from WordPressKitTests/SiteVerticalsRequestEncodingTests.swift rename to Tests/WordPressKitTests/Tests/SiteVerticalsRequestEncodingTests.swift diff --git a/WordPressKitTests/SiteVerticalsResponseDecodingTests.swift b/Tests/WordPressKitTests/Tests/SiteVerticalsResponseDecodingTests.swift similarity index 100% rename from WordPressKitTests/SiteVerticalsResponseDecodingTests.swift rename to Tests/WordPressKitTests/Tests/SiteVerticalsResponseDecodingTests.swift diff --git a/WordPressKitTests/Social/JetpackSocialServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/Social/JetpackSocialServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/Social/JetpackSocialServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/Social/JetpackSocialServiceRemoteTests.swift diff --git a/WordPressKitTests/StatsAnnualAndMostPopularTimeInsightDecodingTests.swift b/Tests/WordPressKitTests/Tests/StatsAnnualAndMostPopularTimeInsightDecodingTests.swift similarity index 100% rename from WordPressKitTests/StatsAnnualAndMostPopularTimeInsightDecodingTests.swift rename to Tests/WordPressKitTests/Tests/StatsAnnualAndMostPopularTimeInsightDecodingTests.swift diff --git a/WordPressKitTests/StatsRemoteV2Tests.swift b/Tests/WordPressKitTests/Tests/StatsRemoteV2Tests.swift similarity index 100% rename from WordPressKitTests/StatsRemoteV2Tests.swift rename to Tests/WordPressKitTests/Tests/StatsRemoteV2Tests.swift diff --git a/WordPressKitTests/TaxonomyServiceRemoteRESTTests.m b/Tests/WordPressKitTests/Tests/TaxonomyServiceRemoteRESTTests.m similarity index 100% rename from WordPressKitTests/TaxonomyServiceRemoteRESTTests.m rename to Tests/WordPressKitTests/Tests/TaxonomyServiceRemoteRESTTests.m diff --git a/WordPressKitTests/TestCollector+Constants.swift b/Tests/WordPressKitTests/Tests/TestCollector+Constants.swift similarity index 100% rename from WordPressKitTests/TestCollector+Constants.swift rename to Tests/WordPressKitTests/Tests/TestCollector+Constants.swift diff --git a/WordPressKitTests/ThemeServiceRemoteTests.m b/Tests/WordPressKitTests/Tests/ThemeServiceRemoteTests.m similarity index 100% rename from WordPressKitTests/ThemeServiceRemoteTests.m rename to Tests/WordPressKitTests/Tests/ThemeServiceRemoteTests.m diff --git a/WordPressKitTests/TimeZoneServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/TimeZoneServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/TimeZoneServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/TimeZoneServiceRemoteTests.swift diff --git a/WordPressKitTests/TransactionsServiceRemoteTests.swift b/Tests/WordPressKitTests/Tests/TransactionsServiceRemoteTests.swift similarity index 100% rename from WordPressKitTests/TransactionsServiceRemoteTests.swift rename to Tests/WordPressKitTests/Tests/TransactionsServiceRemoteTests.swift diff --git a/WordPressKitTests/UsersServiceRemoteXMLRPCTests.swift b/Tests/WordPressKitTests/Tests/UsersServiceRemoteXMLRPCTests.swift similarity index 100% rename from WordPressKitTests/UsersServiceRemoteXMLRPCTests.swift rename to Tests/WordPressKitTests/Tests/UsersServiceRemoteXMLRPCTests.swift diff --git a/WordPressKitTests/Utilities/AppTransportSecuritySettingsTests.swift b/Tests/WordPressKitTests/Tests/Utilities/AppTransportSecuritySettingsTests.swift similarity index 100% rename from WordPressKitTests/Utilities/AppTransportSecuritySettingsTests.swift rename to Tests/WordPressKitTests/Tests/Utilities/AppTransportSecuritySettingsTests.swift diff --git a/WordPressKitTests/Utilities/ChecksumUtilTests.swift b/Tests/WordPressKitTests/Tests/Utilities/ChecksumUtilTests.swift similarity index 100% rename from WordPressKitTests/Utilities/ChecksumUtilTests.swift rename to Tests/WordPressKitTests/Tests/Utilities/ChecksumUtilTests.swift diff --git a/WordPressKitTests/Utilities/FeatureFlagRemoteTests.swift b/Tests/WordPressKitTests/Tests/Utilities/FeatureFlagRemoteTests.swift similarity index 100% rename from WordPressKitTests/Utilities/FeatureFlagRemoteTests.swift rename to Tests/WordPressKitTests/Tests/Utilities/FeatureFlagRemoteTests.swift diff --git a/WordPressKitTests/Utilities/FeatureFlagSerializationTest.swift b/Tests/WordPressKitTests/Tests/Utilities/FeatureFlagSerializationTest.swift similarity index 100% rename from WordPressKitTests/Utilities/FeatureFlagSerializationTest.swift rename to Tests/WordPressKitTests/Tests/Utilities/FeatureFlagSerializationTest.swift diff --git a/WordPressKitTests/Utilities/HTTPBodyEncodingTests.swift b/Tests/WordPressKitTests/Tests/Utilities/HTTPBodyEncodingTests.swift similarity index 100% rename from WordPressKitTests/Utilities/HTTPBodyEncodingTests.swift rename to Tests/WordPressKitTests/Tests/Utilities/HTTPBodyEncodingTests.swift diff --git a/WordPressKitTests/Utilities/HTTPHeaderValueParserTests.swift b/Tests/WordPressKitTests/Tests/Utilities/HTTPHeaderValueParserTests.swift similarity index 100% rename from WordPressKitTests/Utilities/HTTPHeaderValueParserTests.swift rename to Tests/WordPressKitTests/Tests/Utilities/HTTPHeaderValueParserTests.swift diff --git a/WordPressKitTests/Utilities/HTTPRequestBuilderTests.swift b/Tests/WordPressKitTests/Tests/Utilities/HTTPRequestBuilderTests.swift similarity index 100% rename from WordPressKitTests/Utilities/HTTPRequestBuilderTests.swift rename to Tests/WordPressKitTests/Tests/Utilities/HTTPRequestBuilderTests.swift diff --git a/WordPressKitTests/Utilities/HTTPRequestHelpers.swift b/Tests/WordPressKitTests/Tests/Utilities/HTTPRequestHelpers.swift similarity index 100% rename from WordPressKitTests/Utilities/HTTPRequestHelpers.swift rename to Tests/WordPressKitTests/Tests/Utilities/HTTPRequestHelpers.swift diff --git a/WordPressKitTests/Utilities/LoggingTests.m b/Tests/WordPressKitTests/Tests/Utilities/LoggingTests.m similarity index 100% rename from WordPressKitTests/Utilities/LoggingTests.m rename to Tests/WordPressKitTests/Tests/Utilities/LoggingTests.m diff --git a/WordPressKitTests/Utilities/LoggingTests.swift b/Tests/WordPressKitTests/Tests/Utilities/LoggingTests.swift similarity index 100% rename from WordPressKitTests/Utilities/LoggingTests.swift rename to Tests/WordPressKitTests/Tests/Utilities/LoggingTests.swift diff --git a/WordPressKitTests/Utilities/MultipartFormTests.swift b/Tests/WordPressKitTests/Tests/Utilities/MultipartFormTests.swift similarity index 100% rename from WordPressKitTests/Utilities/MultipartFormTests.swift rename to Tests/WordPressKitTests/Tests/Utilities/MultipartFormTests.swift diff --git a/WordPressKitTests/Utilities/RSDParserTests.swift b/Tests/WordPressKitTests/Tests/Utilities/RSDParserTests.swift similarity index 100% rename from WordPressKitTests/Utilities/RSDParserTests.swift rename to Tests/WordPressKitTests/Tests/Utilities/RSDParserTests.swift diff --git a/WordPressKitTests/Utilities/RemoteConfigRemoteTests.swift b/Tests/WordPressKitTests/Tests/Utilities/RemoteConfigRemoteTests.swift similarity index 100% rename from WordPressKitTests/Utilities/RemoteConfigRemoteTests.swift rename to Tests/WordPressKitTests/Tests/Utilities/RemoteConfigRemoteTests.swift diff --git a/WordPressKitTests/Utilities/URLSessionHelperTests.swift b/Tests/WordPressKitTests/Tests/Utilities/URLSessionHelperTests.swift similarity index 100% rename from WordPressKitTests/Utilities/URLSessionHelperTests.swift rename to Tests/WordPressKitTests/Tests/Utilities/URLSessionHelperTests.swift diff --git a/WordPressKitTests/Utilities/WordPressAPIErrorTests.swift b/Tests/WordPressKitTests/Tests/Utilities/WordPressAPIErrorTests.swift similarity index 100% rename from WordPressKitTests/Utilities/WordPressAPIErrorTests.swift rename to Tests/WordPressKitTests/Tests/Utilities/WordPressAPIErrorTests.swift diff --git a/WordPressKitTests/WordPressAPI/NonceRetrievalTests.swift b/Tests/WordPressKitTests/Tests/WordPressAPI/NonceRetrievalTests.swift similarity index 100% rename from WordPressKitTests/WordPressAPI/NonceRetrievalTests.swift rename to Tests/WordPressKitTests/Tests/WordPressAPI/NonceRetrievalTests.swift diff --git a/WordPressKitTests/WordPressAPI/WordPressOrgAPITests.swift b/Tests/WordPressKitTests/Tests/WordPressAPI/WordPressOrgAPITests.swift similarity index 100% rename from WordPressKitTests/WordPressAPI/WordPressOrgAPITests.swift rename to Tests/WordPressKitTests/Tests/WordPressAPI/WordPressOrgAPITests.swift diff --git a/WordPressKitTests/WordPressAPI/WordPressOrgXMLRPCValidatorTests.swift b/Tests/WordPressKitTests/Tests/WordPressAPI/WordPressOrgXMLRPCValidatorTests.swift similarity index 100% rename from WordPressKitTests/WordPressAPI/WordPressOrgXMLRPCValidatorTests.swift rename to Tests/WordPressKitTests/Tests/WordPressAPI/WordPressOrgXMLRPCValidatorTests.swift diff --git a/WordPressKitTests/WordPressComOAuthClientTests.swift b/Tests/WordPressKitTests/Tests/WordPressComOAuthClientTests.swift similarity index 100% rename from WordPressKitTests/WordPressComOAuthClientTests.swift rename to Tests/WordPressKitTests/Tests/WordPressComOAuthClientTests.swift diff --git a/WordPressKitTests/WordPressComRestApiTests+Error.swift b/Tests/WordPressKitTests/Tests/WordPressComRestApiTests+Error.swift similarity index 100% rename from WordPressKitTests/WordPressComRestApiTests+Error.swift rename to Tests/WordPressKitTests/Tests/WordPressComRestApiTests+Error.swift diff --git a/WordPressKitTests/WordPressComRestApiTests+Locale.swift b/Tests/WordPressKitTests/Tests/WordPressComRestApiTests+Locale.swift similarity index 100% rename from WordPressKitTests/WordPressComRestApiTests+Locale.swift rename to Tests/WordPressKitTests/Tests/WordPressComRestApiTests+Locale.swift diff --git a/WordPressKitTests/WordPressComRestApiTests.swift b/Tests/WordPressKitTests/Tests/WordPressComRestApiTests.swift similarity index 100% rename from WordPressKitTests/WordPressComRestApiTests.swift rename to Tests/WordPressKitTests/Tests/WordPressComRestApiTests.swift diff --git a/WordPressKitTests/WordPressComServiceRemoteRestTests.swift b/Tests/WordPressKitTests/Tests/WordPressComServiceRemoteRestTests.swift similarity index 100% rename from WordPressKitTests/WordPressComServiceRemoteRestTests.swift rename to Tests/WordPressKitTests/Tests/WordPressComServiceRemoteRestTests.swift diff --git a/WordPressKitTests/WordPressComServiceRemoteTests+SiteCreation.swift b/Tests/WordPressKitTests/Tests/WordPressComServiceRemoteTests+SiteCreation.swift similarity index 100% rename from WordPressKitTests/WordPressComServiceRemoteTests+SiteCreation.swift rename to Tests/WordPressKitTests/Tests/WordPressComServiceRemoteTests+SiteCreation.swift diff --git a/WordPressKitTests/WordPressComServiceRemoteTests+SiteVerticals.swift b/Tests/WordPressKitTests/Tests/WordPressComServiceRemoteTests+SiteVerticals.swift similarity index 100% rename from WordPressKitTests/WordPressComServiceRemoteTests+SiteVerticals.swift rename to Tests/WordPressKitTests/Tests/WordPressComServiceRemoteTests+SiteVerticals.swift diff --git a/WordPressKitTests/WordPressComServiceRemoteTests+SiteVerticalsPrompt.swift b/Tests/WordPressKitTests/Tests/WordPressComServiceRemoteTests+SiteVerticalsPrompt.swift similarity index 100% rename from WordPressKitTests/WordPressComServiceRemoteTests+SiteVerticalsPrompt.swift rename to Tests/WordPressKitTests/Tests/WordPressComServiceRemoteTests+SiteVerticalsPrompt.swift diff --git a/WordPressKitTests/WordPressOrgRestApiTests.swift b/Tests/WordPressKitTests/Tests/WordPressOrgRestApiTests.swift similarity index 100% rename from WordPressKitTests/WordPressOrgRestApiTests.swift rename to Tests/WordPressKitTests/Tests/WordPressOrgRestApiTests.swift diff --git a/WordPressKitTests/WordPressOrgXMLRPCApiTests.swift b/Tests/WordPressKitTests/Tests/WordPressOrgXMLRPCApiTests.swift similarity index 100% rename from WordPressKitTests/WordPressOrgXMLRPCApiTests.swift rename to Tests/WordPressKitTests/Tests/WordPressOrgXMLRPCApiTests.swift diff --git a/WordPressKitTests/XMLRPCTestable.swift b/Tests/WordPressKitTests/Tests/XMLRPCTestable.swift similarity index 100% rename from WordPressKitTests/XMLRPCTestable.swift rename to Tests/WordPressKitTests/Tests/XMLRPCTestable.swift diff --git a/WordPressKitTests/UnitTests.xctestplan b/Tests/WordPressKitTests/UnitTests.xctestplan similarity index 100% rename from WordPressKitTests/UnitTests.xctestplan rename to Tests/WordPressKitTests/UnitTests.xctestplan diff --git a/WordPressKitTests/WordPressKitTests-Bridging-Header.h b/Tests/WordPressKitTests/WordPressKitTests-Bridging-Header.h similarity index 100% rename from WordPressKitTests/WordPressKitTests-Bridging-Header.h rename to Tests/WordPressKitTests/WordPressKitTests-Bridging-Header.h diff --git a/WordPressKit.podspec b/WordPressKit.podspec index 56a26741..05afbbf2 100644 --- a/WordPressKit.podspec +++ b/WordPressKit.podspec @@ -18,9 +18,10 @@ Pod::Spec.new do |s| s.swift_version = '5.0' s.source = { git: 'https://github.com/wordpress-mobile/WordPressKit-iOS.git', tag: s.version.to_s } - s.source_files = 'WordPressKit/**/*.{h,m,swift}' - s.private_header_files = 'WordPressKit/Private/*.h' - s.header_dir = 'WordPressKit' + s.source_files = 'Sources/**/*.{h,m,swift}' + # When headers are not specified, then all headers are considered public. + # The only thing left to do is to explicitly specify those that should be private. + s.private_header_files = 'Sources/WordPressKit/Private/*.h' s.dependency 'NSObject-SafeExpectations', '~> 0.0.4' s.dependency 'wpxmlrpc', '~> 0.10' diff --git a/WordPressKit.xcodeproj/project.pbxproj b/WordPressKit.xcodeproj/project.pbxproj index d84fd093..9f4bf60c 100644 --- a/WordPressKit.xcodeproj/project.pbxproj +++ b/WordPressKit.xcodeproj/project.pbxproj @@ -1298,13 +1298,11 @@ AB49D0B225D1B4D80084905B /* post-likes-failure.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "post-likes-failure.json"; sourceTree = ""; }; ABD95B7E25DD6C4B00735BEE /* CommentServiceRemoteRESTLikesTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommentServiceRemoteRESTLikesTests.swift; sourceTree = ""; }; ABD95B8425DD6DA200735BEE /* comment-likes-success.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "comment-likes-success.json"; sourceTree = ""; }; - B56D96B0202C9B7500485233 /* WordPressUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WordPressUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B5969E1920A49AC4005E9DF1 /* NSString+MD5.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+MD5.h"; sourceTree = ""; }; B5969E1A20A49AC4005E9DF1 /* NSString+MD5.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+MD5.m"; sourceTree = ""; }; - B5A4822A20AC6C0B009D95F6 /* WPKitLogging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = WPKitLogging.swift; path = WordPressKit/WPKitLogging.swift; sourceTree = SOURCE_ROOT; }; - B5A4822C20AC6C19009D95F6 /* WPKitLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WPKitLogging.m; path = WordPressKit/WPKitLogging.m; sourceTree = SOURCE_ROOT; }; - B5A4822D20AC6C1A009D95F6 /* WPKitLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WPKitLogging.h; path = WordPressKit/WPKitLogging.h; sourceTree = SOURCE_ROOT; }; - B5A78828202B421B007874FB /* WordPressUIKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = WordPressUIKit.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B5A4822A20AC6C0B009D95F6 /* WPKitLogging.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WPKitLogging.swift; sourceTree = ""; }; + B5A4822C20AC6C19009D95F6 /* WPKitLogging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WPKitLogging.m; sourceTree = ""; }; + B5A4822D20AC6C1A009D95F6 /* WPKitLogging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WPKitLogging.h; sourceTree = ""; }; B76472D20711B6BE2ACDC332 /* Pods-WordPressKitTests.release-internal.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressKitTests.release-internal.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressKitTests/Pods-WordPressKitTests.release-internal.xcconfig"; sourceTree = ""; }; BA0637EC2492382200AF8419 /* PluginStateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PluginStateTests.swift; sourceTree = ""; }; BA2A78F924A486D300BB6F53 /* SitePluginTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SitePluginTests.swift; sourceTree = ""; }; @@ -1328,7 +1326,7 @@ BAFA775524ADAB3C000F0D3A /* MockPluginDirectoryEntryProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockPluginDirectoryEntryProvider.swift; sourceTree = ""; }; BEEC8B5D92DA614468900BD7 /* Pods-WordPressKit.release-alpha.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressKit.release-alpha.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressKit/Pods-WordPressKit.release-alpha.xcconfig"; sourceTree = ""; }; C5953994B3865AF409BA4210 /* Pods-WordPressKitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressKitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-WordPressKitTests/Pods-WordPressKitTests.release.xcconfig"; sourceTree = ""; }; - C738CAEE28622325001BE107 /* QRLoginServiceRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = QRLoginServiceRemoteTests.swift; path = Scan/QRLoginServiceRemoteTests.swift; sourceTree = ""; }; + C738CAEE28622325001BE107 /* QRLoginServiceRemoteTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRLoginServiceRemoteTests.swift; sourceTree = ""; }; C738CAF0286224ED001BE107 /* qrlogin-validate-200.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "qrlogin-validate-200.json"; sourceTree = ""; }; C738CAF2286226D6001BE107 /* qrlogin-validate-400.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "qrlogin-validate-400.json"; sourceTree = ""; }; C738CAF428622953001BE107 /* qrlogin-validate-expired-401.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = "qrlogin-validate-expired-401.json"; sourceTree = ""; }; @@ -1495,31 +1493,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 08C7493C2A45E9E3000DA0E2 /* Privacy */ = { - isa = PBXGroup; - children = ( - 08C7493D2A45EA11000DA0E2 /* IPLocationRemoteTests.swift */, - ); - name = Privacy; - sourceTree = ""; - }; - 0CB1905C2A2A5E7B004D3E80 /* Blaze */ = { - isa = PBXGroup; - children = ( - 0CB1905D2A2A5E83004D3E80 /* BlazeCampaign.swift */, - 0CB190642A2A7569004D3E80 /* BlazeCampaignsSearchResponse.swift */, - ); - name = Blaze; - sourceTree = ""; - }; - 0CED1FE92B617D6700E6DD52 /* Atomic */ = { - isa = PBXGroup; - children = ( - 0CED1FEA2B617D7D00E6DD52 /* AtomicLogs.swift */, - ); - name = Atomic; - sourceTree = ""; - }; 3297E1DC2564649D00287D21 /* Scan */ = { isa = PBXGroup; children = ( @@ -1543,8 +1516,6 @@ 38C6ABE94A27A12C9C4AD19D /* Frameworks */ = { isa = PBXGroup; children = ( - B56D96B0202C9B7500485233 /* WordPressUI.framework */, - B5A78828202B421B007874FB /* WordPressUIKit.framework */, EFF80A6E6EE37118CB1DA158 /* Pods_WordPressKit.framework */, ED05C8FF3E61D93CE5BA527E /* Pods_WordPressKitTests.framework */, ); @@ -1560,243 +1531,61 @@ path = Plans; sourceTree = ""; }; - 404057C3221B30140060250C /* Time Interval */ = { + 3FE2E9352BB10D92002CA2E1 /* WordPressAPI */ = { isa = PBXGroup; children = ( - 01438D3A2B6A36BF0097D60A /* StatsTotalsSummaryData.swift */, - 984E34EA22EF7209005C3F92 /* StatsFileDownloadsTimeIntervalData.swift */, - 40819772221E10C900A298E4 /* StatsPublishedPostsTimeIntervalData.swift */, - 404057C4221B30400060250C /* StatsSearchTermTimeIntervalData.swift */, - 40819777221F00E600A298E4 /* StatsSummaryTimeIntervalData.swift */, - 404057C8221B789B0060250C /* StatsTopAuthorsTimeIntervalData.swift */, - 404057D5221C92660060250C /* StatsTopClicksTimeIntervalData.swift */, - 404057D1221C56AB0060250C /* StatsTopCountryTimeIntervalData.swift */, - 4081976E221DDE9B00A298E4 /* StatsTopPostsTimeIntervalData.swift */, - 404057D9221C9D560060250C /* StatsTopReferrersTimeIntervalData.swift */, - 404057CD221C38130060250C /* StatsTopVideosTimeIntervalData.swift */, - ); - path = "Time Interval"; - sourceTree = ""; - }; - 40414061220F9F2800CF7C5B /* Insights */ = { - isa = PBXGroup; - children = ( - 408197872220A35000A298E4 /* StatsLastPostInsight.swift */, - 4041405D220F9EF500CF7C5B /* StatsDotComFollowersInsight.swift */, - 40E7FEA8220FA4050032834E /* StatsEmailFollowersInsight.swift */, - 4041405F220F9F1F00CF7C5B /* StatsAllTimesInsight.swift */, - 40E7FEAD220FAEA10032834E /* StatsPublicizeInsight.swift */, - 40E7FEB0220FB3B60032834E /* StatsAnnualAndMostPopularTimeInsight.swift */, - 98DC787422BAEBF100267279 /* StatsAllAnnualInsight.swift */, - 40E7FEB3221063480032834E /* StatsTodayInsight.swift */, - 40E7FEB622106A8D0032834E /* StatsCommentsInsight.swift */, - 40E7FEB92210894B0032834E /* StatsTagsAndCategoriesInsight.swift */, - 40F98808221AC88700B7B369 /* StatsPostingStreakInsight.swift */, + 3FFCC0552BABC78B0051D229 /* WordPressComRESTAPIInterfacing.h */, + 4A05E7952B2FCB6400C25E3B /* NonceRetrieval.swift */, + 4A05E7992B2FDC3200C25E3B /* WordPressOrgRestApi.swift */, + 93BD27741EE73944002BB00B /* HTTPAuthenticationAlertController.swift */, + 3FFCC0462BAA6EF40051D229 /* NSDate+WordPressCom.swift */, + 3FFCC04E2BABA6E60051D229 /* Date+WordPressCom.swift */, + 3FFCC0482BAB98130051D229 /* DateFormatter+WordPressCom.swift */, + 93BD27771EE73944002BB00B /* WordPressComOAuthClient.swift */, + 93BD27781EE73944002BB00B /* WordPressComRestApi.swift */, + 93BD27791EE73944002BB00B /* WordPressOrgXMLRPCApi.swift */, + 93BD277A1EE73944002BB00B /* WordPressOrgXMLRPCValidator.swift */, + 93BD277B1EE73944002BB00B /* WordPressRSDParser.swift */, + 4A11239D2B1926D1004690CF /* HTTPClient.swift */, + 4A11239B2B1926B7004690CF /* HTTPRequestBuilder.swift */, + 4A1123992B19269A004690CF /* WordPressAPIError.swift */, + 4A57A6822B54A326008D0660 /* WordPressAPIError+NSErrorBrdige.swift */, ); - path = Insights; + path = WordPressAPI; sourceTree = ""; }; - 40B01BF3220E534900036D10 /* V2 */ = { + 3FE2E9362BB10EC7002CA2E1 /* Stats */ = { isa = PBXGroup; children = ( 404057C3221B30140060250C /* Time Interval */, 40414061220F9F2800CF7C5B /* Insights */, 40819782221F5C8200A298E4 /* StatsPostDetails.swift */, ); - name = V2; - sourceTree = ""; - }; - 436D56362118DC2800CEAA33 /* Transactions */ = { - isa = PBXGroup; - children = ( - 436D56372118DC4B00CEAA33 /* TransactionsServiceRemoteTests.swift */, - ); - name = Transactions; - sourceTree = ""; - }; - 4624223C2548C235002B8A12 /* SiteDesigns */ = { - isa = PBXGroup; - children = ( - 4624223D2548C26D002B8A12 /* SiteDesignServiceRemoteTests.swift */, - ); - name = SiteDesigns; - sourceTree = ""; - }; - 4625B96A253A34D300C04AAD /* StarterPageLayouts */ = { - isa = PBXGroup; - children = ( - 4625BAEA253E118400C04AAD /* PageLayoutServiceRemoteTests.swift */, - ); - name = StarterPageLayouts; - sourceTree = ""; - }; - 465F8892263B094900F4C950 /* BlockEditorSettings */ = { - isa = PBXGroup; - children = ( - 465F8893263B09AE00F4C950 /* wp-block-editor-v1-settings-success-NotThemeJSON.json */, - 465F8899263B09BF00F4C950 /* wp-block-editor-v1-settings-success-ThemeJSON.json */, - 465F88B0263B3E8A00F4C950 /* get_wp_v2_themes_twentytwentyone.json */, - 465F88B6263B455300F4C950 /* get_wp_v2_themes_twentytwentyone-no-colors.json */, - ); - path = BlockEditorSettings; - sourceTree = ""; - }; - 465F88A5263B370300F4C950 /* BlockEditorSettings */ = { - isa = PBXGroup; - children = ( - 465F88A6263B371D00F4C950 /* BlockEditorSettingsServiceRemoteTests.swift */, - ); - name = BlockEditorSettings; - sourceTree = ""; - }; - 4AE7E3692B9A994200C8CED5 /* Announcement */ = { - isa = PBXGroup; - children = ( - 4AE7E36A2B9A995500C8CED5 /* AnnouncementServiceRemoteTests.swift */, - ); - name = Announcement; - sourceTree = ""; - }; - 57A38E502624F7D000472480 /* WordPressAPI */ = { - isa = PBXGroup; - children = ( - 46ABD0DF262EED3D00C7FF24 /* WordPressOrgXMLRPCValidatorTests.swift */, - 4A05E7972B2FCB9A00C25E3B /* NonceRetrievalTests.swift */, - 4A05E79B2B2FDC6100C25E3B /* WordPressOrgAPITests.swift */, - ); - path = WordPressAPI; - sourceTree = ""; - }; - 57A38E572624FF1000472480 /* Fakes */ = { - isa = PBXGroup; - children = ( - 46ABD0E5262EEDAB00C7FF24 /* FakeInfoDictionaryObjectProvider.swift */, - ); - path = Fakes; - sourceTree = ""; - }; - 740B23D41F17F6D200067A2A /* Post */ = { - isa = PBXGroup; - children = ( - 32AF21E2236DEB3C001C6502 /* PostServiceRemoteRESTAutosaveTests.swift */, - 9AB6D649218727D60008F274 /* PostServiceRemoteRESTRevisionsTest.swift */, - AB49D09225D1A85D0084905B /* PostServiceRemoteRESTLikesTests.swift */, - 740B23D01F17F6BB00067A2A /* PostServiceRemoteRESTTests.m */, - 740B23D11F17F6BB00067A2A /* PostServiceRemoteXMLRPCTests.swift */, - ); - name = Post; - sourceTree = ""; - }; - 7430C9BF1F192C210051B8E6 /* Reader */ = { - isa = PBXGroup; - children = ( - 9F3E0BA72087355D009CB5BA /* RemoteReaderSiteInfoSubscriptionTests.swift */, - 9F3E0BAB20873785009CB5BA /* ServiceRequestTest.swift */, - 9F3E0BAD20873835009CB5BA /* ReaderTopicServiceRemoteTest+Subscriptions.swift */, - 7430C9B91F192C0F0051B8E6 /* ReaderSiteServiceRemoteTests.swift */, - 7430C9BA1F192C0F0051B8E6 /* ReaderPostServiceRemoteTests.m */, - 7430C9BB1F192C0F0051B8E6 /* ReaderTopicServiceRemoteTests.m */, - 17CE77F320C701C8001DEA5A /* ReaderSiteSearchServiceRemoteTests.swift */, - 8B2F4BE424ABB3C70056C08A /* RemoteReaderPostTests.m */, - 8B2F4BE824ABC9DC0056C08A /* ReaderPostServiceRemote+CardsTests.swift */, - FACBDD3725ECB4480026705B /* ReaderPostServiceRemote+RelatedPostsTests.swift */, - FA87FE0624EB39C4003FBEE3 /* ReaderPostServiceRemote+SubscriptionTests.swift */, - 3236F79924AE406D0088E8F3 /* ReaderTopicServiceRemote+InterestsTests.swift */, - 8B16CE91252502C4007BE5A9 /* RemoteReaderPostTests+V2.swift */, - 4AB6A3642B83191600769115 /* ReaderPostServiceRemote+FetchEndpointTests.swift */, - ); - name = Reader; - sourceTree = ""; - }; - 7433BC061EFC456B002D9E92 /* Plans */ = { - isa = PBXGroup; - children = ( - 7433BC031EFC4556002D9E92 /* PlanServiceRemoteTests.swift */, - ); - name = Plans; - sourceTree = ""; - }; - 74585B911F0D520700E7E667 /* Domains */ = { - isa = PBXGroup; - children = ( - 74585B8F1F0D51F900E7E667 /* DomainsServiceRemoteRESTTests.swift */, - F4B0F47F2ACB4EA9003ABC61 /* AllDomainsResultDomainTests.swift */, - ); - name = Domains; - sourceTree = ""; - }; - 74A44DD61F13C6F3006CD8F4 /* Notifications */ = { - isa = PBXGroup; - children = ( - 74A44DD21F13C6D8006CD8F4 /* RemoteNotificationTests.swift */, - 74A44DD31F13C6D8006CD8F4 /* PushAuthenticationServiceRemoteTests.swift */, - 74FC6F3A1F191BB400112505 /* NotificationSyncServiceRemoteTests.swift */, - ); - name = Notifications; - sourceTree = ""; - }; - 74B5F0DF1EF82AAB00B411E7 /* Blog */ = { - isa = PBXGroup; - children = ( - 74B5F0DD1EF82A9600B411E7 /* BlogServiceRemoteRESTTests.m */, - FEE48EF52A4B3602008A48E0 /* BlogServiceRemote+ActiveFeaturesTests.swift */, - ); - name = Blog; - sourceTree = ""; - }; - 74C473AD1EF2F7BF009918F2 /* Site */ = { - isa = PBXGroup; - children = ( - 731BA83521DECD61000FDFCD /* SiteCreationRequestEncodingTests.swift */, - 731BA83721DECD97000FDFCD /* SiteCreationResponseDecodingTests.swift */, - 74C473AE1EF2F7D1009918F2 /* SiteManagementServiceRemoteTests.swift */, - 736C970F21E80D48007A4200 /* SiteVerticalsPromptResponseDecodingTests.swift */, - 73D5930221E552CD00E4CF84 /* SiteVerticalsRequestEncodingTests.swift */, - 73D592FF21E550F500E4CF84 /* SiteVerticalsResponseDecodingTests.swift */, - E1787DB1200E5690004CB3AF /* TimeZoneServiceRemoteTests.swift */, - 7328420521CD798A00126755 /* WordPressComServiceRemoteTests+SiteCreation.swift */, - 73D5930421E5541200E4CF84 /* WordPressComServiceRemoteTests+SiteVerticals.swift */, - 73A2F38C21E7FC8200388609 /* WordPressComServiceRemoteTests+SiteVerticalsPrompt.swift */, - ); - name = Site; - sourceTree = ""; - }; - 74D67F0B1F15C2570010C5ED /* People */ = { - isa = PBXGroup; - children = ( - 74D67F091F15C24C0010C5ED /* PeopleServiceRemoteTests.swift */, - ); - name = People; - sourceTree = ""; - }; - 74D97CB91F1CF6E200AC49B7 /* Menu */ = { - isa = PBXGroup; - children = ( - 74D97CB71F1CF6D500AC49B7 /* MenusServiceRemoteTests.m */, - ); - name = Menu; + path = Stats; sourceTree = ""; }; - 74E2294C1F1E73650085F7F2 /* Sharing */ = { + 3FE2E9372BB10F10002CA2E1 /* Revisions */ = { isa = PBXGroup; children = ( - FE5096512A13938500DDD071 /* SharingServiceRemoteTests.swift */, - FEFFD99A26C1598F00F34231 /* ShareAppContentServiceRemoteTests.swift */, + 9AF4F2FE2183346B00570E4B /* RemoteRevision.swift */, + 9AB6D646218705E90008F274 /* RemoteDiff.swift */, ); - name = Sharing; + path = Revisions; sourceTree = ""; }; - 74FA25F81F1FDA240044BC54 /* Media */ = { + 3FE2E9392BB10F67002CA2E1 /* Plugins */ = { isa = PBXGroup; children = ( - 74FA25F61F1FDA200044BC54 /* MediaServiceRemoteRESTTests.swift */, - 4AA5A1A22AA68F6B00969464 /* MediaLibraryTestSupport.swift */, - 4AA5A1A42AA695D700969464 /* LoadMediaLibraryTests.swift */, + 40AB1AD9200FED25009B533D /* PluginDirectoryFeedPage.swift */, + E194CB721FBDEF6400B0A8B8 /* PluginState.swift */, + E1EF5D5C1F9F329900B6D53E /* SitePluginCapabilities.swift */, + E11C2AD11FA77FB90023BDE2 /* SitePlugin.swift */, + E1A6605E1FD694ED00BAC339 /* PluginDirectoryEntry.swift */, ); - name = Media; + path = Plugins; sourceTree = ""; }; - 7E3E7A4620E443100075D159 /* Extensions */ = { + 3FE2E93B2BB10FBB002CA2E1 /* Extensions */ = { isa = PBXGroup; children = ( 7E3E7A4420E443050075D159 /* NSAttributedString+extensions.swift */, @@ -1805,191 +1594,123 @@ 8C5734F825681A6A005E61EE /* Enum+UnknownCaseRepresentable.swift */, 8B52B900257AC5A200221663 /* Date+endOfDay.swift */, ); - name = Extensions; - sourceTree = ""; - }; - 7EC60EBC22DC4F5A00FB0336 /* Editor */ = { - isa = PBXGroup; - children = ( - 7EC60EBD22DC4F9000FB0336 /* EditorServiceRemoteTests.swift */, - ); - name = Editor; - sourceTree = ""; - }; - 826016FE1F9FD59400533B6C /* Activity */ = { - isa = PBXGroup; - children = ( - 826016FF1F9FD60A00533B6C /* ActivityServiceRemoteTests.swift */, - 3F8308A629EE683500354497 /* ActivityTests.swift */, - ); - name = Activity; - sourceTree = ""; - }; - 8BB5F62227A9A5AF00B2FFAF /* Dashboard */ = { - isa = PBXGroup; - children = ( - 8BB5F62327A9A5D100B2FFAF /* DashboardServiceRemoteTests.swift */, - ); - name = Dashboard; - sourceTree = ""; - }; - 8BE67ED124AD05B5004DB4C9 /* Extensions */ = { - isa = PBXGroup; - children = ( - 8BE67ED224AD05D3004DB4C9 /* Decodable+DictionaryTests.swift */, - ); path = Extensions; sourceTree = ""; }; - 9309994F1F1658DB00F006A1 /* Theme */ = { - isa = PBXGroup; - children = ( - 930999511F1658F800F006A1 /* ThemeServiceRemoteTests.m */, - ); - name = Theme; - sourceTree = ""; - }; - 930F52B91ECF8A44002F921B /* Stats */ = { - isa = PBXGroup; - children = ( - 40B01BF3220E534900036D10 /* V2 */, - ); - name = Stats; - sourceTree = ""; - }; - 930F52BA1ECF8A67002F921B /* Tests */ = { - isa = PBXGroup; - children = ( - 93BD273E1EE732CC002BB00B /* Accounts */, - 826016FE1F9FD59400533B6C /* Activity */, - 4AE7E3692B9A994200C8CED5 /* Announcement */, - F194E1212417ED7E00874408 /* Authentication */, - FAD1345425909DF500A8FEB1 /* Backup */, - FA1D0F8F299535020025D76C /* Blaze */, - 465F88A5263B370300F4C950 /* BlockEditorSettings */, - 74B5F0DF1EF82AAB00B411E7 /* Blog */, - FEEFD8B5280EC8C800A3E261 /* BloggingPrompts */, - ABD95B7D25DD6C2400735BEE /* Comment */, - 8BB5F62227A9A5AF00B2FFAF /* Dashboard */, - 74585B911F0D520700E7E667 /* Domains */, - BA62CFE824B592E000978BE1 /* DynamicMockProvider.swift */, - 7EC60EBC22DC4F5A00FB0336 /* Editor */, - 8BE67ED124AD05B5004DB4C9 /* Extensions */, - 9A2D0B29225E0DF7009E585F /* Jetpack */, - 931924231F1662FA0069CBCC /* JSONLoader.swift */, - 74FA25F81F1FDA240044BC54 /* Media */, - 74D97CB91F1CF6E200AC49B7 /* Menu */, - BAFA775524ADAB3C000F0D3A /* MockPluginDirectoryEntryProvider.swift */, - BAB0E36324AD599700B3D22C /* MockPluginStateProvider.swift */, - 9F3E0BA920873772009CB5BA /* MockServiceRequest.swift */, - 74B335D71F06F1CA0053A184 /* MockWordPressComRestApi.swift */, - F3FF8A1A279C86AF00E5C90F /* Models */, - 74A44DD61F13C6F3006CD8F4 /* Notifications */, - 74D67F0B1F15C2570010C5ED /* People */, - 7433BC061EFC456B002D9E92 /* Plans */, - E13EE14A1F332C3100C15787 /* Plugins */, - 740B23D41F17F6D200067A2A /* Post */, - 08C7493C2A45E9E3000DA0E2 /* Privacy */, - C738CAED286222C9001BE107 /* QR Login */, - 7430C9BF1F192C210051B8E6 /* Reader */, - 93AB06031EE8838400EF8764 /* RemoteTestCase.swift */, - 74A923B11F2BE2DF00EC8F92 /* RESTTestable.swift */, - 74155E241EF87DDF00A06AEA /* ServiceRemoteRESTTests.m */, - 74E2294C1F1E73650085F7F2 /* Sharing */, - 74C473AD1EF2F7BF009918F2 /* Site */, - 4624223C2548C235002B8A12 /* SiteDesigns */, - 4625B96A253A34D300C04AAD /* StarterPageLayouts */, - 930F52BB1ECF8A78002F921B /* Stats */, - 93188D201F2264A80028ED4D /* Taxonomy */, - 3F3C9E9B289A3E31009A1357 /* TestCollector+Constants.swift */, - 9309994F1F1658DB00F006A1 /* Theme */, - 436D56362118DC2800CEAA33 /* Transactions */, - 93F50A421F227CC400B5BEBA /* Users */, - F9E56DF924EB18A300916770 /* Utilities */, - 57A38E502624F7D000472480 /* WordPressAPI */, - FFE247A620C891D1002DF3A2 /* WordPressComOAuthClientTests.swift */, - 74B335D91F06F3D60053A184 /* WordPressComRestApiTests.swift */, - 73B3DAD521FBB20D00B2CF18 /* WordPressComRestApiTests+Locale.swift */, - 4A57A6802B549144008D0660 /* WordPressComRestApiTests+Error.swift */, - FFA4D4A82423B10A00BF5180 /* WordPressOrgRestApiTests.swift */, - 74B335DB1F06F4180053A184 /* WordPressOrgXMLRPCApiTests.swift */, - 740B23D51F17F7C100067A2A /* XMLRPCTestable.swift */, - 3FFCC0402BA995290051D229 /* Date+WordPressComTests.swift */, - 3FFCC04C2BABA6980051D229 /* NSDate+WordPressComTests.swift */, - 3FFCC04A2BABA5220051D229 /* DateFormatter+WordPressComTests.swift */, - ); - name = Tests; - sourceTree = ""; - }; - 930F52BB1ECF8A78002F921B /* Stats */ = { - isa = PBXGroup; - children = ( - 40F9880B221ACEEE00B7B369 /* StatsRemoteV2Tests.swift */, - 0152100B28EDA9E400DD6783 /* StatsAnnualAndMostPopularTimeInsightDecodingTests.swift */, - ); - name = Stats; - sourceTree = ""; - }; - 93188D201F2264A80028ED4D /* Taxonomy */ = { - isa = PBXGroup; - children = ( - 93188D211F2264E60028ED4D /* TaxonomyServiceRemoteRESTTests.m */, - ); - name = Taxonomy; - sourceTree = ""; - }; - 9368C7711EC5EF1B0092CE8E = { + 3FE2E93C2BB10FF1002CA2E1 /* Blaze */ = { isa = PBXGroup; children = ( - FFE247CD20CB1245002DF3A2 /* LICENSE */, - FFE247CC20CB118A002DF3A2 /* README.md */, - 0C3A2A412A2E7BA500FD91D6 /* CHANGELOG.md */, - FF20AD2120B8471A00082398 /* WordPressKit.podspec */, - 9368C77D1EC5EF1B0092CE8E /* WordPressKit */, - 9368C7881EC5EF1B0092CE8E /* WordPressKitTests */, - 9368C77C1EC5EF1B0092CE8E /* Products */, - 38C6ABE94A27A12C9C4AD19D /* Frameworks */, - E5EA953F7DD505CCED2E44CD /* Pods */, - ); - sourceTree = ""; - }; - 9368C77C1EC5EF1B0092CE8E /* Products */ = { - isa = PBXGroup; - children = ( - 9368C77B1EC5EF1B0092CE8E /* WordPressKit.framework */, - 9368C7841EC5EF1B0092CE8E /* WordPressKitTests.xctest */, + 0CB1905D2A2A5E83004D3E80 /* BlazeCampaign.swift */, + 0CB190642A2A7569004D3E80 /* BlazeCampaignsSearchResponse.swift */, ); - name = Products; + path = Blaze; sourceTree = ""; }; - 9368C77D1EC5EF1B0092CE8E /* WordPressKit */ = { + 3FE2E93D2BB1100F002CA2E1 /* Atomic */ = { isa = PBXGroup; children = ( - B5A4821F20AC6B5C009D95F6 /* Private */, - 9368C79C1EC62EBD0092CE8E /* Models */, - 9368C79B1EC62EB70092CE8E /* Services */, - 93BD27871EE829B4002BB00B /* Utility */, - 93BD27731EE7388E002BB00B /* WordPressAPI */, - 9368C77E1EC5EF1B0092CE8E /* WordPressKit.h */, - 9368C77F1EC5EF1B0092CE8E /* Info.plist */, + 0CED1FEA2B617D7D00E6DD52 /* AtomicLogs.swift */, ); - path = WordPressKit; + path = Atomic; sourceTree = ""; }; - 9368C7881EC5EF1B0092CE8E /* WordPressKitTests */ = { + 3FE2E93F2BB11038002CA2E1 /* Models */ = { isa = PBXGroup; children = ( - 57A38E572624FF1000472480 /* Fakes */, - 9368C78B1EC5EF1B0092CE8E /* Info.plist */, - 93BD27421EE73384002BB00B /* Mock Data */, - 930F52BA1ECF8A67002F921B /* Tests */, - 3FB8642D288813E9003A86BE /* UnitTests.xctestplan */, - 93BD273F1EE73310002BB00B /* WordPressKitTests-Bridging-Header.h */, + 3FE2E93D2BB1100F002CA2E1 /* Atomic */, + 3FE2E93C2BB10FF1002CA2E1 /* Blaze */, + 3FE2E93B2BB10FBB002CA2E1 /* Extensions */, + 3FE2E9392BB10F67002CA2E1 /* Plugins */, + 3FE2E9362BB10EC7002CA2E1 /* Stats */, + 3FE2E9372BB10F10002CA2E1 /* Revisions */, + 32FC1D25255C91ED00CD0A7B /* Jetpack Scan */, + FAD1344A259094C300A8FEB1 /* JetpackBackup.swift */, + FA28A3D5259079960082C7B0 /* JetpackRestoreTypes.swift */, + 7403A3011EF0726E00DED7DC /* AccountSettings.swift */, + 7EC60EBF22DC5D7C00FB0336 /* EditorSettings.swift */, + 74E229591F1E77290085F7F2 /* KeyringConnection.swift */, + 74E2295A1F1E77290085F7F2 /* KeyringConnectionExternalUser.swift */, + 40247DFB2120E69600AE1C3C /* AutomatedTransferStatus.swift */, + 826016F21F9FA17B00533B6C /* Activity.swift */, + 436D56342118D85800CEAA33 /* WPCountry.swift */, + 436D5640211B7F4400CEAA33 /* DomainContactInformation.swift */, + 4A68E3CC29404181004AC3DC /* RemoteBlog.swift */, + 82FFBF511F45F04100F4573F /* RemoteBlogJetpackMonitorSettings.swift */, + 8236EB4C2024B9F8007C7CF9 /* RemoteBlogJetpackModulesSettings.swift */, + 82FFBF4F1F45EFD100F4573F /* RemoteBlogJetpackSettings.swift */, + 4A68E3CE29404289004AC3DC /* RemoteBlogOptionsHelper.swift */, + 74585B961F0D54B400E7E667 /* RemoteDomain.swift */, + 93C674ED1EE834B700BFAF05 /* RemoteBlogSettings.swift */, + 74BA04F71F06DC3900ED5CD8 /* RemoteComment.h */, + 74BA04F81F06DC3900ED5CD8 /* RemoteComment.m */, + 74650F731F0EA1E200188EDB /* RemoteGravatarProfile.swift */, + 17D936242475D8AB008B2205 /* RemoteHomepageType.swift */, + E6B0460825E5B4DD00DF6F4F /* RemoteInviteLink.swift */, + FE5096602A2F852E00DDD071 /* RemotePublicizeInfo.swift */, + 74DA56381F06EB3000FE9BF4 /* RemoteMedia.h */, + 74DA56391F06EB3000FE9BF4 /* RemoteMedia.m */, + 4A68E3D029406AA0004AC3DC /* RemoteMenu.swift */, + 4A68E3D129406AA0004AC3DC /* RemoteMenuItem.swift */, + 4A68E3D229406AA0004AC3DC /* RemoteMenuLocation.swift */, + 74A44DCE1F13C64B006CD8F4 /* RemoteNotification.swift */, + 74A44DCF1F13C64B006CD8F4 /* RemoteNotificationSettings.swift */, + 74D67F071F15BEB70010C5ED /* RemotePerson.swift */, + 439A44D92107C93000795ED7 /* RemotePlan_ApiVersion1_3.swift */, + E61A51A521B172A900A5F902 /* RemoteWpcomPlan.swift */, + 740B23C01F17EE8000067A2A /* RemotePost.h */, + 740B23C11F17EE8000067A2A /* RemotePost.m */, + 0C9CD7982B9A107E0045BE03 /* RemotePostParameters.swift */, + 740B23BE1F17EE8000067A2A /* RemotePostCategory.h */, + 740B23BF1F17EE8000067A2A /* RemotePostCategory.m */, + 93188D1C1F2262BF0028ED4D /* RemotePostTag.h */, + 93188D1D1F2262BF0028ED4D /* RemotePostTag.m */, + 74B5F0E41EF8699C00B411E7 /* RemotePostType.h */, + 74B5F0E51EF8699C00B411E7 /* RemotePostType.m */, + 93F50A401F227C9700B5BEBA /* RemoteProfile.swift */, + 74E2294F1F1E741B0085F7F2 /* RemotePublicizeConnection.swift */, + 74E2294D1F1E73FE0085F7F2 /* RemotePublicizeService.swift */, + 7430C9D61F1933200051B8E6 /* RemoteReaderCrossPostMeta.swift */, + 8B16CE8D25250039007BE5A9 /* RemoteReaderPost.swift */, + 8B2F4BEE24ACCC120056C08A /* RemoteReaderCard.swift */, + 8B2F4BF024ACE3C30056C08A /* RemoteReaderInterest.swift */, + 7430C9A91F1927C50051B8E6 /* RemoteReaderPost.h */, + 7430C9AA1F1927C50051B8E6 /* RemoteReaderPost.m */, + FACBDD1D25ECA7F90026705B /* RemoteReaderSimplePost.swift */, + 4A68E3DC294070A7004AC3DC /* RemoteReaderSite.swift */, + 4A68E3E0294076C1004AC3DC /* RemoteReaderSiteInfo.swift */, + 9F3E0B9A208732B2009CB5BA /* RemoteReaderSiteInfoSubscription.swift */, + 4A68E3DE29407100004AC3DC /* RemoteReaderTopic.swift */, + 74E2295D1F1E777B0085F7F2 /* RemoteSharingButton.swift */, + 7430C9C81F192F260051B8E6 /* RemoteSourcePostAttribution.h */, + 7430C9C91F192F260051B8E6 /* RemoteSourcePostAttribution.m */, + 9311A67E1F22625A00704AC9 /* RemoteTaxonomyPaging.h */, + 9311A67F1F22625A00704AC9 /* RemoteTaxonomyPaging.m */, + 930999591F16616A00F006A1 /* RemoteTheme.h */, + 9309995A1F16616A00F006A1 /* RemoteTheme.m */, + 93BD27671EE736A8002BB00B /* RemoteUser.h */, + 93BD27681EE736A8002BB00B /* RemoteUser.m */, + 9856BE952630B5C200C12FEB /* RemoteUser+Likes.swift */, + 436D563B2118E18D00CEAA33 /* WPState.swift */, + E1D6B555200E46F200325669 /* WPTimeZone.swift */, + E632D7771F6E047400297F6D /* SocialLogin2FANonceInfo.swift */, + 264E09B22AD0B3BB004B5A5F /* WebauthChallengeInfo.swift */, + 17CE77F020C6EB41001DEA5A /* ReaderFeed.swift */, + 32E1DD22236AA09A008914B0 /* RemotePostAutosave.swift */, + F9E56DF524EB11EF00916770 /* FeatureFlag.swift */, + 4625B964253A343900C04AAD /* RemotePageLayouts.swift */, + 4624222C2548BA0F002B8A12 /* RemoteSiteDesign.swift */, + 464BAB0A262F6736006AEED5 /* RemoteBlockEditorSettings.swift */, + FEFFD99226C141A800F34231 /* RemoteShareAppContent.swift */, + FEE4EF56272FDD4B003CDA3C /* RemoteCommentV2.swift */, + FEF7419C28085D89002C4203 /* RemoteBloggingPrompt.swift */, + FE20A6A3282A96C00025E975 /* RemoteBloggingPromptsSettings.swift */, + 1DAC3D2529AF4F250068FE13 /* RemoteVideoPressVideo.swift */, + F41D98E92B48602B004EC050 /* SessionDetails.swift */, ); - path = WordPressKitTests; + path = Models; sourceTree = ""; }; - 9368C79B1EC62EB70092CE8E /* Services */ = { + 3FE2E9402BB11075002CA2E1 /* Services */ = { isa = PBXGroup; children = ( F4B0F4712ACAF47D003ABC61 /* Domains */, @@ -2105,115 +1826,294 @@ 73A2F38921E7F81E00388609 /* WordPressComServiceRemote+SiteVerticalsPrompt.swift */, 803DE80E28FFA787007D4E9C /* RemoteConfigRemote.swift */, ); - name = Services; + path = Services; + sourceTree = ""; + }; + 3FE2E9412BB110B3002CA2E1 /* Utility */ = { + isa = PBXGroup; + children = ( + B5969E1920A49AC4005E9DF1 /* NSString+MD5.h */, + B5969E1A20A49AC4005E9DF1 /* NSString+MD5.m */, + F1B7F4FB272376A8004215CD /* NSCharacterSet+URLEncode.swift */, + 93C674EF1EE8351E00BFAF05 /* NSMutableDictionary+Helpers.h */, + 93C674F01EE8351E00BFAF05 /* NSMutableDictionary+Helpers.m */, + 9F4E51FF2088E38200424676 /* ObjectValidation.swift */, + 57BCD3D326209D9500292CB3 /* AppTransportSecuritySettings.swift */, + 465F88A1263B325C00F4C950 /* ChecksumUtil.swift */, + 3F3195AC266FF94B00397EE7 /* ZendeskMetadata.swift */, + 4A11239F2B196821004690CF /* MultipartForm.swift */, + 4AE278432B2FAF6200E4D9B1 /* HTTPProtocolHelpers.swift */, + 3F391E192B50F3EB007975C4 /* Result+Callback.swift */, + 4A5BC1A72B59DE6600C7D037 /* Either.swift */, + 4A57A6852B54C68C008D0660 /* Constants.h */, + 4A57A6862B54C68C008D0660 /* Constants.m */, + ); + path = Utility; + sourceTree = ""; + }; + 3FE2E9422BB11280002CA2E1 /* Tests */ = { + isa = PBXGroup; + children = ( + D813437521F6D70D0060D99A /* SiteSegmentsResponseDecodingTests.swift */, + D8DB403F21EF222000B8238E /* SiteCreationSegmentsTests.swift */, + 93BD27401EE73311002BB00B /* AccountServiceRemoteRESTTests.swift */, + 7403A2E51EF06F7000DED7DC /* AccountSettingsRemoteTests.swift */, + 93F50A391F226BB600B5BEBA /* WordPressComServiceRemoteRestTests.swift */, + 826016FF1F9FD60A00533B6C /* ActivityServiceRemoteTests.swift */, + 3F8308A629EE683500354497 /* ActivityTests.swift */, + 4AE7E36A2B9A995500C8CED5 /* AnnouncementServiceRemoteTests.swift */, + F194E1222417ED9F00874408 /* AtomicAuthenticationServiceRemoteTests.swift */, + FAD1345025909DEA00A8FEB1 /* JetpackBackupServiceRemoteTests.swift */, + FA1D0F8D299534FF0025D76C /* BlazeServiceRemoteTests.swift */, + 465F88A6263B371D00F4C950 /* BlockEditorSettingsServiceRemoteTests.swift */, + 74B5F0DD1EF82A9600B411E7 /* BlogServiceRemoteRESTTests.m */, + FEE48EF52A4B3602008A48E0 /* BlogServiceRemote+ActiveFeaturesTests.swift */, + FEEFD8B6280EC91B00A3E261 /* BloggingPromptsServiceRemoteTests.swift */, + ABD95B7E25DD6C4B00735BEE /* CommentServiceRemoteRESTLikesTests.swift */, + 98F884D326BC6445009ADF57 /* CommentServiceRemoteRESTTests.swift */, + 9817D9D326BC8AF000ECBD8C /* CommentServiceRemoteXMLRPCTests.swift */, + FEE4EF5A27302317003CDA3C /* CommentServiceRemoteREST+APIv2Tests.swift */, + 8BB5F62327A9A5D100B2FFAF /* DashboardServiceRemoteTests.swift */, + 74585B8F1F0D51F900E7E667 /* DomainsServiceRemoteRESTTests.swift */, + F4B0F47F2ACB4EA9003ABC61 /* AllDomainsResultDomainTests.swift */, + BA62CFE824B592E000978BE1 /* DynamicMockProvider.swift */, + 7EC60EBD22DC4F9000FB0336 /* EditorServiceRemoteTests.swift */, + 8BE67ED124AD05B5004DB4C9 /* Extensions */, + FE5096662A309E3700DDD071 /* Social */, + 3297E1DC2564649D00287D21 /* Scan */, + 9A2D0B2A225E0E22009E585F /* JetpackServiceRemoteTests.swift */, + 8B749E8125AF7DDA00023F03 /* JetpackCapabilitiesServiceRemoteTests.swift */, + FED77252298B819900C2346E /* JetpackProxyServiceRemoteTests.swift */, + 931924231F1662FA0069CBCC /* JSONLoader.swift */, + 74FA25F61F1FDA200044BC54 /* MediaServiceRemoteRESTTests.swift */, + 4AA5A1A22AA68F6B00969464 /* MediaLibraryTestSupport.swift */, + 4AA5A1A42AA695D700969464 /* LoadMediaLibraryTests.swift */, + 74D97CB71F1CF6D500AC49B7 /* MenusServiceRemoteTests.m */, + BAFA775524ADAB3C000F0D3A /* MockPluginDirectoryEntryProvider.swift */, + BAB0E36324AD599700B3D22C /* MockPluginStateProvider.swift */, + 9F3E0BA920873772009CB5BA /* MockServiceRequest.swift */, + 74B335D71F06F1CA0053A184 /* MockWordPressComRestApi.swift */, + 74A44DD21F13C6D8006CD8F4 /* RemoteNotificationTests.swift */, + 74A44DD31F13C6D8006CD8F4 /* PushAuthenticationServiceRemoteTests.swift */, + 74FC6F3A1F191BB400112505 /* NotificationSyncServiceRemoteTests.swift */, + 74D67F091F15C24C0010C5ED /* PeopleServiceRemoteTests.swift */, + 7433BC031EFC4556002D9E92 /* PlanServiceRemoteTests.swift */, + E13EE14B1F332C4400C15787 /* PluginServiceRemoteTests.swift */, + E1E89C691FD6BDB1006E7A33 /* PluginDirectoryTests.swift */, + BA0637EC2492382200AF8419 /* PluginStateTests.swift */, + BA2A78F924A486D300BB6F53 /* SitePluginTests.swift */, + 4A3239632B73132B00EFD2A8 /* SelfHostedPluginManagementClientTests.swift */, + 32AF21E2236DEB3C001C6502 /* PostServiceRemoteRESTAutosaveTests.swift */, + 9AB6D649218727D60008F274 /* PostServiceRemoteRESTRevisionsTest.swift */, + AB49D09225D1A85D0084905B /* PostServiceRemoteRESTLikesTests.swift */, + 740B23D01F17F6BB00067A2A /* PostServiceRemoteRESTTests.m */, + 740B23D11F17F6BB00067A2A /* PostServiceRemoteXMLRPCTests.swift */, + 08C7493D2A45EA11000DA0E2 /* IPLocationRemoteTests.swift */, + C738CAEE28622325001BE107 /* QRLoginServiceRemoteTests.swift */, + 9F3E0BA72087355D009CB5BA /* RemoteReaderSiteInfoSubscriptionTests.swift */, + 9F3E0BAB20873785009CB5BA /* ServiceRequestTest.swift */, + 9F3E0BAD20873835009CB5BA /* ReaderTopicServiceRemoteTest+Subscriptions.swift */, + 7430C9B91F192C0F0051B8E6 /* ReaderSiteServiceRemoteTests.swift */, + 7430C9BA1F192C0F0051B8E6 /* ReaderPostServiceRemoteTests.m */, + 7430C9BB1F192C0F0051B8E6 /* ReaderTopicServiceRemoteTests.m */, + 17CE77F320C701C8001DEA5A /* ReaderSiteSearchServiceRemoteTests.swift */, + 8B2F4BE424ABB3C70056C08A /* RemoteReaderPostTests.m */, + 8B2F4BE824ABC9DC0056C08A /* ReaderPostServiceRemote+CardsTests.swift */, + FACBDD3725ECB4480026705B /* ReaderPostServiceRemote+RelatedPostsTests.swift */, + FA87FE0624EB39C4003FBEE3 /* ReaderPostServiceRemote+SubscriptionTests.swift */, + 3236F79924AE406D0088E8F3 /* ReaderTopicServiceRemote+InterestsTests.swift */, + 8B16CE91252502C4007BE5A9 /* RemoteReaderPostTests+V2.swift */, + 4AB6A3642B83191600769115 /* ReaderPostServiceRemote+FetchEndpointTests.swift */, + F3FF8A1A279C86AF00E5C90F /* Models */, + 93AB06031EE8838400EF8764 /* RemoteTestCase.swift */, + 74A923B11F2BE2DF00EC8F92 /* RESTTestable.swift */, + FE5096512A13938500DDD071 /* SharingServiceRemoteTests.swift */, + FEFFD99A26C1598F00F34231 /* ShareAppContentServiceRemoteTests.swift */, + 74155E241EF87DDF00A06AEA /* ServiceRemoteRESTTests.m */, + 731BA83521DECD61000FDFCD /* SiteCreationRequestEncodingTests.swift */, + 731BA83721DECD97000FDFCD /* SiteCreationResponseDecodingTests.swift */, + 74C473AE1EF2F7D1009918F2 /* SiteManagementServiceRemoteTests.swift */, + 736C970F21E80D48007A4200 /* SiteVerticalsPromptResponseDecodingTests.swift */, + 73D5930221E552CD00E4CF84 /* SiteVerticalsRequestEncodingTests.swift */, + 73D592FF21E550F500E4CF84 /* SiteVerticalsResponseDecodingTests.swift */, + E1787DB1200E5690004CB3AF /* TimeZoneServiceRemoteTests.swift */, + 7328420521CD798A00126755 /* WordPressComServiceRemoteTests+SiteCreation.swift */, + 73D5930421E5541200E4CF84 /* WordPressComServiceRemoteTests+SiteVerticals.swift */, + 73A2F38C21E7FC8200388609 /* WordPressComServiceRemoteTests+SiteVerticalsPrompt.swift */, + 4624223D2548C26D002B8A12 /* SiteDesignServiceRemoteTests.swift */, + 4625BAEA253E118400C04AAD /* PageLayoutServiceRemoteTests.swift */, + 40F9880B221ACEEE00B7B369 /* StatsRemoteV2Tests.swift */, + 0152100B28EDA9E400DD6783 /* StatsAnnualAndMostPopularTimeInsightDecodingTests.swift */, + 93188D211F2264E60028ED4D /* TaxonomyServiceRemoteRESTTests.m */, + 3F3C9E9B289A3E31009A1357 /* TestCollector+Constants.swift */, + 930999511F1658F800F006A1 /* ThemeServiceRemoteTests.m */, + 436D56372118DC4B00CEAA33 /* TransactionsServiceRemoteTests.swift */, + 93F50A431F227CFB00B5BEBA /* UsersServiceRemoteXMLRPCTests.swift */, + F9E56DF924EB18A300916770 /* Utilities */, + 57A38E502624F7D000472480 /* WordPressAPI */, + FFE247A620C891D1002DF3A2 /* WordPressComOAuthClientTests.swift */, + 74B335D91F06F3D60053A184 /* WordPressComRestApiTests.swift */, + 73B3DAD521FBB20D00B2CF18 /* WordPressComRestApiTests+Locale.swift */, + 4A57A6802B549144008D0660 /* WordPressComRestApiTests+Error.swift */, + FFA4D4A82423B10A00BF5180 /* WordPressOrgRestApiTests.swift */, + 74B335DB1F06F4180053A184 /* WordPressOrgXMLRPCApiTests.swift */, + 740B23D51F17F7C100067A2A /* XMLRPCTestable.swift */, + 3FFCC0402BA995290051D229 /* Date+WordPressComTests.swift */, + 3FFCC04C2BABA6980051D229 /* NSDate+WordPressComTests.swift */, + 3FFCC04A2BABA5220051D229 /* DateFormatter+WordPressComTests.swift */, + ); + path = Tests; + sourceTree = ""; + }; + 3FE2E9432BB11413002CA2E1 /* Sources */ = { + isa = PBXGroup; + children = ( + 3FE2E9462BB12020002CA2E1 /* WordPressKit */, + ); + path = Sources; + sourceTree = ""; + }; + 3FE2E9442BB11592002CA2E1 /* Tests */ = { + isa = PBXGroup; + children = ( + 3FE2E9472BB12113002CA2E1 /* WordPressKitTests */, + ); + path = Tests; + sourceTree = ""; + }; + 3FE2E9452BB11BA7002CA2E1 /* Logging */ = { + isa = PBXGroup; + children = ( + B5A4822A20AC6C0B009D95F6 /* WPKitLogging.swift */, + B5A4822D20AC6C1A009D95F6 /* WPKitLogging.h */, + B5A4822C20AC6C19009D95F6 /* WPKitLogging.m */, + ); + path = Logging; + sourceTree = ""; + }; + 3FE2E9462BB12020002CA2E1 /* WordPressKit */ = { + isa = PBXGroup; + children = ( + 3FE2E9352BB10D92002CA2E1 /* WordPressAPI */, + B5A4821F20AC6B5C009D95F6 /* Private */, + 3FE2E9452BB11BA7002CA2E1 /* Logging */, + 3FE2E93F2BB11038002CA2E1 /* Models */, + 3FE2E9402BB11075002CA2E1 /* Services */, + 3FE2E9412BB110B3002CA2E1 /* Utility */, + 9368C77E1EC5EF1B0092CE8E /* WordPressKit.h */, + 9368C77F1EC5EF1B0092CE8E /* Info.plist */, + ); + path = WordPressKit; + sourceTree = ""; + }; + 3FE2E9472BB12113002CA2E1 /* WordPressKitTests */ = { + isa = PBXGroup; + children = ( + 57A38E572624FF1000472480 /* Fakes */, + 9368C78B1EC5EF1B0092CE8E /* Info.plist */, + 93BD27421EE73384002BB00B /* Mock Data */, + 3FE2E9422BB11280002CA2E1 /* Tests */, + 3FB8642D288813E9003A86BE /* UnitTests.xctestplan */, + 93BD273F1EE73310002BB00B /* WordPressKitTests-Bridging-Header.h */, + ); + path = WordPressKitTests; + sourceTree = ""; + }; + 404057C3221B30140060250C /* Time Interval */ = { + isa = PBXGroup; + children = ( + 01438D3A2B6A36BF0097D60A /* StatsTotalsSummaryData.swift */, + 984E34EA22EF7209005C3F92 /* StatsFileDownloadsTimeIntervalData.swift */, + 40819772221E10C900A298E4 /* StatsPublishedPostsTimeIntervalData.swift */, + 404057C4221B30400060250C /* StatsSearchTermTimeIntervalData.swift */, + 40819777221F00E600A298E4 /* StatsSummaryTimeIntervalData.swift */, + 404057C8221B789B0060250C /* StatsTopAuthorsTimeIntervalData.swift */, + 404057D5221C92660060250C /* StatsTopClicksTimeIntervalData.swift */, + 404057D1221C56AB0060250C /* StatsTopCountryTimeIntervalData.swift */, + 4081976E221DDE9B00A298E4 /* StatsTopPostsTimeIntervalData.swift */, + 404057D9221C9D560060250C /* StatsTopReferrersTimeIntervalData.swift */, + 404057CD221C38130060250C /* StatsTopVideosTimeIntervalData.swift */, + ); + path = "Time Interval"; + sourceTree = ""; + }; + 40414061220F9F2800CF7C5B /* Insights */ = { + isa = PBXGroup; + children = ( + 408197872220A35000A298E4 /* StatsLastPostInsight.swift */, + 4041405D220F9EF500CF7C5B /* StatsDotComFollowersInsight.swift */, + 40E7FEA8220FA4050032834E /* StatsEmailFollowersInsight.swift */, + 4041405F220F9F1F00CF7C5B /* StatsAllTimesInsight.swift */, + 40E7FEAD220FAEA10032834E /* StatsPublicizeInsight.swift */, + 40E7FEB0220FB3B60032834E /* StatsAnnualAndMostPopularTimeInsight.swift */, + 98DC787422BAEBF100267279 /* StatsAllAnnualInsight.swift */, + 40E7FEB3221063480032834E /* StatsTodayInsight.swift */, + 40E7FEB622106A8D0032834E /* StatsCommentsInsight.swift */, + 40E7FEB92210894B0032834E /* StatsTagsAndCategoriesInsight.swift */, + 40F98808221AC88700B7B369 /* StatsPostingStreakInsight.swift */, + ); + path = Insights; + sourceTree = ""; + }; + 465F8892263B094900F4C950 /* BlockEditorSettings */ = { + isa = PBXGroup; + children = ( + 465F8893263B09AE00F4C950 /* wp-block-editor-v1-settings-success-NotThemeJSON.json */, + 465F8899263B09BF00F4C950 /* wp-block-editor-v1-settings-success-ThemeJSON.json */, + 465F88B0263B3E8A00F4C950 /* get_wp_v2_themes_twentytwentyone.json */, + 465F88B6263B455300F4C950 /* get_wp_v2_themes_twentytwentyone-no-colors.json */, + ); + path = BlockEditorSettings; sourceTree = ""; }; - 9368C79C1EC62EBD0092CE8E /* Models */ = { + 57A38E502624F7D000472480 /* WordPressAPI */ = { isa = PBXGroup; children = ( - 0CED1FE92B617D6700E6DD52 /* Atomic */, - 0CB1905C2A2A5E7B004D3E80 /* Blaze */, - 7E3E7A4620E443100075D159 /* Extensions */, - E1EF5D5E1F9F3CA700B6D53E /* Plugins */, - 9AF4F2FD2183345D00570E4B /* Revisions */, - 930F52B91ECF8A44002F921B /* Stats */, - 32FC1D25255C91ED00CD0A7B /* Jetpack Scan */, - FAD1344A259094C300A8FEB1 /* JetpackBackup.swift */, - FA28A3D5259079960082C7B0 /* JetpackRestoreTypes.swift */, - 7403A3011EF0726E00DED7DC /* AccountSettings.swift */, - 7EC60EBF22DC5D7C00FB0336 /* EditorSettings.swift */, - 74E229591F1E77290085F7F2 /* KeyringConnection.swift */, - 74E2295A1F1E77290085F7F2 /* KeyringConnectionExternalUser.swift */, - 40247DFB2120E69600AE1C3C /* AutomatedTransferStatus.swift */, - 826016F21F9FA17B00533B6C /* Activity.swift */, - 436D56342118D85800CEAA33 /* WPCountry.swift */, - 436D5640211B7F4400CEAA33 /* DomainContactInformation.swift */, - 4A68E3CC29404181004AC3DC /* RemoteBlog.swift */, - 82FFBF511F45F04100F4573F /* RemoteBlogJetpackMonitorSettings.swift */, - 8236EB4C2024B9F8007C7CF9 /* RemoteBlogJetpackModulesSettings.swift */, - 82FFBF4F1F45EFD100F4573F /* RemoteBlogJetpackSettings.swift */, - 4A68E3CE29404289004AC3DC /* RemoteBlogOptionsHelper.swift */, - 74585B961F0D54B400E7E667 /* RemoteDomain.swift */, - 93C674ED1EE834B700BFAF05 /* RemoteBlogSettings.swift */, - 74BA04F71F06DC3900ED5CD8 /* RemoteComment.h */, - 74BA04F81F06DC3900ED5CD8 /* RemoteComment.m */, - 74650F731F0EA1E200188EDB /* RemoteGravatarProfile.swift */, - 17D936242475D8AB008B2205 /* RemoteHomepageType.swift */, - E6B0460825E5B4DD00DF6F4F /* RemoteInviteLink.swift */, - FE5096602A2F852E00DDD071 /* RemotePublicizeInfo.swift */, - 74DA56381F06EB3000FE9BF4 /* RemoteMedia.h */, - 74DA56391F06EB3000FE9BF4 /* RemoteMedia.m */, - 4A68E3D029406AA0004AC3DC /* RemoteMenu.swift */, - 4A68E3D129406AA0004AC3DC /* RemoteMenuItem.swift */, - 4A68E3D229406AA0004AC3DC /* RemoteMenuLocation.swift */, - 74A44DCE1F13C64B006CD8F4 /* RemoteNotification.swift */, - 74A44DCF1F13C64B006CD8F4 /* RemoteNotificationSettings.swift */, - 74D67F071F15BEB70010C5ED /* RemotePerson.swift */, - 439A44D92107C93000795ED7 /* RemotePlan_ApiVersion1_3.swift */, - E61A51A521B172A900A5F902 /* RemoteWpcomPlan.swift */, - 740B23C01F17EE8000067A2A /* RemotePost.h */, - 740B23C11F17EE8000067A2A /* RemotePost.m */, - 0C9CD7982B9A107E0045BE03 /* RemotePostParameters.swift */, - 740B23BE1F17EE8000067A2A /* RemotePostCategory.h */, - 740B23BF1F17EE8000067A2A /* RemotePostCategory.m */, - 93188D1C1F2262BF0028ED4D /* RemotePostTag.h */, - 93188D1D1F2262BF0028ED4D /* RemotePostTag.m */, - 74B5F0E41EF8699C00B411E7 /* RemotePostType.h */, - 74B5F0E51EF8699C00B411E7 /* RemotePostType.m */, - 93F50A401F227C9700B5BEBA /* RemoteProfile.swift */, - 74E2294F1F1E741B0085F7F2 /* RemotePublicizeConnection.swift */, - 74E2294D1F1E73FE0085F7F2 /* RemotePublicizeService.swift */, - 7430C9D61F1933200051B8E6 /* RemoteReaderCrossPostMeta.swift */, - 8B16CE8D25250039007BE5A9 /* RemoteReaderPost.swift */, - 8B2F4BEE24ACCC120056C08A /* RemoteReaderCard.swift */, - 8B2F4BF024ACE3C30056C08A /* RemoteReaderInterest.swift */, - 7430C9A91F1927C50051B8E6 /* RemoteReaderPost.h */, - 7430C9AA1F1927C50051B8E6 /* RemoteReaderPost.m */, - FACBDD1D25ECA7F90026705B /* RemoteReaderSimplePost.swift */, - 4A68E3DC294070A7004AC3DC /* RemoteReaderSite.swift */, - 4A68E3E0294076C1004AC3DC /* RemoteReaderSiteInfo.swift */, - 9F3E0B9A208732B2009CB5BA /* RemoteReaderSiteInfoSubscription.swift */, - 4A68E3DE29407100004AC3DC /* RemoteReaderTopic.swift */, - 74E2295D1F1E777B0085F7F2 /* RemoteSharingButton.swift */, - 7430C9C81F192F260051B8E6 /* RemoteSourcePostAttribution.h */, - 7430C9C91F192F260051B8E6 /* RemoteSourcePostAttribution.m */, - 9311A67E1F22625A00704AC9 /* RemoteTaxonomyPaging.h */, - 9311A67F1F22625A00704AC9 /* RemoteTaxonomyPaging.m */, - 930999591F16616A00F006A1 /* RemoteTheme.h */, - 9309995A1F16616A00F006A1 /* RemoteTheme.m */, - 93BD27671EE736A8002BB00B /* RemoteUser.h */, - 93BD27681EE736A8002BB00B /* RemoteUser.m */, - 9856BE952630B5C200C12FEB /* RemoteUser+Likes.swift */, - 436D563B2118E18D00CEAA33 /* WPState.swift */, - E1D6B555200E46F200325669 /* WPTimeZone.swift */, - E632D7771F6E047400297F6D /* SocialLogin2FANonceInfo.swift */, - 264E09B22AD0B3BB004B5A5F /* WebauthChallengeInfo.swift */, - 17CE77F020C6EB41001DEA5A /* ReaderFeed.swift */, - 32E1DD22236AA09A008914B0 /* RemotePostAutosave.swift */, - F9E56DF524EB11EF00916770 /* FeatureFlag.swift */, - 4625B964253A343900C04AAD /* RemotePageLayouts.swift */, - 4624222C2548BA0F002B8A12 /* RemoteSiteDesign.swift */, - 464BAB0A262F6736006AEED5 /* RemoteBlockEditorSettings.swift */, - FEFFD99226C141A800F34231 /* RemoteShareAppContent.swift */, - FEE4EF56272FDD4B003CDA3C /* RemoteCommentV2.swift */, - FEF7419C28085D89002C4203 /* RemoteBloggingPrompt.swift */, - FE20A6A3282A96C00025E975 /* RemoteBloggingPromptsSettings.swift */, - 1DAC3D2529AF4F250068FE13 /* RemoteVideoPressVideo.swift */, - F41D98E92B48602B004EC050 /* SessionDetails.swift */, + 46ABD0DF262EED3D00C7FF24 /* WordPressOrgXMLRPCValidatorTests.swift */, + 4A05E7972B2FCB9A00C25E3B /* NonceRetrievalTests.swift */, + 4A05E79B2B2FDC6100C25E3B /* WordPressOrgAPITests.swift */, ); - name = Models; + path = WordPressAPI; sourceTree = ""; }; - 93BD273E1EE732CC002BB00B /* Accounts */ = { + 57A38E572624FF1000472480 /* Fakes */ = { isa = PBXGroup; children = ( - D813437521F6D70D0060D99A /* SiteSegmentsResponseDecodingTests.swift */, - D8DB403F21EF222000B8238E /* SiteCreationSegmentsTests.swift */, - 93BD27401EE73311002BB00B /* AccountServiceRemoteRESTTests.swift */, - 7403A2E51EF06F7000DED7DC /* AccountSettingsRemoteTests.swift */, - 93F50A391F226BB600B5BEBA /* WordPressComServiceRemoteRestTests.swift */, + 46ABD0E5262EEDAB00C7FF24 /* FakeInfoDictionaryObjectProvider.swift */, + ); + path = Fakes; + sourceTree = ""; + }; + 8BE67ED124AD05B5004DB4C9 /* Extensions */ = { + isa = PBXGroup; + children = ( + 8BE67ED224AD05D3004DB4C9 /* Decodable+DictionaryTests.swift */, + ); + path = Extensions; + sourceTree = ""; + }; + 9368C7711EC5EF1B0092CE8E = { + isa = PBXGroup; + children = ( + 3FE2E9432BB11413002CA2E1 /* Sources */, + 3FE2E9442BB11592002CA2E1 /* Tests */, + FFE247CD20CB1245002DF3A2 /* LICENSE */, + FFE247CC20CB118A002DF3A2 /* README.md */, + 0C3A2A412A2E7BA500FD91D6 /* CHANGELOG.md */, + FF20AD2120B8471A00082398 /* WordPressKit.podspec */, + 9368C77C1EC5EF1B0092CE8E /* Products */, + 38C6ABE94A27A12C9C4AD19D /* Frameworks */, + E5EA953F7DD505CCED2E44CD /* Pods */, + ); + sourceTree = ""; + }; + 9368C77C1EC5EF1B0092CE8E /* Products */ = { + isa = PBXGroup; + children = ( + 9368C77B1EC5EF1B0092CE8E /* WordPressKit.framework */, + 9368C7841EC5EF1B0092CE8E /* WordPressKitTests.xctest */, ); - name = Accounts; + name = Products; sourceTree = ""; }; 93BD27421EE73384002BB00B /* Mock Data */ = { @@ -2525,110 +2425,14 @@ path = "Mock Data"; sourceTree = ""; }; - 93BD27731EE7388E002BB00B /* WordPressAPI */ = { - isa = PBXGroup; - children = ( - 3FFCC0552BABC78B0051D229 /* WordPressComRESTAPIInterfacing.h */, - 4A05E7952B2FCB6400C25E3B /* NonceRetrieval.swift */, - 4A05E7992B2FDC3200C25E3B /* WordPressOrgRestApi.swift */, - 93BD27741EE73944002BB00B /* HTTPAuthenticationAlertController.swift */, - 3FFCC0462BAA6EF40051D229 /* NSDate+WordPressCom.swift */, - 3FFCC04E2BABA6E60051D229 /* Date+WordPressCom.swift */, - 3FFCC0482BAB98130051D229 /* DateFormatter+WordPressCom.swift */, - 93BD27771EE73944002BB00B /* WordPressComOAuthClient.swift */, - 93BD27781EE73944002BB00B /* WordPressComRestApi.swift */, - 93BD27791EE73944002BB00B /* WordPressOrgXMLRPCApi.swift */, - 93BD277A1EE73944002BB00B /* WordPressOrgXMLRPCValidator.swift */, - 93BD277B1EE73944002BB00B /* WordPressRSDParser.swift */, - 4A11239D2B1926D1004690CF /* HTTPClient.swift */, - 4A11239B2B1926B7004690CF /* HTTPRequestBuilder.swift */, - 4A1123992B19269A004690CF /* WordPressAPIError.swift */, - 4A57A6822B54A326008D0660 /* WordPressAPIError+NSErrorBrdige.swift */, - ); - name = WordPressAPI; - sourceTree = ""; - }; - 93BD27871EE829B4002BB00B /* Utility */ = { - isa = PBXGroup; - children = ( - B5969E1920A49AC4005E9DF1 /* NSString+MD5.h */, - B5969E1A20A49AC4005E9DF1 /* NSString+MD5.m */, - F1B7F4FB272376A8004215CD /* NSCharacterSet+URLEncode.swift */, - 93C674EF1EE8351E00BFAF05 /* NSMutableDictionary+Helpers.h */, - 93C674F01EE8351E00BFAF05 /* NSMutableDictionary+Helpers.m */, - 9F4E51FF2088E38200424676 /* ObjectValidation.swift */, - 57BCD3D326209D9500292CB3 /* AppTransportSecuritySettings.swift */, - 465F88A1263B325C00F4C950 /* ChecksumUtil.swift */, - 3F3195AC266FF94B00397EE7 /* ZendeskMetadata.swift */, - 4A11239F2B196821004690CF /* MultipartForm.swift */, - 4AE278432B2FAF6200E4D9B1 /* HTTPProtocolHelpers.swift */, - 3F391E192B50F3EB007975C4 /* Result+Callback.swift */, - 4A5BC1A72B59DE6600C7D037 /* Either.swift */, - 4A57A6852B54C68C008D0660 /* Constants.h */, - 4A57A6862B54C68C008D0660 /* Constants.m */, - ); - name = Utility; - sourceTree = ""; - }; - 93F50A421F227CC400B5BEBA /* Users */ = { - isa = PBXGroup; - children = ( - 93F50A431F227CFB00B5BEBA /* UsersServiceRemoteXMLRPCTests.swift */, - ); - name = Users; - sourceTree = ""; - }; - 9A2D0B29225E0DF7009E585F /* Jetpack */ = { - isa = PBXGroup; - children = ( - FE5096662A309E3700DDD071 /* Social */, - 3297E1DC2564649D00287D21 /* Scan */, - 9A2D0B2A225E0E22009E585F /* JetpackServiceRemoteTests.swift */, - 8B749E8125AF7DDA00023F03 /* JetpackCapabilitiesServiceRemoteTests.swift */, - FED77252298B819900C2346E /* JetpackProxyServiceRemoteTests.swift */, - ); - name = Jetpack; - sourceTree = ""; - }; - 9AF4F2FD2183345D00570E4B /* Revisions */ = { - isa = PBXGroup; - children = ( - 9AF4F2FE2183346B00570E4B /* RemoteRevision.swift */, - 9AB6D646218705E90008F274 /* RemoteDiff.swift */, - ); - name = Revisions; - sourceTree = ""; - }; - ABD95B7D25DD6C2400735BEE /* Comment */ = { - isa = PBXGroup; - children = ( - ABD95B7E25DD6C4B00735BEE /* CommentServiceRemoteRESTLikesTests.swift */, - 98F884D326BC6445009ADF57 /* CommentServiceRemoteRESTTests.swift */, - 9817D9D326BC8AF000ECBD8C /* CommentServiceRemoteXMLRPCTests.swift */, - FEE4EF5A27302317003CDA3C /* CommentServiceRemoteREST+APIv2Tests.swift */, - ); - name = Comment; - sourceTree = ""; - }; B5A4821F20AC6B5C009D95F6 /* Private */ = { isa = PBXGroup; children = ( - B5A4822A20AC6C0B009D95F6 /* WPKitLogging.swift */, - B5A4822D20AC6C1A009D95F6 /* WPKitLogging.h */, - B5A4822C20AC6C19009D95F6 /* WPKitLogging.m */, 1A4F98662279A87D00D86E8E /* WPKit-Swift.h */, ); path = Private; sourceTree = ""; }; - C738CAED286222C9001BE107 /* QR Login */ = { - isa = PBXGroup; - children = ( - C738CAEE28622325001BE107 /* QRLoginServiceRemoteTests.swift */, - ); - name = "QR Login"; - sourceTree = ""; - }; C79719682679007B0072F984 /* Plugin Management */ = { isa = PBXGroup; children = ( @@ -2648,30 +2452,6 @@ path = "QR Login"; sourceTree = ""; }; - E13EE14A1F332C3100C15787 /* Plugins */ = { - isa = PBXGroup; - children = ( - E13EE14B1F332C4400C15787 /* PluginServiceRemoteTests.swift */, - E1E89C691FD6BDB1006E7A33 /* PluginDirectoryTests.swift */, - BA0637EC2492382200AF8419 /* PluginStateTests.swift */, - BA2A78F924A486D300BB6F53 /* SitePluginTests.swift */, - 4A3239632B73132B00EFD2A8 /* SelfHostedPluginManagementClientTests.swift */, - ); - name = Plugins; - sourceTree = ""; - }; - E1EF5D5E1F9F3CA700B6D53E /* Plugins */ = { - isa = PBXGroup; - children = ( - 40AB1AD9200FED25009B533D /* PluginDirectoryFeedPage.swift */, - E194CB721FBDEF6400B0A8B8 /* PluginState.swift */, - E1EF5D5C1F9F329900B6D53E /* SitePluginCapabilities.swift */, - E11C2AD11FA77FB90023BDE2 /* SitePlugin.swift */, - E1A6605E1FD694ED00BAC339 /* PluginDirectoryEntry.swift */, - ); - name = Plugins; - sourceTree = ""; - }; E5EA953F7DD505CCED2E44CD /* Pods */ = { isa = PBXGroup; children = ( @@ -2687,14 +2467,6 @@ name = Pods; sourceTree = ""; }; - F194E1212417ED7E00874408 /* Authentication */ = { - isa = PBXGroup; - children = ( - F194E1222417ED9F00874408 /* AtomicAuthenticationServiceRemoteTests.swift */, - ); - name = Authentication; - sourceTree = ""; - }; F3FF8A1A279C86AF00E5C90F /* Models */ = { isa = PBXGroup; children = ( @@ -2768,22 +2540,6 @@ path = Utilities; sourceTree = ""; }; - FA1D0F8F299535020025D76C /* Blaze */ = { - isa = PBXGroup; - children = ( - FA1D0F8D299534FF0025D76C /* BlazeServiceRemoteTests.swift */, - ); - name = Blaze; - sourceTree = ""; - }; - FAD1345425909DF500A8FEB1 /* Backup */ = { - isa = PBXGroup; - children = ( - FAD1345025909DEA00A8FEB1 /* JetpackBackupServiceRemoteTests.swift */, - ); - name = Backup; - sourceTree = ""; - }; FE5096662A309E3700DDD071 /* Social */ = { isa = PBXGroup; children = ( @@ -2792,14 +2548,6 @@ path = Social; sourceTree = ""; }; - FEEFD8B5280EC8C800A3E261 /* BloggingPrompts */ = { - isa = PBXGroup; - children = ( - FEEFD8B6280EC91B00A3E261 /* BloggingPromptsServiceRemoteTests.swift */, - ); - name = BloggingPrompts; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -3884,7 +3632,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressKit/Info.plist; + INFOPLIST_FILE = Sources/WordPressKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -3916,7 +3664,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressKit/Info.plist; + INFOPLIST_FILE = Sources/WordPressKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -3942,7 +3690,7 @@ "${inherited}", "$(SDKROOT)/usr/include/libxml2", ); - INFOPLIST_FILE = WordPressKitTests/Info.plist; + INFOPLIST_FILE = Tests/WordPressKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3950,7 +3698,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressKitTests/WordPressKitTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Tests/WordPressKitTests/WordPressKitTests-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; }; @@ -3967,7 +3715,7 @@ "${inherited}", "$(SDKROOT)/usr/include/libxml2", ); - INFOPLIST_FILE = WordPressKitTests/Info.plist; + INFOPLIST_FILE = Tests/WordPressKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -3975,7 +3723,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressKitTests/WordPressKitTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Tests/WordPressKitTests/WordPressKitTests-Bridging-Header.h"; SWIFT_VERSION = 5.0; }; name = Release; @@ -4055,7 +3803,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressKit/Info.plist; + INFOPLIST_FILE = Sources/WordPressKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -4081,7 +3829,7 @@ "${inherited}", "$(SDKROOT)/usr/include/libxml2", ); - INFOPLIST_FILE = WordPressKitTests/Info.plist; + INFOPLIST_FILE = Tests/WordPressKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4089,7 +3837,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressKitTests/WordPressKitTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Tests/WordPressKitTests/WordPressKitTests-Bridging-Header.h"; SWIFT_VERSION = 5.0; }; name = "Release-Internal"; @@ -4169,7 +3917,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - INFOPLIST_FILE = WordPressKit/Info.plist; + INFOPLIST_FILE = Sources/WordPressKit/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -4195,7 +3943,7 @@ "${inherited}", "$(SDKROOT)/usr/include/libxml2", ); - INFOPLIST_FILE = WordPressKitTests/Info.plist; + INFOPLIST_FILE = Tests/WordPressKitTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -4203,7 +3951,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.automattic.WordPressKitTests; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_OBJC_BRIDGING_HEADER = "WordPressKitTests/WordPressKitTests-Bridging-Header.h"; + SWIFT_OBJC_BRIDGING_HEADER = "Tests/WordPressKitTests/WordPressKitTests-Bridging-Header.h"; SWIFT_VERSION = 5.0; }; name = "Release-Alpha"; diff --git a/WordPressKit.xcodeproj/xcshareddata/xcschemes/WordPressKit.xcscheme b/WordPressKit.xcodeproj/xcshareddata/xcschemes/WordPressKit.xcscheme index f09ffe95..5fa59bfe 100644 --- a/WordPressKit.xcodeproj/xcshareddata/xcschemes/WordPressKit.xcscheme +++ b/WordPressKit.xcodeproj/xcshareddata/xcschemes/WordPressKit.xcscheme @@ -30,7 +30,7 @@ codeCoverageEnabled = "YES">