diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/All.kt b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/All.kt
new file mode 100644
index 00000000..8875b07c
--- /dev/null
+++ b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/All.kt
@@ -0,0 +1,105 @@
+package icu.samnyan.aqua.sega.ongeki.model.response.data
+
+import icu.samnyan.aqua.sega.ongeki.model.userdata.UserMusicDetail
+import lombok.AllArgsConstructor
+import lombok.Data
+import lombok.NoArgsConstructor
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+class GameEventItem {
+    var id: Long = 0
+    var type = 0
+    var startDate: String = ""
+    var endDate: String = ""
+}
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+class GameIdListItem {
+    var id = 0
+    var type = 0
+}
+
+/**
+ * Fro getGameRanking request
+ * @author samnyan (privateamusement@protonmail.com)
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+class GameRankingItem {
+    var id: Long = 0
+
+    // this 2 field never use in game code,
+    // maybe for the future update like in game player ranking
+    var point: Long = 0
+    var userName: String = ""
+}
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+class GameSetting {
+    var dataVersion: String = ""
+    var onlineDataVersion: String = ""
+    var isMaintenance = false
+    var requestInterval = 0
+    var rebootStartTime: String = ""
+    var rebootEndTime: String = ""
+    var isBackgroundDistribute = false
+    var maxCountCharacter = 0
+    var maxCountCard = 0
+    var maxCountItem = 0
+    var maxCountMusic = 0
+    var maxCountMusicItem = 0
+    var maxCountRivalMusic = 0
+}
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+class UserEventRankingItem {
+    var eventId = 0
+    var type = 0
+    var date: String = ""
+    var rank = 0
+    var point: Long = 0
+}
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+class UserMusicListItem {
+    var length = 0
+    var userMusicDetailList: List<UserMusicDetail>? = null
+}
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+class UserRivalData {
+    var rivalUserId: Long = 0
+    var rivalUserName: String = ""
+}
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+class UserRivalMusic {
+    var userRivalMusicDetailList: List<UserMusicDetail>? = null
+    var length = 0
+}
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+class UserTechEventRankingItem {
+    var eventId = 0
+    var date: String = ""
+    var rank = 0
+    var totalTechScore = 0
+    var totalPlatinumScore = 0
+}
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameEventItem.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameEventItem.java
deleted file mode 100644
index c8c6aba2..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameEventItem.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package icu.samnyan.aqua.sega.ongeki.model.response.data;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GameEventItem {
-    private long id;
-    private int type;
-    private String startDate;
-    private String endDate;
-}
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameIdListItem.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameIdListItem.java
deleted file mode 100644
index 3eed677e..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameIdListItem.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package icu.samnyan.aqua.sega.ongeki.model.response.data;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GameIdListItem {
-    private int id;
-    private int type;
-}
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameRankingItem.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameRankingItem.java
deleted file mode 100644
index 59e2e4e8..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameRankingItem.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package icu.samnyan.aqua.sega.ongeki.model.response.data;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * Fro getGameRanking request
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GameRankingItem {
-    private long id;
-    // this 2 field never use in game code,
-    // maybe for the future update like in game player ranking
-    private long point;
-    private String userName;
-}
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameSetting.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameSetting.java
deleted file mode 100644
index d6ef6d52..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/GameSetting.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package icu.samnyan.aqua.sega.ongeki.model.response.data;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GameSetting {
-    private String dataVersion;
-    private String onlineDataVersion;
-    @JsonProperty("isMaintenance")
-    private boolean isMaintenance;
-    private int requestInterval;
-    private String rebootStartTime;
-    private String rebootEndTime;
-    @JsonProperty("isBackgroundDistribute")
-    private boolean isBackgroundDistribute;
-    private int maxCountCharacter;
-    private int maxCountCard;
-    private int maxCountItem;
-    private int maxCountMusic;
-    private int maxCountMusicItem;
-    private int maxCountRivalMusic;
-}
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserEventRankingItem.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserEventRankingItem.java
deleted file mode 100644
index 46b7f3f7..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserEventRankingItem.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package icu.samnyan.aqua.sega.ongeki.model.response.data;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserEventRankingItem {
-    private int eventId;
-    private int type;
-    private String date;
-    private int rank;
-    private long point;
-}
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserMusicListItem.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserMusicListItem.java
deleted file mode 100644
index 4c4b80a1..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserMusicListItem.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package icu.samnyan.aqua.sega.ongeki.model.response.data;
-
-import icu.samnyan.aqua.sega.ongeki.model.userdata.UserMusicDetail;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserMusicListItem {
-    private int length;
-    private List<UserMusicDetail> userMusicDetailList;
-}
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserRivalData.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserRivalData.java
deleted file mode 100644
index 6e1ae559..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserRivalData.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package icu.samnyan.aqua.sega.ongeki.model.response.data;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserRivalData {
-    private long rivalUserId;
-    private String rivalUserName;
-}
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserRivalMusic.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserRivalMusic.java
deleted file mode 100644
index 3dd0e4ca..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserRivalMusic.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package icu.samnyan.aqua.sega.ongeki.model.response.data;
-
-import icu.samnyan.aqua.sega.ongeki.model.userdata.UserMusicDetail;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserRivalMusic {
-    private List<UserMusicDetail> userRivalMusicDetailList;
-    private int length;
-}
diff --git a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserTechEventRankingItem.java b/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserTechEventRankingItem.java
deleted file mode 100644
index f56539ed..00000000
--- a/src/main/java/icu/samnyan/aqua/sega/ongeki/model/response/data/UserTechEventRankingItem.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package icu.samnyan.aqua.sega.ongeki.model.response.data;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author samnyan (privateamusement@protonmail.com)
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class UserTechEventRankingItem {
-    private int eventId;
-    private String date;
-    private int rank;
-    private int totalTechScore;
-    private int totalPlatinumScore;
-}