diff --git a/Package.swift b/Package.swift
index 16057bd..a186785 100644
--- a/Package.swift
+++ b/Package.swift
@@ -42,7 +42,7 @@ let package = Package(
                 .product(name: "OpenAPIRuntime", package: "swift-openapi-runtime"),
                 .product(name: "OpenAPIURLSession", package: "swift-openapi-urlsession")
             ],
-            path: "Sources",
+            path: "Sources/AmiiboService",
             plugins: [
                 .plugin(name: "OpenAPIGenerator", package: "swift-openapi-generator"),
             ]
@@ -52,7 +52,7 @@ let package = Package(
             dependencies: [
                 .byName(name: AmiiboService.target)
             ],
-            path: "Tests"
+            path: "Tests/AmiiboService"
         ),
     ]
 )
diff --git a/Sources/Catalogs/AmiiboService.docc/Library.md b/Sources/AmiiboService/Catalogs/AmiiboService.docc/Library.md
similarity index 100%
rename from Sources/Catalogs/AmiiboService.docc/Library.md
rename to Sources/AmiiboService/Catalogs/AmiiboService.docc/Library.md
diff --git a/Sources/Internal/Extensions/DateFormatter+Properties.swift b/Sources/AmiiboService/Internal/Extensions/DateFormatter+Properties.swift
similarity index 100%
rename from Sources/Internal/Extensions/DateFormatter+Properties.swift
rename to Sources/AmiiboService/Internal/Extensions/DateFormatter+Properties.swift
diff --git a/Sources/Internal/Protocols/APIClient.swift b/Sources/AmiiboService/Internal/Protocols/APIClient.swift
similarity index 100%
rename from Sources/Internal/Protocols/APIClient.swift
rename to Sources/AmiiboService/Internal/Protocols/APIClient.swift
diff --git a/Sources/Internal/Protocols/KeyNameFilter.swift b/Sources/AmiiboService/Internal/Protocols/KeyNameFilter.swift
similarity index 100%
rename from Sources/Internal/Protocols/KeyNameFilter.swift
rename to Sources/AmiiboService/Internal/Protocols/KeyNameFilter.swift
diff --git a/Sources/Internal/Protocols/KeyNameModel.swift b/Sources/AmiiboService/Internal/Protocols/KeyNameModel.swift
similarity index 100%
rename from Sources/Internal/Protocols/KeyNameModel.swift
rename to Sources/AmiiboService/Internal/Protocols/KeyNameModel.swift
diff --git a/Sources/Internal/Transcoders/ISOTimestampTranscoder.swift b/Sources/AmiiboService/Internal/Transcoders/ISOTimestampTranscoder.swift
similarity index 100%
rename from Sources/Internal/Transcoders/ISOTimestampTranscoder.swift
rename to Sources/AmiiboService/Internal/Transcoders/ISOTimestampTranscoder.swift
diff --git a/Sources/Public/Clients/AmiiboLiveClient.swift b/Sources/AmiiboService/Public/Clients/AmiiboLiveClient.swift
similarity index 100%
rename from Sources/Public/Clients/AmiiboLiveClient.swift
rename to Sources/AmiiboService/Public/Clients/AmiiboLiveClient.swift
diff --git a/Sources/Public/Clients/AmiiboMockClient.swift b/Sources/AmiiboService/Public/Clients/AmiiboMockClient.swift
similarity index 100%
rename from Sources/Public/Clients/AmiiboMockClient.swift
rename to Sources/AmiiboService/Public/Clients/AmiiboMockClient.swift
diff --git a/Sources/Public/Enumerations/AmiiboClient.swift b/Sources/AmiiboService/Public/Enumerations/AmiiboClient.swift
similarity index 100%
rename from Sources/Public/Enumerations/AmiiboClient.swift
rename to Sources/AmiiboService/Public/Enumerations/AmiiboClient.swift
diff --git a/Sources/Public/Errors/AmiiboServiceError.swift b/Sources/AmiiboService/Public/Errors/AmiiboServiceError.swift
similarity index 100%
rename from Sources/Public/Errors/AmiiboServiceError.swift
rename to Sources/AmiiboService/Public/Errors/AmiiboServiceError.swift
diff --git a/Sources/Public/Filters/AmiiboFilter.swift b/Sources/AmiiboService/Public/Filters/AmiiboFilter.swift
similarity index 100%
rename from Sources/Public/Filters/AmiiboFilter.swift
rename to Sources/AmiiboService/Public/Filters/AmiiboFilter.swift
diff --git a/Sources/Public/Filters/AmiiboSeriesFilter.swift b/Sources/AmiiboService/Public/Filters/AmiiboSeriesFilter.swift
similarity index 100%
rename from Sources/Public/Filters/AmiiboSeriesFilter.swift
rename to Sources/AmiiboService/Public/Filters/AmiiboSeriesFilter.swift
diff --git a/Sources/Public/Filters/AmiiboTypeFilter.swift b/Sources/AmiiboService/Public/Filters/AmiiboTypeFilter.swift
similarity index 100%
rename from Sources/Public/Filters/AmiiboTypeFilter.swift
rename to Sources/AmiiboService/Public/Filters/AmiiboTypeFilter.swift
diff --git a/Sources/Public/Filters/GameCharacterFilter.swift b/Sources/AmiiboService/Public/Filters/GameCharacterFilter.swift
similarity index 100%
rename from Sources/Public/Filters/GameCharacterFilter.swift
rename to Sources/AmiiboService/Public/Filters/GameCharacterFilter.swift
diff --git a/Sources/Public/Filters/GameSeriesFilter.swift b/Sources/AmiiboService/Public/Filters/GameSeriesFilter.swift
similarity index 100%
rename from Sources/Public/Filters/GameSeriesFilter.swift
rename to Sources/AmiiboService/Public/Filters/GameSeriesFilter.swift
diff --git a/Sources/Public/Models/Amiibo.swift b/Sources/AmiiboService/Public/Models/Amiibo.swift
similarity index 100%
rename from Sources/Public/Models/Amiibo.swift
rename to Sources/AmiiboService/Public/Models/Amiibo.swift
diff --git a/Sources/Public/Models/Amiibo/Amiibo+Game.swift b/Sources/AmiiboService/Public/Models/Amiibo/Amiibo+Game.swift
similarity index 100%
rename from Sources/Public/Models/Amiibo/Amiibo+Game.swift
rename to Sources/AmiiboService/Public/Models/Amiibo/Amiibo+Game.swift
diff --git a/Sources/Public/Models/Amiibo/Amiibo+Platform.swift b/Sources/AmiiboService/Public/Models/Amiibo/Amiibo+Platform.swift
similarity index 100%
rename from Sources/Public/Models/Amiibo/Amiibo+Platform.swift
rename to Sources/AmiiboService/Public/Models/Amiibo/Amiibo+Platform.swift
diff --git a/Sources/Public/Models/Amiibo/Amiibo+Release.swift b/Sources/AmiiboService/Public/Models/Amiibo/Amiibo+Release.swift
similarity index 100%
rename from Sources/Public/Models/Amiibo/Amiibo+Release.swift
rename to Sources/AmiiboService/Public/Models/Amiibo/Amiibo+Release.swift
diff --git a/Sources/Public/Models/Amiibo/Amiibo+Usage.swift b/Sources/AmiiboService/Public/Models/Amiibo/Amiibo+Usage.swift
similarity index 100%
rename from Sources/Public/Models/Amiibo/Amiibo+Usage.swift
rename to Sources/AmiiboService/Public/Models/Amiibo/Amiibo+Usage.swift
diff --git a/Sources/Public/Models/AmiiboSeries.swift b/Sources/AmiiboService/Public/Models/AmiiboSeries.swift
similarity index 100%
rename from Sources/Public/Models/AmiiboSeries.swift
rename to Sources/AmiiboService/Public/Models/AmiiboSeries.swift
diff --git a/Sources/Public/Models/AmiiboType.swift b/Sources/AmiiboService/Public/Models/AmiiboType.swift
similarity index 100%
rename from Sources/Public/Models/AmiiboType.swift
rename to Sources/AmiiboService/Public/Models/AmiiboType.swift
diff --git a/Sources/Public/Models/GameCharacter.swift b/Sources/AmiiboService/Public/Models/GameCharacter.swift
similarity index 100%
rename from Sources/Public/Models/GameCharacter.swift
rename to Sources/AmiiboService/Public/Models/GameCharacter.swift
diff --git a/Sources/Public/Models/GameSeries.swift b/Sources/AmiiboService/Public/Models/GameSeries.swift
similarity index 100%
rename from Sources/Public/Models/GameSeries.swift
rename to Sources/AmiiboService/Public/Models/GameSeries.swift
diff --git a/Sources/Public/Services/AmiiboService.swift b/Sources/AmiiboService/Public/Services/AmiiboService.swift
similarity index 100%
rename from Sources/Public/Services/AmiiboService.swift
rename to Sources/AmiiboService/Public/Services/AmiiboService.swift
diff --git a/Sources/openapi-generator-config.yaml b/Sources/AmiiboService/openapi-generator-config.yaml
similarity index 100%
rename from Sources/openapi-generator-config.yaml
rename to Sources/AmiiboService/openapi-generator-config.yaml
diff --git a/Sources/openapi.yaml b/Sources/AmiiboService/openapi.yaml
similarity index 100%
rename from Sources/openapi.yaml
rename to Sources/AmiiboService/openapi.yaml
diff --git a/Tests/Public/Services/AmiiboServiceLiveTests.swift b/Tests/AmiiboService/Tests/Public/Services/AmiiboServiceLiveTests.swift
similarity index 100%
rename from Tests/Public/Services/AmiiboServiceLiveTests.swift
rename to Tests/AmiiboService/Tests/Public/Services/AmiiboServiceLiveTests.swift