diff --git a/Pachyderm/Package.swift b/Packages/Pachyderm/Package.swift
similarity index 100%
rename from Pachyderm/Package.swift
rename to Packages/Pachyderm/Package.swift
diff --git a/Pachyderm/README.md b/Packages/Pachyderm/README.md
similarity index 100%
rename from Pachyderm/README.md
rename to Packages/Pachyderm/README.md
diff --git a/Pachyderm/Sources/Pachyderm/Client.swift b/Packages/Pachyderm/Sources/Pachyderm/Client.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Client.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Client.swift
diff --git a/Pachyderm/Sources/Pachyderm/Extensions/Data.swift b/Packages/Pachyderm/Sources/Pachyderm/Extensions/Data.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Extensions/Data.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Extensions/Data.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Account.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Account.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Account.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Account.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Application.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Application.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Application.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Application.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Attachment.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Attachment.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Attachment.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Attachment.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Card.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Card.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Card.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Card.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/ConversationContext.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/ConversationContext.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/ConversationContext.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/ConversationContext.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/DirectoryOrder.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/DirectoryOrder.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/DirectoryOrder.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/DirectoryOrder.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Emoji.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Emoji.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Emoji.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Emoji.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/FilterV1.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/FilterV1.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/FilterV1.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/FilterV1.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/FilterV2.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/FilterV2.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/FilterV2.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/FilterV2.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Hashtag.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Hashtag.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Hashtag.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Hashtag.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/History.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/History.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/History.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/History.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Instance.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Instance.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Instance.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Instance.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/List.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/List.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/List.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/List.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/LoginSettings.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/LoginSettings.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/LoginSettings.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/LoginSettings.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/MastodonError.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/MastodonError.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/MastodonError.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/MastodonError.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Mention.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Mention.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Mention.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Mention.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/NodeInfo.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/NodeInfo.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/NodeInfo.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/NodeInfo.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Notification.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Notification.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Notification.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Notification.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Poll.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Poll.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Poll.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Poll.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Protocols/AccountProtocol.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Protocols/AccountProtocol.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Protocols/AccountProtocol.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Protocols/AccountProtocol.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Protocols/StatusProtocol.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Protocols/StatusProtocol.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Protocols/StatusProtocol.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Protocols/StatusProtocol.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/PushSubscription.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/PushSubscription.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/PushSubscription.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/PushSubscription.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/RegisteredApplication.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/RegisteredApplication.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/RegisteredApplication.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/RegisteredApplication.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Relationship.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Relationship.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Relationship.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Relationship.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Report.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Report.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Report.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Report.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Scope.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Scope.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Scope.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Scope.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/SearchResultType.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/SearchResultType.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/SearchResultType.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/SearchResultType.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/SearchResults.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/SearchResults.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/SearchResults.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/SearchResults.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Status.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Status.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Status.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Status.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/StatusContentType.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/StatusContentType.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/StatusContentType.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/StatusContentType.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/Timeline.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/Timeline.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/Timeline.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/Timeline.swift
diff --git a/Pachyderm/Sources/Pachyderm/Model/WellKnown.swift b/Packages/Pachyderm/Sources/Pachyderm/Model/WellKnown.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Model/WellKnown.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Model/WellKnown.swift
diff --git a/Pachyderm/Sources/Pachyderm/Request/Body.swift b/Packages/Pachyderm/Sources/Pachyderm/Request/Body.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Request/Body.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Request/Body.swift
diff --git a/Pachyderm/Sources/Pachyderm/Request/Endpoint.swift b/Packages/Pachyderm/Sources/Pachyderm/Request/Endpoint.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Request/Endpoint.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Request/Endpoint.swift
diff --git a/Pachyderm/Sources/Pachyderm/Request/FormAttachment.swift b/Packages/Pachyderm/Sources/Pachyderm/Request/FormAttachment.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Request/FormAttachment.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Request/FormAttachment.swift
diff --git a/Pachyderm/Sources/Pachyderm/Request/Method.swift b/Packages/Pachyderm/Sources/Pachyderm/Request/Method.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Request/Method.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Request/Method.swift
diff --git a/Pachyderm/Sources/Pachyderm/Request/Parameter.swift b/Packages/Pachyderm/Sources/Pachyderm/Request/Parameter.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Request/Parameter.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Request/Parameter.swift
diff --git a/Pachyderm/Sources/Pachyderm/Request/Request.swift b/Packages/Pachyderm/Sources/Pachyderm/Request/Request.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Request/Request.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Request/Request.swift
diff --git a/Pachyderm/Sources/Pachyderm/Request/RequestRange.swift b/Packages/Pachyderm/Sources/Pachyderm/Request/RequestRange.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Request/RequestRange.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Request/RequestRange.swift
diff --git a/Pachyderm/Sources/Pachyderm/Response/Empty.swift b/Packages/Pachyderm/Sources/Pachyderm/Response/Empty.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Response/Empty.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Response/Empty.swift
diff --git a/Pachyderm/Sources/Pachyderm/Response/Pagination.swift b/Packages/Pachyderm/Sources/Pachyderm/Response/Pagination.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Response/Pagination.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Response/Pagination.swift
diff --git a/Pachyderm/Sources/Pachyderm/Response/Response.swift b/Packages/Pachyderm/Sources/Pachyderm/Response/Response.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Response/Response.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Response/Response.swift
diff --git a/Pachyderm/Sources/Pachyderm/Utilities/CharacterCounter.swift b/Packages/Pachyderm/Sources/Pachyderm/Utilities/CharacterCounter.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Utilities/CharacterCounter.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Utilities/CharacterCounter.swift
diff --git a/Pachyderm/Sources/Pachyderm/Utilities/CollapseState.swift b/Packages/Pachyderm/Sources/Pachyderm/Utilities/CollapseState.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Utilities/CollapseState.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Utilities/CollapseState.swift
diff --git a/Pachyderm/Sources/Pachyderm/Utilities/InstanceSelector.swift b/Packages/Pachyderm/Sources/Pachyderm/Utilities/InstanceSelector.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Utilities/InstanceSelector.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Utilities/InstanceSelector.swift
diff --git a/Pachyderm/Sources/Pachyderm/Utilities/NotificationGroup.swift b/Packages/Pachyderm/Sources/Pachyderm/Utilities/NotificationGroup.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Utilities/NotificationGroup.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Utilities/NotificationGroup.swift
diff --git a/Pachyderm/Sources/Pachyderm/Utilities/TimelineSegment.swift b/Packages/Pachyderm/Sources/Pachyderm/Utilities/TimelineSegment.swift
similarity index 100%
rename from Pachyderm/Sources/Pachyderm/Utilities/TimelineSegment.swift
rename to Packages/Pachyderm/Sources/Pachyderm/Utilities/TimelineSegment.swift
diff --git a/Pachyderm/Tests/PachydermTests/CharacterCounterTests.swift b/Packages/Pachyderm/Tests/PachydermTests/CharacterCounterTests.swift
similarity index 100%
rename from Pachyderm/Tests/PachydermTests/CharacterCounterTests.swift
rename to Packages/Pachyderm/Tests/PachydermTests/CharacterCounterTests.swift
diff --git a/Pachyderm/Tests/PachydermTests/NotificationGroupTests.swift b/Packages/Pachyderm/Tests/PachydermTests/NotificationGroupTests.swift
similarity index 100%
rename from Pachyderm/Tests/PachydermTests/NotificationGroupTests.swift
rename to Packages/Pachyderm/Tests/PachydermTests/NotificationGroupTests.swift
diff --git a/Pachyderm/Tests/PachydermTests/URLTests.swift b/Packages/Pachyderm/Tests/PachydermTests/URLTests.swift
similarity index 100%
rename from Pachyderm/Tests/PachydermTests/URLTests.swift
rename to Packages/Pachyderm/Tests/PachydermTests/URLTests.swift
diff --git a/Tusker.xcodeproj/project.pbxproj b/Tusker.xcodeproj/project.pbxproj
index 27b7c55c..bcd4d3e7 100644
--- a/Tusker.xcodeproj/project.pbxproj
+++ b/Tusker.xcodeproj/project.pbxproj
@@ -559,7 +559,7 @@
 		D66A77BA233838DC0058F1EC /* UIFont+Traits.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Traits.swift"; sourceTree = "<group>"; };
 		D66C900A28DAB7FD00217BF2 /* TimelineViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimelineViewController.swift; sourceTree = "<group>"; };
 		D673ACCD2919E74200D6F8B0 /* MenuPicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuPicker.swift; sourceTree = "<group>"; };
-		D674A50727F910F300BA03AC /* Pachyderm */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Pachyderm; sourceTree = "<group>"; };
+		D674A50727F910F300BA03AC /* Pachyderm */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Pachyderm; path = Packages/Pachyderm; sourceTree = "<group>"; };
 		D677284724ECBCB100C732D3 /* ComposeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeView.swift; sourceTree = "<group>"; };
 		D677284924ECBDF400C732D3 /* ComposeCurrentAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeCurrentAccount.swift; sourceTree = "<group>"; };
 		D677284B24ECBE9100C732D3 /* ComposeAvatarImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeAvatarImageView.swift; sourceTree = "<group>"; };