diff --git a/Sources/Models/AmiiboGame.swift b/Sources/Models/AmiiboGame.swift
deleted file mode 100644
index 7b7fd73..0000000
--- a/Sources/Models/AmiiboGame.swift
+++ /dev/null
@@ -1,17 +0,0 @@
-extension Amiibo {
-    public struct Game {
-        public let identifiers: [String]
-        public let name: String
-        public let usage: [Usage]?
-    }
-}
-
-// MARK: - Decodable
-
-extension Amiibo.Game: Decodable {
-    enum CodingKeys: String, CodingKey {
-        case identifiers = "gameID"
-        case name = "gameName"
-        case usage = "amiiboUsage"
-    }
-}
diff --git a/Sources/Models/AmiiboRelease.swift b/Sources/Models/AmiiboRelease.swift
deleted file mode 100644
index a53c7a1..0000000
--- a/Sources/Models/AmiiboRelease.swift
+++ /dev/null
@@ -1,21 +0,0 @@
-import Foundation
-
-extension Amiibo {
-    public struct Release {
-        public let australia: Date?
-        public let europe: Date?
-        public let japan: Date?
-        public let america: Date?
-    }
-}
-
-// MARK: - Decodable
-
-extension Amiibo.Release: Decodable {
-    enum CodingKeys: String, CodingKey {
-        case australia = "au"
-        case europe = "eu"
-        case japan = "jp"
-        case america = "na"
-    }
-}
diff --git a/Sources/Models/AmiiboUsage.swift b/Sources/Models/AmiiboUsage.swift
deleted file mode 100644
index ee07b16..0000000
--- a/Sources/Models/AmiiboUsage.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-extension Amiibo {
-    public struct Usage {
-        public let explanation: String
-        public let isWritable: Bool
-    }
-}
-
-// MARK: - Decodable
-
-extension Amiibo.Usage: Decodable {
-    enum CodingKeys: String, CodingKey {
-        case explanation = "Usage"
-        case isWritable = "write"
-    }
-}
diff --git a/Sources/Models/Game.swift b/Sources/Models/Game.swift
new file mode 100644
index 0000000..304267d
--- /dev/null
+++ b/Sources/Models/Game.swift
@@ -0,0 +1,15 @@
+public struct Game {
+    public let ids: [String]
+    public let name: String
+    public let usage: [Usage]?
+}
+
+// MARK: - Decodable
+
+extension Game: Decodable {
+    enum CodingKeys: String, CodingKey {
+        case ids = "gameID"
+        case name = "gameName"
+        case usage = "amiiboUsage"
+    }
+}
diff --git a/Sources/Models/Release.swift b/Sources/Models/Release.swift
new file mode 100644
index 0000000..b3b672e
--- /dev/null
+++ b/Sources/Models/Release.swift
@@ -0,0 +1,19 @@
+import Foundation
+
+public struct Release {
+    public let australia: Date?
+    public let europe: Date?
+    public let japan: Date?
+    public let america: Date?
+}
+
+// MARK: - Decodable
+
+extension Release: Decodable {
+    enum CodingKeys: String, CodingKey {
+        case australia = "au"
+        case europe = "eu"
+        case japan = "jp"
+        case america = "na"
+    }
+}
diff --git a/Sources/Models/Usage.swift b/Sources/Models/Usage.swift
new file mode 100644
index 0000000..7d54439
--- /dev/null
+++ b/Sources/Models/Usage.swift
@@ -0,0 +1,13 @@
+public struct Usage {
+    public let explanation: String
+    public let isWritable: Bool
+}
+
+// MARK: - Decodable
+
+extension Usage: Decodable {
+    enum CodingKeys: String, CodingKey {
+        case explanation = "Usage"
+        case isWritable = "write"
+    }
+}