diff --git a/.gitignore b/.gitignore
index 2af6173..6b262b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,10 +6,5 @@ config.json
 data
 temp
 
-assets/data.db
-assets/dictionary_zh_k.db
-assets/masterdata.db
-assets/userdata
-
 .idea
 .vscode
diff --git a/assets/.gitignore b/assets/.gitignore
new file mode 100644
index 0000000..1e4c958
--- /dev/null
+++ b/assets/.gitignore
@@ -0,0 +1 @@
+data.db
diff --git a/assets/data.example.db b/assets/data.example.db
deleted file mode 100644
index 14321c4..0000000
Binary files a/assets/data.example.db and /dev/null differ
diff --git a/assets/serverdata/notes/Live_0001.json b/assets/serverdata/beatmaps/Live_0001.json
similarity index 100%
rename from assets/serverdata/notes/Live_0001.json
rename to assets/serverdata/beatmaps/Live_0001.json
diff --git a/assets/serverdata/notes/Live_0002.json b/assets/serverdata/beatmaps/Live_0002.json
similarity index 100%
rename from assets/serverdata/notes/Live_0002.json
rename to assets/serverdata/beatmaps/Live_0002.json
diff --git a/assets/serverdata/notes/Live_0003.json b/assets/serverdata/beatmaps/Live_0003.json
similarity index 100%
rename from assets/serverdata/notes/Live_0003.json
rename to assets/serverdata/beatmaps/Live_0003.json
diff --git a/assets/serverdata/notes/Live_0004.json b/assets/serverdata/beatmaps/Live_0004.json
similarity index 100%
rename from assets/serverdata/notes/Live_0004.json
rename to assets/serverdata/beatmaps/Live_0004.json
diff --git a/assets/serverdata/notes/Live_0005.json b/assets/serverdata/beatmaps/Live_0005.json
similarity index 100%
rename from assets/serverdata/notes/Live_0005.json
rename to assets/serverdata/beatmaps/Live_0005.json
diff --git a/assets/serverdata/notes/Live_0006.json b/assets/serverdata/beatmaps/Live_0006.json
similarity index 100%
rename from assets/serverdata/notes/Live_0006.json
rename to assets/serverdata/beatmaps/Live_0006.json
diff --git a/assets/serverdata/notes/Live_0007.json b/assets/serverdata/beatmaps/Live_0007.json
similarity index 100%
rename from assets/serverdata/notes/Live_0007.json
rename to assets/serverdata/beatmaps/Live_0007.json
diff --git a/assets/serverdata/notes/Live_0008.json b/assets/serverdata/beatmaps/Live_0008.json
similarity index 100%
rename from assets/serverdata/notes/Live_0008.json
rename to assets/serverdata/beatmaps/Live_0008.json
diff --git a/assets/serverdata/notes/Live_0009.json b/assets/serverdata/beatmaps/Live_0009.json
similarity index 100%
rename from assets/serverdata/notes/Live_0009.json
rename to assets/serverdata/beatmaps/Live_0009.json
diff --git a/assets/serverdata/notes/Live_0010.json b/assets/serverdata/beatmaps/Live_0010.json
similarity index 100%
rename from assets/serverdata/notes/Live_0010.json
rename to assets/serverdata/beatmaps/Live_0010.json
diff --git a/assets/serverdata/notes/Live_0011.json b/assets/serverdata/beatmaps/Live_0011.json
similarity index 100%
rename from assets/serverdata/notes/Live_0011.json
rename to assets/serverdata/beatmaps/Live_0011.json
diff --git a/assets/serverdata/notes/Live_0012.json b/assets/serverdata/beatmaps/Live_0012.json
similarity index 100%
rename from assets/serverdata/notes/Live_0012.json
rename to assets/serverdata/beatmaps/Live_0012.json
diff --git a/assets/serverdata/notes/Live_0013.json b/assets/serverdata/beatmaps/Live_0013.json
similarity index 100%
rename from assets/serverdata/notes/Live_0013.json
rename to assets/serverdata/beatmaps/Live_0013.json
diff --git a/assets/serverdata/notes/Live_0014.json b/assets/serverdata/beatmaps/Live_0014.json
similarity index 100%
rename from assets/serverdata/notes/Live_0014.json
rename to assets/serverdata/beatmaps/Live_0014.json
diff --git a/assets/serverdata/notes/Live_0015.json b/assets/serverdata/beatmaps/Live_0015.json
similarity index 100%
rename from assets/serverdata/notes/Live_0015.json
rename to assets/serverdata/beatmaps/Live_0015.json
diff --git a/assets/serverdata/notes/Live_0016.json b/assets/serverdata/beatmaps/Live_0016.json
similarity index 100%
rename from assets/serverdata/notes/Live_0016.json
rename to assets/serverdata/beatmaps/Live_0016.json
diff --git a/assets/serverdata/notes/Live_0017.json b/assets/serverdata/beatmaps/Live_0017.json
similarity index 100%
rename from assets/serverdata/notes/Live_0017.json
rename to assets/serverdata/beatmaps/Live_0017.json
diff --git a/assets/serverdata/notes/Live_0018.json b/assets/serverdata/beatmaps/Live_0018.json
similarity index 100%
rename from assets/serverdata/notes/Live_0018.json
rename to assets/serverdata/beatmaps/Live_0018.json
diff --git a/assets/serverdata/notes/Live_0019.json b/assets/serverdata/beatmaps/Live_0019.json
similarity index 100%
rename from assets/serverdata/notes/Live_0019.json
rename to assets/serverdata/beatmaps/Live_0019.json
diff --git a/assets/serverdata/notes/Live_0020.json b/assets/serverdata/beatmaps/Live_0020.json
similarity index 100%
rename from assets/serverdata/notes/Live_0020.json
rename to assets/serverdata/beatmaps/Live_0020.json
diff --git a/assets/serverdata/notes/Live_0021.json b/assets/serverdata/beatmaps/Live_0021.json
similarity index 100%
rename from assets/serverdata/notes/Live_0021.json
rename to assets/serverdata/beatmaps/Live_0021.json
diff --git a/assets/serverdata/notes/Live_0022.json b/assets/serverdata/beatmaps/Live_0022.json
similarity index 100%
rename from assets/serverdata/notes/Live_0022.json
rename to assets/serverdata/beatmaps/Live_0022.json
diff --git a/assets/serverdata/notes/Live_0023.json b/assets/serverdata/beatmaps/Live_0023.json
similarity index 100%
rename from assets/serverdata/notes/Live_0023.json
rename to assets/serverdata/beatmaps/Live_0023.json
diff --git a/assets/serverdata/notes/Live_0024.json b/assets/serverdata/beatmaps/Live_0024.json
similarity index 100%
rename from assets/serverdata/notes/Live_0024.json
rename to assets/serverdata/beatmaps/Live_0024.json
diff --git a/assets/serverdata/notes/Live_0025.json b/assets/serverdata/beatmaps/Live_0025.json
similarity index 100%
rename from assets/serverdata/notes/Live_0025.json
rename to assets/serverdata/beatmaps/Live_0025.json
diff --git a/assets/serverdata/notes/Live_0026.json b/assets/serverdata/beatmaps/Live_0026.json
similarity index 100%
rename from assets/serverdata/notes/Live_0026.json
rename to assets/serverdata/beatmaps/Live_0026.json
diff --git a/assets/serverdata/notes/Live_0027.json b/assets/serverdata/beatmaps/Live_0027.json
similarity index 100%
rename from assets/serverdata/notes/Live_0027.json
rename to assets/serverdata/beatmaps/Live_0027.json
diff --git a/assets/serverdata/notes/Live_0028.json b/assets/serverdata/beatmaps/Live_0028.json
similarity index 100%
rename from assets/serverdata/notes/Live_0028.json
rename to assets/serverdata/beatmaps/Live_0028.json
diff --git a/assets/serverdata/notes/Live_0029.json b/assets/serverdata/beatmaps/Live_0029.json
similarity index 100%
rename from assets/serverdata/notes/Live_0029.json
rename to assets/serverdata/beatmaps/Live_0029.json
diff --git a/assets/serverdata/notes/Live_0030.json b/assets/serverdata/beatmaps/Live_0030.json
similarity index 100%
rename from assets/serverdata/notes/Live_0030.json
rename to assets/serverdata/beatmaps/Live_0030.json
diff --git a/assets/serverdata/notes/Live_0037.json b/assets/serverdata/beatmaps/Live_0037.json
similarity index 100%
rename from assets/serverdata/notes/Live_0037.json
rename to assets/serverdata/beatmaps/Live_0037.json
diff --git a/assets/serverdata/notes/Live_0038.json b/assets/serverdata/beatmaps/Live_0038.json
similarity index 100%
rename from assets/serverdata/notes/Live_0038.json
rename to assets/serverdata/beatmaps/Live_0038.json
diff --git a/assets/serverdata/notes/Live_0039.json b/assets/serverdata/beatmaps/Live_0039.json
similarity index 100%
rename from assets/serverdata/notes/Live_0039.json
rename to assets/serverdata/beatmaps/Live_0039.json
diff --git a/assets/serverdata/notes/Live_0040.json b/assets/serverdata/beatmaps/Live_0040.json
similarity index 100%
rename from assets/serverdata/notes/Live_0040.json
rename to assets/serverdata/beatmaps/Live_0040.json
diff --git a/assets/serverdata/notes/Live_0041.json b/assets/serverdata/beatmaps/Live_0041.json
similarity index 100%
rename from assets/serverdata/notes/Live_0041.json
rename to assets/serverdata/beatmaps/Live_0041.json
diff --git a/assets/serverdata/notes/Live_0042.json b/assets/serverdata/beatmaps/Live_0042.json
similarity index 100%
rename from assets/serverdata/notes/Live_0042.json
rename to assets/serverdata/beatmaps/Live_0042.json
diff --git a/assets/serverdata/notes/Live_0046.json b/assets/serverdata/beatmaps/Live_0046.json
similarity index 100%
rename from assets/serverdata/notes/Live_0046.json
rename to assets/serverdata/beatmaps/Live_0046.json
diff --git a/assets/serverdata/notes/Live_0047.json b/assets/serverdata/beatmaps/Live_0047.json
similarity index 100%
rename from assets/serverdata/notes/Live_0047.json
rename to assets/serverdata/beatmaps/Live_0047.json
diff --git a/assets/serverdata/notes/Live_0048.json b/assets/serverdata/beatmaps/Live_0048.json
similarity index 100%
rename from assets/serverdata/notes/Live_0048.json
rename to assets/serverdata/beatmaps/Live_0048.json
diff --git a/assets/serverdata/notes/Live_0049.json b/assets/serverdata/beatmaps/Live_0049.json
similarity index 100%
rename from assets/serverdata/notes/Live_0049.json
rename to assets/serverdata/beatmaps/Live_0049.json
diff --git a/assets/serverdata/notes/Live_0050.json b/assets/serverdata/beatmaps/Live_0050.json
similarity index 100%
rename from assets/serverdata/notes/Live_0050.json
rename to assets/serverdata/beatmaps/Live_0050.json
diff --git a/assets/serverdata/notes/Live_0051.json b/assets/serverdata/beatmaps/Live_0051.json
similarity index 100%
rename from assets/serverdata/notes/Live_0051.json
rename to assets/serverdata/beatmaps/Live_0051.json
diff --git a/assets/serverdata/notes/Live_0052.json b/assets/serverdata/beatmaps/Live_0052.json
similarity index 100%
rename from assets/serverdata/notes/Live_0052.json
rename to assets/serverdata/beatmaps/Live_0052.json
diff --git a/assets/serverdata/notes/Live_0053.json b/assets/serverdata/beatmaps/Live_0053.json
similarity index 100%
rename from assets/serverdata/notes/Live_0053.json
rename to assets/serverdata/beatmaps/Live_0053.json
diff --git a/assets/serverdata/notes/Live_0054.json b/assets/serverdata/beatmaps/Live_0054.json
similarity index 100%
rename from assets/serverdata/notes/Live_0054.json
rename to assets/serverdata/beatmaps/Live_0054.json
diff --git a/assets/serverdata/notes/Live_0055.json b/assets/serverdata/beatmaps/Live_0055.json
similarity index 100%
rename from assets/serverdata/notes/Live_0055.json
rename to assets/serverdata/beatmaps/Live_0055.json
diff --git a/assets/serverdata/notes/Live_0056.json b/assets/serverdata/beatmaps/Live_0056.json
similarity index 100%
rename from assets/serverdata/notes/Live_0056.json
rename to assets/serverdata/beatmaps/Live_0056.json
diff --git a/assets/serverdata/notes/Live_0057.json b/assets/serverdata/beatmaps/Live_0057.json
similarity index 100%
rename from assets/serverdata/notes/Live_0057.json
rename to assets/serverdata/beatmaps/Live_0057.json
diff --git a/assets/serverdata/notes/Live_0058.json b/assets/serverdata/beatmaps/Live_0058.json
similarity index 100%
rename from assets/serverdata/notes/Live_0058.json
rename to assets/serverdata/beatmaps/Live_0058.json
diff --git a/assets/serverdata/notes/Live_0059.json b/assets/serverdata/beatmaps/Live_0059.json
similarity index 100%
rename from assets/serverdata/notes/Live_0059.json
rename to assets/serverdata/beatmaps/Live_0059.json
diff --git a/assets/serverdata/notes/Live_0060.json b/assets/serverdata/beatmaps/Live_0060.json
similarity index 100%
rename from assets/serverdata/notes/Live_0060.json
rename to assets/serverdata/beatmaps/Live_0060.json
diff --git a/assets/serverdata/notes/Live_0061.json b/assets/serverdata/beatmaps/Live_0061.json
similarity index 100%
rename from assets/serverdata/notes/Live_0061.json
rename to assets/serverdata/beatmaps/Live_0061.json
diff --git a/assets/serverdata/notes/Live_0062.json b/assets/serverdata/beatmaps/Live_0062.json
similarity index 100%
rename from assets/serverdata/notes/Live_0062.json
rename to assets/serverdata/beatmaps/Live_0062.json
diff --git a/assets/serverdata/notes/Live_0063.json b/assets/serverdata/beatmaps/Live_0063.json
similarity index 100%
rename from assets/serverdata/notes/Live_0063.json
rename to assets/serverdata/beatmaps/Live_0063.json
diff --git a/assets/serverdata/notes/Live_0068.json b/assets/serverdata/beatmaps/Live_0068.json
similarity index 100%
rename from assets/serverdata/notes/Live_0068.json
rename to assets/serverdata/beatmaps/Live_0068.json
diff --git a/assets/serverdata/notes/Live_0069.json b/assets/serverdata/beatmaps/Live_0069.json
similarity index 100%
rename from assets/serverdata/notes/Live_0069.json
rename to assets/serverdata/beatmaps/Live_0069.json
diff --git a/assets/serverdata/notes/Live_0070.json b/assets/serverdata/beatmaps/Live_0070.json
similarity index 100%
rename from assets/serverdata/notes/Live_0070.json
rename to assets/serverdata/beatmaps/Live_0070.json
diff --git a/assets/serverdata/notes/Live_0071.json b/assets/serverdata/beatmaps/Live_0071.json
similarity index 100%
rename from assets/serverdata/notes/Live_0071.json
rename to assets/serverdata/beatmaps/Live_0071.json
diff --git a/assets/serverdata/notes/Live_0072.json b/assets/serverdata/beatmaps/Live_0072.json
similarity index 100%
rename from assets/serverdata/notes/Live_0072.json
rename to assets/serverdata/beatmaps/Live_0072.json
diff --git a/assets/serverdata/notes/Live_0073.json b/assets/serverdata/beatmaps/Live_0073.json
similarity index 100%
rename from assets/serverdata/notes/Live_0073.json
rename to assets/serverdata/beatmaps/Live_0073.json
diff --git a/assets/serverdata/notes/Live_0074.json b/assets/serverdata/beatmaps/Live_0074.json
similarity index 100%
rename from assets/serverdata/notes/Live_0074.json
rename to assets/serverdata/beatmaps/Live_0074.json
diff --git a/assets/serverdata/notes/Live_0075.json b/assets/serverdata/beatmaps/Live_0075.json
similarity index 100%
rename from assets/serverdata/notes/Live_0075.json
rename to assets/serverdata/beatmaps/Live_0075.json
diff --git a/assets/serverdata/notes/Live_0076.json b/assets/serverdata/beatmaps/Live_0076.json
similarity index 100%
rename from assets/serverdata/notes/Live_0076.json
rename to assets/serverdata/beatmaps/Live_0076.json
diff --git a/assets/serverdata/notes/Live_0077.json b/assets/serverdata/beatmaps/Live_0077.json
similarity index 100%
rename from assets/serverdata/notes/Live_0077.json
rename to assets/serverdata/beatmaps/Live_0077.json
diff --git a/assets/serverdata/notes/Live_0078.json b/assets/serverdata/beatmaps/Live_0078.json
similarity index 100%
rename from assets/serverdata/notes/Live_0078.json
rename to assets/serverdata/beatmaps/Live_0078.json
diff --git a/assets/serverdata/notes/Live_0079.json b/assets/serverdata/beatmaps/Live_0079.json
similarity index 100%
rename from assets/serverdata/notes/Live_0079.json
rename to assets/serverdata/beatmaps/Live_0079.json
diff --git a/assets/serverdata/notes/Live_0080.json b/assets/serverdata/beatmaps/Live_0080.json
similarity index 100%
rename from assets/serverdata/notes/Live_0080.json
rename to assets/serverdata/beatmaps/Live_0080.json
diff --git a/assets/serverdata/notes/Live_0081.json b/assets/serverdata/beatmaps/Live_0081.json
similarity index 100%
rename from assets/serverdata/notes/Live_0081.json
rename to assets/serverdata/beatmaps/Live_0081.json
diff --git a/assets/serverdata/notes/Live_0082.json b/assets/serverdata/beatmaps/Live_0082.json
similarity index 100%
rename from assets/serverdata/notes/Live_0082.json
rename to assets/serverdata/beatmaps/Live_0082.json
diff --git a/assets/serverdata/notes/Live_0083.json b/assets/serverdata/beatmaps/Live_0083.json
similarity index 100%
rename from assets/serverdata/notes/Live_0083.json
rename to assets/serverdata/beatmaps/Live_0083.json
diff --git a/assets/serverdata/notes/Live_0084.json b/assets/serverdata/beatmaps/Live_0084.json
similarity index 100%
rename from assets/serverdata/notes/Live_0084.json
rename to assets/serverdata/beatmaps/Live_0084.json
diff --git a/assets/serverdata/notes/Live_0088.json b/assets/serverdata/beatmaps/Live_0088.json
similarity index 100%
rename from assets/serverdata/notes/Live_0088.json
rename to assets/serverdata/beatmaps/Live_0088.json
diff --git a/assets/serverdata/notes/Live_0089.json b/assets/serverdata/beatmaps/Live_0089.json
similarity index 100%
rename from assets/serverdata/notes/Live_0089.json
rename to assets/serverdata/beatmaps/Live_0089.json
diff --git a/assets/serverdata/notes/Live_0090.json b/assets/serverdata/beatmaps/Live_0090.json
similarity index 100%
rename from assets/serverdata/notes/Live_0090.json
rename to assets/serverdata/beatmaps/Live_0090.json
diff --git a/assets/serverdata/notes/Live_0091.json b/assets/serverdata/beatmaps/Live_0091.json
similarity index 100%
rename from assets/serverdata/notes/Live_0091.json
rename to assets/serverdata/beatmaps/Live_0091.json
diff --git a/assets/serverdata/notes/Live_0092.json b/assets/serverdata/beatmaps/Live_0092.json
similarity index 100%
rename from assets/serverdata/notes/Live_0092.json
rename to assets/serverdata/beatmaps/Live_0092.json
diff --git a/assets/serverdata/notes/Live_0096.json b/assets/serverdata/beatmaps/Live_0096.json
similarity index 100%
rename from assets/serverdata/notes/Live_0096.json
rename to assets/serverdata/beatmaps/Live_0096.json
diff --git a/assets/serverdata/notes/Live_0097.json b/assets/serverdata/beatmaps/Live_0097.json
similarity index 100%
rename from assets/serverdata/notes/Live_0097.json
rename to assets/serverdata/beatmaps/Live_0097.json
diff --git a/assets/serverdata/notes/Live_0098.json b/assets/serverdata/beatmaps/Live_0098.json
similarity index 100%
rename from assets/serverdata/notes/Live_0098.json
rename to assets/serverdata/beatmaps/Live_0098.json
diff --git a/assets/serverdata/notes/Live_0099.json b/assets/serverdata/beatmaps/Live_0099.json
similarity index 100%
rename from assets/serverdata/notes/Live_0099.json
rename to assets/serverdata/beatmaps/Live_0099.json
diff --git a/assets/serverdata/notes/Live_0104.json b/assets/serverdata/beatmaps/Live_0104.json
similarity index 100%
rename from assets/serverdata/notes/Live_0104.json
rename to assets/serverdata/beatmaps/Live_0104.json
diff --git a/assets/serverdata/notes/Live_0112.json b/assets/serverdata/beatmaps/Live_0112.json
similarity index 100%
rename from assets/serverdata/notes/Live_0112.json
rename to assets/serverdata/beatmaps/Live_0112.json
diff --git a/assets/serverdata/notes/Live_0113.json b/assets/serverdata/beatmaps/Live_0113.json
similarity index 100%
rename from assets/serverdata/notes/Live_0113.json
rename to assets/serverdata/beatmaps/Live_0113.json
diff --git a/assets/serverdata/notes/Live_0114.json b/assets/serverdata/beatmaps/Live_0114.json
similarity index 100%
rename from assets/serverdata/notes/Live_0114.json
rename to assets/serverdata/beatmaps/Live_0114.json
diff --git a/assets/serverdata/notes/Live_0115.json b/assets/serverdata/beatmaps/Live_0115.json
similarity index 100%
rename from assets/serverdata/notes/Live_0115.json
rename to assets/serverdata/beatmaps/Live_0115.json
diff --git a/assets/serverdata/notes/Live_0116.json b/assets/serverdata/beatmaps/Live_0116.json
similarity index 100%
rename from assets/serverdata/notes/Live_0116.json
rename to assets/serverdata/beatmaps/Live_0116.json
diff --git a/assets/serverdata/notes/Live_0124.json b/assets/serverdata/beatmaps/Live_0124.json
similarity index 100%
rename from assets/serverdata/notes/Live_0124.json
rename to assets/serverdata/beatmaps/Live_0124.json
diff --git a/assets/serverdata/notes/Live_0125.json b/assets/serverdata/beatmaps/Live_0125.json
similarity index 100%
rename from assets/serverdata/notes/Live_0125.json
rename to assets/serverdata/beatmaps/Live_0125.json
diff --git a/assets/serverdata/notes/Live_0126.json b/assets/serverdata/beatmaps/Live_0126.json
similarity index 100%
rename from assets/serverdata/notes/Live_0126.json
rename to assets/serverdata/beatmaps/Live_0126.json
diff --git a/assets/serverdata/notes/Live_0127.json b/assets/serverdata/beatmaps/Live_0127.json
similarity index 100%
rename from assets/serverdata/notes/Live_0127.json
rename to assets/serverdata/beatmaps/Live_0127.json
diff --git a/assets/serverdata/notes/Live_0128.json b/assets/serverdata/beatmaps/Live_0128.json
similarity index 100%
rename from assets/serverdata/notes/Live_0128.json
rename to assets/serverdata/beatmaps/Live_0128.json
diff --git a/assets/serverdata/notes/Live_0129.json b/assets/serverdata/beatmaps/Live_0129.json
similarity index 100%
rename from assets/serverdata/notes/Live_0129.json
rename to assets/serverdata/beatmaps/Live_0129.json
diff --git a/assets/serverdata/notes/Live_0148.json b/assets/serverdata/beatmaps/Live_0148.json
similarity index 100%
rename from assets/serverdata/notes/Live_0148.json
rename to assets/serverdata/beatmaps/Live_0148.json
diff --git a/assets/serverdata/notes/Live_0149.json b/assets/serverdata/beatmaps/Live_0149.json
similarity index 100%
rename from assets/serverdata/notes/Live_0149.json
rename to assets/serverdata/beatmaps/Live_0149.json
diff --git a/assets/serverdata/notes/Live_0150.json b/assets/serverdata/beatmaps/Live_0150.json
similarity index 100%
rename from assets/serverdata/notes/Live_0150.json
rename to assets/serverdata/beatmaps/Live_0150.json
diff --git a/assets/serverdata/notes/Live_0151.json b/assets/serverdata/beatmaps/Live_0151.json
similarity index 100%
rename from assets/serverdata/notes/Live_0151.json
rename to assets/serverdata/beatmaps/Live_0151.json
diff --git a/assets/serverdata/notes/Live_0152.json b/assets/serverdata/beatmaps/Live_0152.json
similarity index 100%
rename from assets/serverdata/notes/Live_0152.json
rename to assets/serverdata/beatmaps/Live_0152.json
diff --git a/assets/serverdata/notes/Live_0181.json b/assets/serverdata/beatmaps/Live_0181.json
similarity index 100%
rename from assets/serverdata/notes/Live_0181.json
rename to assets/serverdata/beatmaps/Live_0181.json
diff --git a/assets/serverdata/notes/Live_0182.json b/assets/serverdata/beatmaps/Live_0182.json
similarity index 100%
rename from assets/serverdata/notes/Live_0182.json
rename to assets/serverdata/beatmaps/Live_0182.json
diff --git a/assets/serverdata/notes/Live_0183.json b/assets/serverdata/beatmaps/Live_0183.json
similarity index 100%
rename from assets/serverdata/notes/Live_0183.json
rename to assets/serverdata/beatmaps/Live_0183.json
diff --git a/assets/serverdata/notes/Live_0259.json b/assets/serverdata/beatmaps/Live_0259.json
similarity index 100%
rename from assets/serverdata/notes/Live_0259.json
rename to assets/serverdata/beatmaps/Live_0259.json
diff --git a/assets/serverdata/notes/Live_0260.json b/assets/serverdata/beatmaps/Live_0260.json
similarity index 100%
rename from assets/serverdata/notes/Live_0260.json
rename to assets/serverdata/beatmaps/Live_0260.json
diff --git a/assets/serverdata/notes/Live_0261.json b/assets/serverdata/beatmaps/Live_0261.json
similarity index 100%
rename from assets/serverdata/notes/Live_0261.json
rename to assets/serverdata/beatmaps/Live_0261.json
diff --git a/assets/serverdata/notes/Live_0262.json b/assets/serverdata/beatmaps/Live_0262.json
similarity index 100%
rename from assets/serverdata/notes/Live_0262.json
rename to assets/serverdata/beatmaps/Live_0262.json
diff --git a/assets/serverdata/notes/Live_0270.json b/assets/serverdata/beatmaps/Live_0270.json
similarity index 100%
rename from assets/serverdata/notes/Live_0270.json
rename to assets/serverdata/beatmaps/Live_0270.json
diff --git a/assets/serverdata/notes/Live_0271.json b/assets/serverdata/beatmaps/Live_0271.json
similarity index 100%
rename from assets/serverdata/notes/Live_0271.json
rename to assets/serverdata/beatmaps/Live_0271.json
diff --git a/assets/serverdata/notes/Live_0272.json b/assets/serverdata/beatmaps/Live_0272.json
similarity index 100%
rename from assets/serverdata/notes/Live_0272.json
rename to assets/serverdata/beatmaps/Live_0272.json
diff --git a/assets/serverdata/notes/Live_0303.json b/assets/serverdata/beatmaps/Live_0303.json
similarity index 100%
rename from assets/serverdata/notes/Live_0303.json
rename to assets/serverdata/beatmaps/Live_0303.json
diff --git a/assets/serverdata/notes/Live_0304.json b/assets/serverdata/beatmaps/Live_0304.json
similarity index 100%
rename from assets/serverdata/notes/Live_0304.json
rename to assets/serverdata/beatmaps/Live_0304.json
diff --git a/assets/serverdata/notes/Live_0305.json b/assets/serverdata/beatmaps/Live_0305.json
similarity index 100%
rename from assets/serverdata/notes/Live_0305.json
rename to assets/serverdata/beatmaps/Live_0305.json
diff --git a/assets/serverdata/notes/Live_0306.json b/assets/serverdata/beatmaps/Live_0306.json
similarity index 100%
rename from assets/serverdata/notes/Live_0306.json
rename to assets/serverdata/beatmaps/Live_0306.json
diff --git a/assets/serverdata/notes/Live_0314.json b/assets/serverdata/beatmaps/Live_0314.json
similarity index 100%
rename from assets/serverdata/notes/Live_0314.json
rename to assets/serverdata/beatmaps/Live_0314.json
diff --git a/assets/serverdata/notes/Live_0315.json b/assets/serverdata/beatmaps/Live_0315.json
similarity index 100%
rename from assets/serverdata/notes/Live_0315.json
rename to assets/serverdata/beatmaps/Live_0315.json
diff --git a/assets/serverdata/notes/Live_0316.json b/assets/serverdata/beatmaps/Live_0316.json
similarity index 100%
rename from assets/serverdata/notes/Live_0316.json
rename to assets/serverdata/beatmaps/Live_0316.json
diff --git a/assets/serverdata/notes/Live_0346.json b/assets/serverdata/beatmaps/Live_0346.json
similarity index 100%
rename from assets/serverdata/notes/Live_0346.json
rename to assets/serverdata/beatmaps/Live_0346.json
diff --git a/assets/serverdata/notes/Live_0347.json b/assets/serverdata/beatmaps/Live_0347.json
similarity index 100%
rename from assets/serverdata/notes/Live_0347.json
rename to assets/serverdata/beatmaps/Live_0347.json
diff --git a/assets/serverdata/notes/Live_0348.json b/assets/serverdata/beatmaps/Live_0348.json
similarity index 100%
rename from assets/serverdata/notes/Live_0348.json
rename to assets/serverdata/beatmaps/Live_0348.json
diff --git a/assets/serverdata/notes/Live_0349.json b/assets/serverdata/beatmaps/Live_0349.json
similarity index 100%
rename from assets/serverdata/notes/Live_0349.json
rename to assets/serverdata/beatmaps/Live_0349.json
diff --git a/assets/serverdata/notes/Live_0350.json b/assets/serverdata/beatmaps/Live_0350.json
similarity index 100%
rename from assets/serverdata/notes/Live_0350.json
rename to assets/serverdata/beatmaps/Live_0350.json
diff --git a/assets/serverdata/notes/Live_0358.json b/assets/serverdata/beatmaps/Live_0358.json
similarity index 100%
rename from assets/serverdata/notes/Live_0358.json
rename to assets/serverdata/beatmaps/Live_0358.json
diff --git a/assets/serverdata/notes/Live_0359.json b/assets/serverdata/beatmaps/Live_0359.json
similarity index 100%
rename from assets/serverdata/notes/Live_0359.json
rename to assets/serverdata/beatmaps/Live_0359.json
diff --git a/assets/serverdata/notes/Live_0360.json b/assets/serverdata/beatmaps/Live_0360.json
similarity index 100%
rename from assets/serverdata/notes/Live_0360.json
rename to assets/serverdata/beatmaps/Live_0360.json
diff --git a/assets/serverdata/notes/Live_0390.json b/assets/serverdata/beatmaps/Live_0390.json
similarity index 100%
rename from assets/serverdata/notes/Live_0390.json
rename to assets/serverdata/beatmaps/Live_0390.json
diff --git a/assets/serverdata/notes/Live_0391.json b/assets/serverdata/beatmaps/Live_0391.json
similarity index 100%
rename from assets/serverdata/notes/Live_0391.json
rename to assets/serverdata/beatmaps/Live_0391.json
diff --git a/assets/serverdata/notes/Live_0392.json b/assets/serverdata/beatmaps/Live_0392.json
similarity index 100%
rename from assets/serverdata/notes/Live_0392.json
rename to assets/serverdata/beatmaps/Live_0392.json
diff --git a/assets/serverdata/notes/Live_0393.json b/assets/serverdata/beatmaps/Live_0393.json
similarity index 100%
rename from assets/serverdata/notes/Live_0393.json
rename to assets/serverdata/beatmaps/Live_0393.json
diff --git a/assets/serverdata/notes/Live_0402.json b/assets/serverdata/beatmaps/Live_0402.json
similarity index 100%
rename from assets/serverdata/notes/Live_0402.json
rename to assets/serverdata/beatmaps/Live_0402.json
diff --git a/assets/serverdata/notes/Live_0403.json b/assets/serverdata/beatmaps/Live_0403.json
similarity index 100%
rename from assets/serverdata/notes/Live_0403.json
rename to assets/serverdata/beatmaps/Live_0403.json
diff --git a/assets/serverdata/notes/Live_0404.json b/assets/serverdata/beatmaps/Live_0404.json
similarity index 100%
rename from assets/serverdata/notes/Live_0404.json
rename to assets/serverdata/beatmaps/Live_0404.json
diff --git a/assets/serverdata/notes/Live_0413.json b/assets/serverdata/beatmaps/Live_0413.json
similarity index 100%
rename from assets/serverdata/notes/Live_0413.json
rename to assets/serverdata/beatmaps/Live_0413.json
diff --git a/assets/serverdata/notes/Live_0414.json b/assets/serverdata/beatmaps/Live_0414.json
similarity index 100%
rename from assets/serverdata/notes/Live_0414.json
rename to assets/serverdata/beatmaps/Live_0414.json
diff --git a/assets/serverdata/notes/Live_0415.json b/assets/serverdata/beatmaps/Live_0415.json
similarity index 100%
rename from assets/serverdata/notes/Live_0415.json
rename to assets/serverdata/beatmaps/Live_0415.json
diff --git a/assets/serverdata/notes/Live_0416.json b/assets/serverdata/beatmaps/Live_0416.json
similarity index 100%
rename from assets/serverdata/notes/Live_0416.json
rename to assets/serverdata/beatmaps/Live_0416.json
diff --git a/assets/serverdata/notes/Live_0425.json b/assets/serverdata/beatmaps/Live_0425.json
similarity index 100%
rename from assets/serverdata/notes/Live_0425.json
rename to assets/serverdata/beatmaps/Live_0425.json
diff --git a/assets/serverdata/notes/Live_0426.json b/assets/serverdata/beatmaps/Live_0426.json
similarity index 100%
rename from assets/serverdata/notes/Live_0426.json
rename to assets/serverdata/beatmaps/Live_0426.json
diff --git a/assets/serverdata/notes/Live_0427.json b/assets/serverdata/beatmaps/Live_0427.json
similarity index 100%
rename from assets/serverdata/notes/Live_0427.json
rename to assets/serverdata/beatmaps/Live_0427.json
diff --git a/assets/serverdata/notes/Live_0436.json b/assets/serverdata/beatmaps/Live_0436.json
similarity index 100%
rename from assets/serverdata/notes/Live_0436.json
rename to assets/serverdata/beatmaps/Live_0436.json
diff --git a/assets/serverdata/notes/Live_0437.json b/assets/serverdata/beatmaps/Live_0437.json
similarity index 100%
rename from assets/serverdata/notes/Live_0437.json
rename to assets/serverdata/beatmaps/Live_0437.json
diff --git a/assets/serverdata/notes/Live_0438.json b/assets/serverdata/beatmaps/Live_0438.json
similarity index 100%
rename from assets/serverdata/notes/Live_0438.json
rename to assets/serverdata/beatmaps/Live_0438.json
diff --git a/assets/serverdata/notes/Live_0439.json b/assets/serverdata/beatmaps/Live_0439.json
similarity index 100%
rename from assets/serverdata/notes/Live_0439.json
rename to assets/serverdata/beatmaps/Live_0439.json
diff --git a/assets/serverdata/notes/Live_0440.json b/assets/serverdata/beatmaps/Live_0440.json
similarity index 100%
rename from assets/serverdata/notes/Live_0440.json
rename to assets/serverdata/beatmaps/Live_0440.json
diff --git a/assets/serverdata/notes/Live_0441.json b/assets/serverdata/beatmaps/Live_0441.json
similarity index 100%
rename from assets/serverdata/notes/Live_0441.json
rename to assets/serverdata/beatmaps/Live_0441.json
diff --git a/assets/serverdata/notes/Live_0442.json b/assets/serverdata/beatmaps/Live_0442.json
similarity index 100%
rename from assets/serverdata/notes/Live_0442.json
rename to assets/serverdata/beatmaps/Live_0442.json
diff --git a/assets/serverdata/notes/Live_0443.json b/assets/serverdata/beatmaps/Live_0443.json
similarity index 100%
rename from assets/serverdata/notes/Live_0443.json
rename to assets/serverdata/beatmaps/Live_0443.json
diff --git a/assets/serverdata/notes/Live_0444.json b/assets/serverdata/beatmaps/Live_0444.json
similarity index 100%
rename from assets/serverdata/notes/Live_0444.json
rename to assets/serverdata/beatmaps/Live_0444.json
diff --git a/assets/serverdata/notes/Live_0445.json b/assets/serverdata/beatmaps/Live_0445.json
similarity index 100%
rename from assets/serverdata/notes/Live_0445.json
rename to assets/serverdata/beatmaps/Live_0445.json
diff --git a/assets/serverdata/notes/Live_0446.json b/assets/serverdata/beatmaps/Live_0446.json
similarity index 100%
rename from assets/serverdata/notes/Live_0446.json
rename to assets/serverdata/beatmaps/Live_0446.json
diff --git a/assets/serverdata/notes/Live_0455.json b/assets/serverdata/beatmaps/Live_0455.json
similarity index 100%
rename from assets/serverdata/notes/Live_0455.json
rename to assets/serverdata/beatmaps/Live_0455.json
diff --git a/assets/serverdata/notes/Live_0456.json b/assets/serverdata/beatmaps/Live_0456.json
similarity index 100%
rename from assets/serverdata/notes/Live_0456.json
rename to assets/serverdata/beatmaps/Live_0456.json
diff --git a/assets/serverdata/notes/Live_0457.json b/assets/serverdata/beatmaps/Live_0457.json
similarity index 100%
rename from assets/serverdata/notes/Live_0457.json
rename to assets/serverdata/beatmaps/Live_0457.json
diff --git a/assets/serverdata/notes/Live_0458.json b/assets/serverdata/beatmaps/Live_0458.json
similarity index 100%
rename from assets/serverdata/notes/Live_0458.json
rename to assets/serverdata/beatmaps/Live_0458.json
diff --git a/assets/serverdata/notes/Live_0459.json b/assets/serverdata/beatmaps/Live_0459.json
similarity index 100%
rename from assets/serverdata/notes/Live_0459.json
rename to assets/serverdata/beatmaps/Live_0459.json
diff --git a/assets/serverdata/notes/Live_0460.json b/assets/serverdata/beatmaps/Live_0460.json
similarity index 100%
rename from assets/serverdata/notes/Live_0460.json
rename to assets/serverdata/beatmaps/Live_0460.json
diff --git a/assets/serverdata/notes/Live_0461.json b/assets/serverdata/beatmaps/Live_0461.json
similarity index 100%
rename from assets/serverdata/notes/Live_0461.json
rename to assets/serverdata/beatmaps/Live_0461.json
diff --git a/assets/serverdata/notes/Live_0462.json b/assets/serverdata/beatmaps/Live_0462.json
similarity index 100%
rename from assets/serverdata/notes/Live_0462.json
rename to assets/serverdata/beatmaps/Live_0462.json
diff --git a/assets/serverdata/notes/Live_0463.json b/assets/serverdata/beatmaps/Live_0463.json
similarity index 100%
rename from assets/serverdata/notes/Live_0463.json
rename to assets/serverdata/beatmaps/Live_0463.json
diff --git a/assets/serverdata/notes/Live_0475.json b/assets/serverdata/beatmaps/Live_0475.json
similarity index 100%
rename from assets/serverdata/notes/Live_0475.json
rename to assets/serverdata/beatmaps/Live_0475.json
diff --git a/assets/serverdata/notes/Live_0476.json b/assets/serverdata/beatmaps/Live_0476.json
similarity index 100%
rename from assets/serverdata/notes/Live_0476.json
rename to assets/serverdata/beatmaps/Live_0476.json
diff --git a/assets/serverdata/notes/Live_0477.json b/assets/serverdata/beatmaps/Live_0477.json
similarity index 100%
rename from assets/serverdata/notes/Live_0477.json
rename to assets/serverdata/beatmaps/Live_0477.json
diff --git a/assets/serverdata/notes/Live_0478.json b/assets/serverdata/beatmaps/Live_0478.json
similarity index 100%
rename from assets/serverdata/notes/Live_0478.json
rename to assets/serverdata/beatmaps/Live_0478.json
diff --git a/assets/serverdata/notes/Live_0479.json b/assets/serverdata/beatmaps/Live_0479.json
similarity index 100%
rename from assets/serverdata/notes/Live_0479.json
rename to assets/serverdata/beatmaps/Live_0479.json
diff --git a/assets/serverdata/notes/Live_0480.json b/assets/serverdata/beatmaps/Live_0480.json
similarity index 100%
rename from assets/serverdata/notes/Live_0480.json
rename to assets/serverdata/beatmaps/Live_0480.json
diff --git a/assets/serverdata/notes/Live_0481.json b/assets/serverdata/beatmaps/Live_0481.json
similarity index 100%
rename from assets/serverdata/notes/Live_0481.json
rename to assets/serverdata/beatmaps/Live_0481.json
diff --git a/assets/serverdata/notes/Live_0482.json b/assets/serverdata/beatmaps/Live_0482.json
similarity index 100%
rename from assets/serverdata/notes/Live_0482.json
rename to assets/serverdata/beatmaps/Live_0482.json
diff --git a/assets/serverdata/notes/Live_0483.json b/assets/serverdata/beatmaps/Live_0483.json
similarity index 100%
rename from assets/serverdata/notes/Live_0483.json
rename to assets/serverdata/beatmaps/Live_0483.json
diff --git a/assets/serverdata/notes/Live_0484.json b/assets/serverdata/beatmaps/Live_0484.json
similarity index 100%
rename from assets/serverdata/notes/Live_0484.json
rename to assets/serverdata/beatmaps/Live_0484.json
diff --git a/assets/serverdata/notes/Live_0485.json b/assets/serverdata/beatmaps/Live_0485.json
similarity index 100%
rename from assets/serverdata/notes/Live_0485.json
rename to assets/serverdata/beatmaps/Live_0485.json
diff --git a/assets/serverdata/notes/Live_0486.json b/assets/serverdata/beatmaps/Live_0486.json
similarity index 100%
rename from assets/serverdata/notes/Live_0486.json
rename to assets/serverdata/beatmaps/Live_0486.json
diff --git a/assets/serverdata/notes/Live_0487.json b/assets/serverdata/beatmaps/Live_0487.json
similarity index 100%
rename from assets/serverdata/notes/Live_0487.json
rename to assets/serverdata/beatmaps/Live_0487.json
diff --git a/assets/serverdata/notes/Live_0496.json b/assets/serverdata/beatmaps/Live_0496.json
similarity index 100%
rename from assets/serverdata/notes/Live_0496.json
rename to assets/serverdata/beatmaps/Live_0496.json
diff --git a/assets/serverdata/notes/Live_0497.json b/assets/serverdata/beatmaps/Live_0497.json
similarity index 100%
rename from assets/serverdata/notes/Live_0497.json
rename to assets/serverdata/beatmaps/Live_0497.json
diff --git a/assets/serverdata/notes/Live_0498.json b/assets/serverdata/beatmaps/Live_0498.json
similarity index 100%
rename from assets/serverdata/notes/Live_0498.json
rename to assets/serverdata/beatmaps/Live_0498.json
diff --git a/assets/serverdata/notes/Live_0507.json b/assets/serverdata/beatmaps/Live_0507.json
similarity index 100%
rename from assets/serverdata/notes/Live_0507.json
rename to assets/serverdata/beatmaps/Live_0507.json
diff --git a/assets/serverdata/notes/Live_0508.json b/assets/serverdata/beatmaps/Live_0508.json
similarity index 100%
rename from assets/serverdata/notes/Live_0508.json
rename to assets/serverdata/beatmaps/Live_0508.json
diff --git a/assets/serverdata/notes/Live_0509.json b/assets/serverdata/beatmaps/Live_0509.json
similarity index 100%
rename from assets/serverdata/notes/Live_0509.json
rename to assets/serverdata/beatmaps/Live_0509.json
diff --git a/assets/serverdata/notes/Live_0510.json b/assets/serverdata/beatmaps/Live_0510.json
similarity index 100%
rename from assets/serverdata/notes/Live_0510.json
rename to assets/serverdata/beatmaps/Live_0510.json
diff --git a/assets/serverdata/notes/Live_0511.json b/assets/serverdata/beatmaps/Live_0511.json
similarity index 100%
rename from assets/serverdata/notes/Live_0511.json
rename to assets/serverdata/beatmaps/Live_0511.json
diff --git a/assets/serverdata/notes/Live_0520.json b/assets/serverdata/beatmaps/Live_0520.json
similarity index 100%
rename from assets/serverdata/notes/Live_0520.json
rename to assets/serverdata/beatmaps/Live_0520.json
diff --git a/assets/serverdata/notes/Live_0521.json b/assets/serverdata/beatmaps/Live_0521.json
similarity index 100%
rename from assets/serverdata/notes/Live_0521.json
rename to assets/serverdata/beatmaps/Live_0521.json
diff --git a/assets/serverdata/notes/Live_0522.json b/assets/serverdata/beatmaps/Live_0522.json
similarity index 100%
rename from assets/serverdata/notes/Live_0522.json
rename to assets/serverdata/beatmaps/Live_0522.json
diff --git a/assets/serverdata/notes/Live_0534.json b/assets/serverdata/beatmaps/Live_0534.json
similarity index 100%
rename from assets/serverdata/notes/Live_0534.json
rename to assets/serverdata/beatmaps/Live_0534.json
diff --git a/assets/serverdata/notes/Live_0535.json b/assets/serverdata/beatmaps/Live_0535.json
similarity index 100%
rename from assets/serverdata/notes/Live_0535.json
rename to assets/serverdata/beatmaps/Live_0535.json
diff --git a/assets/serverdata/notes/Live_0536.json b/assets/serverdata/beatmaps/Live_0536.json
similarity index 100%
rename from assets/serverdata/notes/Live_0536.json
rename to assets/serverdata/beatmaps/Live_0536.json
diff --git a/assets/serverdata/notes/Live_0537.json b/assets/serverdata/beatmaps/Live_0537.json
similarity index 100%
rename from assets/serverdata/notes/Live_0537.json
rename to assets/serverdata/beatmaps/Live_0537.json
diff --git a/assets/serverdata/notes/Live_0538.json b/assets/serverdata/beatmaps/Live_0538.json
similarity index 100%
rename from assets/serverdata/notes/Live_0538.json
rename to assets/serverdata/beatmaps/Live_0538.json
diff --git a/assets/serverdata/notes/Live_0539.json b/assets/serverdata/beatmaps/Live_0539.json
similarity index 100%
rename from assets/serverdata/notes/Live_0539.json
rename to assets/serverdata/beatmaps/Live_0539.json
diff --git a/assets/serverdata/notes/Live_0540.json b/assets/serverdata/beatmaps/Live_0540.json
similarity index 100%
rename from assets/serverdata/notes/Live_0540.json
rename to assets/serverdata/beatmaps/Live_0540.json
diff --git a/assets/serverdata/notes/Live_0549.json b/assets/serverdata/beatmaps/Live_0549.json
similarity index 100%
rename from assets/serverdata/notes/Live_0549.json
rename to assets/serverdata/beatmaps/Live_0549.json
diff --git a/assets/serverdata/notes/Live_0550.json b/assets/serverdata/beatmaps/Live_0550.json
similarity index 100%
rename from assets/serverdata/notes/Live_0550.json
rename to assets/serverdata/beatmaps/Live_0550.json
diff --git a/assets/serverdata/notes/Live_0551.json b/assets/serverdata/beatmaps/Live_0551.json
similarity index 100%
rename from assets/serverdata/notes/Live_0551.json
rename to assets/serverdata/beatmaps/Live_0551.json
diff --git a/assets/serverdata/notes/Live_0552.json b/assets/serverdata/beatmaps/Live_0552.json
similarity index 100%
rename from assets/serverdata/notes/Live_0552.json
rename to assets/serverdata/beatmaps/Live_0552.json
diff --git a/assets/serverdata/notes/Live_0561.json b/assets/serverdata/beatmaps/Live_0561.json
similarity index 100%
rename from assets/serverdata/notes/Live_0561.json
rename to assets/serverdata/beatmaps/Live_0561.json
diff --git a/assets/serverdata/notes/Live_0562.json b/assets/serverdata/beatmaps/Live_0562.json
similarity index 100%
rename from assets/serverdata/notes/Live_0562.json
rename to assets/serverdata/beatmaps/Live_0562.json
diff --git a/assets/serverdata/notes/Live_0563.json b/assets/serverdata/beatmaps/Live_0563.json
similarity index 100%
rename from assets/serverdata/notes/Live_0563.json
rename to assets/serverdata/beatmaps/Live_0563.json
diff --git a/assets/serverdata/notes/Live_0564.json b/assets/serverdata/beatmaps/Live_0564.json
similarity index 100%
rename from assets/serverdata/notes/Live_0564.json
rename to assets/serverdata/beatmaps/Live_0564.json
diff --git a/assets/serverdata/notes/Live_0565.json b/assets/serverdata/beatmaps/Live_0565.json
similarity index 100%
rename from assets/serverdata/notes/Live_0565.json
rename to assets/serverdata/beatmaps/Live_0565.json
diff --git a/assets/serverdata/notes/Live_0566.json b/assets/serverdata/beatmaps/Live_0566.json
similarity index 100%
rename from assets/serverdata/notes/Live_0566.json
rename to assets/serverdata/beatmaps/Live_0566.json
diff --git a/assets/serverdata/notes/Live_0567.json b/assets/serverdata/beatmaps/Live_0567.json
similarity index 100%
rename from assets/serverdata/notes/Live_0567.json
rename to assets/serverdata/beatmaps/Live_0567.json
diff --git a/assets/serverdata/notes/Live_0568.json b/assets/serverdata/beatmaps/Live_0568.json
similarity index 100%
rename from assets/serverdata/notes/Live_0568.json
rename to assets/serverdata/beatmaps/Live_0568.json
diff --git a/assets/serverdata/notes/Live_0569.json b/assets/serverdata/beatmaps/Live_0569.json
similarity index 100%
rename from assets/serverdata/notes/Live_0569.json
rename to assets/serverdata/beatmaps/Live_0569.json
diff --git a/assets/serverdata/notes/Live_0578.json b/assets/serverdata/beatmaps/Live_0578.json
similarity index 100%
rename from assets/serverdata/notes/Live_0578.json
rename to assets/serverdata/beatmaps/Live_0578.json
diff --git a/assets/serverdata/notes/Live_0579.json b/assets/serverdata/beatmaps/Live_0579.json
similarity index 100%
rename from assets/serverdata/notes/Live_0579.json
rename to assets/serverdata/beatmaps/Live_0579.json
diff --git a/assets/serverdata/notes/Live_0580.json b/assets/serverdata/beatmaps/Live_0580.json
similarity index 100%
rename from assets/serverdata/notes/Live_0580.json
rename to assets/serverdata/beatmaps/Live_0580.json
diff --git a/assets/serverdata/notes/Live_0589.json b/assets/serverdata/beatmaps/Live_0589.json
similarity index 100%
rename from assets/serverdata/notes/Live_0589.json
rename to assets/serverdata/beatmaps/Live_0589.json
diff --git a/assets/serverdata/notes/Live_0590.json b/assets/serverdata/beatmaps/Live_0590.json
similarity index 100%
rename from assets/serverdata/notes/Live_0590.json
rename to assets/serverdata/beatmaps/Live_0590.json
diff --git a/assets/serverdata/notes/Live_0591.json b/assets/serverdata/beatmaps/Live_0591.json
similarity index 100%
rename from assets/serverdata/notes/Live_0591.json
rename to assets/serverdata/beatmaps/Live_0591.json
diff --git a/assets/serverdata/notes/Live_0592.json b/assets/serverdata/beatmaps/Live_0592.json
similarity index 100%
rename from assets/serverdata/notes/Live_0592.json
rename to assets/serverdata/beatmaps/Live_0592.json
diff --git a/assets/serverdata/notes/Live_0593.json b/assets/serverdata/beatmaps/Live_0593.json
similarity index 100%
rename from assets/serverdata/notes/Live_0593.json
rename to assets/serverdata/beatmaps/Live_0593.json
diff --git a/assets/serverdata/notes/Live_0594.json b/assets/serverdata/beatmaps/Live_0594.json
similarity index 100%
rename from assets/serverdata/notes/Live_0594.json
rename to assets/serverdata/beatmaps/Live_0594.json
diff --git a/assets/serverdata/notes/Live_0601.json b/assets/serverdata/beatmaps/Live_0601.json
similarity index 100%
rename from assets/serverdata/notes/Live_0601.json
rename to assets/serverdata/beatmaps/Live_0601.json
diff --git a/assets/serverdata/notes/Live_0603.json b/assets/serverdata/beatmaps/Live_0603.json
similarity index 100%
rename from assets/serverdata/notes/Live_0603.json
rename to assets/serverdata/beatmaps/Live_0603.json
diff --git a/assets/serverdata/notes/Live_0604.json b/assets/serverdata/beatmaps/Live_0604.json
similarity index 100%
rename from assets/serverdata/notes/Live_0604.json
rename to assets/serverdata/beatmaps/Live_0604.json
diff --git a/assets/serverdata/notes/Live_0605.json b/assets/serverdata/beatmaps/Live_0605.json
similarity index 100%
rename from assets/serverdata/notes/Live_0605.json
rename to assets/serverdata/beatmaps/Live_0605.json
diff --git a/assets/serverdata/notes/Live_0606.json b/assets/serverdata/beatmaps/Live_0606.json
similarity index 100%
rename from assets/serverdata/notes/Live_0606.json
rename to assets/serverdata/beatmaps/Live_0606.json
diff --git a/assets/serverdata/notes/Live_0615.json b/assets/serverdata/beatmaps/Live_0615.json
similarity index 100%
rename from assets/serverdata/notes/Live_0615.json
rename to assets/serverdata/beatmaps/Live_0615.json
diff --git a/assets/serverdata/notes/Live_0616.json b/assets/serverdata/beatmaps/Live_0616.json
similarity index 100%
rename from assets/serverdata/notes/Live_0616.json
rename to assets/serverdata/beatmaps/Live_0616.json
diff --git a/assets/serverdata/notes/Live_0617.json b/assets/serverdata/beatmaps/Live_0617.json
similarity index 100%
rename from assets/serverdata/notes/Live_0617.json
rename to assets/serverdata/beatmaps/Live_0617.json
diff --git a/assets/serverdata/notes/Live_0618.json b/assets/serverdata/beatmaps/Live_0618.json
similarity index 100%
rename from assets/serverdata/notes/Live_0618.json
rename to assets/serverdata/beatmaps/Live_0618.json
diff --git a/assets/serverdata/notes/Live_0619.json b/assets/serverdata/beatmaps/Live_0619.json
similarity index 100%
rename from assets/serverdata/notes/Live_0619.json
rename to assets/serverdata/beatmaps/Live_0619.json
diff --git a/assets/serverdata/notes/Live_0620.json b/assets/serverdata/beatmaps/Live_0620.json
similarity index 100%
rename from assets/serverdata/notes/Live_0620.json
rename to assets/serverdata/beatmaps/Live_0620.json
diff --git a/assets/serverdata/notes/Live_0621.json b/assets/serverdata/beatmaps/Live_0621.json
similarity index 100%
rename from assets/serverdata/notes/Live_0621.json
rename to assets/serverdata/beatmaps/Live_0621.json
diff --git a/assets/serverdata/notes/Live_0628.json b/assets/serverdata/beatmaps/Live_0628.json
similarity index 100%
rename from assets/serverdata/notes/Live_0628.json
rename to assets/serverdata/beatmaps/Live_0628.json
diff --git a/assets/serverdata/notes/Live_0630.json b/assets/serverdata/beatmaps/Live_0630.json
similarity index 100%
rename from assets/serverdata/notes/Live_0630.json
rename to assets/serverdata/beatmaps/Live_0630.json
diff --git a/assets/serverdata/notes/Live_0631.json b/assets/serverdata/beatmaps/Live_0631.json
similarity index 100%
rename from assets/serverdata/notes/Live_0631.json
rename to assets/serverdata/beatmaps/Live_0631.json
diff --git a/assets/serverdata/notes/Live_0632.json b/assets/serverdata/beatmaps/Live_0632.json
similarity index 100%
rename from assets/serverdata/notes/Live_0632.json
rename to assets/serverdata/beatmaps/Live_0632.json
diff --git a/assets/serverdata/notes/Live_0633.json b/assets/serverdata/beatmaps/Live_0633.json
similarity index 100%
rename from assets/serverdata/notes/Live_0633.json
rename to assets/serverdata/beatmaps/Live_0633.json
diff --git a/assets/serverdata/notes/Live_0634.json b/assets/serverdata/beatmaps/Live_0634.json
similarity index 100%
rename from assets/serverdata/notes/Live_0634.json
rename to assets/serverdata/beatmaps/Live_0634.json
diff --git a/assets/serverdata/notes/Live_0635.json b/assets/serverdata/beatmaps/Live_0635.json
similarity index 100%
rename from assets/serverdata/notes/Live_0635.json
rename to assets/serverdata/beatmaps/Live_0635.json
diff --git a/assets/serverdata/notes/Live_0636.json b/assets/serverdata/beatmaps/Live_0636.json
similarity index 100%
rename from assets/serverdata/notes/Live_0636.json
rename to assets/serverdata/beatmaps/Live_0636.json
diff --git a/assets/serverdata/notes/Live_0648.json b/assets/serverdata/beatmaps/Live_0648.json
similarity index 100%
rename from assets/serverdata/notes/Live_0648.json
rename to assets/serverdata/beatmaps/Live_0648.json
diff --git a/assets/serverdata/notes/Live_0649.json b/assets/serverdata/beatmaps/Live_0649.json
similarity index 100%
rename from assets/serverdata/notes/Live_0649.json
rename to assets/serverdata/beatmaps/Live_0649.json
diff --git a/assets/serverdata/notes/Live_0650.json b/assets/serverdata/beatmaps/Live_0650.json
similarity index 100%
rename from assets/serverdata/notes/Live_0650.json
rename to assets/serverdata/beatmaps/Live_0650.json
diff --git a/assets/serverdata/notes/Live_0651.json b/assets/serverdata/beatmaps/Live_0651.json
similarity index 100%
rename from assets/serverdata/notes/Live_0651.json
rename to assets/serverdata/beatmaps/Live_0651.json
diff --git a/assets/serverdata/notes/Live_0652.json b/assets/serverdata/beatmaps/Live_0652.json
similarity index 100%
rename from assets/serverdata/notes/Live_0652.json
rename to assets/serverdata/beatmaps/Live_0652.json
diff --git a/assets/serverdata/notes/Live_0659.json b/assets/serverdata/beatmaps/Live_0659.json
similarity index 100%
rename from assets/serverdata/notes/Live_0659.json
rename to assets/serverdata/beatmaps/Live_0659.json
diff --git a/assets/serverdata/notes/Live_0661.json b/assets/serverdata/beatmaps/Live_0661.json
similarity index 100%
rename from assets/serverdata/notes/Live_0661.json
rename to assets/serverdata/beatmaps/Live_0661.json
diff --git a/assets/serverdata/notes/Live_0662.json b/assets/serverdata/beatmaps/Live_0662.json
similarity index 100%
rename from assets/serverdata/notes/Live_0662.json
rename to assets/serverdata/beatmaps/Live_0662.json
diff --git a/assets/serverdata/notes/Live_0663.json b/assets/serverdata/beatmaps/Live_0663.json
similarity index 100%
rename from assets/serverdata/notes/Live_0663.json
rename to assets/serverdata/beatmaps/Live_0663.json
diff --git a/assets/serverdata/notes/Live_0664.json b/assets/serverdata/beatmaps/Live_0664.json
similarity index 100%
rename from assets/serverdata/notes/Live_0664.json
rename to assets/serverdata/beatmaps/Live_0664.json
diff --git a/assets/serverdata/notes/Live_0665.json b/assets/serverdata/beatmaps/Live_0665.json
similarity index 100%
rename from assets/serverdata/notes/Live_0665.json
rename to assets/serverdata/beatmaps/Live_0665.json
diff --git a/assets/serverdata/notes/Live_0666.json b/assets/serverdata/beatmaps/Live_0666.json
similarity index 100%
rename from assets/serverdata/notes/Live_0666.json
rename to assets/serverdata/beatmaps/Live_0666.json
diff --git a/assets/serverdata/notes/Live_0678.json b/assets/serverdata/beatmaps/Live_0678.json
similarity index 100%
rename from assets/serverdata/notes/Live_0678.json
rename to assets/serverdata/beatmaps/Live_0678.json
diff --git a/assets/serverdata/notes/Live_0679.json b/assets/serverdata/beatmaps/Live_0679.json
similarity index 100%
rename from assets/serverdata/notes/Live_0679.json
rename to assets/serverdata/beatmaps/Live_0679.json
diff --git a/assets/serverdata/notes/Live_0680.json b/assets/serverdata/beatmaps/Live_0680.json
similarity index 100%
rename from assets/serverdata/notes/Live_0680.json
rename to assets/serverdata/beatmaps/Live_0680.json
diff --git a/assets/serverdata/notes/Live_0681.json b/assets/serverdata/beatmaps/Live_0681.json
similarity index 100%
rename from assets/serverdata/notes/Live_0681.json
rename to assets/serverdata/beatmaps/Live_0681.json
diff --git a/assets/serverdata/notes/Live_0688.json b/assets/serverdata/beatmaps/Live_0688.json
similarity index 100%
rename from assets/serverdata/notes/Live_0688.json
rename to assets/serverdata/beatmaps/Live_0688.json
diff --git a/assets/serverdata/notes/Live_0690.json b/assets/serverdata/beatmaps/Live_0690.json
similarity index 100%
rename from assets/serverdata/notes/Live_0690.json
rename to assets/serverdata/beatmaps/Live_0690.json
diff --git a/assets/serverdata/notes/Live_0691.json b/assets/serverdata/beatmaps/Live_0691.json
similarity index 100%
rename from assets/serverdata/notes/Live_0691.json
rename to assets/serverdata/beatmaps/Live_0691.json
diff --git a/assets/serverdata/notes/Live_0692.json b/assets/serverdata/beatmaps/Live_0692.json
similarity index 100%
rename from assets/serverdata/notes/Live_0692.json
rename to assets/serverdata/beatmaps/Live_0692.json
diff --git a/assets/serverdata/notes/Live_0693.json b/assets/serverdata/beatmaps/Live_0693.json
similarity index 100%
rename from assets/serverdata/notes/Live_0693.json
rename to assets/serverdata/beatmaps/Live_0693.json
diff --git a/assets/serverdata/notes/Live_0702.json b/assets/serverdata/beatmaps/Live_0702.json
similarity index 100%
rename from assets/serverdata/notes/Live_0702.json
rename to assets/serverdata/beatmaps/Live_0702.json
diff --git a/assets/serverdata/notes/Live_0703.json b/assets/serverdata/beatmaps/Live_0703.json
similarity index 100%
rename from assets/serverdata/notes/Live_0703.json
rename to assets/serverdata/beatmaps/Live_0703.json
diff --git a/assets/serverdata/notes/Live_0704.json b/assets/serverdata/beatmaps/Live_0704.json
similarity index 100%
rename from assets/serverdata/notes/Live_0704.json
rename to assets/serverdata/beatmaps/Live_0704.json
diff --git a/assets/serverdata/notes/Live_0705.json b/assets/serverdata/beatmaps/Live_0705.json
similarity index 100%
rename from assets/serverdata/notes/Live_0705.json
rename to assets/serverdata/beatmaps/Live_0705.json
diff --git a/assets/serverdata/notes/Live_0706.json b/assets/serverdata/beatmaps/Live_0706.json
similarity index 100%
rename from assets/serverdata/notes/Live_0706.json
rename to assets/serverdata/beatmaps/Live_0706.json
diff --git a/assets/serverdata/notes/Live_0707.json b/assets/serverdata/beatmaps/Live_0707.json
similarity index 100%
rename from assets/serverdata/notes/Live_0707.json
rename to assets/serverdata/beatmaps/Live_0707.json
diff --git a/assets/serverdata/notes/Live_0708.json b/assets/serverdata/beatmaps/Live_0708.json
similarity index 100%
rename from assets/serverdata/notes/Live_0708.json
rename to assets/serverdata/beatmaps/Live_0708.json
diff --git a/assets/serverdata/notes/Live_0709.json b/assets/serverdata/beatmaps/Live_0709.json
similarity index 100%
rename from assets/serverdata/notes/Live_0709.json
rename to assets/serverdata/beatmaps/Live_0709.json
diff --git a/assets/serverdata/notes/Live_0713.json b/assets/serverdata/beatmaps/Live_0713.json
similarity index 100%
rename from assets/serverdata/notes/Live_0713.json
rename to assets/serverdata/beatmaps/Live_0713.json
diff --git a/assets/serverdata/notes/Live_0714.json b/assets/serverdata/beatmaps/Live_0714.json
similarity index 100%
rename from assets/serverdata/notes/Live_0714.json
rename to assets/serverdata/beatmaps/Live_0714.json
diff --git a/assets/serverdata/notes/Live_0715.json b/assets/serverdata/beatmaps/Live_0715.json
similarity index 100%
rename from assets/serverdata/notes/Live_0715.json
rename to assets/serverdata/beatmaps/Live_0715.json
diff --git a/assets/serverdata/notes/Live_0716.json b/assets/serverdata/beatmaps/Live_0716.json
similarity index 100%
rename from assets/serverdata/notes/Live_0716.json
rename to assets/serverdata/beatmaps/Live_0716.json
diff --git a/assets/serverdata/notes/Live_0718.json b/assets/serverdata/beatmaps/Live_0718.json
similarity index 100%
rename from assets/serverdata/notes/Live_0718.json
rename to assets/serverdata/beatmaps/Live_0718.json
diff --git a/assets/serverdata/notes/Live_0719.json b/assets/serverdata/beatmaps/Live_0719.json
similarity index 100%
rename from assets/serverdata/notes/Live_0719.json
rename to assets/serverdata/beatmaps/Live_0719.json
diff --git a/assets/serverdata/notes/Live_0720.json b/assets/serverdata/beatmaps/Live_0720.json
similarity index 100%
rename from assets/serverdata/notes/Live_0720.json
rename to assets/serverdata/beatmaps/Live_0720.json
diff --git a/assets/serverdata/notes/Live_0721.json b/assets/serverdata/beatmaps/Live_0721.json
similarity index 100%
rename from assets/serverdata/notes/Live_0721.json
rename to assets/serverdata/beatmaps/Live_0721.json
diff --git a/assets/serverdata/notes/Live_0749.json b/assets/serverdata/beatmaps/Live_0749.json
similarity index 100%
rename from assets/serverdata/notes/Live_0749.json
rename to assets/serverdata/beatmaps/Live_0749.json
diff --git a/assets/serverdata/notes/Live_0750.json b/assets/serverdata/beatmaps/Live_0750.json
similarity index 100%
rename from assets/serverdata/notes/Live_0750.json
rename to assets/serverdata/beatmaps/Live_0750.json
diff --git a/assets/serverdata/notes/Live_0751.json b/assets/serverdata/beatmaps/Live_0751.json
similarity index 100%
rename from assets/serverdata/notes/Live_0751.json
rename to assets/serverdata/beatmaps/Live_0751.json
diff --git a/assets/serverdata/notes/Live_0752.json b/assets/serverdata/beatmaps/Live_0752.json
similarity index 100%
rename from assets/serverdata/notes/Live_0752.json
rename to assets/serverdata/beatmaps/Live_0752.json
diff --git a/assets/serverdata/notes/Live_0753.json b/assets/serverdata/beatmaps/Live_0753.json
similarity index 100%
rename from assets/serverdata/notes/Live_0753.json
rename to assets/serverdata/beatmaps/Live_0753.json
diff --git a/assets/serverdata/notes/Live_0754.json b/assets/serverdata/beatmaps/Live_0754.json
similarity index 100%
rename from assets/serverdata/notes/Live_0754.json
rename to assets/serverdata/beatmaps/Live_0754.json
diff --git a/assets/serverdata/notes/Live_0755.json b/assets/serverdata/beatmaps/Live_0755.json
similarity index 100%
rename from assets/serverdata/notes/Live_0755.json
rename to assets/serverdata/beatmaps/Live_0755.json
diff --git a/assets/serverdata/notes/Live_0756.json b/assets/serverdata/beatmaps/Live_0756.json
similarity index 100%
rename from assets/serverdata/notes/Live_0756.json
rename to assets/serverdata/beatmaps/Live_0756.json
diff --git a/assets/serverdata/notes/Live_0763.json b/assets/serverdata/beatmaps/Live_0763.json
similarity index 100%
rename from assets/serverdata/notes/Live_0763.json
rename to assets/serverdata/beatmaps/Live_0763.json
diff --git a/assets/serverdata/notes/Live_0765.json b/assets/serverdata/beatmaps/Live_0765.json
similarity index 100%
rename from assets/serverdata/notes/Live_0765.json
rename to assets/serverdata/beatmaps/Live_0765.json
diff --git a/assets/serverdata/notes/Live_0766.json b/assets/serverdata/beatmaps/Live_0766.json
similarity index 100%
rename from assets/serverdata/notes/Live_0766.json
rename to assets/serverdata/beatmaps/Live_0766.json
diff --git a/assets/serverdata/notes/Live_0767.json b/assets/serverdata/beatmaps/Live_0767.json
similarity index 100%
rename from assets/serverdata/notes/Live_0767.json
rename to assets/serverdata/beatmaps/Live_0767.json
diff --git a/assets/serverdata/notes/Live_0768.json b/assets/serverdata/beatmaps/Live_0768.json
similarity index 100%
rename from assets/serverdata/notes/Live_0768.json
rename to assets/serverdata/beatmaps/Live_0768.json
diff --git a/assets/serverdata/notes/Live_0791.json b/assets/serverdata/beatmaps/Live_0791.json
similarity index 100%
rename from assets/serverdata/notes/Live_0791.json
rename to assets/serverdata/beatmaps/Live_0791.json
diff --git a/assets/serverdata/notes/Live_0792.json b/assets/serverdata/beatmaps/Live_0792.json
similarity index 100%
rename from assets/serverdata/notes/Live_0792.json
rename to assets/serverdata/beatmaps/Live_0792.json
diff --git a/assets/serverdata/notes/Live_0793.json b/assets/serverdata/beatmaps/Live_0793.json
similarity index 100%
rename from assets/serverdata/notes/Live_0793.json
rename to assets/serverdata/beatmaps/Live_0793.json
diff --git a/assets/serverdata/notes/Live_0794.json b/assets/serverdata/beatmaps/Live_0794.json
similarity index 100%
rename from assets/serverdata/notes/Live_0794.json
rename to assets/serverdata/beatmaps/Live_0794.json
diff --git a/assets/serverdata/notes/Live_0797.json b/assets/serverdata/beatmaps/Live_0797.json
similarity index 100%
rename from assets/serverdata/notes/Live_0797.json
rename to assets/serverdata/beatmaps/Live_0797.json
diff --git a/assets/serverdata/notes/Live_0798.json b/assets/serverdata/beatmaps/Live_0798.json
similarity index 100%
rename from assets/serverdata/notes/Live_0798.json
rename to assets/serverdata/beatmaps/Live_0798.json
diff --git a/assets/serverdata/notes/Live_0799.json b/assets/serverdata/beatmaps/Live_0799.json
similarity index 100%
rename from assets/serverdata/notes/Live_0799.json
rename to assets/serverdata/beatmaps/Live_0799.json
diff --git a/assets/serverdata/notes/Live_0803.json b/assets/serverdata/beatmaps/Live_0803.json
similarity index 100%
rename from assets/serverdata/notes/Live_0803.json
rename to assets/serverdata/beatmaps/Live_0803.json
diff --git a/assets/serverdata/notes/Live_0804.json b/assets/serverdata/beatmaps/Live_0804.json
similarity index 100%
rename from assets/serverdata/notes/Live_0804.json
rename to assets/serverdata/beatmaps/Live_0804.json
diff --git a/assets/serverdata/notes/Live_0805.json b/assets/serverdata/beatmaps/Live_0805.json
similarity index 100%
rename from assets/serverdata/notes/Live_0805.json
rename to assets/serverdata/beatmaps/Live_0805.json
diff --git a/assets/serverdata/notes/Live_0806.json b/assets/serverdata/beatmaps/Live_0806.json
similarity index 100%
rename from assets/serverdata/notes/Live_0806.json
rename to assets/serverdata/beatmaps/Live_0806.json
diff --git a/assets/serverdata/notes/Live_0810.json b/assets/serverdata/beatmaps/Live_0810.json
similarity index 100%
rename from assets/serverdata/notes/Live_0810.json
rename to assets/serverdata/beatmaps/Live_0810.json
diff --git a/assets/serverdata/notes/Live_0811.json b/assets/serverdata/beatmaps/Live_0811.json
similarity index 100%
rename from assets/serverdata/notes/Live_0811.json
rename to assets/serverdata/beatmaps/Live_0811.json
diff --git a/assets/serverdata/notes/Live_0812.json b/assets/serverdata/beatmaps/Live_0812.json
similarity index 100%
rename from assets/serverdata/notes/Live_0812.json
rename to assets/serverdata/beatmaps/Live_0812.json
diff --git a/assets/serverdata/notes/Live_0813.json b/assets/serverdata/beatmaps/Live_0813.json
similarity index 100%
rename from assets/serverdata/notes/Live_0813.json
rename to assets/serverdata/beatmaps/Live_0813.json
diff --git a/assets/serverdata/notes/Live_0814.json b/assets/serverdata/beatmaps/Live_0814.json
similarity index 100%
rename from assets/serverdata/notes/Live_0814.json
rename to assets/serverdata/beatmaps/Live_0814.json
diff --git a/assets/serverdata/notes/Live_0831.json b/assets/serverdata/beatmaps/Live_0831.json
similarity index 100%
rename from assets/serverdata/notes/Live_0831.json
rename to assets/serverdata/beatmaps/Live_0831.json
diff --git a/assets/serverdata/notes/Live_0832.json b/assets/serverdata/beatmaps/Live_0832.json
similarity index 100%
rename from assets/serverdata/notes/Live_0832.json
rename to assets/serverdata/beatmaps/Live_0832.json
diff --git a/assets/serverdata/notes/Live_0833.json b/assets/serverdata/beatmaps/Live_0833.json
similarity index 100%
rename from assets/serverdata/notes/Live_0833.json
rename to assets/serverdata/beatmaps/Live_0833.json
diff --git a/assets/serverdata/notes/Live_0834.json b/assets/serverdata/beatmaps/Live_0834.json
similarity index 100%
rename from assets/serverdata/notes/Live_0834.json
rename to assets/serverdata/beatmaps/Live_0834.json
diff --git a/assets/serverdata/notes/Live_0835.json b/assets/serverdata/beatmaps/Live_0835.json
similarity index 100%
rename from assets/serverdata/notes/Live_0835.json
rename to assets/serverdata/beatmaps/Live_0835.json
diff --git a/assets/serverdata/notes/Live_0836.json b/assets/serverdata/beatmaps/Live_0836.json
similarity index 100%
rename from assets/serverdata/notes/Live_0836.json
rename to assets/serverdata/beatmaps/Live_0836.json
diff --git a/assets/serverdata/notes/Live_0837.json b/assets/serverdata/beatmaps/Live_0837.json
similarity index 100%
rename from assets/serverdata/notes/Live_0837.json
rename to assets/serverdata/beatmaps/Live_0837.json
diff --git a/assets/serverdata/notes/Live_0838.json b/assets/serverdata/beatmaps/Live_0838.json
similarity index 100%
rename from assets/serverdata/notes/Live_0838.json
rename to assets/serverdata/beatmaps/Live_0838.json
diff --git a/assets/serverdata/notes/Live_0842.json b/assets/serverdata/beatmaps/Live_0842.json
similarity index 100%
rename from assets/serverdata/notes/Live_0842.json
rename to assets/serverdata/beatmaps/Live_0842.json
diff --git a/assets/serverdata/notes/Live_0843.json b/assets/serverdata/beatmaps/Live_0843.json
similarity index 100%
rename from assets/serverdata/notes/Live_0843.json
rename to assets/serverdata/beatmaps/Live_0843.json
diff --git a/assets/serverdata/notes/Live_0844.json b/assets/serverdata/beatmaps/Live_0844.json
similarity index 100%
rename from assets/serverdata/notes/Live_0844.json
rename to assets/serverdata/beatmaps/Live_0844.json
diff --git a/assets/serverdata/notes/Live_0845.json b/assets/serverdata/beatmaps/Live_0845.json
similarity index 100%
rename from assets/serverdata/notes/Live_0845.json
rename to assets/serverdata/beatmaps/Live_0845.json
diff --git a/assets/serverdata/notes/Live_0849.json b/assets/serverdata/beatmaps/Live_0849.json
similarity index 100%
rename from assets/serverdata/notes/Live_0849.json
rename to assets/serverdata/beatmaps/Live_0849.json
diff --git a/assets/serverdata/notes/Live_0850.json b/assets/serverdata/beatmaps/Live_0850.json
similarity index 100%
rename from assets/serverdata/notes/Live_0850.json
rename to assets/serverdata/beatmaps/Live_0850.json
diff --git a/assets/serverdata/notes/Live_0851.json b/assets/serverdata/beatmaps/Live_0851.json
similarity index 100%
rename from assets/serverdata/notes/Live_0851.json
rename to assets/serverdata/beatmaps/Live_0851.json
diff --git a/assets/serverdata/notes/Live_0852.json b/assets/serverdata/beatmaps/Live_0852.json
similarity index 100%
rename from assets/serverdata/notes/Live_0852.json
rename to assets/serverdata/beatmaps/Live_0852.json
diff --git a/assets/serverdata/notes/Live_0866.json b/assets/serverdata/beatmaps/Live_0866.json
similarity index 100%
rename from assets/serverdata/notes/Live_0866.json
rename to assets/serverdata/beatmaps/Live_0866.json
diff --git a/assets/serverdata/notes/Live_0867.json b/assets/serverdata/beatmaps/Live_0867.json
similarity index 100%
rename from assets/serverdata/notes/Live_0867.json
rename to assets/serverdata/beatmaps/Live_0867.json
diff --git a/assets/serverdata/notes/Live_0868.json b/assets/serverdata/beatmaps/Live_0868.json
similarity index 100%
rename from assets/serverdata/notes/Live_0868.json
rename to assets/serverdata/beatmaps/Live_0868.json
diff --git a/assets/serverdata/notes/Live_0869.json b/assets/serverdata/beatmaps/Live_0869.json
similarity index 100%
rename from assets/serverdata/notes/Live_0869.json
rename to assets/serverdata/beatmaps/Live_0869.json
diff --git a/assets/serverdata/notes/Live_0871.json b/assets/serverdata/beatmaps/Live_0871.json
similarity index 100%
rename from assets/serverdata/notes/Live_0871.json
rename to assets/serverdata/beatmaps/Live_0871.json
diff --git a/assets/serverdata/notes/Live_0872.json b/assets/serverdata/beatmaps/Live_0872.json
similarity index 100%
rename from assets/serverdata/notes/Live_0872.json
rename to assets/serverdata/beatmaps/Live_0872.json
diff --git a/assets/serverdata/notes/Live_0873.json b/assets/serverdata/beatmaps/Live_0873.json
similarity index 100%
rename from assets/serverdata/notes/Live_0873.json
rename to assets/serverdata/beatmaps/Live_0873.json
diff --git a/assets/serverdata/notes/Live_0874.json b/assets/serverdata/beatmaps/Live_0874.json
similarity index 100%
rename from assets/serverdata/notes/Live_0874.json
rename to assets/serverdata/beatmaps/Live_0874.json
diff --git a/assets/serverdata/notes/Live_s0361.json b/assets/serverdata/beatmaps/Live_s0361.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0361.json
rename to assets/serverdata/beatmaps/Live_s0361.json
diff --git a/assets/serverdata/notes/Live_s0362.json b/assets/serverdata/beatmaps/Live_s0362.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0362.json
rename to assets/serverdata/beatmaps/Live_s0362.json
diff --git a/assets/serverdata/notes/Live_s0363.json b/assets/serverdata/beatmaps/Live_s0363.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0363.json
rename to assets/serverdata/beatmaps/Live_s0363.json
diff --git a/assets/serverdata/notes/Live_s0364.json b/assets/serverdata/beatmaps/Live_s0364.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0364.json
rename to assets/serverdata/beatmaps/Live_s0364.json
diff --git a/assets/serverdata/notes/Live_s0365.json b/assets/serverdata/beatmaps/Live_s0365.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0365.json
rename to assets/serverdata/beatmaps/Live_s0365.json
diff --git a/assets/serverdata/notes/Live_s0371.json b/assets/serverdata/beatmaps/Live_s0371.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0371.json
rename to assets/serverdata/beatmaps/Live_s0371.json
diff --git a/assets/serverdata/notes/Live_s0372.json b/assets/serverdata/beatmaps/Live_s0372.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0372.json
rename to assets/serverdata/beatmaps/Live_s0372.json
diff --git a/assets/serverdata/notes/Live_s0373.json b/assets/serverdata/beatmaps/Live_s0373.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0373.json
rename to assets/serverdata/beatmaps/Live_s0373.json
diff --git a/assets/serverdata/notes/Live_s0374.json b/assets/serverdata/beatmaps/Live_s0374.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0374.json
rename to assets/serverdata/beatmaps/Live_s0374.json
diff --git a/assets/serverdata/notes/Live_s0375.json b/assets/serverdata/beatmaps/Live_s0375.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0375.json
rename to assets/serverdata/beatmaps/Live_s0375.json
diff --git a/assets/serverdata/notes/Live_s0376.json b/assets/serverdata/beatmaps/Live_s0376.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0376.json
rename to assets/serverdata/beatmaps/Live_s0376.json
diff --git a/assets/serverdata/notes/Live_s0377.json b/assets/serverdata/beatmaps/Live_s0377.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0377.json
rename to assets/serverdata/beatmaps/Live_s0377.json
diff --git a/assets/serverdata/notes/Live_s0378.json b/assets/serverdata/beatmaps/Live_s0378.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0378.json
rename to assets/serverdata/beatmaps/Live_s0378.json
diff --git a/assets/serverdata/notes/Live_s0385.json b/assets/serverdata/beatmaps/Live_s0385.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0385.json
rename to assets/serverdata/beatmaps/Live_s0385.json
diff --git a/assets/serverdata/notes/Live_s0386.json b/assets/serverdata/beatmaps/Live_s0386.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0386.json
rename to assets/serverdata/beatmaps/Live_s0386.json
diff --git a/assets/serverdata/notes/Live_s0387.json b/assets/serverdata/beatmaps/Live_s0387.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0387.json
rename to assets/serverdata/beatmaps/Live_s0387.json
diff --git a/assets/serverdata/notes/Live_s0388.json b/assets/serverdata/beatmaps/Live_s0388.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0388.json
rename to assets/serverdata/beatmaps/Live_s0388.json
diff --git a/assets/serverdata/notes/Live_s0389.json b/assets/serverdata/beatmaps/Live_s0389.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0389.json
rename to assets/serverdata/beatmaps/Live_s0389.json
diff --git a/assets/serverdata/notes/Live_s0390.json b/assets/serverdata/beatmaps/Live_s0390.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0390.json
rename to assets/serverdata/beatmaps/Live_s0390.json
diff --git a/assets/serverdata/notes/Live_s0391.json b/assets/serverdata/beatmaps/Live_s0391.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0391.json
rename to assets/serverdata/beatmaps/Live_s0391.json
diff --git a/assets/serverdata/notes/Live_s0392.json b/assets/serverdata/beatmaps/Live_s0392.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0392.json
rename to assets/serverdata/beatmaps/Live_s0392.json
diff --git a/assets/serverdata/notes/Live_s0393.json b/assets/serverdata/beatmaps/Live_s0393.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0393.json
rename to assets/serverdata/beatmaps/Live_s0393.json
diff --git a/assets/serverdata/notes/Live_s0394.json b/assets/serverdata/beatmaps/Live_s0394.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0394.json
rename to assets/serverdata/beatmaps/Live_s0394.json
diff --git a/assets/serverdata/notes/Live_s0395.json b/assets/serverdata/beatmaps/Live_s0395.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0395.json
rename to assets/serverdata/beatmaps/Live_s0395.json
diff --git a/assets/serverdata/notes/Live_s0396.json b/assets/serverdata/beatmaps/Live_s0396.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0396.json
rename to assets/serverdata/beatmaps/Live_s0396.json
diff --git a/assets/serverdata/notes/Live_s0397.json b/assets/serverdata/beatmaps/Live_s0397.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0397.json
rename to assets/serverdata/beatmaps/Live_s0397.json
diff --git a/assets/serverdata/notes/Live_s0398.json b/assets/serverdata/beatmaps/Live_s0398.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0398.json
rename to assets/serverdata/beatmaps/Live_s0398.json
diff --git a/assets/serverdata/notes/Live_s0399.json b/assets/serverdata/beatmaps/Live_s0399.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0399.json
rename to assets/serverdata/beatmaps/Live_s0399.json
diff --git a/assets/serverdata/notes/Live_s0400.json b/assets/serverdata/beatmaps/Live_s0400.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0400.json
rename to assets/serverdata/beatmaps/Live_s0400.json
diff --git a/assets/serverdata/notes/Live_s0401.json b/assets/serverdata/beatmaps/Live_s0401.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0401.json
rename to assets/serverdata/beatmaps/Live_s0401.json
diff --git a/assets/serverdata/notes/Live_s0402.json b/assets/serverdata/beatmaps/Live_s0402.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0402.json
rename to assets/serverdata/beatmaps/Live_s0402.json
diff --git a/assets/serverdata/notes/Live_s0405.json b/assets/serverdata/beatmaps/Live_s0405.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0405.json
rename to assets/serverdata/beatmaps/Live_s0405.json
diff --git a/assets/serverdata/notes/Live_s0406.json b/assets/serverdata/beatmaps/Live_s0406.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0406.json
rename to assets/serverdata/beatmaps/Live_s0406.json
diff --git a/assets/serverdata/notes/Live_s0407.json b/assets/serverdata/beatmaps/Live_s0407.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0407.json
rename to assets/serverdata/beatmaps/Live_s0407.json
diff --git a/assets/serverdata/notes/Live_s0408.json b/assets/serverdata/beatmaps/Live_s0408.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0408.json
rename to assets/serverdata/beatmaps/Live_s0408.json
diff --git a/assets/serverdata/notes/Live_s0409.json b/assets/serverdata/beatmaps/Live_s0409.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0409.json
rename to assets/serverdata/beatmaps/Live_s0409.json
diff --git a/assets/serverdata/notes/Live_s0410.json b/assets/serverdata/beatmaps/Live_s0410.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0410.json
rename to assets/serverdata/beatmaps/Live_s0410.json
diff --git a/assets/serverdata/notes/Live_s0411.json b/assets/serverdata/beatmaps/Live_s0411.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0411.json
rename to assets/serverdata/beatmaps/Live_s0411.json
diff --git a/assets/serverdata/notes/Live_s0412.json b/assets/serverdata/beatmaps/Live_s0412.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0412.json
rename to assets/serverdata/beatmaps/Live_s0412.json
diff --git a/assets/serverdata/notes/Live_s0413.json b/assets/serverdata/beatmaps/Live_s0413.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0413.json
rename to assets/serverdata/beatmaps/Live_s0413.json
diff --git a/assets/serverdata/notes/Live_s0414.json b/assets/serverdata/beatmaps/Live_s0414.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0414.json
rename to assets/serverdata/beatmaps/Live_s0414.json
diff --git a/assets/serverdata/notes/Live_s0415.json b/assets/serverdata/beatmaps/Live_s0415.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0415.json
rename to assets/serverdata/beatmaps/Live_s0415.json
diff --git a/assets/serverdata/notes/Live_s0416.json b/assets/serverdata/beatmaps/Live_s0416.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0416.json
rename to assets/serverdata/beatmaps/Live_s0416.json
diff --git a/assets/serverdata/notes/Live_s0417.json b/assets/serverdata/beatmaps/Live_s0417.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0417.json
rename to assets/serverdata/beatmaps/Live_s0417.json
diff --git a/assets/serverdata/notes/Live_s0418.json b/assets/serverdata/beatmaps/Live_s0418.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0418.json
rename to assets/serverdata/beatmaps/Live_s0418.json
diff --git a/assets/serverdata/notes/Live_s0419.json b/assets/serverdata/beatmaps/Live_s0419.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0419.json
rename to assets/serverdata/beatmaps/Live_s0419.json
diff --git a/assets/serverdata/notes/Live_s0420.json b/assets/serverdata/beatmaps/Live_s0420.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0420.json
rename to assets/serverdata/beatmaps/Live_s0420.json
diff --git a/assets/serverdata/notes/Live_s0421.json b/assets/serverdata/beatmaps/Live_s0421.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0421.json
rename to assets/serverdata/beatmaps/Live_s0421.json
diff --git a/assets/serverdata/notes/Live_s0432.json b/assets/serverdata/beatmaps/Live_s0432.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0432.json
rename to assets/serverdata/beatmaps/Live_s0432.json
diff --git a/assets/serverdata/notes/Live_s0433.json b/assets/serverdata/beatmaps/Live_s0433.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0433.json
rename to assets/serverdata/beatmaps/Live_s0433.json
diff --git a/assets/serverdata/notes/Live_s0434.json b/assets/serverdata/beatmaps/Live_s0434.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0434.json
rename to assets/serverdata/beatmaps/Live_s0434.json
diff --git a/assets/serverdata/notes/Live_s0435.json b/assets/serverdata/beatmaps/Live_s0435.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0435.json
rename to assets/serverdata/beatmaps/Live_s0435.json
diff --git a/assets/serverdata/notes/Live_s0436.json b/assets/serverdata/beatmaps/Live_s0436.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0436.json
rename to assets/serverdata/beatmaps/Live_s0436.json
diff --git a/assets/serverdata/notes/Live_s0437.json b/assets/serverdata/beatmaps/Live_s0437.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0437.json
rename to assets/serverdata/beatmaps/Live_s0437.json
diff --git a/assets/serverdata/notes/Live_s0438.json b/assets/serverdata/beatmaps/Live_s0438.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0438.json
rename to assets/serverdata/beatmaps/Live_s0438.json
diff --git a/assets/serverdata/notes/Live_s0439.json b/assets/serverdata/beatmaps/Live_s0439.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0439.json
rename to assets/serverdata/beatmaps/Live_s0439.json
diff --git a/assets/serverdata/notes/Live_s0440.json b/assets/serverdata/beatmaps/Live_s0440.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0440.json
rename to assets/serverdata/beatmaps/Live_s0440.json
diff --git a/assets/serverdata/notes/Live_s0441.json b/assets/serverdata/beatmaps/Live_s0441.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0441.json
rename to assets/serverdata/beatmaps/Live_s0441.json
diff --git a/assets/serverdata/notes/Live_s0442.json b/assets/serverdata/beatmaps/Live_s0442.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0442.json
rename to assets/serverdata/beatmaps/Live_s0442.json
diff --git a/assets/serverdata/notes/Live_s0443.json b/assets/serverdata/beatmaps/Live_s0443.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0443.json
rename to assets/serverdata/beatmaps/Live_s0443.json
diff --git a/assets/serverdata/notes/Live_s0444.json b/assets/serverdata/beatmaps/Live_s0444.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0444.json
rename to assets/serverdata/beatmaps/Live_s0444.json
diff --git a/assets/serverdata/notes/Live_s0445.json b/assets/serverdata/beatmaps/Live_s0445.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0445.json
rename to assets/serverdata/beatmaps/Live_s0445.json
diff --git a/assets/serverdata/notes/Live_s0446.json b/assets/serverdata/beatmaps/Live_s0446.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0446.json
rename to assets/serverdata/beatmaps/Live_s0446.json
diff --git a/assets/serverdata/notes/Live_s0453.json b/assets/serverdata/beatmaps/Live_s0453.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0453.json
rename to assets/serverdata/beatmaps/Live_s0453.json
diff --git a/assets/serverdata/notes/Live_s0454.json b/assets/serverdata/beatmaps/Live_s0454.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0454.json
rename to assets/serverdata/beatmaps/Live_s0454.json
diff --git a/assets/serverdata/notes/Live_s0455.json b/assets/serverdata/beatmaps/Live_s0455.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0455.json
rename to assets/serverdata/beatmaps/Live_s0455.json
diff --git a/assets/serverdata/notes/Live_s0456.json b/assets/serverdata/beatmaps/Live_s0456.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0456.json
rename to assets/serverdata/beatmaps/Live_s0456.json
diff --git a/assets/serverdata/notes/Live_s0457.json b/assets/serverdata/beatmaps/Live_s0457.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0457.json
rename to assets/serverdata/beatmaps/Live_s0457.json
diff --git a/assets/serverdata/notes/Live_s0458.json b/assets/serverdata/beatmaps/Live_s0458.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0458.json
rename to assets/serverdata/beatmaps/Live_s0458.json
diff --git a/assets/serverdata/notes/Live_s0459.json b/assets/serverdata/beatmaps/Live_s0459.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0459.json
rename to assets/serverdata/beatmaps/Live_s0459.json
diff --git a/assets/serverdata/notes/Live_s0460.json b/assets/serverdata/beatmaps/Live_s0460.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0460.json
rename to assets/serverdata/beatmaps/Live_s0460.json
diff --git a/assets/serverdata/notes/Live_s0461.json b/assets/serverdata/beatmaps/Live_s0461.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0461.json
rename to assets/serverdata/beatmaps/Live_s0461.json
diff --git a/assets/serverdata/notes/Live_s0462.json b/assets/serverdata/beatmaps/Live_s0462.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0462.json
rename to assets/serverdata/beatmaps/Live_s0462.json
diff --git a/assets/serverdata/notes/Live_s0463.json b/assets/serverdata/beatmaps/Live_s0463.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0463.json
rename to assets/serverdata/beatmaps/Live_s0463.json
diff --git a/assets/serverdata/notes/Live_s0464.json b/assets/serverdata/beatmaps/Live_s0464.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0464.json
rename to assets/serverdata/beatmaps/Live_s0464.json
diff --git a/assets/serverdata/notes/Live_s0465.json b/assets/serverdata/beatmaps/Live_s0465.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0465.json
rename to assets/serverdata/beatmaps/Live_s0465.json
diff --git a/assets/serverdata/notes/Live_s0466.json b/assets/serverdata/beatmaps/Live_s0466.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0466.json
rename to assets/serverdata/beatmaps/Live_s0466.json
diff --git a/assets/serverdata/notes/Live_s0467.json b/assets/serverdata/beatmaps/Live_s0467.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0467.json
rename to assets/serverdata/beatmaps/Live_s0467.json
diff --git a/assets/serverdata/notes/Live_s0468.json b/assets/serverdata/beatmaps/Live_s0468.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0468.json
rename to assets/serverdata/beatmaps/Live_s0468.json
diff --git a/assets/serverdata/notes/Live_s0469.json b/assets/serverdata/beatmaps/Live_s0469.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0469.json
rename to assets/serverdata/beatmaps/Live_s0469.json
diff --git a/assets/serverdata/notes/Live_s0470.json b/assets/serverdata/beatmaps/Live_s0470.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0470.json
rename to assets/serverdata/beatmaps/Live_s0470.json
diff --git a/assets/serverdata/notes/Live_s0471.json b/assets/serverdata/beatmaps/Live_s0471.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0471.json
rename to assets/serverdata/beatmaps/Live_s0471.json
diff --git a/assets/serverdata/notes/Live_s0472.json b/assets/serverdata/beatmaps/Live_s0472.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0472.json
rename to assets/serverdata/beatmaps/Live_s0472.json
diff --git a/assets/serverdata/notes/Live_s0473.json b/assets/serverdata/beatmaps/Live_s0473.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0473.json
rename to assets/serverdata/beatmaps/Live_s0473.json
diff --git a/assets/serverdata/notes/Live_s0482.json b/assets/serverdata/beatmaps/Live_s0482.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0482.json
rename to assets/serverdata/beatmaps/Live_s0482.json
diff --git a/assets/serverdata/notes/Live_s0483.json b/assets/serverdata/beatmaps/Live_s0483.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0483.json
rename to assets/serverdata/beatmaps/Live_s0483.json
diff --git a/assets/serverdata/notes/Live_s0484.json b/assets/serverdata/beatmaps/Live_s0484.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0484.json
rename to assets/serverdata/beatmaps/Live_s0484.json
diff --git a/assets/serverdata/notes/Live_s0485.json b/assets/serverdata/beatmaps/Live_s0485.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0485.json
rename to assets/serverdata/beatmaps/Live_s0485.json
diff --git a/assets/serverdata/notes/Live_s0486.json b/assets/serverdata/beatmaps/Live_s0486.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0486.json
rename to assets/serverdata/beatmaps/Live_s0486.json
diff --git a/assets/serverdata/notes/Live_s0487.json b/assets/serverdata/beatmaps/Live_s0487.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0487.json
rename to assets/serverdata/beatmaps/Live_s0487.json
diff --git a/assets/serverdata/notes/Live_s0488.json b/assets/serverdata/beatmaps/Live_s0488.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0488.json
rename to assets/serverdata/beatmaps/Live_s0488.json
diff --git a/assets/serverdata/notes/Live_s0489.json b/assets/serverdata/beatmaps/Live_s0489.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0489.json
rename to assets/serverdata/beatmaps/Live_s0489.json
diff --git a/assets/serverdata/notes/Live_s0490.json b/assets/serverdata/beatmaps/Live_s0490.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0490.json
rename to assets/serverdata/beatmaps/Live_s0490.json
diff --git a/assets/serverdata/notes/Live_s0491.json b/assets/serverdata/beatmaps/Live_s0491.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0491.json
rename to assets/serverdata/beatmaps/Live_s0491.json
diff --git a/assets/serverdata/notes/Live_s0492.json b/assets/serverdata/beatmaps/Live_s0492.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0492.json
rename to assets/serverdata/beatmaps/Live_s0492.json
diff --git a/assets/serverdata/notes/Live_s0493.json b/assets/serverdata/beatmaps/Live_s0493.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0493.json
rename to assets/serverdata/beatmaps/Live_s0493.json
diff --git a/assets/serverdata/notes/Live_s0494.json b/assets/serverdata/beatmaps/Live_s0494.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0494.json
rename to assets/serverdata/beatmaps/Live_s0494.json
diff --git a/assets/serverdata/notes/Live_s0495.json b/assets/serverdata/beatmaps/Live_s0495.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0495.json
rename to assets/serverdata/beatmaps/Live_s0495.json
diff --git a/assets/serverdata/notes/Live_s0496.json b/assets/serverdata/beatmaps/Live_s0496.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0496.json
rename to assets/serverdata/beatmaps/Live_s0496.json
diff --git a/assets/serverdata/notes/Live_s0497.json b/assets/serverdata/beatmaps/Live_s0497.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0497.json
rename to assets/serverdata/beatmaps/Live_s0497.json
diff --git a/assets/serverdata/notes/Live_s0498.json b/assets/serverdata/beatmaps/Live_s0498.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0498.json
rename to assets/serverdata/beatmaps/Live_s0498.json
diff --git a/assets/serverdata/notes/Live_s0499.json b/assets/serverdata/beatmaps/Live_s0499.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0499.json
rename to assets/serverdata/beatmaps/Live_s0499.json
diff --git a/assets/serverdata/notes/Live_s0500.json b/assets/serverdata/beatmaps/Live_s0500.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0500.json
rename to assets/serverdata/beatmaps/Live_s0500.json
diff --git a/assets/serverdata/notes/Live_s0501.json b/assets/serverdata/beatmaps/Live_s0501.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0501.json
rename to assets/serverdata/beatmaps/Live_s0501.json
diff --git a/assets/serverdata/notes/Live_s0502.json b/assets/serverdata/beatmaps/Live_s0502.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0502.json
rename to assets/serverdata/beatmaps/Live_s0502.json
diff --git a/assets/serverdata/notes/Live_s0503.json b/assets/serverdata/beatmaps/Live_s0503.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0503.json
rename to assets/serverdata/beatmaps/Live_s0503.json
diff --git a/assets/serverdata/notes/Live_s0504.json b/assets/serverdata/beatmaps/Live_s0504.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0504.json
rename to assets/serverdata/beatmaps/Live_s0504.json
diff --git a/assets/serverdata/notes/Live_s0505.json b/assets/serverdata/beatmaps/Live_s0505.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0505.json
rename to assets/serverdata/beatmaps/Live_s0505.json
diff --git a/assets/serverdata/notes/Live_s0506.json b/assets/serverdata/beatmaps/Live_s0506.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0506.json
rename to assets/serverdata/beatmaps/Live_s0506.json
diff --git a/assets/serverdata/notes/Live_s0507.json b/assets/serverdata/beatmaps/Live_s0507.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0507.json
rename to assets/serverdata/beatmaps/Live_s0507.json
diff --git a/assets/serverdata/notes/Live_s0508.json b/assets/serverdata/beatmaps/Live_s0508.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0508.json
rename to assets/serverdata/beatmaps/Live_s0508.json
diff --git a/assets/serverdata/notes/Live_s0509.json b/assets/serverdata/beatmaps/Live_s0509.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0509.json
rename to assets/serverdata/beatmaps/Live_s0509.json
diff --git a/assets/serverdata/notes/Live_s0510.json b/assets/serverdata/beatmaps/Live_s0510.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0510.json
rename to assets/serverdata/beatmaps/Live_s0510.json
diff --git a/assets/serverdata/notes/Live_s0511.json b/assets/serverdata/beatmaps/Live_s0511.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0511.json
rename to assets/serverdata/beatmaps/Live_s0511.json
diff --git a/assets/serverdata/notes/Live_s0512.json b/assets/serverdata/beatmaps/Live_s0512.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0512.json
rename to assets/serverdata/beatmaps/Live_s0512.json
diff --git a/assets/serverdata/notes/Live_s0513.json b/assets/serverdata/beatmaps/Live_s0513.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0513.json
rename to assets/serverdata/beatmaps/Live_s0513.json
diff --git a/assets/serverdata/notes/Live_s0514.json b/assets/serverdata/beatmaps/Live_s0514.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0514.json
rename to assets/serverdata/beatmaps/Live_s0514.json
diff --git a/assets/serverdata/notes/Live_s0515.json b/assets/serverdata/beatmaps/Live_s0515.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0515.json
rename to assets/serverdata/beatmaps/Live_s0515.json
diff --git a/assets/serverdata/notes/Live_s0516.json b/assets/serverdata/beatmaps/Live_s0516.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0516.json
rename to assets/serverdata/beatmaps/Live_s0516.json
diff --git a/assets/serverdata/notes/Live_s0517.json b/assets/serverdata/beatmaps/Live_s0517.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0517.json
rename to assets/serverdata/beatmaps/Live_s0517.json
diff --git a/assets/serverdata/notes/Live_s0518.json b/assets/serverdata/beatmaps/Live_s0518.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0518.json
rename to assets/serverdata/beatmaps/Live_s0518.json
diff --git a/assets/serverdata/notes/Live_s0519.json b/assets/serverdata/beatmaps/Live_s0519.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0519.json
rename to assets/serverdata/beatmaps/Live_s0519.json
diff --git a/assets/serverdata/notes/Live_s0520.json b/assets/serverdata/beatmaps/Live_s0520.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0520.json
rename to assets/serverdata/beatmaps/Live_s0520.json
diff --git a/assets/serverdata/notes/Live_s0521.json b/assets/serverdata/beatmaps/Live_s0521.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0521.json
rename to assets/serverdata/beatmaps/Live_s0521.json
diff --git a/assets/serverdata/notes/Live_s0522.json b/assets/serverdata/beatmaps/Live_s0522.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0522.json
rename to assets/serverdata/beatmaps/Live_s0522.json
diff --git a/assets/serverdata/notes/Live_s0523.json b/assets/serverdata/beatmaps/Live_s0523.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0523.json
rename to assets/serverdata/beatmaps/Live_s0523.json
diff --git a/assets/serverdata/notes/Live_s0524.json b/assets/serverdata/beatmaps/Live_s0524.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0524.json
rename to assets/serverdata/beatmaps/Live_s0524.json
diff --git a/assets/serverdata/notes/Live_s0525.json b/assets/serverdata/beatmaps/Live_s0525.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0525.json
rename to assets/serverdata/beatmaps/Live_s0525.json
diff --git a/assets/serverdata/notes/Live_s0526.json b/assets/serverdata/beatmaps/Live_s0526.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0526.json
rename to assets/serverdata/beatmaps/Live_s0526.json
diff --git a/assets/serverdata/notes/Live_s0527.json b/assets/serverdata/beatmaps/Live_s0527.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0527.json
rename to assets/serverdata/beatmaps/Live_s0527.json
diff --git a/assets/serverdata/notes/Live_s0528.json b/assets/serverdata/beatmaps/Live_s0528.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0528.json
rename to assets/serverdata/beatmaps/Live_s0528.json
diff --git a/assets/serverdata/notes/Live_s0529.json b/assets/serverdata/beatmaps/Live_s0529.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0529.json
rename to assets/serverdata/beatmaps/Live_s0529.json
diff --git a/assets/serverdata/notes/Live_s0530.json b/assets/serverdata/beatmaps/Live_s0530.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0530.json
rename to assets/serverdata/beatmaps/Live_s0530.json
diff --git a/assets/serverdata/notes/Live_s0531.json b/assets/serverdata/beatmaps/Live_s0531.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0531.json
rename to assets/serverdata/beatmaps/Live_s0531.json
diff --git a/assets/serverdata/notes/Live_s0532.json b/assets/serverdata/beatmaps/Live_s0532.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0532.json
rename to assets/serverdata/beatmaps/Live_s0532.json
diff --git a/assets/serverdata/notes/Live_s0533.json b/assets/serverdata/beatmaps/Live_s0533.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0533.json
rename to assets/serverdata/beatmaps/Live_s0533.json
diff --git a/assets/serverdata/notes/Live_s0534.json b/assets/serverdata/beatmaps/Live_s0534.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0534.json
rename to assets/serverdata/beatmaps/Live_s0534.json
diff --git a/assets/serverdata/notes/Live_s0535.json b/assets/serverdata/beatmaps/Live_s0535.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0535.json
rename to assets/serverdata/beatmaps/Live_s0535.json
diff --git a/assets/serverdata/notes/Live_s0536.json b/assets/serverdata/beatmaps/Live_s0536.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0536.json
rename to assets/serverdata/beatmaps/Live_s0536.json
diff --git a/assets/serverdata/notes/Live_s0537.json b/assets/serverdata/beatmaps/Live_s0537.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0537.json
rename to assets/serverdata/beatmaps/Live_s0537.json
diff --git a/assets/serverdata/notes/Live_s0538.json b/assets/serverdata/beatmaps/Live_s0538.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0538.json
rename to assets/serverdata/beatmaps/Live_s0538.json
diff --git a/assets/serverdata/notes/Live_s0539.json b/assets/serverdata/beatmaps/Live_s0539.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0539.json
rename to assets/serverdata/beatmaps/Live_s0539.json
diff --git a/assets/serverdata/notes/Live_s0551.json b/assets/serverdata/beatmaps/Live_s0551.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0551.json
rename to assets/serverdata/beatmaps/Live_s0551.json
diff --git a/assets/serverdata/notes/Live_s0552.json b/assets/serverdata/beatmaps/Live_s0552.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0552.json
rename to assets/serverdata/beatmaps/Live_s0552.json
diff --git a/assets/serverdata/notes/Live_s0553.json b/assets/serverdata/beatmaps/Live_s0553.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0553.json
rename to assets/serverdata/beatmaps/Live_s0553.json
diff --git a/assets/serverdata/notes/Live_s0554.json b/assets/serverdata/beatmaps/Live_s0554.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0554.json
rename to assets/serverdata/beatmaps/Live_s0554.json
diff --git a/assets/serverdata/notes/Live_s0555.json b/assets/serverdata/beatmaps/Live_s0555.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0555.json
rename to assets/serverdata/beatmaps/Live_s0555.json
diff --git a/assets/serverdata/notes/Live_s0556.json b/assets/serverdata/beatmaps/Live_s0556.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0556.json
rename to assets/serverdata/beatmaps/Live_s0556.json
diff --git a/assets/serverdata/notes/Live_s0557.json b/assets/serverdata/beatmaps/Live_s0557.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0557.json
rename to assets/serverdata/beatmaps/Live_s0557.json
diff --git a/assets/serverdata/notes/Live_s0558.json b/assets/serverdata/beatmaps/Live_s0558.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0558.json
rename to assets/serverdata/beatmaps/Live_s0558.json
diff --git a/assets/serverdata/notes/Live_s0559.json b/assets/serverdata/beatmaps/Live_s0559.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0559.json
rename to assets/serverdata/beatmaps/Live_s0559.json
diff --git a/assets/serverdata/notes/Live_s0560.json b/assets/serverdata/beatmaps/Live_s0560.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0560.json
rename to assets/serverdata/beatmaps/Live_s0560.json
diff --git a/assets/serverdata/notes/Live_s0561.json b/assets/serverdata/beatmaps/Live_s0561.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0561.json
rename to assets/serverdata/beatmaps/Live_s0561.json
diff --git a/assets/serverdata/notes/Live_s0562.json b/assets/serverdata/beatmaps/Live_s0562.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0562.json
rename to assets/serverdata/beatmaps/Live_s0562.json
diff --git a/assets/serverdata/notes/Live_s0563.json b/assets/serverdata/beatmaps/Live_s0563.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0563.json
rename to assets/serverdata/beatmaps/Live_s0563.json
diff --git a/assets/serverdata/notes/Live_s0564.json b/assets/serverdata/beatmaps/Live_s0564.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0564.json
rename to assets/serverdata/beatmaps/Live_s0564.json
diff --git a/assets/serverdata/notes/Live_s0565.json b/assets/serverdata/beatmaps/Live_s0565.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0565.json
rename to assets/serverdata/beatmaps/Live_s0565.json
diff --git a/assets/serverdata/notes/Live_s0566.json b/assets/serverdata/beatmaps/Live_s0566.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0566.json
rename to assets/serverdata/beatmaps/Live_s0566.json
diff --git a/assets/serverdata/notes/Live_s0567.json b/assets/serverdata/beatmaps/Live_s0567.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0567.json
rename to assets/serverdata/beatmaps/Live_s0567.json
diff --git a/assets/serverdata/notes/Live_s0568.json b/assets/serverdata/beatmaps/Live_s0568.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0568.json
rename to assets/serverdata/beatmaps/Live_s0568.json
diff --git a/assets/serverdata/notes/Live_s0569.json b/assets/serverdata/beatmaps/Live_s0569.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0569.json
rename to assets/serverdata/beatmaps/Live_s0569.json
diff --git a/assets/serverdata/notes/Live_s0570.json b/assets/serverdata/beatmaps/Live_s0570.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0570.json
rename to assets/serverdata/beatmaps/Live_s0570.json
diff --git a/assets/serverdata/notes/Live_s0571.json b/assets/serverdata/beatmaps/Live_s0571.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0571.json
rename to assets/serverdata/beatmaps/Live_s0571.json
diff --git a/assets/serverdata/notes/Live_s0572.json b/assets/serverdata/beatmaps/Live_s0572.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0572.json
rename to assets/serverdata/beatmaps/Live_s0572.json
diff --git a/assets/serverdata/notes/Live_s0573.json b/assets/serverdata/beatmaps/Live_s0573.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0573.json
rename to assets/serverdata/beatmaps/Live_s0573.json
diff --git a/assets/serverdata/notes/Live_s0574.json b/assets/serverdata/beatmaps/Live_s0574.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0574.json
rename to assets/serverdata/beatmaps/Live_s0574.json
diff --git a/assets/serverdata/notes/Live_s0575.json b/assets/serverdata/beatmaps/Live_s0575.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0575.json
rename to assets/serverdata/beatmaps/Live_s0575.json
diff --git a/assets/serverdata/notes/Live_s0576.json b/assets/serverdata/beatmaps/Live_s0576.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0576.json
rename to assets/serverdata/beatmaps/Live_s0576.json
diff --git a/assets/serverdata/notes/Live_s0577.json b/assets/serverdata/beatmaps/Live_s0577.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0577.json
rename to assets/serverdata/beatmaps/Live_s0577.json
diff --git a/assets/serverdata/notes/Live_s0578.json b/assets/serverdata/beatmaps/Live_s0578.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0578.json
rename to assets/serverdata/beatmaps/Live_s0578.json
diff --git a/assets/serverdata/notes/Live_s0579.json b/assets/serverdata/beatmaps/Live_s0579.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0579.json
rename to assets/serverdata/beatmaps/Live_s0579.json
diff --git a/assets/serverdata/notes/Live_s0580.json b/assets/serverdata/beatmaps/Live_s0580.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0580.json
rename to assets/serverdata/beatmaps/Live_s0580.json
diff --git a/assets/serverdata/notes/Live_s0581.json b/assets/serverdata/beatmaps/Live_s0581.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0581.json
rename to assets/serverdata/beatmaps/Live_s0581.json
diff --git a/assets/serverdata/notes/Live_s0582.json b/assets/serverdata/beatmaps/Live_s0582.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0582.json
rename to assets/serverdata/beatmaps/Live_s0582.json
diff --git a/assets/serverdata/notes/Live_s0583.json b/assets/serverdata/beatmaps/Live_s0583.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0583.json
rename to assets/serverdata/beatmaps/Live_s0583.json
diff --git a/assets/serverdata/notes/Live_s0584.json b/assets/serverdata/beatmaps/Live_s0584.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0584.json
rename to assets/serverdata/beatmaps/Live_s0584.json
diff --git a/assets/serverdata/notes/Live_s0585.json b/assets/serverdata/beatmaps/Live_s0585.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0585.json
rename to assets/serverdata/beatmaps/Live_s0585.json
diff --git a/assets/serverdata/notes/Live_s0586.json b/assets/serverdata/beatmaps/Live_s0586.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0586.json
rename to assets/serverdata/beatmaps/Live_s0586.json
diff --git a/assets/serverdata/notes/Live_s0587.json b/assets/serverdata/beatmaps/Live_s0587.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0587.json
rename to assets/serverdata/beatmaps/Live_s0587.json
diff --git a/assets/serverdata/notes/Live_s0588.json b/assets/serverdata/beatmaps/Live_s0588.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0588.json
rename to assets/serverdata/beatmaps/Live_s0588.json
diff --git a/assets/serverdata/notes/Live_s0589.json b/assets/serverdata/beatmaps/Live_s0589.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0589.json
rename to assets/serverdata/beatmaps/Live_s0589.json
diff --git a/assets/serverdata/notes/Live_s0596.json b/assets/serverdata/beatmaps/Live_s0596.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0596.json
rename to assets/serverdata/beatmaps/Live_s0596.json
diff --git a/assets/serverdata/notes/Live_s0597.json b/assets/serverdata/beatmaps/Live_s0597.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0597.json
rename to assets/serverdata/beatmaps/Live_s0597.json
diff --git a/assets/serverdata/notes/Live_s0598.json b/assets/serverdata/beatmaps/Live_s0598.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0598.json
rename to assets/serverdata/beatmaps/Live_s0598.json
diff --git a/assets/serverdata/notes/Live_s0599.json b/assets/serverdata/beatmaps/Live_s0599.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0599.json
rename to assets/serverdata/beatmaps/Live_s0599.json
diff --git a/assets/serverdata/notes/Live_s0600.json b/assets/serverdata/beatmaps/Live_s0600.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0600.json
rename to assets/serverdata/beatmaps/Live_s0600.json
diff --git a/assets/serverdata/notes/Live_s0601.json b/assets/serverdata/beatmaps/Live_s0601.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0601.json
rename to assets/serverdata/beatmaps/Live_s0601.json
diff --git a/assets/serverdata/notes/Live_s0602.json b/assets/serverdata/beatmaps/Live_s0602.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0602.json
rename to assets/serverdata/beatmaps/Live_s0602.json
diff --git a/assets/serverdata/notes/Live_s0603.json b/assets/serverdata/beatmaps/Live_s0603.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0603.json
rename to assets/serverdata/beatmaps/Live_s0603.json
diff --git a/assets/serverdata/notes/Live_s0604.json b/assets/serverdata/beatmaps/Live_s0604.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0604.json
rename to assets/serverdata/beatmaps/Live_s0604.json
diff --git a/assets/serverdata/notes/Live_s0605.json b/assets/serverdata/beatmaps/Live_s0605.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0605.json
rename to assets/serverdata/beatmaps/Live_s0605.json
diff --git a/assets/serverdata/notes/Live_s0606.json b/assets/serverdata/beatmaps/Live_s0606.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0606.json
rename to assets/serverdata/beatmaps/Live_s0606.json
diff --git a/assets/serverdata/notes/Live_s0607.json b/assets/serverdata/beatmaps/Live_s0607.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0607.json
rename to assets/serverdata/beatmaps/Live_s0607.json
diff --git a/assets/serverdata/notes/Live_s0608.json b/assets/serverdata/beatmaps/Live_s0608.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0608.json
rename to assets/serverdata/beatmaps/Live_s0608.json
diff --git a/assets/serverdata/notes/Live_s0609.json b/assets/serverdata/beatmaps/Live_s0609.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0609.json
rename to assets/serverdata/beatmaps/Live_s0609.json
diff --git a/assets/serverdata/notes/Live_s0610.json b/assets/serverdata/beatmaps/Live_s0610.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0610.json
rename to assets/serverdata/beatmaps/Live_s0610.json
diff --git a/assets/serverdata/notes/Live_s0611.json b/assets/serverdata/beatmaps/Live_s0611.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0611.json
rename to assets/serverdata/beatmaps/Live_s0611.json
diff --git a/assets/serverdata/notes/Live_s0612.json b/assets/serverdata/beatmaps/Live_s0612.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0612.json
rename to assets/serverdata/beatmaps/Live_s0612.json
diff --git a/assets/serverdata/notes/Live_s0613.json b/assets/serverdata/beatmaps/Live_s0613.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0613.json
rename to assets/serverdata/beatmaps/Live_s0613.json
diff --git a/assets/serverdata/notes/Live_s0614.json b/assets/serverdata/beatmaps/Live_s0614.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0614.json
rename to assets/serverdata/beatmaps/Live_s0614.json
diff --git a/assets/serverdata/notes/Live_s0615.json b/assets/serverdata/beatmaps/Live_s0615.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0615.json
rename to assets/serverdata/beatmaps/Live_s0615.json
diff --git a/assets/serverdata/notes/Live_s0616.json b/assets/serverdata/beatmaps/Live_s0616.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0616.json
rename to assets/serverdata/beatmaps/Live_s0616.json
diff --git a/assets/serverdata/notes/Live_s0617.json b/assets/serverdata/beatmaps/Live_s0617.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0617.json
rename to assets/serverdata/beatmaps/Live_s0617.json
diff --git a/assets/serverdata/notes/Live_s0618.json b/assets/serverdata/beatmaps/Live_s0618.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0618.json
rename to assets/serverdata/beatmaps/Live_s0618.json
diff --git a/assets/serverdata/notes/Live_s0619.json b/assets/serverdata/beatmaps/Live_s0619.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0619.json
rename to assets/serverdata/beatmaps/Live_s0619.json
diff --git a/assets/serverdata/notes/Live_s0620.json b/assets/serverdata/beatmaps/Live_s0620.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0620.json
rename to assets/serverdata/beatmaps/Live_s0620.json
diff --git a/assets/serverdata/notes/Live_s0621.json b/assets/serverdata/beatmaps/Live_s0621.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0621.json
rename to assets/serverdata/beatmaps/Live_s0621.json
diff --git a/assets/serverdata/notes/Live_s0622.json b/assets/serverdata/beatmaps/Live_s0622.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0622.json
rename to assets/serverdata/beatmaps/Live_s0622.json
diff --git a/assets/serverdata/notes/Live_s0623.json b/assets/serverdata/beatmaps/Live_s0623.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0623.json
rename to assets/serverdata/beatmaps/Live_s0623.json
diff --git a/assets/serverdata/notes/Live_s0624.json b/assets/serverdata/beatmaps/Live_s0624.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0624.json
rename to assets/serverdata/beatmaps/Live_s0624.json
diff --git a/assets/serverdata/notes/Live_s0625.json b/assets/serverdata/beatmaps/Live_s0625.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0625.json
rename to assets/serverdata/beatmaps/Live_s0625.json
diff --git a/assets/serverdata/notes/Live_s0626.json b/assets/serverdata/beatmaps/Live_s0626.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0626.json
rename to assets/serverdata/beatmaps/Live_s0626.json
diff --git a/assets/serverdata/notes/Live_s0627.json b/assets/serverdata/beatmaps/Live_s0627.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0627.json
rename to assets/serverdata/beatmaps/Live_s0627.json
diff --git a/assets/serverdata/notes/Live_s0628.json b/assets/serverdata/beatmaps/Live_s0628.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0628.json
rename to assets/serverdata/beatmaps/Live_s0628.json
diff --git a/assets/serverdata/notes/Live_s0629.json b/assets/serverdata/beatmaps/Live_s0629.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0629.json
rename to assets/serverdata/beatmaps/Live_s0629.json
diff --git a/assets/serverdata/notes/Live_s0630.json b/assets/serverdata/beatmaps/Live_s0630.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0630.json
rename to assets/serverdata/beatmaps/Live_s0630.json
diff --git a/assets/serverdata/notes/Live_s0631.json b/assets/serverdata/beatmaps/Live_s0631.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0631.json
rename to assets/serverdata/beatmaps/Live_s0631.json
diff --git a/assets/serverdata/notes/Live_s0632.json b/assets/serverdata/beatmaps/Live_s0632.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0632.json
rename to assets/serverdata/beatmaps/Live_s0632.json
diff --git a/assets/serverdata/notes/Live_s0633.json b/assets/serverdata/beatmaps/Live_s0633.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0633.json
rename to assets/serverdata/beatmaps/Live_s0633.json
diff --git a/assets/serverdata/notes/Live_s0634.json b/assets/serverdata/beatmaps/Live_s0634.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0634.json
rename to assets/serverdata/beatmaps/Live_s0634.json
diff --git a/assets/serverdata/notes/Live_s0641.json b/assets/serverdata/beatmaps/Live_s0641.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0641.json
rename to assets/serverdata/beatmaps/Live_s0641.json
diff --git a/assets/serverdata/notes/Live_s0642.json b/assets/serverdata/beatmaps/Live_s0642.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0642.json
rename to assets/serverdata/beatmaps/Live_s0642.json
diff --git a/assets/serverdata/notes/Live_s0643.json b/assets/serverdata/beatmaps/Live_s0643.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0643.json
rename to assets/serverdata/beatmaps/Live_s0643.json
diff --git a/assets/serverdata/notes/Live_s0644.json b/assets/serverdata/beatmaps/Live_s0644.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0644.json
rename to assets/serverdata/beatmaps/Live_s0644.json
diff --git a/assets/serverdata/notes/Live_s0645.json b/assets/serverdata/beatmaps/Live_s0645.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0645.json
rename to assets/serverdata/beatmaps/Live_s0645.json
diff --git a/assets/serverdata/notes/Live_s0646.json b/assets/serverdata/beatmaps/Live_s0646.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0646.json
rename to assets/serverdata/beatmaps/Live_s0646.json
diff --git a/assets/serverdata/notes/Live_s0647.json b/assets/serverdata/beatmaps/Live_s0647.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0647.json
rename to assets/serverdata/beatmaps/Live_s0647.json
diff --git a/assets/serverdata/notes/Live_s0648.json b/assets/serverdata/beatmaps/Live_s0648.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0648.json
rename to assets/serverdata/beatmaps/Live_s0648.json
diff --git a/assets/serverdata/notes/Live_s0649.json b/assets/serverdata/beatmaps/Live_s0649.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0649.json
rename to assets/serverdata/beatmaps/Live_s0649.json
diff --git a/assets/serverdata/notes/Live_s0650.json b/assets/serverdata/beatmaps/Live_s0650.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0650.json
rename to assets/serverdata/beatmaps/Live_s0650.json
diff --git a/assets/serverdata/notes/Live_s0651.json b/assets/serverdata/beatmaps/Live_s0651.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0651.json
rename to assets/serverdata/beatmaps/Live_s0651.json
diff --git a/assets/serverdata/notes/Live_s0652.json b/assets/serverdata/beatmaps/Live_s0652.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0652.json
rename to assets/serverdata/beatmaps/Live_s0652.json
diff --git a/assets/serverdata/notes/Live_s0653.json b/assets/serverdata/beatmaps/Live_s0653.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0653.json
rename to assets/serverdata/beatmaps/Live_s0653.json
diff --git a/assets/serverdata/notes/Live_s0654.json b/assets/serverdata/beatmaps/Live_s0654.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0654.json
rename to assets/serverdata/beatmaps/Live_s0654.json
diff --git a/assets/serverdata/notes/Live_s0655.json b/assets/serverdata/beatmaps/Live_s0655.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0655.json
rename to assets/serverdata/beatmaps/Live_s0655.json
diff --git a/assets/serverdata/notes/Live_s0656.json b/assets/serverdata/beatmaps/Live_s0656.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0656.json
rename to assets/serverdata/beatmaps/Live_s0656.json
diff --git a/assets/serverdata/notes/Live_s0657.json b/assets/serverdata/beatmaps/Live_s0657.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0657.json
rename to assets/serverdata/beatmaps/Live_s0657.json
diff --git a/assets/serverdata/notes/Live_s0658.json b/assets/serverdata/beatmaps/Live_s0658.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0658.json
rename to assets/serverdata/beatmaps/Live_s0658.json
diff --git a/assets/serverdata/notes/Live_s0659.json b/assets/serverdata/beatmaps/Live_s0659.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0659.json
rename to assets/serverdata/beatmaps/Live_s0659.json
diff --git a/assets/serverdata/notes/Live_s0660.json b/assets/serverdata/beatmaps/Live_s0660.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0660.json
rename to assets/serverdata/beatmaps/Live_s0660.json
diff --git a/assets/serverdata/notes/Live_s0661.json b/assets/serverdata/beatmaps/Live_s0661.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0661.json
rename to assets/serverdata/beatmaps/Live_s0661.json
diff --git a/assets/serverdata/notes/Live_s0662.json b/assets/serverdata/beatmaps/Live_s0662.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0662.json
rename to assets/serverdata/beatmaps/Live_s0662.json
diff --git a/assets/serverdata/notes/Live_s0663.json b/assets/serverdata/beatmaps/Live_s0663.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0663.json
rename to assets/serverdata/beatmaps/Live_s0663.json
diff --git a/assets/serverdata/notes/Live_s0664.json b/assets/serverdata/beatmaps/Live_s0664.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0664.json
rename to assets/serverdata/beatmaps/Live_s0664.json
diff --git a/assets/serverdata/notes/Live_s0665.json b/assets/serverdata/beatmaps/Live_s0665.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0665.json
rename to assets/serverdata/beatmaps/Live_s0665.json
diff --git a/assets/serverdata/notes/Live_s0666.json b/assets/serverdata/beatmaps/Live_s0666.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0666.json
rename to assets/serverdata/beatmaps/Live_s0666.json
diff --git a/assets/serverdata/notes/Live_s0667.json b/assets/serverdata/beatmaps/Live_s0667.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0667.json
rename to assets/serverdata/beatmaps/Live_s0667.json
diff --git a/assets/serverdata/notes/Live_s0668.json b/assets/serverdata/beatmaps/Live_s0668.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0668.json
rename to assets/serverdata/beatmaps/Live_s0668.json
diff --git a/assets/serverdata/notes/Live_s0669.json b/assets/serverdata/beatmaps/Live_s0669.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0669.json
rename to assets/serverdata/beatmaps/Live_s0669.json
diff --git a/assets/serverdata/notes/Live_s0670.json b/assets/serverdata/beatmaps/Live_s0670.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0670.json
rename to assets/serverdata/beatmaps/Live_s0670.json
diff --git a/assets/serverdata/notes/Live_s0671.json b/assets/serverdata/beatmaps/Live_s0671.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0671.json
rename to assets/serverdata/beatmaps/Live_s0671.json
diff --git a/assets/serverdata/notes/Live_s0672.json b/assets/serverdata/beatmaps/Live_s0672.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0672.json
rename to assets/serverdata/beatmaps/Live_s0672.json
diff --git a/assets/serverdata/notes/Live_s0673.json b/assets/serverdata/beatmaps/Live_s0673.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0673.json
rename to assets/serverdata/beatmaps/Live_s0673.json
diff --git a/assets/serverdata/notes/Live_s0677.json b/assets/serverdata/beatmaps/Live_s0677.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0677.json
rename to assets/serverdata/beatmaps/Live_s0677.json
diff --git a/assets/serverdata/notes/Live_s0678.json b/assets/serverdata/beatmaps/Live_s0678.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0678.json
rename to assets/serverdata/beatmaps/Live_s0678.json
diff --git a/assets/serverdata/notes/Live_s0679.json b/assets/serverdata/beatmaps/Live_s0679.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0679.json
rename to assets/serverdata/beatmaps/Live_s0679.json
diff --git a/assets/serverdata/notes/Live_s0680.json b/assets/serverdata/beatmaps/Live_s0680.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0680.json
rename to assets/serverdata/beatmaps/Live_s0680.json
diff --git a/assets/serverdata/notes/Live_s0681.json b/assets/serverdata/beatmaps/Live_s0681.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0681.json
rename to assets/serverdata/beatmaps/Live_s0681.json
diff --git a/assets/serverdata/notes/Live_s0682.json b/assets/serverdata/beatmaps/Live_s0682.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0682.json
rename to assets/serverdata/beatmaps/Live_s0682.json
diff --git a/assets/serverdata/notes/Live_s0683.json b/assets/serverdata/beatmaps/Live_s0683.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0683.json
rename to assets/serverdata/beatmaps/Live_s0683.json
diff --git a/assets/serverdata/notes/Live_s0684.json b/assets/serverdata/beatmaps/Live_s0684.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0684.json
rename to assets/serverdata/beatmaps/Live_s0684.json
diff --git a/assets/serverdata/notes/Live_s0685.json b/assets/serverdata/beatmaps/Live_s0685.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0685.json
rename to assets/serverdata/beatmaps/Live_s0685.json
diff --git a/assets/serverdata/notes/Live_s0686.json b/assets/serverdata/beatmaps/Live_s0686.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0686.json
rename to assets/serverdata/beatmaps/Live_s0686.json
diff --git a/assets/serverdata/notes/Live_s0687.json b/assets/serverdata/beatmaps/Live_s0687.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0687.json
rename to assets/serverdata/beatmaps/Live_s0687.json
diff --git a/assets/serverdata/notes/Live_s0688.json b/assets/serverdata/beatmaps/Live_s0688.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0688.json
rename to assets/serverdata/beatmaps/Live_s0688.json
diff --git a/assets/serverdata/notes/Live_s0689.json b/assets/serverdata/beatmaps/Live_s0689.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0689.json
rename to assets/serverdata/beatmaps/Live_s0689.json
diff --git a/assets/serverdata/notes/Live_s0690.json b/assets/serverdata/beatmaps/Live_s0690.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0690.json
rename to assets/serverdata/beatmaps/Live_s0690.json
diff --git a/assets/serverdata/notes/Live_s0691.json b/assets/serverdata/beatmaps/Live_s0691.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0691.json
rename to assets/serverdata/beatmaps/Live_s0691.json
diff --git a/assets/serverdata/notes/Live_s0692.json b/assets/serverdata/beatmaps/Live_s0692.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0692.json
rename to assets/serverdata/beatmaps/Live_s0692.json
diff --git a/assets/serverdata/notes/Live_s0693.json b/assets/serverdata/beatmaps/Live_s0693.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0693.json
rename to assets/serverdata/beatmaps/Live_s0693.json
diff --git a/assets/serverdata/notes/Live_s0694.json b/assets/serverdata/beatmaps/Live_s0694.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0694.json
rename to assets/serverdata/beatmaps/Live_s0694.json
diff --git a/assets/serverdata/notes/Live_s0695.json b/assets/serverdata/beatmaps/Live_s0695.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0695.json
rename to assets/serverdata/beatmaps/Live_s0695.json
diff --git a/assets/serverdata/notes/Live_s0696.json b/assets/serverdata/beatmaps/Live_s0696.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0696.json
rename to assets/serverdata/beatmaps/Live_s0696.json
diff --git a/assets/serverdata/notes/Live_s0697.json b/assets/serverdata/beatmaps/Live_s0697.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0697.json
rename to assets/serverdata/beatmaps/Live_s0697.json
diff --git a/assets/serverdata/notes/Live_s0698.json b/assets/serverdata/beatmaps/Live_s0698.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0698.json
rename to assets/serverdata/beatmaps/Live_s0698.json
diff --git a/assets/serverdata/notes/Live_s0699.json b/assets/serverdata/beatmaps/Live_s0699.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0699.json
rename to assets/serverdata/beatmaps/Live_s0699.json
diff --git a/assets/serverdata/notes/Live_s0700.json b/assets/serverdata/beatmaps/Live_s0700.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0700.json
rename to assets/serverdata/beatmaps/Live_s0700.json
diff --git a/assets/serverdata/notes/Live_s0703.json b/assets/serverdata/beatmaps/Live_s0703.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0703.json
rename to assets/serverdata/beatmaps/Live_s0703.json
diff --git a/assets/serverdata/notes/Live_s0704.json b/assets/serverdata/beatmaps/Live_s0704.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0704.json
rename to assets/serverdata/beatmaps/Live_s0704.json
diff --git a/assets/serverdata/notes/Live_s0705.json b/assets/serverdata/beatmaps/Live_s0705.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0705.json
rename to assets/serverdata/beatmaps/Live_s0705.json
diff --git a/assets/serverdata/notes/Live_s0706.json b/assets/serverdata/beatmaps/Live_s0706.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0706.json
rename to assets/serverdata/beatmaps/Live_s0706.json
diff --git a/assets/serverdata/notes/Live_s0707.json b/assets/serverdata/beatmaps/Live_s0707.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0707.json
rename to assets/serverdata/beatmaps/Live_s0707.json
diff --git a/assets/serverdata/notes/Live_s0708.json b/assets/serverdata/beatmaps/Live_s0708.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0708.json
rename to assets/serverdata/beatmaps/Live_s0708.json
diff --git a/assets/serverdata/notes/Live_s0709.json b/assets/serverdata/beatmaps/Live_s0709.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0709.json
rename to assets/serverdata/beatmaps/Live_s0709.json
diff --git a/assets/serverdata/notes/Live_s0710.json b/assets/serverdata/beatmaps/Live_s0710.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0710.json
rename to assets/serverdata/beatmaps/Live_s0710.json
diff --git a/assets/serverdata/notes/Live_s0711.json b/assets/serverdata/beatmaps/Live_s0711.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0711.json
rename to assets/serverdata/beatmaps/Live_s0711.json
diff --git a/assets/serverdata/notes/Live_s0712.json b/assets/serverdata/beatmaps/Live_s0712.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0712.json
rename to assets/serverdata/beatmaps/Live_s0712.json
diff --git a/assets/serverdata/notes/Live_s0713.json b/assets/serverdata/beatmaps/Live_s0713.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0713.json
rename to assets/serverdata/beatmaps/Live_s0713.json
diff --git a/assets/serverdata/notes/Live_s0714.json b/assets/serverdata/beatmaps/Live_s0714.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0714.json
rename to assets/serverdata/beatmaps/Live_s0714.json
diff --git a/assets/serverdata/notes/Live_s0715.json b/assets/serverdata/beatmaps/Live_s0715.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0715.json
rename to assets/serverdata/beatmaps/Live_s0715.json
diff --git a/assets/serverdata/notes/Live_s0716.json b/assets/serverdata/beatmaps/Live_s0716.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0716.json
rename to assets/serverdata/beatmaps/Live_s0716.json
diff --git a/assets/serverdata/notes/Live_s0717.json b/assets/serverdata/beatmaps/Live_s0717.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0717.json
rename to assets/serverdata/beatmaps/Live_s0717.json
diff --git a/assets/serverdata/notes/Live_s0718.json b/assets/serverdata/beatmaps/Live_s0718.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0718.json
rename to assets/serverdata/beatmaps/Live_s0718.json
diff --git a/assets/serverdata/notes/Live_s0719.json b/assets/serverdata/beatmaps/Live_s0719.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0719.json
rename to assets/serverdata/beatmaps/Live_s0719.json
diff --git a/assets/serverdata/notes/Live_s0720.json b/assets/serverdata/beatmaps/Live_s0720.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0720.json
rename to assets/serverdata/beatmaps/Live_s0720.json
diff --git a/assets/serverdata/notes/Live_s0721.json b/assets/serverdata/beatmaps/Live_s0721.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0721.json
rename to assets/serverdata/beatmaps/Live_s0721.json
diff --git a/assets/serverdata/notes/Live_s0722.json b/assets/serverdata/beatmaps/Live_s0722.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0722.json
rename to assets/serverdata/beatmaps/Live_s0722.json
diff --git a/assets/serverdata/notes/Live_s0725.json b/assets/serverdata/beatmaps/Live_s0725.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0725.json
rename to assets/serverdata/beatmaps/Live_s0725.json
diff --git a/assets/serverdata/notes/Live_s0726.json b/assets/serverdata/beatmaps/Live_s0726.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0726.json
rename to assets/serverdata/beatmaps/Live_s0726.json
diff --git a/assets/serverdata/notes/Live_s0727.json b/assets/serverdata/beatmaps/Live_s0727.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0727.json
rename to assets/serverdata/beatmaps/Live_s0727.json
diff --git a/assets/serverdata/notes/Live_s0728.json b/assets/serverdata/beatmaps/Live_s0728.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0728.json
rename to assets/serverdata/beatmaps/Live_s0728.json
diff --git a/assets/serverdata/notes/Live_s0729.json b/assets/serverdata/beatmaps/Live_s0729.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0729.json
rename to assets/serverdata/beatmaps/Live_s0729.json
diff --git a/assets/serverdata/notes/Live_s0730.json b/assets/serverdata/beatmaps/Live_s0730.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0730.json
rename to assets/serverdata/beatmaps/Live_s0730.json
diff --git a/assets/serverdata/notes/Live_s0731.json b/assets/serverdata/beatmaps/Live_s0731.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0731.json
rename to assets/serverdata/beatmaps/Live_s0731.json
diff --git a/assets/serverdata/notes/Live_s0732.json b/assets/serverdata/beatmaps/Live_s0732.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0732.json
rename to assets/serverdata/beatmaps/Live_s0732.json
diff --git a/assets/serverdata/notes/Live_s0733.json b/assets/serverdata/beatmaps/Live_s0733.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0733.json
rename to assets/serverdata/beatmaps/Live_s0733.json
diff --git a/assets/serverdata/notes/Live_s0734.json b/assets/serverdata/beatmaps/Live_s0734.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0734.json
rename to assets/serverdata/beatmaps/Live_s0734.json
diff --git a/assets/serverdata/notes/Live_s0735.json b/assets/serverdata/beatmaps/Live_s0735.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0735.json
rename to assets/serverdata/beatmaps/Live_s0735.json
diff --git a/assets/serverdata/notes/Live_s0736.json b/assets/serverdata/beatmaps/Live_s0736.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0736.json
rename to assets/serverdata/beatmaps/Live_s0736.json
diff --git a/assets/serverdata/notes/Live_s0737.json b/assets/serverdata/beatmaps/Live_s0737.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0737.json
rename to assets/serverdata/beatmaps/Live_s0737.json
diff --git a/assets/serverdata/notes/Live_s0738.json b/assets/serverdata/beatmaps/Live_s0738.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0738.json
rename to assets/serverdata/beatmaps/Live_s0738.json
diff --git a/assets/serverdata/notes/Live_s0739.json b/assets/serverdata/beatmaps/Live_s0739.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0739.json
rename to assets/serverdata/beatmaps/Live_s0739.json
diff --git a/assets/serverdata/notes/Live_s0740.json b/assets/serverdata/beatmaps/Live_s0740.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0740.json
rename to assets/serverdata/beatmaps/Live_s0740.json
diff --git a/assets/serverdata/notes/Live_s0741.json b/assets/serverdata/beatmaps/Live_s0741.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0741.json
rename to assets/serverdata/beatmaps/Live_s0741.json
diff --git a/assets/serverdata/notes/Live_s0742.json b/assets/serverdata/beatmaps/Live_s0742.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0742.json
rename to assets/serverdata/beatmaps/Live_s0742.json
diff --git a/assets/serverdata/notes/Live_s0743.json b/assets/serverdata/beatmaps/Live_s0743.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0743.json
rename to assets/serverdata/beatmaps/Live_s0743.json
diff --git a/assets/serverdata/notes/Live_s0744.json b/assets/serverdata/beatmaps/Live_s0744.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0744.json
rename to assets/serverdata/beatmaps/Live_s0744.json
diff --git a/assets/serverdata/notes/Live_s0745.json b/assets/serverdata/beatmaps/Live_s0745.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0745.json
rename to assets/serverdata/beatmaps/Live_s0745.json
diff --git a/assets/serverdata/notes/Live_s0746.json b/assets/serverdata/beatmaps/Live_s0746.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0746.json
rename to assets/serverdata/beatmaps/Live_s0746.json
diff --git a/assets/serverdata/notes/Live_s0747.json b/assets/serverdata/beatmaps/Live_s0747.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0747.json
rename to assets/serverdata/beatmaps/Live_s0747.json
diff --git a/assets/serverdata/notes/Live_s0748.json b/assets/serverdata/beatmaps/Live_s0748.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0748.json
rename to assets/serverdata/beatmaps/Live_s0748.json
diff --git a/assets/serverdata/notes/Live_s0749.json b/assets/serverdata/beatmaps/Live_s0749.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0749.json
rename to assets/serverdata/beatmaps/Live_s0749.json
diff --git a/assets/serverdata/notes/Live_s0750.json b/assets/serverdata/beatmaps/Live_s0750.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0750.json
rename to assets/serverdata/beatmaps/Live_s0750.json
diff --git a/assets/serverdata/notes/Live_s0751.json b/assets/serverdata/beatmaps/Live_s0751.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0751.json
rename to assets/serverdata/beatmaps/Live_s0751.json
diff --git a/assets/serverdata/notes/Live_s0764.json b/assets/serverdata/beatmaps/Live_s0764.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0764.json
rename to assets/serverdata/beatmaps/Live_s0764.json
diff --git a/assets/serverdata/notes/Live_s0765.json b/assets/serverdata/beatmaps/Live_s0765.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0765.json
rename to assets/serverdata/beatmaps/Live_s0765.json
diff --git a/assets/serverdata/notes/Live_s0766.json b/assets/serverdata/beatmaps/Live_s0766.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0766.json
rename to assets/serverdata/beatmaps/Live_s0766.json
diff --git a/assets/serverdata/notes/Live_s0767.json b/assets/serverdata/beatmaps/Live_s0767.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0767.json
rename to assets/serverdata/beatmaps/Live_s0767.json
diff --git a/assets/serverdata/notes/Live_s0768.json b/assets/serverdata/beatmaps/Live_s0768.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0768.json
rename to assets/serverdata/beatmaps/Live_s0768.json
diff --git a/assets/serverdata/notes/Live_s0769.json b/assets/serverdata/beatmaps/Live_s0769.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0769.json
rename to assets/serverdata/beatmaps/Live_s0769.json
diff --git a/assets/serverdata/notes/Live_s0770.json b/assets/serverdata/beatmaps/Live_s0770.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0770.json
rename to assets/serverdata/beatmaps/Live_s0770.json
diff --git a/assets/serverdata/notes/Live_s0771.json b/assets/serverdata/beatmaps/Live_s0771.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0771.json
rename to assets/serverdata/beatmaps/Live_s0771.json
diff --git a/assets/serverdata/notes/Live_s0772.json b/assets/serverdata/beatmaps/Live_s0772.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0772.json
rename to assets/serverdata/beatmaps/Live_s0772.json
diff --git a/assets/serverdata/notes/Live_s0773.json b/assets/serverdata/beatmaps/Live_s0773.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0773.json
rename to assets/serverdata/beatmaps/Live_s0773.json
diff --git a/assets/serverdata/notes/Live_s0774.json b/assets/serverdata/beatmaps/Live_s0774.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0774.json
rename to assets/serverdata/beatmaps/Live_s0774.json
diff --git a/assets/serverdata/notes/Live_s0775.json b/assets/serverdata/beatmaps/Live_s0775.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0775.json
rename to assets/serverdata/beatmaps/Live_s0775.json
diff --git a/assets/serverdata/notes/Live_s0776.json b/assets/serverdata/beatmaps/Live_s0776.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0776.json
rename to assets/serverdata/beatmaps/Live_s0776.json
diff --git a/assets/serverdata/notes/Live_s0777.json b/assets/serverdata/beatmaps/Live_s0777.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0777.json
rename to assets/serverdata/beatmaps/Live_s0777.json
diff --git a/assets/serverdata/notes/Live_s0778.json b/assets/serverdata/beatmaps/Live_s0778.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0778.json
rename to assets/serverdata/beatmaps/Live_s0778.json
diff --git a/assets/serverdata/notes/Live_s0779.json b/assets/serverdata/beatmaps/Live_s0779.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0779.json
rename to assets/serverdata/beatmaps/Live_s0779.json
diff --git a/assets/serverdata/notes/Live_s0780.json b/assets/serverdata/beatmaps/Live_s0780.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0780.json
rename to assets/serverdata/beatmaps/Live_s0780.json
diff --git a/assets/serverdata/notes/Live_s0781.json b/assets/serverdata/beatmaps/Live_s0781.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0781.json
rename to assets/serverdata/beatmaps/Live_s0781.json
diff --git a/assets/serverdata/notes/Live_s0782.json b/assets/serverdata/beatmaps/Live_s0782.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0782.json
rename to assets/serverdata/beatmaps/Live_s0782.json
diff --git a/assets/serverdata/notes/Live_s0783.json b/assets/serverdata/beatmaps/Live_s0783.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0783.json
rename to assets/serverdata/beatmaps/Live_s0783.json
diff --git a/assets/serverdata/notes/Live_s0784.json b/assets/serverdata/beatmaps/Live_s0784.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0784.json
rename to assets/serverdata/beatmaps/Live_s0784.json
diff --git a/assets/serverdata/notes/Live_s0785.json b/assets/serverdata/beatmaps/Live_s0785.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0785.json
rename to assets/serverdata/beatmaps/Live_s0785.json
diff --git a/assets/serverdata/notes/Live_s0786.json b/assets/serverdata/beatmaps/Live_s0786.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0786.json
rename to assets/serverdata/beatmaps/Live_s0786.json
diff --git a/assets/serverdata/notes/Live_s0787.json b/assets/serverdata/beatmaps/Live_s0787.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0787.json
rename to assets/serverdata/beatmaps/Live_s0787.json
diff --git a/assets/serverdata/notes/Live_s0788.json b/assets/serverdata/beatmaps/Live_s0788.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0788.json
rename to assets/serverdata/beatmaps/Live_s0788.json
diff --git a/assets/serverdata/notes/Live_s0789.json b/assets/serverdata/beatmaps/Live_s0789.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0789.json
rename to assets/serverdata/beatmaps/Live_s0789.json
diff --git a/assets/serverdata/notes/Live_s0790.json b/assets/serverdata/beatmaps/Live_s0790.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0790.json
rename to assets/serverdata/beatmaps/Live_s0790.json
diff --git a/assets/serverdata/notes/Live_s0791.json b/assets/serverdata/beatmaps/Live_s0791.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0791.json
rename to assets/serverdata/beatmaps/Live_s0791.json
diff --git a/assets/serverdata/notes/Live_s0792.json b/assets/serverdata/beatmaps/Live_s0792.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0792.json
rename to assets/serverdata/beatmaps/Live_s0792.json
diff --git a/assets/serverdata/notes/Live_s0793.json b/assets/serverdata/beatmaps/Live_s0793.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0793.json
rename to assets/serverdata/beatmaps/Live_s0793.json
diff --git a/assets/serverdata/notes/Live_s0794.json b/assets/serverdata/beatmaps/Live_s0794.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0794.json
rename to assets/serverdata/beatmaps/Live_s0794.json
diff --git a/assets/serverdata/notes/Live_s0795.json b/assets/serverdata/beatmaps/Live_s0795.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0795.json
rename to assets/serverdata/beatmaps/Live_s0795.json
diff --git a/assets/serverdata/notes/Live_s0802.json b/assets/serverdata/beatmaps/Live_s0802.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0802.json
rename to assets/serverdata/beatmaps/Live_s0802.json
diff --git a/assets/serverdata/notes/Live_s0803.json b/assets/serverdata/beatmaps/Live_s0803.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0803.json
rename to assets/serverdata/beatmaps/Live_s0803.json
diff --git a/assets/serverdata/notes/Live_s0804.json b/assets/serverdata/beatmaps/Live_s0804.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0804.json
rename to assets/serverdata/beatmaps/Live_s0804.json
diff --git a/assets/serverdata/notes/Live_s0805.json b/assets/serverdata/beatmaps/Live_s0805.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0805.json
rename to assets/serverdata/beatmaps/Live_s0805.json
diff --git a/assets/serverdata/notes/Live_s0806.json b/assets/serverdata/beatmaps/Live_s0806.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0806.json
rename to assets/serverdata/beatmaps/Live_s0806.json
diff --git a/assets/serverdata/notes/Live_s0807.json b/assets/serverdata/beatmaps/Live_s0807.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0807.json
rename to assets/serverdata/beatmaps/Live_s0807.json
diff --git a/assets/serverdata/notes/Live_s0808.json b/assets/serverdata/beatmaps/Live_s0808.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0808.json
rename to assets/serverdata/beatmaps/Live_s0808.json
diff --git a/assets/serverdata/notes/Live_s0809.json b/assets/serverdata/beatmaps/Live_s0809.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0809.json
rename to assets/serverdata/beatmaps/Live_s0809.json
diff --git a/assets/serverdata/notes/Live_s0810.json b/assets/serverdata/beatmaps/Live_s0810.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0810.json
rename to assets/serverdata/beatmaps/Live_s0810.json
diff --git a/assets/serverdata/notes/Live_s0811.json b/assets/serverdata/beatmaps/Live_s0811.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0811.json
rename to assets/serverdata/beatmaps/Live_s0811.json
diff --git a/assets/serverdata/notes/Live_s0812.json b/assets/serverdata/beatmaps/Live_s0812.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0812.json
rename to assets/serverdata/beatmaps/Live_s0812.json
diff --git a/assets/serverdata/notes/Live_s0813.json b/assets/serverdata/beatmaps/Live_s0813.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0813.json
rename to assets/serverdata/beatmaps/Live_s0813.json
diff --git a/assets/serverdata/notes/Live_s0814.json b/assets/serverdata/beatmaps/Live_s0814.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0814.json
rename to assets/serverdata/beatmaps/Live_s0814.json
diff --git a/assets/serverdata/notes/Live_s0815.json b/assets/serverdata/beatmaps/Live_s0815.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0815.json
rename to assets/serverdata/beatmaps/Live_s0815.json
diff --git a/assets/serverdata/notes/Live_s0816.json b/assets/serverdata/beatmaps/Live_s0816.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0816.json
rename to assets/serverdata/beatmaps/Live_s0816.json
diff --git a/assets/serverdata/notes/Live_s0817.json b/assets/serverdata/beatmaps/Live_s0817.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0817.json
rename to assets/serverdata/beatmaps/Live_s0817.json
diff --git a/assets/serverdata/notes/Live_s0818.json b/assets/serverdata/beatmaps/Live_s0818.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0818.json
rename to assets/serverdata/beatmaps/Live_s0818.json
diff --git a/assets/serverdata/notes/Live_s0819.json b/assets/serverdata/beatmaps/Live_s0819.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0819.json
rename to assets/serverdata/beatmaps/Live_s0819.json
diff --git a/assets/serverdata/notes/Live_s0820.json b/assets/serverdata/beatmaps/Live_s0820.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0820.json
rename to assets/serverdata/beatmaps/Live_s0820.json
diff --git a/assets/serverdata/notes/Live_s0821.json b/assets/serverdata/beatmaps/Live_s0821.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0821.json
rename to assets/serverdata/beatmaps/Live_s0821.json
diff --git a/assets/serverdata/notes/Live_s0822.json b/assets/serverdata/beatmaps/Live_s0822.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0822.json
rename to assets/serverdata/beatmaps/Live_s0822.json
diff --git a/assets/serverdata/notes/Live_s0823.json b/assets/serverdata/beatmaps/Live_s0823.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0823.json
rename to assets/serverdata/beatmaps/Live_s0823.json
diff --git a/assets/serverdata/notes/Live_s0824.json b/assets/serverdata/beatmaps/Live_s0824.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0824.json
rename to assets/serverdata/beatmaps/Live_s0824.json
diff --git a/assets/serverdata/notes/Live_s0825.json b/assets/serverdata/beatmaps/Live_s0825.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0825.json
rename to assets/serverdata/beatmaps/Live_s0825.json
diff --git a/assets/serverdata/notes/Live_s0826.json b/assets/serverdata/beatmaps/Live_s0826.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0826.json
rename to assets/serverdata/beatmaps/Live_s0826.json
diff --git a/assets/serverdata/notes/Live_s0827.json b/assets/serverdata/beatmaps/Live_s0827.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0827.json
rename to assets/serverdata/beatmaps/Live_s0827.json
diff --git a/assets/serverdata/notes/Live_s0828.json b/assets/serverdata/beatmaps/Live_s0828.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0828.json
rename to assets/serverdata/beatmaps/Live_s0828.json
diff --git a/assets/serverdata/notes/Live_s0829.json b/assets/serverdata/beatmaps/Live_s0829.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0829.json
rename to assets/serverdata/beatmaps/Live_s0829.json
diff --git a/assets/serverdata/notes/Live_s0830.json b/assets/serverdata/beatmaps/Live_s0830.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0830.json
rename to assets/serverdata/beatmaps/Live_s0830.json
diff --git a/assets/serverdata/notes/Live_s0831.json b/assets/serverdata/beatmaps/Live_s0831.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0831.json
rename to assets/serverdata/beatmaps/Live_s0831.json
diff --git a/assets/serverdata/notes/Live_s0832.json b/assets/serverdata/beatmaps/Live_s0832.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0832.json
rename to assets/serverdata/beatmaps/Live_s0832.json
diff --git a/assets/serverdata/notes/Live_s0833.json b/assets/serverdata/beatmaps/Live_s0833.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0833.json
rename to assets/serverdata/beatmaps/Live_s0833.json
diff --git a/assets/serverdata/notes/Live_s0834.json b/assets/serverdata/beatmaps/Live_s0834.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0834.json
rename to assets/serverdata/beatmaps/Live_s0834.json
diff --git a/assets/serverdata/notes/Live_s0835.json b/assets/serverdata/beatmaps/Live_s0835.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0835.json
rename to assets/serverdata/beatmaps/Live_s0835.json
diff --git a/assets/serverdata/notes/Live_s0836.json b/assets/serverdata/beatmaps/Live_s0836.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0836.json
rename to assets/serverdata/beatmaps/Live_s0836.json
diff --git a/assets/serverdata/notes/Live_s0837.json b/assets/serverdata/beatmaps/Live_s0837.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0837.json
rename to assets/serverdata/beatmaps/Live_s0837.json
diff --git a/assets/serverdata/notes/Live_s0838.json b/assets/serverdata/beatmaps/Live_s0838.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0838.json
rename to assets/serverdata/beatmaps/Live_s0838.json
diff --git a/assets/serverdata/notes/Live_s0839.json b/assets/serverdata/beatmaps/Live_s0839.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0839.json
rename to assets/serverdata/beatmaps/Live_s0839.json
diff --git a/assets/serverdata/notes/Live_s0840.json b/assets/serverdata/beatmaps/Live_s0840.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0840.json
rename to assets/serverdata/beatmaps/Live_s0840.json
diff --git a/assets/serverdata/notes/Live_s0841.json b/assets/serverdata/beatmaps/Live_s0841.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0841.json
rename to assets/serverdata/beatmaps/Live_s0841.json
diff --git a/assets/serverdata/notes/Live_s0842.json b/assets/serverdata/beatmaps/Live_s0842.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0842.json
rename to assets/serverdata/beatmaps/Live_s0842.json
diff --git a/assets/serverdata/notes/Live_s0843.json b/assets/serverdata/beatmaps/Live_s0843.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0843.json
rename to assets/serverdata/beatmaps/Live_s0843.json
diff --git a/assets/serverdata/notes/Live_s0844.json b/assets/serverdata/beatmaps/Live_s0844.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0844.json
rename to assets/serverdata/beatmaps/Live_s0844.json
diff --git a/assets/serverdata/notes/Live_s0845.json b/assets/serverdata/beatmaps/Live_s0845.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0845.json
rename to assets/serverdata/beatmaps/Live_s0845.json
diff --git a/assets/serverdata/notes/Live_s0846.json b/assets/serverdata/beatmaps/Live_s0846.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0846.json
rename to assets/serverdata/beatmaps/Live_s0846.json
diff --git a/assets/serverdata/notes/Live_s0847.json b/assets/serverdata/beatmaps/Live_s0847.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0847.json
rename to assets/serverdata/beatmaps/Live_s0847.json
diff --git a/assets/serverdata/notes/Live_s0848.json b/assets/serverdata/beatmaps/Live_s0848.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0848.json
rename to assets/serverdata/beatmaps/Live_s0848.json
diff --git a/assets/serverdata/notes/Live_s0849.json b/assets/serverdata/beatmaps/Live_s0849.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0849.json
rename to assets/serverdata/beatmaps/Live_s0849.json
diff --git a/assets/serverdata/notes/Live_s0850.json b/assets/serverdata/beatmaps/Live_s0850.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0850.json
rename to assets/serverdata/beatmaps/Live_s0850.json
diff --git a/assets/serverdata/notes/Live_s0851.json b/assets/serverdata/beatmaps/Live_s0851.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0851.json
rename to assets/serverdata/beatmaps/Live_s0851.json
diff --git a/assets/serverdata/notes/Live_s0852.json b/assets/serverdata/beatmaps/Live_s0852.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0852.json
rename to assets/serverdata/beatmaps/Live_s0852.json
diff --git a/assets/serverdata/notes/Live_s0853.json b/assets/serverdata/beatmaps/Live_s0853.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0853.json
rename to assets/serverdata/beatmaps/Live_s0853.json
diff --git a/assets/serverdata/notes/Live_s0854.json b/assets/serverdata/beatmaps/Live_s0854.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0854.json
rename to assets/serverdata/beatmaps/Live_s0854.json
diff --git a/assets/serverdata/notes/Live_s0855.json b/assets/serverdata/beatmaps/Live_s0855.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0855.json
rename to assets/serverdata/beatmaps/Live_s0855.json
diff --git a/assets/serverdata/notes/Live_s0856.json b/assets/serverdata/beatmaps/Live_s0856.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0856.json
rename to assets/serverdata/beatmaps/Live_s0856.json
diff --git a/assets/serverdata/notes/Live_s0857.json b/assets/serverdata/beatmaps/Live_s0857.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0857.json
rename to assets/serverdata/beatmaps/Live_s0857.json
diff --git a/assets/serverdata/notes/Live_s0858.json b/assets/serverdata/beatmaps/Live_s0858.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0858.json
rename to assets/serverdata/beatmaps/Live_s0858.json
diff --git a/assets/serverdata/notes/Live_s0859.json b/assets/serverdata/beatmaps/Live_s0859.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0859.json
rename to assets/serverdata/beatmaps/Live_s0859.json
diff --git a/assets/serverdata/notes/Live_s0860.json b/assets/serverdata/beatmaps/Live_s0860.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0860.json
rename to assets/serverdata/beatmaps/Live_s0860.json
diff --git a/assets/serverdata/notes/Live_s0863.json b/assets/serverdata/beatmaps/Live_s0863.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0863.json
rename to assets/serverdata/beatmaps/Live_s0863.json
diff --git a/assets/serverdata/notes/Live_s0864.json b/assets/serverdata/beatmaps/Live_s0864.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0864.json
rename to assets/serverdata/beatmaps/Live_s0864.json
diff --git a/assets/serverdata/notes/Live_s0865.json b/assets/serverdata/beatmaps/Live_s0865.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0865.json
rename to assets/serverdata/beatmaps/Live_s0865.json
diff --git a/assets/serverdata/notes/Live_s0866.json b/assets/serverdata/beatmaps/Live_s0866.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0866.json
rename to assets/serverdata/beatmaps/Live_s0866.json
diff --git a/assets/serverdata/notes/Live_s0867.json b/assets/serverdata/beatmaps/Live_s0867.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0867.json
rename to assets/serverdata/beatmaps/Live_s0867.json
diff --git a/assets/serverdata/notes/Live_s0868.json b/assets/serverdata/beatmaps/Live_s0868.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0868.json
rename to assets/serverdata/beatmaps/Live_s0868.json
diff --git a/assets/serverdata/notes/Live_s0869.json b/assets/serverdata/beatmaps/Live_s0869.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0869.json
rename to assets/serverdata/beatmaps/Live_s0869.json
diff --git a/assets/serverdata/notes/Live_s0870.json b/assets/serverdata/beatmaps/Live_s0870.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0870.json
rename to assets/serverdata/beatmaps/Live_s0870.json
diff --git a/assets/serverdata/notes/Live_s0871.json b/assets/serverdata/beatmaps/Live_s0871.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0871.json
rename to assets/serverdata/beatmaps/Live_s0871.json
diff --git a/assets/serverdata/notes/Live_s0872.json b/assets/serverdata/beatmaps/Live_s0872.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0872.json
rename to assets/serverdata/beatmaps/Live_s0872.json
diff --git a/assets/serverdata/notes/Live_s0873.json b/assets/serverdata/beatmaps/Live_s0873.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0873.json
rename to assets/serverdata/beatmaps/Live_s0873.json
diff --git a/assets/serverdata/notes/Live_s0874.json b/assets/serverdata/beatmaps/Live_s0874.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0874.json
rename to assets/serverdata/beatmaps/Live_s0874.json
diff --git a/assets/serverdata/notes/Live_s0875.json b/assets/serverdata/beatmaps/Live_s0875.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0875.json
rename to assets/serverdata/beatmaps/Live_s0875.json
diff --git a/assets/serverdata/notes/Live_s0876.json b/assets/serverdata/beatmaps/Live_s0876.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0876.json
rename to assets/serverdata/beatmaps/Live_s0876.json
diff --git a/assets/serverdata/notes/Live_s0877.json b/assets/serverdata/beatmaps/Live_s0877.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0877.json
rename to assets/serverdata/beatmaps/Live_s0877.json
diff --git a/assets/serverdata/notes/Live_s0878.json b/assets/serverdata/beatmaps/Live_s0878.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0878.json
rename to assets/serverdata/beatmaps/Live_s0878.json
diff --git a/assets/serverdata/notes/Live_s0879.json b/assets/serverdata/beatmaps/Live_s0879.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0879.json
rename to assets/serverdata/beatmaps/Live_s0879.json
diff --git a/assets/serverdata/notes/Live_s0880.json b/assets/serverdata/beatmaps/Live_s0880.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0880.json
rename to assets/serverdata/beatmaps/Live_s0880.json
diff --git a/assets/serverdata/notes/Live_s0881.json b/assets/serverdata/beatmaps/Live_s0881.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0881.json
rename to assets/serverdata/beatmaps/Live_s0881.json
diff --git a/assets/serverdata/notes/Live_s0882.json b/assets/serverdata/beatmaps/Live_s0882.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0882.json
rename to assets/serverdata/beatmaps/Live_s0882.json
diff --git a/assets/serverdata/notes/Live_s0883.json b/assets/serverdata/beatmaps/Live_s0883.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0883.json
rename to assets/serverdata/beatmaps/Live_s0883.json
diff --git a/assets/serverdata/notes/Live_s0884.json b/assets/serverdata/beatmaps/Live_s0884.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0884.json
rename to assets/serverdata/beatmaps/Live_s0884.json
diff --git a/assets/serverdata/notes/Live_s0885.json b/assets/serverdata/beatmaps/Live_s0885.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0885.json
rename to assets/serverdata/beatmaps/Live_s0885.json
diff --git a/assets/serverdata/notes/Live_s0886.json b/assets/serverdata/beatmaps/Live_s0886.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0886.json
rename to assets/serverdata/beatmaps/Live_s0886.json
diff --git a/assets/serverdata/notes/Live_s0887.json b/assets/serverdata/beatmaps/Live_s0887.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0887.json
rename to assets/serverdata/beatmaps/Live_s0887.json
diff --git a/assets/serverdata/notes/Live_s0888.json b/assets/serverdata/beatmaps/Live_s0888.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0888.json
rename to assets/serverdata/beatmaps/Live_s0888.json
diff --git a/assets/serverdata/notes/Live_s0889.json b/assets/serverdata/beatmaps/Live_s0889.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0889.json
rename to assets/serverdata/beatmaps/Live_s0889.json
diff --git a/assets/serverdata/notes/Live_s0890.json b/assets/serverdata/beatmaps/Live_s0890.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0890.json
rename to assets/serverdata/beatmaps/Live_s0890.json
diff --git a/assets/serverdata/notes/Live_s0891.json b/assets/serverdata/beatmaps/Live_s0891.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0891.json
rename to assets/serverdata/beatmaps/Live_s0891.json
diff --git a/assets/serverdata/notes/Live_s0892.json b/assets/serverdata/beatmaps/Live_s0892.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0892.json
rename to assets/serverdata/beatmaps/Live_s0892.json
diff --git a/assets/serverdata/notes/Live_s0893.json b/assets/serverdata/beatmaps/Live_s0893.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0893.json
rename to assets/serverdata/beatmaps/Live_s0893.json
diff --git a/assets/serverdata/notes/Live_s0894.json b/assets/serverdata/beatmaps/Live_s0894.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0894.json
rename to assets/serverdata/beatmaps/Live_s0894.json
diff --git a/assets/serverdata/notes/Live_s0895.json b/assets/serverdata/beatmaps/Live_s0895.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0895.json
rename to assets/serverdata/beatmaps/Live_s0895.json
diff --git a/assets/serverdata/notes/Live_s0896.json b/assets/serverdata/beatmaps/Live_s0896.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0896.json
rename to assets/serverdata/beatmaps/Live_s0896.json
diff --git a/assets/serverdata/notes/Live_s0897.json b/assets/serverdata/beatmaps/Live_s0897.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0897.json
rename to assets/serverdata/beatmaps/Live_s0897.json
diff --git a/assets/serverdata/notes/Live_s0898.json b/assets/serverdata/beatmaps/Live_s0898.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0898.json
rename to assets/serverdata/beatmaps/Live_s0898.json
diff --git a/assets/serverdata/notes/Live_s0899.json b/assets/serverdata/beatmaps/Live_s0899.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0899.json
rename to assets/serverdata/beatmaps/Live_s0899.json
diff --git a/assets/serverdata/notes/Live_s0900.json b/assets/serverdata/beatmaps/Live_s0900.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0900.json
rename to assets/serverdata/beatmaps/Live_s0900.json
diff --git a/assets/serverdata/notes/Live_s0901.json b/assets/serverdata/beatmaps/Live_s0901.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0901.json
rename to assets/serverdata/beatmaps/Live_s0901.json
diff --git a/assets/serverdata/notes/Live_s0902.json b/assets/serverdata/beatmaps/Live_s0902.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0902.json
rename to assets/serverdata/beatmaps/Live_s0902.json
diff --git a/assets/serverdata/notes/Live_s0903.json b/assets/serverdata/beatmaps/Live_s0903.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0903.json
rename to assets/serverdata/beatmaps/Live_s0903.json
diff --git a/assets/serverdata/notes/Live_s0904.json b/assets/serverdata/beatmaps/Live_s0904.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0904.json
rename to assets/serverdata/beatmaps/Live_s0904.json
diff --git a/assets/serverdata/notes/Live_s0905.json b/assets/serverdata/beatmaps/Live_s0905.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0905.json
rename to assets/serverdata/beatmaps/Live_s0905.json
diff --git a/assets/serverdata/notes/Live_s0906.json b/assets/serverdata/beatmaps/Live_s0906.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0906.json
rename to assets/serverdata/beatmaps/Live_s0906.json
diff --git a/assets/serverdata/notes/Live_s0907.json b/assets/serverdata/beatmaps/Live_s0907.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0907.json
rename to assets/serverdata/beatmaps/Live_s0907.json
diff --git a/assets/serverdata/notes/Live_s0908.json b/assets/serverdata/beatmaps/Live_s0908.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0908.json
rename to assets/serverdata/beatmaps/Live_s0908.json
diff --git a/assets/serverdata/notes/Live_s0909.json b/assets/serverdata/beatmaps/Live_s0909.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0909.json
rename to assets/serverdata/beatmaps/Live_s0909.json
diff --git a/assets/serverdata/notes/Live_s0910.json b/assets/serverdata/beatmaps/Live_s0910.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0910.json
rename to assets/serverdata/beatmaps/Live_s0910.json
diff --git a/assets/serverdata/notes/Live_s0911.json b/assets/serverdata/beatmaps/Live_s0911.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0911.json
rename to assets/serverdata/beatmaps/Live_s0911.json
diff --git a/assets/serverdata/notes/Live_s0912.json b/assets/serverdata/beatmaps/Live_s0912.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0912.json
rename to assets/serverdata/beatmaps/Live_s0912.json
diff --git a/assets/serverdata/notes/Live_s0913.json b/assets/serverdata/beatmaps/Live_s0913.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0913.json
rename to assets/serverdata/beatmaps/Live_s0913.json
diff --git a/assets/serverdata/notes/Live_s0914.json b/assets/serverdata/beatmaps/Live_s0914.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0914.json
rename to assets/serverdata/beatmaps/Live_s0914.json
diff --git a/assets/serverdata/notes/Live_s0915.json b/assets/serverdata/beatmaps/Live_s0915.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0915.json
rename to assets/serverdata/beatmaps/Live_s0915.json
diff --git a/assets/serverdata/notes/Live_s0916.json b/assets/serverdata/beatmaps/Live_s0916.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0916.json
rename to assets/serverdata/beatmaps/Live_s0916.json
diff --git a/assets/serverdata/notes/Live_s0917.json b/assets/serverdata/beatmaps/Live_s0917.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0917.json
rename to assets/serverdata/beatmaps/Live_s0917.json
diff --git a/assets/serverdata/notes/Live_s0918.json b/assets/serverdata/beatmaps/Live_s0918.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0918.json
rename to assets/serverdata/beatmaps/Live_s0918.json
diff --git a/assets/serverdata/notes/Live_s0919.json b/assets/serverdata/beatmaps/Live_s0919.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0919.json
rename to assets/serverdata/beatmaps/Live_s0919.json
diff --git a/assets/serverdata/notes/Live_s0920.json b/assets/serverdata/beatmaps/Live_s0920.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0920.json
rename to assets/serverdata/beatmaps/Live_s0920.json
diff --git a/assets/serverdata/notes/Live_s0921.json b/assets/serverdata/beatmaps/Live_s0921.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0921.json
rename to assets/serverdata/beatmaps/Live_s0921.json
diff --git a/assets/serverdata/notes/Live_s0922.json b/assets/serverdata/beatmaps/Live_s0922.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0922.json
rename to assets/serverdata/beatmaps/Live_s0922.json
diff --git a/assets/serverdata/notes/Live_s0923.json b/assets/serverdata/beatmaps/Live_s0923.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0923.json
rename to assets/serverdata/beatmaps/Live_s0923.json
diff --git a/assets/serverdata/notes/Live_s0924.json b/assets/serverdata/beatmaps/Live_s0924.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0924.json
rename to assets/serverdata/beatmaps/Live_s0924.json
diff --git a/assets/serverdata/notes/Live_s0925.json b/assets/serverdata/beatmaps/Live_s0925.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0925.json
rename to assets/serverdata/beatmaps/Live_s0925.json
diff --git a/assets/serverdata/notes/Live_s0926.json b/assets/serverdata/beatmaps/Live_s0926.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0926.json
rename to assets/serverdata/beatmaps/Live_s0926.json
diff --git a/assets/serverdata/notes/Live_s0927.json b/assets/serverdata/beatmaps/Live_s0927.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0927.json
rename to assets/serverdata/beatmaps/Live_s0927.json
diff --git a/assets/serverdata/notes/Live_s0928.json b/assets/serverdata/beatmaps/Live_s0928.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0928.json
rename to assets/serverdata/beatmaps/Live_s0928.json
diff --git a/assets/serverdata/notes/Live_s0929.json b/assets/serverdata/beatmaps/Live_s0929.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0929.json
rename to assets/serverdata/beatmaps/Live_s0929.json
diff --git a/assets/serverdata/notes/Live_s0930.json b/assets/serverdata/beatmaps/Live_s0930.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0930.json
rename to assets/serverdata/beatmaps/Live_s0930.json
diff --git a/assets/serverdata/notes/Live_s0931.json b/assets/serverdata/beatmaps/Live_s0931.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0931.json
rename to assets/serverdata/beatmaps/Live_s0931.json
diff --git a/assets/serverdata/notes/Live_s0932.json b/assets/serverdata/beatmaps/Live_s0932.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0932.json
rename to assets/serverdata/beatmaps/Live_s0932.json
diff --git a/assets/serverdata/notes/Live_s0933.json b/assets/serverdata/beatmaps/Live_s0933.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0933.json
rename to assets/serverdata/beatmaps/Live_s0933.json
diff --git a/assets/serverdata/notes/Live_s0934.json b/assets/serverdata/beatmaps/Live_s0934.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0934.json
rename to assets/serverdata/beatmaps/Live_s0934.json
diff --git a/assets/serverdata/notes/Live_s0935.json b/assets/serverdata/beatmaps/Live_s0935.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0935.json
rename to assets/serverdata/beatmaps/Live_s0935.json
diff --git a/assets/serverdata/notes/Live_s0936.json b/assets/serverdata/beatmaps/Live_s0936.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0936.json
rename to assets/serverdata/beatmaps/Live_s0936.json
diff --git a/assets/serverdata/notes/Live_s0937.json b/assets/serverdata/beatmaps/Live_s0937.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0937.json
rename to assets/serverdata/beatmaps/Live_s0937.json
diff --git a/assets/serverdata/notes/Live_s0938.json b/assets/serverdata/beatmaps/Live_s0938.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0938.json
rename to assets/serverdata/beatmaps/Live_s0938.json
diff --git a/assets/serverdata/notes/Live_s0939.json b/assets/serverdata/beatmaps/Live_s0939.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0939.json
rename to assets/serverdata/beatmaps/Live_s0939.json
diff --git a/assets/serverdata/notes/Live_s0940.json b/assets/serverdata/beatmaps/Live_s0940.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0940.json
rename to assets/serverdata/beatmaps/Live_s0940.json
diff --git a/assets/serverdata/notes/Live_s0941.json b/assets/serverdata/beatmaps/Live_s0941.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0941.json
rename to assets/serverdata/beatmaps/Live_s0941.json
diff --git a/assets/serverdata/notes/Live_s0942.json b/assets/serverdata/beatmaps/Live_s0942.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0942.json
rename to assets/serverdata/beatmaps/Live_s0942.json
diff --git a/assets/serverdata/notes/Live_s0943.json b/assets/serverdata/beatmaps/Live_s0943.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0943.json
rename to assets/serverdata/beatmaps/Live_s0943.json
diff --git a/assets/serverdata/notes/Live_s0944.json b/assets/serverdata/beatmaps/Live_s0944.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0944.json
rename to assets/serverdata/beatmaps/Live_s0944.json
diff --git a/assets/serverdata/notes/Live_s0945.json b/assets/serverdata/beatmaps/Live_s0945.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0945.json
rename to assets/serverdata/beatmaps/Live_s0945.json
diff --git a/assets/serverdata/notes/Live_s0946.json b/assets/serverdata/beatmaps/Live_s0946.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0946.json
rename to assets/serverdata/beatmaps/Live_s0946.json
diff --git a/assets/serverdata/notes/Live_s0947.json b/assets/serverdata/beatmaps/Live_s0947.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0947.json
rename to assets/serverdata/beatmaps/Live_s0947.json
diff --git a/assets/serverdata/notes/Live_s0948.json b/assets/serverdata/beatmaps/Live_s0948.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0948.json
rename to assets/serverdata/beatmaps/Live_s0948.json
diff --git a/assets/serverdata/notes/Live_s0949.json b/assets/serverdata/beatmaps/Live_s0949.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0949.json
rename to assets/serverdata/beatmaps/Live_s0949.json
diff --git a/assets/serverdata/notes/Live_s0950.json b/assets/serverdata/beatmaps/Live_s0950.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0950.json
rename to assets/serverdata/beatmaps/Live_s0950.json
diff --git a/assets/serverdata/notes/Live_s0951.json b/assets/serverdata/beatmaps/Live_s0951.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0951.json
rename to assets/serverdata/beatmaps/Live_s0951.json
diff --git a/assets/serverdata/notes/Live_s0952.json b/assets/serverdata/beatmaps/Live_s0952.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0952.json
rename to assets/serverdata/beatmaps/Live_s0952.json
diff --git a/assets/serverdata/notes/Live_s0953.json b/assets/serverdata/beatmaps/Live_s0953.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0953.json
rename to assets/serverdata/beatmaps/Live_s0953.json
diff --git a/assets/serverdata/notes/Live_s0954.json b/assets/serverdata/beatmaps/Live_s0954.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0954.json
rename to assets/serverdata/beatmaps/Live_s0954.json
diff --git a/assets/serverdata/notes/Live_s0955.json b/assets/serverdata/beatmaps/Live_s0955.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0955.json
rename to assets/serverdata/beatmaps/Live_s0955.json
diff --git a/assets/serverdata/notes/Live_s0956.json b/assets/serverdata/beatmaps/Live_s0956.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0956.json
rename to assets/serverdata/beatmaps/Live_s0956.json
diff --git a/assets/serverdata/notes/Live_s0957.json b/assets/serverdata/beatmaps/Live_s0957.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0957.json
rename to assets/serverdata/beatmaps/Live_s0957.json
diff --git a/assets/serverdata/notes/Live_s0958.json b/assets/serverdata/beatmaps/Live_s0958.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0958.json
rename to assets/serverdata/beatmaps/Live_s0958.json
diff --git a/assets/serverdata/notes/Live_s0959.json b/assets/serverdata/beatmaps/Live_s0959.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0959.json
rename to assets/serverdata/beatmaps/Live_s0959.json
diff --git a/assets/serverdata/notes/Live_s0960.json b/assets/serverdata/beatmaps/Live_s0960.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0960.json
rename to assets/serverdata/beatmaps/Live_s0960.json
diff --git a/assets/serverdata/notes/Live_s0961.json b/assets/serverdata/beatmaps/Live_s0961.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0961.json
rename to assets/serverdata/beatmaps/Live_s0961.json
diff --git a/assets/serverdata/notes/Live_s0962.json b/assets/serverdata/beatmaps/Live_s0962.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0962.json
rename to assets/serverdata/beatmaps/Live_s0962.json
diff --git a/assets/serverdata/notes/Live_s0963.json b/assets/serverdata/beatmaps/Live_s0963.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0963.json
rename to assets/serverdata/beatmaps/Live_s0963.json
diff --git a/assets/serverdata/notes/Live_s0964.json b/assets/serverdata/beatmaps/Live_s0964.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0964.json
rename to assets/serverdata/beatmaps/Live_s0964.json
diff --git a/assets/serverdata/notes/Live_s0965.json b/assets/serverdata/beatmaps/Live_s0965.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0965.json
rename to assets/serverdata/beatmaps/Live_s0965.json
diff --git a/assets/serverdata/notes/Live_s0966.json b/assets/serverdata/beatmaps/Live_s0966.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0966.json
rename to assets/serverdata/beatmaps/Live_s0966.json
diff --git a/assets/serverdata/notes/Live_s0967.json b/assets/serverdata/beatmaps/Live_s0967.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0967.json
rename to assets/serverdata/beatmaps/Live_s0967.json
diff --git a/assets/serverdata/notes/Live_s0968.json b/assets/serverdata/beatmaps/Live_s0968.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0968.json
rename to assets/serverdata/beatmaps/Live_s0968.json
diff --git a/assets/serverdata/notes/Live_s0969.json b/assets/serverdata/beatmaps/Live_s0969.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0969.json
rename to assets/serverdata/beatmaps/Live_s0969.json
diff --git a/assets/serverdata/notes/Live_s0970.json b/assets/serverdata/beatmaps/Live_s0970.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0970.json
rename to assets/serverdata/beatmaps/Live_s0970.json
diff --git a/assets/serverdata/notes/Live_s0971.json b/assets/serverdata/beatmaps/Live_s0971.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0971.json
rename to assets/serverdata/beatmaps/Live_s0971.json
diff --git a/assets/serverdata/notes/Live_s0972.json b/assets/serverdata/beatmaps/Live_s0972.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0972.json
rename to assets/serverdata/beatmaps/Live_s0972.json
diff --git a/assets/serverdata/notes/Live_s0973.json b/assets/serverdata/beatmaps/Live_s0973.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0973.json
rename to assets/serverdata/beatmaps/Live_s0973.json
diff --git a/assets/serverdata/notes/Live_s0974.json b/assets/serverdata/beatmaps/Live_s0974.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0974.json
rename to assets/serverdata/beatmaps/Live_s0974.json
diff --git a/assets/serverdata/notes/Live_s0975.json b/assets/serverdata/beatmaps/Live_s0975.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0975.json
rename to assets/serverdata/beatmaps/Live_s0975.json
diff --git a/assets/serverdata/notes/Live_s0976.json b/assets/serverdata/beatmaps/Live_s0976.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0976.json
rename to assets/serverdata/beatmaps/Live_s0976.json
diff --git a/assets/serverdata/notes/Live_s0977.json b/assets/serverdata/beatmaps/Live_s0977.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0977.json
rename to assets/serverdata/beatmaps/Live_s0977.json
diff --git a/assets/serverdata/notes/Live_s0978.json b/assets/serverdata/beatmaps/Live_s0978.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0978.json
rename to assets/serverdata/beatmaps/Live_s0978.json
diff --git a/assets/serverdata/notes/Live_s0979.json b/assets/serverdata/beatmaps/Live_s0979.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0979.json
rename to assets/serverdata/beatmaps/Live_s0979.json
diff --git a/assets/serverdata/notes/Live_s0980.json b/assets/serverdata/beatmaps/Live_s0980.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0980.json
rename to assets/serverdata/beatmaps/Live_s0980.json
diff --git a/assets/serverdata/notes/Live_s0981.json b/assets/serverdata/beatmaps/Live_s0981.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0981.json
rename to assets/serverdata/beatmaps/Live_s0981.json
diff --git a/assets/serverdata/notes/Live_s0982.json b/assets/serverdata/beatmaps/Live_s0982.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0982.json
rename to assets/serverdata/beatmaps/Live_s0982.json
diff --git a/assets/serverdata/notes/Live_s0983.json b/assets/serverdata/beatmaps/Live_s0983.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0983.json
rename to assets/serverdata/beatmaps/Live_s0983.json
diff --git a/assets/serverdata/notes/Live_s0984.json b/assets/serverdata/beatmaps/Live_s0984.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0984.json
rename to assets/serverdata/beatmaps/Live_s0984.json
diff --git a/assets/serverdata/notes/Live_s0985.json b/assets/serverdata/beatmaps/Live_s0985.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0985.json
rename to assets/serverdata/beatmaps/Live_s0985.json
diff --git a/assets/serverdata/notes/Live_s0986.json b/assets/serverdata/beatmaps/Live_s0986.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0986.json
rename to assets/serverdata/beatmaps/Live_s0986.json
diff --git a/assets/serverdata/notes/Live_s0987.json b/assets/serverdata/beatmaps/Live_s0987.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0987.json
rename to assets/serverdata/beatmaps/Live_s0987.json
diff --git a/assets/serverdata/notes/Live_s0988.json b/assets/serverdata/beatmaps/Live_s0988.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0988.json
rename to assets/serverdata/beatmaps/Live_s0988.json
diff --git a/assets/serverdata/notes/Live_s0989.json b/assets/serverdata/beatmaps/Live_s0989.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0989.json
rename to assets/serverdata/beatmaps/Live_s0989.json
diff --git a/assets/serverdata/notes/Live_s0990.json b/assets/serverdata/beatmaps/Live_s0990.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0990.json
rename to assets/serverdata/beatmaps/Live_s0990.json
diff --git a/assets/serverdata/notes/Live_s0991.json b/assets/serverdata/beatmaps/Live_s0991.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0991.json
rename to assets/serverdata/beatmaps/Live_s0991.json
diff --git a/assets/serverdata/notes/Live_s0992.json b/assets/serverdata/beatmaps/Live_s0992.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0992.json
rename to assets/serverdata/beatmaps/Live_s0992.json
diff --git a/assets/serverdata/notes/Live_s0993.json b/assets/serverdata/beatmaps/Live_s0993.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0993.json
rename to assets/serverdata/beatmaps/Live_s0993.json
diff --git a/assets/serverdata/notes/Live_s0994.json b/assets/serverdata/beatmaps/Live_s0994.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0994.json
rename to assets/serverdata/beatmaps/Live_s0994.json
diff --git a/assets/serverdata/notes/Live_s0995.json b/assets/serverdata/beatmaps/Live_s0995.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0995.json
rename to assets/serverdata/beatmaps/Live_s0995.json
diff --git a/assets/serverdata/notes/Live_s0996.json b/assets/serverdata/beatmaps/Live_s0996.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0996.json
rename to assets/serverdata/beatmaps/Live_s0996.json
diff --git a/assets/serverdata/notes/Live_s0997.json b/assets/serverdata/beatmaps/Live_s0997.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0997.json
rename to assets/serverdata/beatmaps/Live_s0997.json
diff --git a/assets/serverdata/notes/Live_s0998.json b/assets/serverdata/beatmaps/Live_s0998.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0998.json
rename to assets/serverdata/beatmaps/Live_s0998.json
diff --git a/assets/serverdata/notes/Live_s0999.json b/assets/serverdata/beatmaps/Live_s0999.json
similarity index 100%
rename from assets/serverdata/notes/Live_s0999.json
rename to assets/serverdata/beatmaps/Live_s0999.json
diff --git a/assets/serverdata/notes/Live_s1000.json b/assets/serverdata/beatmaps/Live_s1000.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1000.json
rename to assets/serverdata/beatmaps/Live_s1000.json
diff --git a/assets/serverdata/notes/Live_s1001.json b/assets/serverdata/beatmaps/Live_s1001.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1001.json
rename to assets/serverdata/beatmaps/Live_s1001.json
diff --git a/assets/serverdata/notes/Live_s1002.json b/assets/serverdata/beatmaps/Live_s1002.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1002.json
rename to assets/serverdata/beatmaps/Live_s1002.json
diff --git a/assets/serverdata/notes/Live_s1003.json b/assets/serverdata/beatmaps/Live_s1003.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1003.json
rename to assets/serverdata/beatmaps/Live_s1003.json
diff --git a/assets/serverdata/notes/Live_s1004.json b/assets/serverdata/beatmaps/Live_s1004.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1004.json
rename to assets/serverdata/beatmaps/Live_s1004.json
diff --git a/assets/serverdata/notes/Live_s1005.json b/assets/serverdata/beatmaps/Live_s1005.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1005.json
rename to assets/serverdata/beatmaps/Live_s1005.json
diff --git a/assets/serverdata/notes/Live_s1006.json b/assets/serverdata/beatmaps/Live_s1006.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1006.json
rename to assets/serverdata/beatmaps/Live_s1006.json
diff --git a/assets/serverdata/notes/Live_s1007.json b/assets/serverdata/beatmaps/Live_s1007.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1007.json
rename to assets/serverdata/beatmaps/Live_s1007.json
diff --git a/assets/serverdata/notes/Live_s1008.json b/assets/serverdata/beatmaps/Live_s1008.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1008.json
rename to assets/serverdata/beatmaps/Live_s1008.json
diff --git a/assets/serverdata/notes/Live_s1009.json b/assets/serverdata/beatmaps/Live_s1009.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1009.json
rename to assets/serverdata/beatmaps/Live_s1009.json
diff --git a/assets/serverdata/notes/Live_s1010.json b/assets/serverdata/beatmaps/Live_s1010.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1010.json
rename to assets/serverdata/beatmaps/Live_s1010.json
diff --git a/assets/serverdata/notes/Live_s1011.json b/assets/serverdata/beatmaps/Live_s1011.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1011.json
rename to assets/serverdata/beatmaps/Live_s1011.json
diff --git a/assets/serverdata/notes/Live_s1012.json b/assets/serverdata/beatmaps/Live_s1012.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1012.json
rename to assets/serverdata/beatmaps/Live_s1012.json
diff --git a/assets/serverdata/notes/Live_s1013.json b/assets/serverdata/beatmaps/Live_s1013.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1013.json
rename to assets/serverdata/beatmaps/Live_s1013.json
diff --git a/assets/serverdata/notes/Live_s1014.json b/assets/serverdata/beatmaps/Live_s1014.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1014.json
rename to assets/serverdata/beatmaps/Live_s1014.json
diff --git a/assets/serverdata/notes/Live_s1015.json b/assets/serverdata/beatmaps/Live_s1015.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1015.json
rename to assets/serverdata/beatmaps/Live_s1015.json
diff --git a/assets/serverdata/notes/Live_s1016.json b/assets/serverdata/beatmaps/Live_s1016.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1016.json
rename to assets/serverdata/beatmaps/Live_s1016.json
diff --git a/assets/serverdata/notes/Live_s1017.json b/assets/serverdata/beatmaps/Live_s1017.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1017.json
rename to assets/serverdata/beatmaps/Live_s1017.json
diff --git a/assets/serverdata/notes/Live_s1018.json b/assets/serverdata/beatmaps/Live_s1018.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1018.json
rename to assets/serverdata/beatmaps/Live_s1018.json
diff --git a/assets/serverdata/notes/Live_s1019.json b/assets/serverdata/beatmaps/Live_s1019.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1019.json
rename to assets/serverdata/beatmaps/Live_s1019.json
diff --git a/assets/serverdata/notes/Live_s1020.json b/assets/serverdata/beatmaps/Live_s1020.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1020.json
rename to assets/serverdata/beatmaps/Live_s1020.json
diff --git a/assets/serverdata/notes/Live_s1021.json b/assets/serverdata/beatmaps/Live_s1021.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1021.json
rename to assets/serverdata/beatmaps/Live_s1021.json
diff --git a/assets/serverdata/notes/Live_s1022.json b/assets/serverdata/beatmaps/Live_s1022.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1022.json
rename to assets/serverdata/beatmaps/Live_s1022.json
diff --git a/assets/serverdata/notes/Live_s1023.json b/assets/serverdata/beatmaps/Live_s1023.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1023.json
rename to assets/serverdata/beatmaps/Live_s1023.json
diff --git a/assets/serverdata/notes/Live_s1024.json b/assets/serverdata/beatmaps/Live_s1024.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1024.json
rename to assets/serverdata/beatmaps/Live_s1024.json
diff --git a/assets/serverdata/notes/Live_s1025.json b/assets/serverdata/beatmaps/Live_s1025.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1025.json
rename to assets/serverdata/beatmaps/Live_s1025.json
diff --git a/assets/serverdata/notes/Live_s1026.json b/assets/serverdata/beatmaps/Live_s1026.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1026.json
rename to assets/serverdata/beatmaps/Live_s1026.json
diff --git a/assets/serverdata/notes/Live_s1027.json b/assets/serverdata/beatmaps/Live_s1027.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1027.json
rename to assets/serverdata/beatmaps/Live_s1027.json
diff --git a/assets/serverdata/notes/Live_s1028.json b/assets/serverdata/beatmaps/Live_s1028.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1028.json
rename to assets/serverdata/beatmaps/Live_s1028.json
diff --git a/assets/serverdata/notes/Live_s1029.json b/assets/serverdata/beatmaps/Live_s1029.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1029.json
rename to assets/serverdata/beatmaps/Live_s1029.json
diff --git a/assets/serverdata/notes/Live_s1030.json b/assets/serverdata/beatmaps/Live_s1030.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1030.json
rename to assets/serverdata/beatmaps/Live_s1030.json
diff --git a/assets/serverdata/notes/Live_s1031.json b/assets/serverdata/beatmaps/Live_s1031.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1031.json
rename to assets/serverdata/beatmaps/Live_s1031.json
diff --git a/assets/serverdata/notes/Live_s1032.json b/assets/serverdata/beatmaps/Live_s1032.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1032.json
rename to assets/serverdata/beatmaps/Live_s1032.json
diff --git a/assets/serverdata/notes/Live_s1033.json b/assets/serverdata/beatmaps/Live_s1033.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1033.json
rename to assets/serverdata/beatmaps/Live_s1033.json
diff --git a/assets/serverdata/notes/Live_s1034.json b/assets/serverdata/beatmaps/Live_s1034.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1034.json
rename to assets/serverdata/beatmaps/Live_s1034.json
diff --git a/assets/serverdata/notes/Live_s1035.json b/assets/serverdata/beatmaps/Live_s1035.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1035.json
rename to assets/serverdata/beatmaps/Live_s1035.json
diff --git a/assets/serverdata/notes/Live_s1036.json b/assets/serverdata/beatmaps/Live_s1036.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1036.json
rename to assets/serverdata/beatmaps/Live_s1036.json
diff --git a/assets/serverdata/notes/Live_s1037.json b/assets/serverdata/beatmaps/Live_s1037.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1037.json
rename to assets/serverdata/beatmaps/Live_s1037.json
diff --git a/assets/serverdata/notes/Live_s1038.json b/assets/serverdata/beatmaps/Live_s1038.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1038.json
rename to assets/serverdata/beatmaps/Live_s1038.json
diff --git a/assets/serverdata/notes/Live_s1039.json b/assets/serverdata/beatmaps/Live_s1039.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1039.json
rename to assets/serverdata/beatmaps/Live_s1039.json
diff --git a/assets/serverdata/notes/Live_s1040.json b/assets/serverdata/beatmaps/Live_s1040.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1040.json
rename to assets/serverdata/beatmaps/Live_s1040.json
diff --git a/assets/serverdata/notes/Live_s1041.json b/assets/serverdata/beatmaps/Live_s1041.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1041.json
rename to assets/serverdata/beatmaps/Live_s1041.json
diff --git a/assets/serverdata/notes/Live_s1042.json b/assets/serverdata/beatmaps/Live_s1042.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1042.json
rename to assets/serverdata/beatmaps/Live_s1042.json
diff --git a/assets/serverdata/notes/Live_s1043.json b/assets/serverdata/beatmaps/Live_s1043.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1043.json
rename to assets/serverdata/beatmaps/Live_s1043.json
diff --git a/assets/serverdata/notes/Live_s1044.json b/assets/serverdata/beatmaps/Live_s1044.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1044.json
rename to assets/serverdata/beatmaps/Live_s1044.json
diff --git a/assets/serverdata/notes/Live_s1045.json b/assets/serverdata/beatmaps/Live_s1045.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1045.json
rename to assets/serverdata/beatmaps/Live_s1045.json
diff --git a/assets/serverdata/notes/Live_s1046.json b/assets/serverdata/beatmaps/Live_s1046.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1046.json
rename to assets/serverdata/beatmaps/Live_s1046.json
diff --git a/assets/serverdata/notes/Live_s1047.json b/assets/serverdata/beatmaps/Live_s1047.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1047.json
rename to assets/serverdata/beatmaps/Live_s1047.json
diff --git a/assets/serverdata/notes/Live_s1048.json b/assets/serverdata/beatmaps/Live_s1048.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1048.json
rename to assets/serverdata/beatmaps/Live_s1048.json
diff --git a/assets/serverdata/notes/Live_s1049.json b/assets/serverdata/beatmaps/Live_s1049.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1049.json
rename to assets/serverdata/beatmaps/Live_s1049.json
diff --git a/assets/serverdata/notes/Live_s1050.json b/assets/serverdata/beatmaps/Live_s1050.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1050.json
rename to assets/serverdata/beatmaps/Live_s1050.json
diff --git a/assets/serverdata/notes/Live_s1051.json b/assets/serverdata/beatmaps/Live_s1051.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1051.json
rename to assets/serverdata/beatmaps/Live_s1051.json
diff --git a/assets/serverdata/notes/Live_s1052.json b/assets/serverdata/beatmaps/Live_s1052.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1052.json
rename to assets/serverdata/beatmaps/Live_s1052.json
diff --git a/assets/serverdata/notes/Live_s1053.json b/assets/serverdata/beatmaps/Live_s1053.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1053.json
rename to assets/serverdata/beatmaps/Live_s1053.json
diff --git a/assets/serverdata/notes/Live_s1054.json b/assets/serverdata/beatmaps/Live_s1054.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1054.json
rename to assets/serverdata/beatmaps/Live_s1054.json
diff --git a/assets/serverdata/notes/Live_s1055.json b/assets/serverdata/beatmaps/Live_s1055.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1055.json
rename to assets/serverdata/beatmaps/Live_s1055.json
diff --git a/assets/serverdata/notes/Live_s1056.json b/assets/serverdata/beatmaps/Live_s1056.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1056.json
rename to assets/serverdata/beatmaps/Live_s1056.json
diff --git a/assets/serverdata/notes/Live_s1057.json b/assets/serverdata/beatmaps/Live_s1057.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1057.json
rename to assets/serverdata/beatmaps/Live_s1057.json
diff --git a/assets/serverdata/notes/Live_s1058.json b/assets/serverdata/beatmaps/Live_s1058.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1058.json
rename to assets/serverdata/beatmaps/Live_s1058.json
diff --git a/assets/serverdata/notes/Live_s1059.json b/assets/serverdata/beatmaps/Live_s1059.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1059.json
rename to assets/serverdata/beatmaps/Live_s1059.json
diff --git a/assets/serverdata/notes/Live_s1060.json b/assets/serverdata/beatmaps/Live_s1060.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1060.json
rename to assets/serverdata/beatmaps/Live_s1060.json
diff --git a/assets/serverdata/notes/Live_s1061.json b/assets/serverdata/beatmaps/Live_s1061.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1061.json
rename to assets/serverdata/beatmaps/Live_s1061.json
diff --git a/assets/serverdata/notes/Live_s1062.json b/assets/serverdata/beatmaps/Live_s1062.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1062.json
rename to assets/serverdata/beatmaps/Live_s1062.json
diff --git a/assets/serverdata/notes/Live_s1063.json b/assets/serverdata/beatmaps/Live_s1063.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1063.json
rename to assets/serverdata/beatmaps/Live_s1063.json
diff --git a/assets/serverdata/notes/Live_s1064.json b/assets/serverdata/beatmaps/Live_s1064.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1064.json
rename to assets/serverdata/beatmaps/Live_s1064.json
diff --git a/assets/serverdata/notes/Live_s1065.json b/assets/serverdata/beatmaps/Live_s1065.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1065.json
rename to assets/serverdata/beatmaps/Live_s1065.json
diff --git a/assets/serverdata/notes/Live_s1066.json b/assets/serverdata/beatmaps/Live_s1066.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1066.json
rename to assets/serverdata/beatmaps/Live_s1066.json
diff --git a/assets/serverdata/notes/Live_s1067.json b/assets/serverdata/beatmaps/Live_s1067.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1067.json
rename to assets/serverdata/beatmaps/Live_s1067.json
diff --git a/assets/serverdata/notes/Live_s1068.json b/assets/serverdata/beatmaps/Live_s1068.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1068.json
rename to assets/serverdata/beatmaps/Live_s1068.json
diff --git a/assets/serverdata/notes/Live_s1069.json b/assets/serverdata/beatmaps/Live_s1069.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1069.json
rename to assets/serverdata/beatmaps/Live_s1069.json
diff --git a/assets/serverdata/notes/Live_s1070.json b/assets/serverdata/beatmaps/Live_s1070.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1070.json
rename to assets/serverdata/beatmaps/Live_s1070.json
diff --git a/assets/serverdata/notes/Live_s1071.json b/assets/serverdata/beatmaps/Live_s1071.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1071.json
rename to assets/serverdata/beatmaps/Live_s1071.json
diff --git a/assets/serverdata/notes/Live_s1072.json b/assets/serverdata/beatmaps/Live_s1072.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1072.json
rename to assets/serverdata/beatmaps/Live_s1072.json
diff --git a/assets/serverdata/notes/Live_s1073.json b/assets/serverdata/beatmaps/Live_s1073.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1073.json
rename to assets/serverdata/beatmaps/Live_s1073.json
diff --git a/assets/serverdata/notes/Live_s1074.json b/assets/serverdata/beatmaps/Live_s1074.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1074.json
rename to assets/serverdata/beatmaps/Live_s1074.json
diff --git a/assets/serverdata/notes/Live_s1075.json b/assets/serverdata/beatmaps/Live_s1075.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1075.json
rename to assets/serverdata/beatmaps/Live_s1075.json
diff --git a/assets/serverdata/notes/Live_s1076.json b/assets/serverdata/beatmaps/Live_s1076.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1076.json
rename to assets/serverdata/beatmaps/Live_s1076.json
diff --git a/assets/serverdata/notes/Live_s1077.json b/assets/serverdata/beatmaps/Live_s1077.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1077.json
rename to assets/serverdata/beatmaps/Live_s1077.json
diff --git a/assets/serverdata/notes/Live_s1078.json b/assets/serverdata/beatmaps/Live_s1078.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1078.json
rename to assets/serverdata/beatmaps/Live_s1078.json
diff --git a/assets/serverdata/notes/Live_s1079.json b/assets/serverdata/beatmaps/Live_s1079.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1079.json
rename to assets/serverdata/beatmaps/Live_s1079.json
diff --git a/assets/serverdata/notes/Live_s1080.json b/assets/serverdata/beatmaps/Live_s1080.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1080.json
rename to assets/serverdata/beatmaps/Live_s1080.json
diff --git a/assets/serverdata/notes/Live_s1081.json b/assets/serverdata/beatmaps/Live_s1081.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1081.json
rename to assets/serverdata/beatmaps/Live_s1081.json
diff --git a/assets/serverdata/notes/Live_s1082.json b/assets/serverdata/beatmaps/Live_s1082.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1082.json
rename to assets/serverdata/beatmaps/Live_s1082.json
diff --git a/assets/serverdata/notes/Live_s1083.json b/assets/serverdata/beatmaps/Live_s1083.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1083.json
rename to assets/serverdata/beatmaps/Live_s1083.json
diff --git a/assets/serverdata/notes/Live_s1084.json b/assets/serverdata/beatmaps/Live_s1084.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1084.json
rename to assets/serverdata/beatmaps/Live_s1084.json
diff --git a/assets/serverdata/notes/Live_s1085.json b/assets/serverdata/beatmaps/Live_s1085.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1085.json
rename to assets/serverdata/beatmaps/Live_s1085.json
diff --git a/assets/serverdata/notes/Live_s1086.json b/assets/serverdata/beatmaps/Live_s1086.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1086.json
rename to assets/serverdata/beatmaps/Live_s1086.json
diff --git a/assets/serverdata/notes/Live_s1087.json b/assets/serverdata/beatmaps/Live_s1087.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1087.json
rename to assets/serverdata/beatmaps/Live_s1087.json
diff --git a/assets/serverdata/notes/Live_s1088.json b/assets/serverdata/beatmaps/Live_s1088.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1088.json
rename to assets/serverdata/beatmaps/Live_s1088.json
diff --git a/assets/serverdata/notes/Live_s1089.json b/assets/serverdata/beatmaps/Live_s1089.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1089.json
rename to assets/serverdata/beatmaps/Live_s1089.json
diff --git a/assets/serverdata/notes/Live_s1090.json b/assets/serverdata/beatmaps/Live_s1090.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1090.json
rename to assets/serverdata/beatmaps/Live_s1090.json
diff --git a/assets/serverdata/notes/Live_s1091.json b/assets/serverdata/beatmaps/Live_s1091.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1091.json
rename to assets/serverdata/beatmaps/Live_s1091.json
diff --git a/assets/serverdata/notes/Live_s1092.json b/assets/serverdata/beatmaps/Live_s1092.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1092.json
rename to assets/serverdata/beatmaps/Live_s1092.json
diff --git a/assets/serverdata/notes/Live_s1093.json b/assets/serverdata/beatmaps/Live_s1093.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1093.json
rename to assets/serverdata/beatmaps/Live_s1093.json
diff --git a/assets/serverdata/notes/Live_s1094.json b/assets/serverdata/beatmaps/Live_s1094.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1094.json
rename to assets/serverdata/beatmaps/Live_s1094.json
diff --git a/assets/serverdata/notes/Live_s1095.json b/assets/serverdata/beatmaps/Live_s1095.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1095.json
rename to assets/serverdata/beatmaps/Live_s1095.json
diff --git a/assets/serverdata/notes/Live_s1096.json b/assets/serverdata/beatmaps/Live_s1096.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1096.json
rename to assets/serverdata/beatmaps/Live_s1096.json
diff --git a/assets/serverdata/notes/Live_s1097.json b/assets/serverdata/beatmaps/Live_s1097.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1097.json
rename to assets/serverdata/beatmaps/Live_s1097.json
diff --git a/assets/serverdata/notes/Live_s1098.json b/assets/serverdata/beatmaps/Live_s1098.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1098.json
rename to assets/serverdata/beatmaps/Live_s1098.json
diff --git a/assets/serverdata/notes/Live_s1099.json b/assets/serverdata/beatmaps/Live_s1099.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1099.json
rename to assets/serverdata/beatmaps/Live_s1099.json
diff --git a/assets/serverdata/notes/Live_s1100.json b/assets/serverdata/beatmaps/Live_s1100.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1100.json
rename to assets/serverdata/beatmaps/Live_s1100.json
diff --git a/assets/serverdata/notes/Live_s1101.json b/assets/serverdata/beatmaps/Live_s1101.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1101.json
rename to assets/serverdata/beatmaps/Live_s1101.json
diff --git a/assets/serverdata/notes/Live_s1102.json b/assets/serverdata/beatmaps/Live_s1102.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1102.json
rename to assets/serverdata/beatmaps/Live_s1102.json
diff --git a/assets/serverdata/notes/Live_s1103.json b/assets/serverdata/beatmaps/Live_s1103.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1103.json
rename to assets/serverdata/beatmaps/Live_s1103.json
diff --git a/assets/serverdata/notes/Live_s1104.json b/assets/serverdata/beatmaps/Live_s1104.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1104.json
rename to assets/serverdata/beatmaps/Live_s1104.json
diff --git a/assets/serverdata/notes/Live_s1105.json b/assets/serverdata/beatmaps/Live_s1105.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1105.json
rename to assets/serverdata/beatmaps/Live_s1105.json
diff --git a/assets/serverdata/notes/Live_s1106.json b/assets/serverdata/beatmaps/Live_s1106.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1106.json
rename to assets/serverdata/beatmaps/Live_s1106.json
diff --git a/assets/serverdata/notes/Live_s1107.json b/assets/serverdata/beatmaps/Live_s1107.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1107.json
rename to assets/serverdata/beatmaps/Live_s1107.json
diff --git a/assets/serverdata/notes/Live_s1108.json b/assets/serverdata/beatmaps/Live_s1108.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1108.json
rename to assets/serverdata/beatmaps/Live_s1108.json
diff --git a/assets/serverdata/notes/Live_s1109.json b/assets/serverdata/beatmaps/Live_s1109.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1109.json
rename to assets/serverdata/beatmaps/Live_s1109.json
diff --git a/assets/serverdata/notes/Live_s1110.json b/assets/serverdata/beatmaps/Live_s1110.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1110.json
rename to assets/serverdata/beatmaps/Live_s1110.json
diff --git a/assets/serverdata/notes/Live_s1111.json b/assets/serverdata/beatmaps/Live_s1111.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1111.json
rename to assets/serverdata/beatmaps/Live_s1111.json
diff --git a/assets/serverdata/notes/Live_s1112.json b/assets/serverdata/beatmaps/Live_s1112.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1112.json
rename to assets/serverdata/beatmaps/Live_s1112.json
diff --git a/assets/serverdata/notes/Live_s1113.json b/assets/serverdata/beatmaps/Live_s1113.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1113.json
rename to assets/serverdata/beatmaps/Live_s1113.json
diff --git a/assets/serverdata/notes/Live_s1114.json b/assets/serverdata/beatmaps/Live_s1114.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1114.json
rename to assets/serverdata/beatmaps/Live_s1114.json
diff --git a/assets/serverdata/notes/Live_s1115.json b/assets/serverdata/beatmaps/Live_s1115.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1115.json
rename to assets/serverdata/beatmaps/Live_s1115.json
diff --git a/assets/serverdata/notes/Live_s1116.json b/assets/serverdata/beatmaps/Live_s1116.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1116.json
rename to assets/serverdata/beatmaps/Live_s1116.json
diff --git a/assets/serverdata/notes/Live_s1117.json b/assets/serverdata/beatmaps/Live_s1117.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1117.json
rename to assets/serverdata/beatmaps/Live_s1117.json
diff --git a/assets/serverdata/notes/Live_s1118.json b/assets/serverdata/beatmaps/Live_s1118.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1118.json
rename to assets/serverdata/beatmaps/Live_s1118.json
diff --git a/assets/serverdata/notes/Live_s1119.json b/assets/serverdata/beatmaps/Live_s1119.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1119.json
rename to assets/serverdata/beatmaps/Live_s1119.json
diff --git a/assets/serverdata/notes/Live_s1120.json b/assets/serverdata/beatmaps/Live_s1120.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1120.json
rename to assets/serverdata/beatmaps/Live_s1120.json
diff --git a/assets/serverdata/notes/Live_s1121.json b/assets/serverdata/beatmaps/Live_s1121.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1121.json
rename to assets/serverdata/beatmaps/Live_s1121.json
diff --git a/assets/serverdata/notes/Live_s1122.json b/assets/serverdata/beatmaps/Live_s1122.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1122.json
rename to assets/serverdata/beatmaps/Live_s1122.json
diff --git a/assets/serverdata/notes/Live_s1123.json b/assets/serverdata/beatmaps/Live_s1123.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1123.json
rename to assets/serverdata/beatmaps/Live_s1123.json
diff --git a/assets/serverdata/notes/Live_s1124.json b/assets/serverdata/beatmaps/Live_s1124.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1124.json
rename to assets/serverdata/beatmaps/Live_s1124.json
diff --git a/assets/serverdata/notes/Live_s1125.json b/assets/serverdata/beatmaps/Live_s1125.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1125.json
rename to assets/serverdata/beatmaps/Live_s1125.json
diff --git a/assets/serverdata/notes/Live_s1126.json b/assets/serverdata/beatmaps/Live_s1126.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1126.json
rename to assets/serverdata/beatmaps/Live_s1126.json
diff --git a/assets/serverdata/notes/Live_s1127.json b/assets/serverdata/beatmaps/Live_s1127.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1127.json
rename to assets/serverdata/beatmaps/Live_s1127.json
diff --git a/assets/serverdata/notes/Live_s1128.json b/assets/serverdata/beatmaps/Live_s1128.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1128.json
rename to assets/serverdata/beatmaps/Live_s1128.json
diff --git a/assets/serverdata/notes/Live_s1129.json b/assets/serverdata/beatmaps/Live_s1129.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1129.json
rename to assets/serverdata/beatmaps/Live_s1129.json
diff --git a/assets/serverdata/notes/Live_s1130.json b/assets/serverdata/beatmaps/Live_s1130.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1130.json
rename to assets/serverdata/beatmaps/Live_s1130.json
diff --git a/assets/serverdata/notes/Live_s1131.json b/assets/serverdata/beatmaps/Live_s1131.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1131.json
rename to assets/serverdata/beatmaps/Live_s1131.json
diff --git a/assets/serverdata/notes/Live_s1132.json b/assets/serverdata/beatmaps/Live_s1132.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1132.json
rename to assets/serverdata/beatmaps/Live_s1132.json
diff --git a/assets/serverdata/notes/Live_s1133.json b/assets/serverdata/beatmaps/Live_s1133.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1133.json
rename to assets/serverdata/beatmaps/Live_s1133.json
diff --git a/assets/serverdata/notes/Live_s1134.json b/assets/serverdata/beatmaps/Live_s1134.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1134.json
rename to assets/serverdata/beatmaps/Live_s1134.json
diff --git a/assets/serverdata/notes/Live_s1135.json b/assets/serverdata/beatmaps/Live_s1135.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1135.json
rename to assets/serverdata/beatmaps/Live_s1135.json
diff --git a/assets/serverdata/notes/Live_s1136.json b/assets/serverdata/beatmaps/Live_s1136.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1136.json
rename to assets/serverdata/beatmaps/Live_s1136.json
diff --git a/assets/serverdata/notes/Live_s1137.json b/assets/serverdata/beatmaps/Live_s1137.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1137.json
rename to assets/serverdata/beatmaps/Live_s1137.json
diff --git a/assets/serverdata/notes/Live_s1138.json b/assets/serverdata/beatmaps/Live_s1138.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1138.json
rename to assets/serverdata/beatmaps/Live_s1138.json
diff --git a/assets/serverdata/notes/Live_s1139.json b/assets/serverdata/beatmaps/Live_s1139.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1139.json
rename to assets/serverdata/beatmaps/Live_s1139.json
diff --git a/assets/serverdata/notes/Live_s1140.json b/assets/serverdata/beatmaps/Live_s1140.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1140.json
rename to assets/serverdata/beatmaps/Live_s1140.json
diff --git a/assets/serverdata/notes/Live_s1141.json b/assets/serverdata/beatmaps/Live_s1141.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1141.json
rename to assets/serverdata/beatmaps/Live_s1141.json
diff --git a/assets/serverdata/notes/Live_s1142.json b/assets/serverdata/beatmaps/Live_s1142.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1142.json
rename to assets/serverdata/beatmaps/Live_s1142.json
diff --git a/assets/serverdata/notes/Live_s1143.json b/assets/serverdata/beatmaps/Live_s1143.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1143.json
rename to assets/serverdata/beatmaps/Live_s1143.json
diff --git a/assets/serverdata/notes/Live_s1144.json b/assets/serverdata/beatmaps/Live_s1144.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1144.json
rename to assets/serverdata/beatmaps/Live_s1144.json
diff --git a/assets/serverdata/notes/Live_s1145.json b/assets/serverdata/beatmaps/Live_s1145.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1145.json
rename to assets/serverdata/beatmaps/Live_s1145.json
diff --git a/assets/serverdata/notes/Live_s1146.json b/assets/serverdata/beatmaps/Live_s1146.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1146.json
rename to assets/serverdata/beatmaps/Live_s1146.json
diff --git a/assets/serverdata/notes/Live_s1147.json b/assets/serverdata/beatmaps/Live_s1147.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1147.json
rename to assets/serverdata/beatmaps/Live_s1147.json
diff --git a/assets/serverdata/notes/Live_s1148.json b/assets/serverdata/beatmaps/Live_s1148.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1148.json
rename to assets/serverdata/beatmaps/Live_s1148.json
diff --git a/assets/serverdata/notes/Live_s1149.json b/assets/serverdata/beatmaps/Live_s1149.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1149.json
rename to assets/serverdata/beatmaps/Live_s1149.json
diff --git a/assets/serverdata/notes/Live_s1150.json b/assets/serverdata/beatmaps/Live_s1150.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1150.json
rename to assets/serverdata/beatmaps/Live_s1150.json
diff --git a/assets/serverdata/notes/Live_s1151.json b/assets/serverdata/beatmaps/Live_s1151.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1151.json
rename to assets/serverdata/beatmaps/Live_s1151.json
diff --git a/assets/serverdata/notes/Live_s1152.json b/assets/serverdata/beatmaps/Live_s1152.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1152.json
rename to assets/serverdata/beatmaps/Live_s1152.json
diff --git a/assets/serverdata/notes/Live_s1153.json b/assets/serverdata/beatmaps/Live_s1153.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1153.json
rename to assets/serverdata/beatmaps/Live_s1153.json
diff --git a/assets/serverdata/notes/Live_s1154.json b/assets/serverdata/beatmaps/Live_s1154.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1154.json
rename to assets/serverdata/beatmaps/Live_s1154.json
diff --git a/assets/serverdata/notes/Live_s1155.json b/assets/serverdata/beatmaps/Live_s1155.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1155.json
rename to assets/serverdata/beatmaps/Live_s1155.json
diff --git a/assets/serverdata/notes/Live_s1156.json b/assets/serverdata/beatmaps/Live_s1156.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1156.json
rename to assets/serverdata/beatmaps/Live_s1156.json
diff --git a/assets/serverdata/notes/Live_s1157.json b/assets/serverdata/beatmaps/Live_s1157.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1157.json
rename to assets/serverdata/beatmaps/Live_s1157.json
diff --git a/assets/serverdata/notes/Live_s1158.json b/assets/serverdata/beatmaps/Live_s1158.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1158.json
rename to assets/serverdata/beatmaps/Live_s1158.json
diff --git a/assets/serverdata/notes/Live_s1159.json b/assets/serverdata/beatmaps/Live_s1159.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1159.json
rename to assets/serverdata/beatmaps/Live_s1159.json
diff --git a/assets/serverdata/notes/Live_s1160.json b/assets/serverdata/beatmaps/Live_s1160.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1160.json
rename to assets/serverdata/beatmaps/Live_s1160.json
diff --git a/assets/serverdata/notes/Live_s1161.json b/assets/serverdata/beatmaps/Live_s1161.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1161.json
rename to assets/serverdata/beatmaps/Live_s1161.json
diff --git a/assets/serverdata/notes/Live_s1162.json b/assets/serverdata/beatmaps/Live_s1162.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1162.json
rename to assets/serverdata/beatmaps/Live_s1162.json
diff --git a/assets/serverdata/notes/Live_s1163.json b/assets/serverdata/beatmaps/Live_s1163.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1163.json
rename to assets/serverdata/beatmaps/Live_s1163.json
diff --git a/assets/serverdata/notes/Live_s1164.json b/assets/serverdata/beatmaps/Live_s1164.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1164.json
rename to assets/serverdata/beatmaps/Live_s1164.json
diff --git a/assets/serverdata/notes/Live_s1165.json b/assets/serverdata/beatmaps/Live_s1165.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1165.json
rename to assets/serverdata/beatmaps/Live_s1165.json
diff --git a/assets/serverdata/notes/Live_s1166.json b/assets/serverdata/beatmaps/Live_s1166.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1166.json
rename to assets/serverdata/beatmaps/Live_s1166.json
diff --git a/assets/serverdata/notes/Live_s1167.json b/assets/serverdata/beatmaps/Live_s1167.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1167.json
rename to assets/serverdata/beatmaps/Live_s1167.json
diff --git a/assets/serverdata/notes/Live_s1168.json b/assets/serverdata/beatmaps/Live_s1168.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1168.json
rename to assets/serverdata/beatmaps/Live_s1168.json
diff --git a/assets/serverdata/notes/Live_s1169.json b/assets/serverdata/beatmaps/Live_s1169.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1169.json
rename to assets/serverdata/beatmaps/Live_s1169.json
diff --git a/assets/serverdata/notes/Live_s1170.json b/assets/serverdata/beatmaps/Live_s1170.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1170.json
rename to assets/serverdata/beatmaps/Live_s1170.json
diff --git a/assets/serverdata/notes/Live_s1171.json b/assets/serverdata/beatmaps/Live_s1171.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1171.json
rename to assets/serverdata/beatmaps/Live_s1171.json
diff --git a/assets/serverdata/notes/Live_s1172.json b/assets/serverdata/beatmaps/Live_s1172.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1172.json
rename to assets/serverdata/beatmaps/Live_s1172.json
diff --git a/assets/serverdata/notes/Live_s1173.json b/assets/serverdata/beatmaps/Live_s1173.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1173.json
rename to assets/serverdata/beatmaps/Live_s1173.json
diff --git a/assets/serverdata/notes/Live_s1174.json b/assets/serverdata/beatmaps/Live_s1174.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1174.json
rename to assets/serverdata/beatmaps/Live_s1174.json
diff --git a/assets/serverdata/notes/Live_s1175.json b/assets/serverdata/beatmaps/Live_s1175.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1175.json
rename to assets/serverdata/beatmaps/Live_s1175.json
diff --git a/assets/serverdata/notes/Live_s1176.json b/assets/serverdata/beatmaps/Live_s1176.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1176.json
rename to assets/serverdata/beatmaps/Live_s1176.json
diff --git a/assets/serverdata/notes/Live_s1177.json b/assets/serverdata/beatmaps/Live_s1177.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1177.json
rename to assets/serverdata/beatmaps/Live_s1177.json
diff --git a/assets/serverdata/notes/Live_s1178.json b/assets/serverdata/beatmaps/Live_s1178.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1178.json
rename to assets/serverdata/beatmaps/Live_s1178.json
diff --git a/assets/serverdata/notes/Live_s1179.json b/assets/serverdata/beatmaps/Live_s1179.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1179.json
rename to assets/serverdata/beatmaps/Live_s1179.json
diff --git a/assets/serverdata/notes/Live_s1180.json b/assets/serverdata/beatmaps/Live_s1180.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1180.json
rename to assets/serverdata/beatmaps/Live_s1180.json
diff --git a/assets/serverdata/notes/Live_s1181.json b/assets/serverdata/beatmaps/Live_s1181.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1181.json
rename to assets/serverdata/beatmaps/Live_s1181.json
diff --git a/assets/serverdata/notes/Live_s1182.json b/assets/serverdata/beatmaps/Live_s1182.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1182.json
rename to assets/serverdata/beatmaps/Live_s1182.json
diff --git a/assets/serverdata/notes/Live_s1183.json b/assets/serverdata/beatmaps/Live_s1183.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1183.json
rename to assets/serverdata/beatmaps/Live_s1183.json
diff --git a/assets/serverdata/notes/Live_s1184.json b/assets/serverdata/beatmaps/Live_s1184.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1184.json
rename to assets/serverdata/beatmaps/Live_s1184.json
diff --git a/assets/serverdata/notes/Live_s1185.json b/assets/serverdata/beatmaps/Live_s1185.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1185.json
rename to assets/serverdata/beatmaps/Live_s1185.json
diff --git a/assets/serverdata/notes/Live_s1186.json b/assets/serverdata/beatmaps/Live_s1186.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1186.json
rename to assets/serverdata/beatmaps/Live_s1186.json
diff --git a/assets/serverdata/notes/Live_s1187.json b/assets/serverdata/beatmaps/Live_s1187.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1187.json
rename to assets/serverdata/beatmaps/Live_s1187.json
diff --git a/assets/serverdata/notes/Live_s1188.json b/assets/serverdata/beatmaps/Live_s1188.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1188.json
rename to assets/serverdata/beatmaps/Live_s1188.json
diff --git a/assets/serverdata/notes/Live_s1189.json b/assets/serverdata/beatmaps/Live_s1189.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1189.json
rename to assets/serverdata/beatmaps/Live_s1189.json
diff --git a/assets/serverdata/notes/Live_s1190.json b/assets/serverdata/beatmaps/Live_s1190.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1190.json
rename to assets/serverdata/beatmaps/Live_s1190.json
diff --git a/assets/serverdata/notes/Live_s1191.json b/assets/serverdata/beatmaps/Live_s1191.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1191.json
rename to assets/serverdata/beatmaps/Live_s1191.json
diff --git a/assets/serverdata/notes/Live_s1192.json b/assets/serverdata/beatmaps/Live_s1192.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1192.json
rename to assets/serverdata/beatmaps/Live_s1192.json
diff --git a/assets/serverdata/notes/Live_s1193.json b/assets/serverdata/beatmaps/Live_s1193.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1193.json
rename to assets/serverdata/beatmaps/Live_s1193.json
diff --git a/assets/serverdata/notes/Live_s1194.json b/assets/serverdata/beatmaps/Live_s1194.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1194.json
rename to assets/serverdata/beatmaps/Live_s1194.json
diff --git a/assets/serverdata/notes/Live_s1195.json b/assets/serverdata/beatmaps/Live_s1195.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1195.json
rename to assets/serverdata/beatmaps/Live_s1195.json
diff --git a/assets/serverdata/notes/Live_s1196.json b/assets/serverdata/beatmaps/Live_s1196.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1196.json
rename to assets/serverdata/beatmaps/Live_s1196.json
diff --git a/assets/serverdata/notes/Live_s1197.json b/assets/serverdata/beatmaps/Live_s1197.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1197.json
rename to assets/serverdata/beatmaps/Live_s1197.json
diff --git a/assets/serverdata/notes/Live_s1198.json b/assets/serverdata/beatmaps/Live_s1198.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1198.json
rename to assets/serverdata/beatmaps/Live_s1198.json
diff --git a/assets/serverdata/notes/Live_s1199.json b/assets/serverdata/beatmaps/Live_s1199.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1199.json
rename to assets/serverdata/beatmaps/Live_s1199.json
diff --git a/assets/serverdata/notes/Live_s1200.json b/assets/serverdata/beatmaps/Live_s1200.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1200.json
rename to assets/serverdata/beatmaps/Live_s1200.json
diff --git a/assets/serverdata/notes/Live_s1201.json b/assets/serverdata/beatmaps/Live_s1201.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1201.json
rename to assets/serverdata/beatmaps/Live_s1201.json
diff --git a/assets/serverdata/notes/Live_s1202.json b/assets/serverdata/beatmaps/Live_s1202.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1202.json
rename to assets/serverdata/beatmaps/Live_s1202.json
diff --git a/assets/serverdata/notes/Live_s1203.json b/assets/serverdata/beatmaps/Live_s1203.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1203.json
rename to assets/serverdata/beatmaps/Live_s1203.json
diff --git a/assets/serverdata/notes/Live_s1204.json b/assets/serverdata/beatmaps/Live_s1204.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1204.json
rename to assets/serverdata/beatmaps/Live_s1204.json
diff --git a/assets/serverdata/notes/Live_s1205.json b/assets/serverdata/beatmaps/Live_s1205.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1205.json
rename to assets/serverdata/beatmaps/Live_s1205.json
diff --git a/assets/serverdata/notes/Live_s1206.json b/assets/serverdata/beatmaps/Live_s1206.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1206.json
rename to assets/serverdata/beatmaps/Live_s1206.json
diff --git a/assets/serverdata/notes/Live_s1207.json b/assets/serverdata/beatmaps/Live_s1207.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1207.json
rename to assets/serverdata/beatmaps/Live_s1207.json
diff --git a/assets/serverdata/notes/Live_s1208.json b/assets/serverdata/beatmaps/Live_s1208.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1208.json
rename to assets/serverdata/beatmaps/Live_s1208.json
diff --git a/assets/serverdata/notes/Live_s1209.json b/assets/serverdata/beatmaps/Live_s1209.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1209.json
rename to assets/serverdata/beatmaps/Live_s1209.json
diff --git a/assets/serverdata/notes/Live_s1210.json b/assets/serverdata/beatmaps/Live_s1210.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1210.json
rename to assets/serverdata/beatmaps/Live_s1210.json
diff --git a/assets/serverdata/notes/Live_s1211.json b/assets/serverdata/beatmaps/Live_s1211.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1211.json
rename to assets/serverdata/beatmaps/Live_s1211.json
diff --git a/assets/serverdata/notes/Live_s1212.json b/assets/serverdata/beatmaps/Live_s1212.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1212.json
rename to assets/serverdata/beatmaps/Live_s1212.json
diff --git a/assets/serverdata/notes/Live_s1213.json b/assets/serverdata/beatmaps/Live_s1213.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1213.json
rename to assets/serverdata/beatmaps/Live_s1213.json
diff --git a/assets/serverdata/notes/Live_s1214.json b/assets/serverdata/beatmaps/Live_s1214.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1214.json
rename to assets/serverdata/beatmaps/Live_s1214.json
diff --git a/assets/serverdata/notes/Live_s1215.json b/assets/serverdata/beatmaps/Live_s1215.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1215.json
rename to assets/serverdata/beatmaps/Live_s1215.json
diff --git a/assets/serverdata/notes/Live_s1216.json b/assets/serverdata/beatmaps/Live_s1216.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1216.json
rename to assets/serverdata/beatmaps/Live_s1216.json
diff --git a/assets/serverdata/notes/Live_s1217.json b/assets/serverdata/beatmaps/Live_s1217.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1217.json
rename to assets/serverdata/beatmaps/Live_s1217.json
diff --git a/assets/serverdata/notes/Live_s1218.json b/assets/serverdata/beatmaps/Live_s1218.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1218.json
rename to assets/serverdata/beatmaps/Live_s1218.json
diff --git a/assets/serverdata/notes/Live_s1219.json b/assets/serverdata/beatmaps/Live_s1219.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1219.json
rename to assets/serverdata/beatmaps/Live_s1219.json
diff --git a/assets/serverdata/notes/Live_s1220.json b/assets/serverdata/beatmaps/Live_s1220.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1220.json
rename to assets/serverdata/beatmaps/Live_s1220.json
diff --git a/assets/serverdata/notes/Live_s1221.json b/assets/serverdata/beatmaps/Live_s1221.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1221.json
rename to assets/serverdata/beatmaps/Live_s1221.json
diff --git a/assets/serverdata/notes/Live_s1222.json b/assets/serverdata/beatmaps/Live_s1222.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1222.json
rename to assets/serverdata/beatmaps/Live_s1222.json
diff --git a/assets/serverdata/notes/Live_s1223.json b/assets/serverdata/beatmaps/Live_s1223.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1223.json
rename to assets/serverdata/beatmaps/Live_s1223.json
diff --git a/assets/serverdata/notes/Live_s1224.json b/assets/serverdata/beatmaps/Live_s1224.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1224.json
rename to assets/serverdata/beatmaps/Live_s1224.json
diff --git a/assets/serverdata/notes/Live_s1225.json b/assets/serverdata/beatmaps/Live_s1225.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1225.json
rename to assets/serverdata/beatmaps/Live_s1225.json
diff --git a/assets/serverdata/notes/Live_s1226.json b/assets/serverdata/beatmaps/Live_s1226.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1226.json
rename to assets/serverdata/beatmaps/Live_s1226.json
diff --git a/assets/serverdata/notes/Live_s1227.json b/assets/serverdata/beatmaps/Live_s1227.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1227.json
rename to assets/serverdata/beatmaps/Live_s1227.json
diff --git a/assets/serverdata/notes/Live_s1228.json b/assets/serverdata/beatmaps/Live_s1228.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1228.json
rename to assets/serverdata/beatmaps/Live_s1228.json
diff --git a/assets/serverdata/notes/Live_s1229.json b/assets/serverdata/beatmaps/Live_s1229.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1229.json
rename to assets/serverdata/beatmaps/Live_s1229.json
diff --git a/assets/serverdata/notes/Live_s1230.json b/assets/serverdata/beatmaps/Live_s1230.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1230.json
rename to assets/serverdata/beatmaps/Live_s1230.json
diff --git a/assets/serverdata/notes/Live_s1231.json b/assets/serverdata/beatmaps/Live_s1231.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1231.json
rename to assets/serverdata/beatmaps/Live_s1231.json
diff --git a/assets/serverdata/notes/Live_s1232.json b/assets/serverdata/beatmaps/Live_s1232.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1232.json
rename to assets/serverdata/beatmaps/Live_s1232.json
diff --git a/assets/serverdata/notes/Live_s1233.json b/assets/serverdata/beatmaps/Live_s1233.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1233.json
rename to assets/serverdata/beatmaps/Live_s1233.json
diff --git a/assets/serverdata/notes/Live_s1234.json b/assets/serverdata/beatmaps/Live_s1234.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1234.json
rename to assets/serverdata/beatmaps/Live_s1234.json
diff --git a/assets/serverdata/notes/Live_s1235.json b/assets/serverdata/beatmaps/Live_s1235.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1235.json
rename to assets/serverdata/beatmaps/Live_s1235.json
diff --git a/assets/serverdata/notes/Live_s1236.json b/assets/serverdata/beatmaps/Live_s1236.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1236.json
rename to assets/serverdata/beatmaps/Live_s1236.json
diff --git a/assets/serverdata/notes/Live_s1237.json b/assets/serverdata/beatmaps/Live_s1237.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1237.json
rename to assets/serverdata/beatmaps/Live_s1237.json
diff --git a/assets/serverdata/notes/Live_s1238.json b/assets/serverdata/beatmaps/Live_s1238.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1238.json
rename to assets/serverdata/beatmaps/Live_s1238.json
diff --git a/assets/serverdata/notes/Live_s1239.json b/assets/serverdata/beatmaps/Live_s1239.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1239.json
rename to assets/serverdata/beatmaps/Live_s1239.json
diff --git a/assets/serverdata/notes/Live_s1240.json b/assets/serverdata/beatmaps/Live_s1240.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1240.json
rename to assets/serverdata/beatmaps/Live_s1240.json
diff --git a/assets/serverdata/notes/Live_s1241.json b/assets/serverdata/beatmaps/Live_s1241.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1241.json
rename to assets/serverdata/beatmaps/Live_s1241.json
diff --git a/assets/serverdata/notes/Live_s1242.json b/assets/serverdata/beatmaps/Live_s1242.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1242.json
rename to assets/serverdata/beatmaps/Live_s1242.json
diff --git a/assets/serverdata/notes/Live_s1243.json b/assets/serverdata/beatmaps/Live_s1243.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1243.json
rename to assets/serverdata/beatmaps/Live_s1243.json
diff --git a/assets/serverdata/notes/Live_s1244.json b/assets/serverdata/beatmaps/Live_s1244.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1244.json
rename to assets/serverdata/beatmaps/Live_s1244.json
diff --git a/assets/serverdata/notes/Live_s1245.json b/assets/serverdata/beatmaps/Live_s1245.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1245.json
rename to assets/serverdata/beatmaps/Live_s1245.json
diff --git a/assets/serverdata/notes/Live_s1246.json b/assets/serverdata/beatmaps/Live_s1246.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1246.json
rename to assets/serverdata/beatmaps/Live_s1246.json
diff --git a/assets/serverdata/notes/Live_s1247.json b/assets/serverdata/beatmaps/Live_s1247.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1247.json
rename to assets/serverdata/beatmaps/Live_s1247.json
diff --git a/assets/serverdata/notes/Live_s1248.json b/assets/serverdata/beatmaps/Live_s1248.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1248.json
rename to assets/serverdata/beatmaps/Live_s1248.json
diff --git a/assets/serverdata/notes/Live_s1249.json b/assets/serverdata/beatmaps/Live_s1249.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1249.json
rename to assets/serverdata/beatmaps/Live_s1249.json
diff --git a/assets/serverdata/notes/Live_s1250.json b/assets/serverdata/beatmaps/Live_s1250.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1250.json
rename to assets/serverdata/beatmaps/Live_s1250.json
diff --git a/assets/serverdata/notes/Live_s1251.json b/assets/serverdata/beatmaps/Live_s1251.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1251.json
rename to assets/serverdata/beatmaps/Live_s1251.json
diff --git a/assets/serverdata/notes/Live_s1252.json b/assets/serverdata/beatmaps/Live_s1252.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1252.json
rename to assets/serverdata/beatmaps/Live_s1252.json
diff --git a/assets/serverdata/notes/Live_s1253.json b/assets/serverdata/beatmaps/Live_s1253.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1253.json
rename to assets/serverdata/beatmaps/Live_s1253.json
diff --git a/assets/serverdata/notes/Live_s1254.json b/assets/serverdata/beatmaps/Live_s1254.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1254.json
rename to assets/serverdata/beatmaps/Live_s1254.json
diff --git a/assets/serverdata/notes/Live_s1255.json b/assets/serverdata/beatmaps/Live_s1255.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1255.json
rename to assets/serverdata/beatmaps/Live_s1255.json
diff --git a/assets/serverdata/notes/Live_s1256.json b/assets/serverdata/beatmaps/Live_s1256.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1256.json
rename to assets/serverdata/beatmaps/Live_s1256.json
diff --git a/assets/serverdata/notes/Live_s1257.json b/assets/serverdata/beatmaps/Live_s1257.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1257.json
rename to assets/serverdata/beatmaps/Live_s1257.json
diff --git a/assets/serverdata/notes/Live_s1258.json b/assets/serverdata/beatmaps/Live_s1258.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1258.json
rename to assets/serverdata/beatmaps/Live_s1258.json
diff --git a/assets/serverdata/notes/Live_s1259.json b/assets/serverdata/beatmaps/Live_s1259.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1259.json
rename to assets/serverdata/beatmaps/Live_s1259.json
diff --git a/assets/serverdata/notes/Live_s1260.json b/assets/serverdata/beatmaps/Live_s1260.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1260.json
rename to assets/serverdata/beatmaps/Live_s1260.json
diff --git a/assets/serverdata/notes/Live_s1261.json b/assets/serverdata/beatmaps/Live_s1261.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1261.json
rename to assets/serverdata/beatmaps/Live_s1261.json
diff --git a/assets/serverdata/notes/Live_s1262.json b/assets/serverdata/beatmaps/Live_s1262.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1262.json
rename to assets/serverdata/beatmaps/Live_s1262.json
diff --git a/assets/serverdata/notes/Live_s1263.json b/assets/serverdata/beatmaps/Live_s1263.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1263.json
rename to assets/serverdata/beatmaps/Live_s1263.json
diff --git a/assets/serverdata/notes/Live_s1264.json b/assets/serverdata/beatmaps/Live_s1264.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1264.json
rename to assets/serverdata/beatmaps/Live_s1264.json
diff --git a/assets/serverdata/notes/Live_s1265.json b/assets/serverdata/beatmaps/Live_s1265.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1265.json
rename to assets/serverdata/beatmaps/Live_s1265.json
diff --git a/assets/serverdata/notes/Live_s1266.json b/assets/serverdata/beatmaps/Live_s1266.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1266.json
rename to assets/serverdata/beatmaps/Live_s1266.json
diff --git a/assets/serverdata/notes/Live_s1267.json b/assets/serverdata/beatmaps/Live_s1267.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1267.json
rename to assets/serverdata/beatmaps/Live_s1267.json
diff --git a/assets/serverdata/notes/Live_s1268.json b/assets/serverdata/beatmaps/Live_s1268.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1268.json
rename to assets/serverdata/beatmaps/Live_s1268.json
diff --git a/assets/serverdata/notes/Live_s1269.json b/assets/serverdata/beatmaps/Live_s1269.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1269.json
rename to assets/serverdata/beatmaps/Live_s1269.json
diff --git a/assets/serverdata/notes/Live_s1270.json b/assets/serverdata/beatmaps/Live_s1270.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1270.json
rename to assets/serverdata/beatmaps/Live_s1270.json
diff --git a/assets/serverdata/notes/Live_s1271.json b/assets/serverdata/beatmaps/Live_s1271.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1271.json
rename to assets/serverdata/beatmaps/Live_s1271.json
diff --git a/assets/serverdata/notes/Live_s1272.json b/assets/serverdata/beatmaps/Live_s1272.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1272.json
rename to assets/serverdata/beatmaps/Live_s1272.json
diff --git a/assets/serverdata/notes/Live_s1273.json b/assets/serverdata/beatmaps/Live_s1273.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1273.json
rename to assets/serverdata/beatmaps/Live_s1273.json
diff --git a/assets/serverdata/notes/Live_s1274.json b/assets/serverdata/beatmaps/Live_s1274.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1274.json
rename to assets/serverdata/beatmaps/Live_s1274.json
diff --git a/assets/serverdata/notes/Live_s1275.json b/assets/serverdata/beatmaps/Live_s1275.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1275.json
rename to assets/serverdata/beatmaps/Live_s1275.json
diff --git a/assets/serverdata/notes/Live_s1276.json b/assets/serverdata/beatmaps/Live_s1276.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1276.json
rename to assets/serverdata/beatmaps/Live_s1276.json
diff --git a/assets/serverdata/notes/Live_s1277.json b/assets/serverdata/beatmaps/Live_s1277.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1277.json
rename to assets/serverdata/beatmaps/Live_s1277.json
diff --git a/assets/serverdata/notes/Live_s1278.json b/assets/serverdata/beatmaps/Live_s1278.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1278.json
rename to assets/serverdata/beatmaps/Live_s1278.json
diff --git a/assets/serverdata/notes/Live_s1279.json b/assets/serverdata/beatmaps/Live_s1279.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1279.json
rename to assets/serverdata/beatmaps/Live_s1279.json
diff --git a/assets/serverdata/notes/Live_s1280.json b/assets/serverdata/beatmaps/Live_s1280.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1280.json
rename to assets/serverdata/beatmaps/Live_s1280.json
diff --git a/assets/serverdata/notes/Live_s1281.json b/assets/serverdata/beatmaps/Live_s1281.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1281.json
rename to assets/serverdata/beatmaps/Live_s1281.json
diff --git a/assets/serverdata/notes/Live_s1282.json b/assets/serverdata/beatmaps/Live_s1282.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1282.json
rename to assets/serverdata/beatmaps/Live_s1282.json
diff --git a/assets/serverdata/notes/Live_s1283.json b/assets/serverdata/beatmaps/Live_s1283.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1283.json
rename to assets/serverdata/beatmaps/Live_s1283.json
diff --git a/assets/serverdata/notes/Live_s1284.json b/assets/serverdata/beatmaps/Live_s1284.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1284.json
rename to assets/serverdata/beatmaps/Live_s1284.json
diff --git a/assets/serverdata/notes/Live_s1285.json b/assets/serverdata/beatmaps/Live_s1285.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1285.json
rename to assets/serverdata/beatmaps/Live_s1285.json
diff --git a/assets/serverdata/notes/Live_s1286.json b/assets/serverdata/beatmaps/Live_s1286.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1286.json
rename to assets/serverdata/beatmaps/Live_s1286.json
diff --git a/assets/serverdata/notes/Live_s1287.json b/assets/serverdata/beatmaps/Live_s1287.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1287.json
rename to assets/serverdata/beatmaps/Live_s1287.json
diff --git a/assets/serverdata/notes/Live_s1288.json b/assets/serverdata/beatmaps/Live_s1288.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1288.json
rename to assets/serverdata/beatmaps/Live_s1288.json
diff --git a/assets/serverdata/notes/Live_s1289.json b/assets/serverdata/beatmaps/Live_s1289.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1289.json
rename to assets/serverdata/beatmaps/Live_s1289.json
diff --git a/assets/serverdata/notes/Live_s1290.json b/assets/serverdata/beatmaps/Live_s1290.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1290.json
rename to assets/serverdata/beatmaps/Live_s1290.json
diff --git a/assets/serverdata/notes/Live_s1291.json b/assets/serverdata/beatmaps/Live_s1291.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1291.json
rename to assets/serverdata/beatmaps/Live_s1291.json
diff --git a/assets/serverdata/notes/Live_s1292.json b/assets/serverdata/beatmaps/Live_s1292.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1292.json
rename to assets/serverdata/beatmaps/Live_s1292.json
diff --git a/assets/serverdata/notes/Live_s1293.json b/assets/serverdata/beatmaps/Live_s1293.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1293.json
rename to assets/serverdata/beatmaps/Live_s1293.json
diff --git a/assets/serverdata/notes/Live_s1294.json b/assets/serverdata/beatmaps/Live_s1294.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1294.json
rename to assets/serverdata/beatmaps/Live_s1294.json
diff --git a/assets/serverdata/notes/Live_s1295.json b/assets/serverdata/beatmaps/Live_s1295.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1295.json
rename to assets/serverdata/beatmaps/Live_s1295.json
diff --git a/assets/serverdata/notes/Live_s1296.json b/assets/serverdata/beatmaps/Live_s1296.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1296.json
rename to assets/serverdata/beatmaps/Live_s1296.json
diff --git a/assets/serverdata/notes/Live_s1297.json b/assets/serverdata/beatmaps/Live_s1297.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1297.json
rename to assets/serverdata/beatmaps/Live_s1297.json
diff --git a/assets/serverdata/notes/Live_s1298.json b/assets/serverdata/beatmaps/Live_s1298.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1298.json
rename to assets/serverdata/beatmaps/Live_s1298.json
diff --git a/assets/serverdata/notes/Live_s1299.json b/assets/serverdata/beatmaps/Live_s1299.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1299.json
rename to assets/serverdata/beatmaps/Live_s1299.json
diff --git a/assets/serverdata/notes/Live_s1300.json b/assets/serverdata/beatmaps/Live_s1300.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1300.json
rename to assets/serverdata/beatmaps/Live_s1300.json
diff --git a/assets/serverdata/notes/Live_s1301.json b/assets/serverdata/beatmaps/Live_s1301.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1301.json
rename to assets/serverdata/beatmaps/Live_s1301.json
diff --git a/assets/serverdata/notes/Live_s1302.json b/assets/serverdata/beatmaps/Live_s1302.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1302.json
rename to assets/serverdata/beatmaps/Live_s1302.json
diff --git a/assets/serverdata/notes/Live_s1303.json b/assets/serverdata/beatmaps/Live_s1303.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1303.json
rename to assets/serverdata/beatmaps/Live_s1303.json
diff --git a/assets/serverdata/notes/Live_s1304.json b/assets/serverdata/beatmaps/Live_s1304.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1304.json
rename to assets/serverdata/beatmaps/Live_s1304.json
diff --git a/assets/serverdata/notes/Live_s1305.json b/assets/serverdata/beatmaps/Live_s1305.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1305.json
rename to assets/serverdata/beatmaps/Live_s1305.json
diff --git a/assets/serverdata/notes/Live_s1306.json b/assets/serverdata/beatmaps/Live_s1306.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1306.json
rename to assets/serverdata/beatmaps/Live_s1306.json
diff --git a/assets/serverdata/notes/Live_s1307.json b/assets/serverdata/beatmaps/Live_s1307.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1307.json
rename to assets/serverdata/beatmaps/Live_s1307.json
diff --git a/assets/serverdata/notes/Live_s1308.json b/assets/serverdata/beatmaps/Live_s1308.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1308.json
rename to assets/serverdata/beatmaps/Live_s1308.json
diff --git a/assets/serverdata/notes/Live_s1309.json b/assets/serverdata/beatmaps/Live_s1309.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1309.json
rename to assets/serverdata/beatmaps/Live_s1309.json
diff --git a/assets/serverdata/notes/Live_s1310.json b/assets/serverdata/beatmaps/Live_s1310.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1310.json
rename to assets/serverdata/beatmaps/Live_s1310.json
diff --git a/assets/serverdata/notes/Live_s1311.json b/assets/serverdata/beatmaps/Live_s1311.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1311.json
rename to assets/serverdata/beatmaps/Live_s1311.json
diff --git a/assets/serverdata/notes/Live_s1312.json b/assets/serverdata/beatmaps/Live_s1312.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1312.json
rename to assets/serverdata/beatmaps/Live_s1312.json
diff --git a/assets/serverdata/notes/Live_s1313.json b/assets/serverdata/beatmaps/Live_s1313.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1313.json
rename to assets/serverdata/beatmaps/Live_s1313.json
diff --git a/assets/serverdata/notes/Live_s1314.json b/assets/serverdata/beatmaps/Live_s1314.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1314.json
rename to assets/serverdata/beatmaps/Live_s1314.json
diff --git a/assets/serverdata/notes/Live_s1315.json b/assets/serverdata/beatmaps/Live_s1315.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1315.json
rename to assets/serverdata/beatmaps/Live_s1315.json
diff --git a/assets/serverdata/notes/Live_s1316.json b/assets/serverdata/beatmaps/Live_s1316.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1316.json
rename to assets/serverdata/beatmaps/Live_s1316.json
diff --git a/assets/serverdata/notes/Live_s1317.json b/assets/serverdata/beatmaps/Live_s1317.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1317.json
rename to assets/serverdata/beatmaps/Live_s1317.json
diff --git a/assets/serverdata/notes/Live_s1318.json b/assets/serverdata/beatmaps/Live_s1318.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1318.json
rename to assets/serverdata/beatmaps/Live_s1318.json
diff --git a/assets/serverdata/notes/Live_s1319.json b/assets/serverdata/beatmaps/Live_s1319.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1319.json
rename to assets/serverdata/beatmaps/Live_s1319.json
diff --git a/assets/serverdata/notes/Live_s1320.json b/assets/serverdata/beatmaps/Live_s1320.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1320.json
rename to assets/serverdata/beatmaps/Live_s1320.json
diff --git a/assets/serverdata/notes/Live_s1321.json b/assets/serverdata/beatmaps/Live_s1321.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1321.json
rename to assets/serverdata/beatmaps/Live_s1321.json
diff --git a/assets/serverdata/notes/Live_s1322.json b/assets/serverdata/beatmaps/Live_s1322.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1322.json
rename to assets/serverdata/beatmaps/Live_s1322.json
diff --git a/assets/serverdata/notes/Live_s1323.json b/assets/serverdata/beatmaps/Live_s1323.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1323.json
rename to assets/serverdata/beatmaps/Live_s1323.json
diff --git a/assets/serverdata/notes/Live_s1324.json b/assets/serverdata/beatmaps/Live_s1324.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1324.json
rename to assets/serverdata/beatmaps/Live_s1324.json
diff --git a/assets/serverdata/notes/Live_s1325.json b/assets/serverdata/beatmaps/Live_s1325.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1325.json
rename to assets/serverdata/beatmaps/Live_s1325.json
diff --git a/assets/serverdata/notes/Live_s1326.json b/assets/serverdata/beatmaps/Live_s1326.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1326.json
rename to assets/serverdata/beatmaps/Live_s1326.json
diff --git a/assets/serverdata/notes/Live_s1327.json b/assets/serverdata/beatmaps/Live_s1327.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1327.json
rename to assets/serverdata/beatmaps/Live_s1327.json
diff --git a/assets/serverdata/notes/Live_s1328.json b/assets/serverdata/beatmaps/Live_s1328.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1328.json
rename to assets/serverdata/beatmaps/Live_s1328.json
diff --git a/assets/serverdata/notes/Live_s1329.json b/assets/serverdata/beatmaps/Live_s1329.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1329.json
rename to assets/serverdata/beatmaps/Live_s1329.json
diff --git a/assets/serverdata/notes/Live_s1330.json b/assets/serverdata/beatmaps/Live_s1330.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1330.json
rename to assets/serverdata/beatmaps/Live_s1330.json
diff --git a/assets/serverdata/notes/Live_s1331.json b/assets/serverdata/beatmaps/Live_s1331.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1331.json
rename to assets/serverdata/beatmaps/Live_s1331.json
diff --git a/assets/serverdata/notes/Live_s1332.json b/assets/serverdata/beatmaps/Live_s1332.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1332.json
rename to assets/serverdata/beatmaps/Live_s1332.json
diff --git a/assets/serverdata/notes/Live_s1333.json b/assets/serverdata/beatmaps/Live_s1333.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1333.json
rename to assets/serverdata/beatmaps/Live_s1333.json
diff --git a/assets/serverdata/notes/Live_s1334.json b/assets/serverdata/beatmaps/Live_s1334.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1334.json
rename to assets/serverdata/beatmaps/Live_s1334.json
diff --git a/assets/serverdata/notes/Live_s1335.json b/assets/serverdata/beatmaps/Live_s1335.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1335.json
rename to assets/serverdata/beatmaps/Live_s1335.json
diff --git a/assets/serverdata/notes/Live_s1336.json b/assets/serverdata/beatmaps/Live_s1336.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1336.json
rename to assets/serverdata/beatmaps/Live_s1336.json
diff --git a/assets/serverdata/notes/Live_s1337.json b/assets/serverdata/beatmaps/Live_s1337.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1337.json
rename to assets/serverdata/beatmaps/Live_s1337.json
diff --git a/assets/serverdata/notes/Live_s1338.json b/assets/serverdata/beatmaps/Live_s1338.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1338.json
rename to assets/serverdata/beatmaps/Live_s1338.json
diff --git a/assets/serverdata/notes/Live_s1339.json b/assets/serverdata/beatmaps/Live_s1339.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1339.json
rename to assets/serverdata/beatmaps/Live_s1339.json
diff --git a/assets/serverdata/notes/Live_s1340.json b/assets/serverdata/beatmaps/Live_s1340.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1340.json
rename to assets/serverdata/beatmaps/Live_s1340.json
diff --git a/assets/serverdata/notes/Live_s1341.json b/assets/serverdata/beatmaps/Live_s1341.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1341.json
rename to assets/serverdata/beatmaps/Live_s1341.json
diff --git a/assets/serverdata/notes/Live_s1342.json b/assets/serverdata/beatmaps/Live_s1342.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1342.json
rename to assets/serverdata/beatmaps/Live_s1342.json
diff --git a/assets/serverdata/notes/Live_s1343.json b/assets/serverdata/beatmaps/Live_s1343.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1343.json
rename to assets/serverdata/beatmaps/Live_s1343.json
diff --git a/assets/serverdata/notes/Live_s1344.json b/assets/serverdata/beatmaps/Live_s1344.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1344.json
rename to assets/serverdata/beatmaps/Live_s1344.json
diff --git a/assets/serverdata/notes/Live_s1345.json b/assets/serverdata/beatmaps/Live_s1345.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1345.json
rename to assets/serverdata/beatmaps/Live_s1345.json
diff --git a/assets/serverdata/notes/Live_s1346.json b/assets/serverdata/beatmaps/Live_s1346.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1346.json
rename to assets/serverdata/beatmaps/Live_s1346.json
diff --git a/assets/serverdata/notes/Live_s1347.json b/assets/serverdata/beatmaps/Live_s1347.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1347.json
rename to assets/serverdata/beatmaps/Live_s1347.json
diff --git a/assets/serverdata/notes/Live_s1348.json b/assets/serverdata/beatmaps/Live_s1348.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1348.json
rename to assets/serverdata/beatmaps/Live_s1348.json
diff --git a/assets/serverdata/notes/Live_s1349.json b/assets/serverdata/beatmaps/Live_s1349.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1349.json
rename to assets/serverdata/beatmaps/Live_s1349.json
diff --git a/assets/serverdata/notes/Live_s1350.json b/assets/serverdata/beatmaps/Live_s1350.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1350.json
rename to assets/serverdata/beatmaps/Live_s1350.json
diff --git a/assets/serverdata/notes/Live_s1351.json b/assets/serverdata/beatmaps/Live_s1351.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1351.json
rename to assets/serverdata/beatmaps/Live_s1351.json
diff --git a/assets/serverdata/notes/Live_s1352.json b/assets/serverdata/beatmaps/Live_s1352.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1352.json
rename to assets/serverdata/beatmaps/Live_s1352.json
diff --git a/assets/serverdata/notes/Live_s1353.json b/assets/serverdata/beatmaps/Live_s1353.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1353.json
rename to assets/serverdata/beatmaps/Live_s1353.json
diff --git a/assets/serverdata/notes/Live_s1354.json b/assets/serverdata/beatmaps/Live_s1354.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1354.json
rename to assets/serverdata/beatmaps/Live_s1354.json
diff --git a/assets/serverdata/notes/Live_s1355.json b/assets/serverdata/beatmaps/Live_s1355.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1355.json
rename to assets/serverdata/beatmaps/Live_s1355.json
diff --git a/assets/serverdata/notes/Live_s1356.json b/assets/serverdata/beatmaps/Live_s1356.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1356.json
rename to assets/serverdata/beatmaps/Live_s1356.json
diff --git a/assets/serverdata/notes/Live_s1357.json b/assets/serverdata/beatmaps/Live_s1357.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1357.json
rename to assets/serverdata/beatmaps/Live_s1357.json
diff --git a/assets/serverdata/notes/Live_s1358.json b/assets/serverdata/beatmaps/Live_s1358.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1358.json
rename to assets/serverdata/beatmaps/Live_s1358.json
diff --git a/assets/serverdata/notes/Live_s1359.json b/assets/serverdata/beatmaps/Live_s1359.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1359.json
rename to assets/serverdata/beatmaps/Live_s1359.json
diff --git a/assets/serverdata/notes/Live_s1360.json b/assets/serverdata/beatmaps/Live_s1360.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1360.json
rename to assets/serverdata/beatmaps/Live_s1360.json
diff --git a/assets/serverdata/notes/Live_s1361.json b/assets/serverdata/beatmaps/Live_s1361.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1361.json
rename to assets/serverdata/beatmaps/Live_s1361.json
diff --git a/assets/serverdata/notes/Live_s1362.json b/assets/serverdata/beatmaps/Live_s1362.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1362.json
rename to assets/serverdata/beatmaps/Live_s1362.json
diff --git a/assets/serverdata/notes/Live_s1363.json b/assets/serverdata/beatmaps/Live_s1363.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1363.json
rename to assets/serverdata/beatmaps/Live_s1363.json
diff --git a/assets/serverdata/notes/Live_s1364.json b/assets/serverdata/beatmaps/Live_s1364.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1364.json
rename to assets/serverdata/beatmaps/Live_s1364.json
diff --git a/assets/serverdata/notes/Live_s1365.json b/assets/serverdata/beatmaps/Live_s1365.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1365.json
rename to assets/serverdata/beatmaps/Live_s1365.json
diff --git a/assets/serverdata/notes/Live_s1366.json b/assets/serverdata/beatmaps/Live_s1366.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1366.json
rename to assets/serverdata/beatmaps/Live_s1366.json
diff --git a/assets/serverdata/notes/Live_s1367.json b/assets/serverdata/beatmaps/Live_s1367.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1367.json
rename to assets/serverdata/beatmaps/Live_s1367.json
diff --git a/assets/serverdata/notes/Live_s1368.json b/assets/serverdata/beatmaps/Live_s1368.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1368.json
rename to assets/serverdata/beatmaps/Live_s1368.json
diff --git a/assets/serverdata/notes/Live_s1369.json b/assets/serverdata/beatmaps/Live_s1369.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1369.json
rename to assets/serverdata/beatmaps/Live_s1369.json
diff --git a/assets/serverdata/notes/Live_s1370.json b/assets/serverdata/beatmaps/Live_s1370.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1370.json
rename to assets/serverdata/beatmaps/Live_s1370.json
diff --git a/assets/serverdata/notes/Live_s1371.json b/assets/serverdata/beatmaps/Live_s1371.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1371.json
rename to assets/serverdata/beatmaps/Live_s1371.json
diff --git a/assets/serverdata/notes/Live_s1372.json b/assets/serverdata/beatmaps/Live_s1372.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1372.json
rename to assets/serverdata/beatmaps/Live_s1372.json
diff --git a/assets/serverdata/notes/Live_s1373.json b/assets/serverdata/beatmaps/Live_s1373.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1373.json
rename to assets/serverdata/beatmaps/Live_s1373.json
diff --git a/assets/serverdata/notes/Live_s1374.json b/assets/serverdata/beatmaps/Live_s1374.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1374.json
rename to assets/serverdata/beatmaps/Live_s1374.json
diff --git a/assets/serverdata/notes/Live_s1375.json b/assets/serverdata/beatmaps/Live_s1375.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1375.json
rename to assets/serverdata/beatmaps/Live_s1375.json
diff --git a/assets/serverdata/notes/Live_s1376.json b/assets/serverdata/beatmaps/Live_s1376.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1376.json
rename to assets/serverdata/beatmaps/Live_s1376.json
diff --git a/assets/serverdata/notes/Live_s1377.json b/assets/serverdata/beatmaps/Live_s1377.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1377.json
rename to assets/serverdata/beatmaps/Live_s1377.json
diff --git a/assets/serverdata/notes/Live_s1378.json b/assets/serverdata/beatmaps/Live_s1378.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1378.json
rename to assets/serverdata/beatmaps/Live_s1378.json
diff --git a/assets/serverdata/notes/Live_s1379.json b/assets/serverdata/beatmaps/Live_s1379.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1379.json
rename to assets/serverdata/beatmaps/Live_s1379.json
diff --git a/assets/serverdata/notes/Live_s1380.json b/assets/serverdata/beatmaps/Live_s1380.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1380.json
rename to assets/serverdata/beatmaps/Live_s1380.json
diff --git a/assets/serverdata/notes/Live_s1381.json b/assets/serverdata/beatmaps/Live_s1381.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1381.json
rename to assets/serverdata/beatmaps/Live_s1381.json
diff --git a/assets/serverdata/notes/Live_s1382.json b/assets/serverdata/beatmaps/Live_s1382.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1382.json
rename to assets/serverdata/beatmaps/Live_s1382.json
diff --git a/assets/serverdata/notes/Live_s1383.json b/assets/serverdata/beatmaps/Live_s1383.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1383.json
rename to assets/serverdata/beatmaps/Live_s1383.json
diff --git a/assets/serverdata/notes/Live_s1384.json b/assets/serverdata/beatmaps/Live_s1384.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1384.json
rename to assets/serverdata/beatmaps/Live_s1384.json
diff --git a/assets/serverdata/notes/Live_s1385.json b/assets/serverdata/beatmaps/Live_s1385.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1385.json
rename to assets/serverdata/beatmaps/Live_s1385.json
diff --git a/assets/serverdata/notes/Live_s1386.json b/assets/serverdata/beatmaps/Live_s1386.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1386.json
rename to assets/serverdata/beatmaps/Live_s1386.json
diff --git a/assets/serverdata/notes/Live_s1387.json b/assets/serverdata/beatmaps/Live_s1387.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1387.json
rename to assets/serverdata/beatmaps/Live_s1387.json
diff --git a/assets/serverdata/notes/Live_s1388.json b/assets/serverdata/beatmaps/Live_s1388.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1388.json
rename to assets/serverdata/beatmaps/Live_s1388.json
diff --git a/assets/serverdata/notes/Live_s1389.json b/assets/serverdata/beatmaps/Live_s1389.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1389.json
rename to assets/serverdata/beatmaps/Live_s1389.json
diff --git a/assets/serverdata/notes/Live_s1390.json b/assets/serverdata/beatmaps/Live_s1390.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1390.json
rename to assets/serverdata/beatmaps/Live_s1390.json
diff --git a/assets/serverdata/notes/Live_s1391.json b/assets/serverdata/beatmaps/Live_s1391.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1391.json
rename to assets/serverdata/beatmaps/Live_s1391.json
diff --git a/assets/serverdata/notes/Live_s1392.json b/assets/serverdata/beatmaps/Live_s1392.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1392.json
rename to assets/serverdata/beatmaps/Live_s1392.json
diff --git a/assets/serverdata/notes/Live_s1393.json b/assets/serverdata/beatmaps/Live_s1393.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1393.json
rename to assets/serverdata/beatmaps/Live_s1393.json
diff --git a/assets/serverdata/notes/Live_s1394.json b/assets/serverdata/beatmaps/Live_s1394.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1394.json
rename to assets/serverdata/beatmaps/Live_s1394.json
diff --git a/assets/serverdata/notes/Live_s1395.json b/assets/serverdata/beatmaps/Live_s1395.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1395.json
rename to assets/serverdata/beatmaps/Live_s1395.json
diff --git a/assets/serverdata/notes/Live_s1396.json b/assets/serverdata/beatmaps/Live_s1396.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1396.json
rename to assets/serverdata/beatmaps/Live_s1396.json
diff --git a/assets/serverdata/notes/Live_s1397.json b/assets/serverdata/beatmaps/Live_s1397.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1397.json
rename to assets/serverdata/beatmaps/Live_s1397.json
diff --git a/assets/serverdata/notes/Live_s1398.json b/assets/serverdata/beatmaps/Live_s1398.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1398.json
rename to assets/serverdata/beatmaps/Live_s1398.json
diff --git a/assets/serverdata/notes/Live_s1399.json b/assets/serverdata/beatmaps/Live_s1399.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1399.json
rename to assets/serverdata/beatmaps/Live_s1399.json
diff --git a/assets/serverdata/notes/Live_s1400.json b/assets/serverdata/beatmaps/Live_s1400.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1400.json
rename to assets/serverdata/beatmaps/Live_s1400.json
diff --git a/assets/serverdata/notes/Live_s1401.json b/assets/serverdata/beatmaps/Live_s1401.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1401.json
rename to assets/serverdata/beatmaps/Live_s1401.json
diff --git a/assets/serverdata/notes/Live_s1402.json b/assets/serverdata/beatmaps/Live_s1402.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1402.json
rename to assets/serverdata/beatmaps/Live_s1402.json
diff --git a/assets/serverdata/notes/Live_s1403.json b/assets/serverdata/beatmaps/Live_s1403.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1403.json
rename to assets/serverdata/beatmaps/Live_s1403.json
diff --git a/assets/serverdata/notes/Live_s1404.json b/assets/serverdata/beatmaps/Live_s1404.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1404.json
rename to assets/serverdata/beatmaps/Live_s1404.json
diff --git a/assets/serverdata/notes/Live_s1405.json b/assets/serverdata/beatmaps/Live_s1405.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1405.json
rename to assets/serverdata/beatmaps/Live_s1405.json
diff --git a/assets/serverdata/notes/Live_s1406.json b/assets/serverdata/beatmaps/Live_s1406.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1406.json
rename to assets/serverdata/beatmaps/Live_s1406.json
diff --git a/assets/serverdata/notes/Live_s1407.json b/assets/serverdata/beatmaps/Live_s1407.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1407.json
rename to assets/serverdata/beatmaps/Live_s1407.json
diff --git a/assets/serverdata/notes/Live_s1408.json b/assets/serverdata/beatmaps/Live_s1408.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1408.json
rename to assets/serverdata/beatmaps/Live_s1408.json
diff --git a/assets/serverdata/notes/Live_s1409.json b/assets/serverdata/beatmaps/Live_s1409.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1409.json
rename to assets/serverdata/beatmaps/Live_s1409.json
diff --git a/assets/serverdata/notes/Live_s1410.json b/assets/serverdata/beatmaps/Live_s1410.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1410.json
rename to assets/serverdata/beatmaps/Live_s1410.json
diff --git a/assets/serverdata/notes/Live_s1411.json b/assets/serverdata/beatmaps/Live_s1411.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1411.json
rename to assets/serverdata/beatmaps/Live_s1411.json
diff --git a/assets/serverdata/notes/Live_s1412.json b/assets/serverdata/beatmaps/Live_s1412.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1412.json
rename to assets/serverdata/beatmaps/Live_s1412.json
diff --git a/assets/serverdata/notes/Live_s1413.json b/assets/serverdata/beatmaps/Live_s1413.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1413.json
rename to assets/serverdata/beatmaps/Live_s1413.json
diff --git a/assets/serverdata/notes/Live_s1414.json b/assets/serverdata/beatmaps/Live_s1414.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1414.json
rename to assets/serverdata/beatmaps/Live_s1414.json
diff --git a/assets/serverdata/notes/Live_s1415.json b/assets/serverdata/beatmaps/Live_s1415.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1415.json
rename to assets/serverdata/beatmaps/Live_s1415.json
diff --git a/assets/serverdata/notes/Live_s1416.json b/assets/serverdata/beatmaps/Live_s1416.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1416.json
rename to assets/serverdata/beatmaps/Live_s1416.json
diff --git a/assets/serverdata/notes/Live_s1417.json b/assets/serverdata/beatmaps/Live_s1417.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1417.json
rename to assets/serverdata/beatmaps/Live_s1417.json
diff --git a/assets/serverdata/notes/Live_s1418.json b/assets/serverdata/beatmaps/Live_s1418.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1418.json
rename to assets/serverdata/beatmaps/Live_s1418.json
diff --git a/assets/serverdata/notes/Live_s1419.json b/assets/serverdata/beatmaps/Live_s1419.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1419.json
rename to assets/serverdata/beatmaps/Live_s1419.json
diff --git a/assets/serverdata/notes/Live_s1420.json b/assets/serverdata/beatmaps/Live_s1420.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1420.json
rename to assets/serverdata/beatmaps/Live_s1420.json
diff --git a/assets/serverdata/notes/Live_s1421.json b/assets/serverdata/beatmaps/Live_s1421.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1421.json
rename to assets/serverdata/beatmaps/Live_s1421.json
diff --git a/assets/serverdata/notes/Live_s1422.json b/assets/serverdata/beatmaps/Live_s1422.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1422.json
rename to assets/serverdata/beatmaps/Live_s1422.json
diff --git a/assets/serverdata/notes/Live_s1423.json b/assets/serverdata/beatmaps/Live_s1423.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1423.json
rename to assets/serverdata/beatmaps/Live_s1423.json
diff --git a/assets/serverdata/notes/Live_s1424.json b/assets/serverdata/beatmaps/Live_s1424.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1424.json
rename to assets/serverdata/beatmaps/Live_s1424.json
diff --git a/assets/serverdata/notes/Live_s1425.json b/assets/serverdata/beatmaps/Live_s1425.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1425.json
rename to assets/serverdata/beatmaps/Live_s1425.json
diff --git a/assets/serverdata/notes/Live_s1426.json b/assets/serverdata/beatmaps/Live_s1426.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1426.json
rename to assets/serverdata/beatmaps/Live_s1426.json
diff --git a/assets/serverdata/notes/Live_s1427.json b/assets/serverdata/beatmaps/Live_s1427.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1427.json
rename to assets/serverdata/beatmaps/Live_s1427.json
diff --git a/assets/serverdata/notes/Live_s1428.json b/assets/serverdata/beatmaps/Live_s1428.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1428.json
rename to assets/serverdata/beatmaps/Live_s1428.json
diff --git a/assets/serverdata/notes/Live_s1429.json b/assets/serverdata/beatmaps/Live_s1429.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1429.json
rename to assets/serverdata/beatmaps/Live_s1429.json
diff --git a/assets/serverdata/notes/Live_s1430.json b/assets/serverdata/beatmaps/Live_s1430.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1430.json
rename to assets/serverdata/beatmaps/Live_s1430.json
diff --git a/assets/serverdata/notes/Live_s1431.json b/assets/serverdata/beatmaps/Live_s1431.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1431.json
rename to assets/serverdata/beatmaps/Live_s1431.json
diff --git a/assets/serverdata/notes/Live_s1432.json b/assets/serverdata/beatmaps/Live_s1432.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1432.json
rename to assets/serverdata/beatmaps/Live_s1432.json
diff --git a/assets/serverdata/notes/Live_s1433.json b/assets/serverdata/beatmaps/Live_s1433.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1433.json
rename to assets/serverdata/beatmaps/Live_s1433.json
diff --git a/assets/serverdata/notes/Live_s1434.json b/assets/serverdata/beatmaps/Live_s1434.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1434.json
rename to assets/serverdata/beatmaps/Live_s1434.json
diff --git a/assets/serverdata/notes/Live_s1435.json b/assets/serverdata/beatmaps/Live_s1435.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1435.json
rename to assets/serverdata/beatmaps/Live_s1435.json
diff --git a/assets/serverdata/notes/Live_s1436.json b/assets/serverdata/beatmaps/Live_s1436.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1436.json
rename to assets/serverdata/beatmaps/Live_s1436.json
diff --git a/assets/serverdata/notes/Live_s1437.json b/assets/serverdata/beatmaps/Live_s1437.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1437.json
rename to assets/serverdata/beatmaps/Live_s1437.json
diff --git a/assets/serverdata/notes/Live_s1438.json b/assets/serverdata/beatmaps/Live_s1438.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1438.json
rename to assets/serverdata/beatmaps/Live_s1438.json
diff --git a/assets/serverdata/notes/Live_s1439.json b/assets/serverdata/beatmaps/Live_s1439.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1439.json
rename to assets/serverdata/beatmaps/Live_s1439.json
diff --git a/assets/serverdata/notes/Live_s1440.json b/assets/serverdata/beatmaps/Live_s1440.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1440.json
rename to assets/serverdata/beatmaps/Live_s1440.json
diff --git a/assets/serverdata/notes/Live_s1441.json b/assets/serverdata/beatmaps/Live_s1441.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1441.json
rename to assets/serverdata/beatmaps/Live_s1441.json
diff --git a/assets/serverdata/notes/Live_s1442.json b/assets/serverdata/beatmaps/Live_s1442.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1442.json
rename to assets/serverdata/beatmaps/Live_s1442.json
diff --git a/assets/serverdata/notes/Live_s1443.json b/assets/serverdata/beatmaps/Live_s1443.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1443.json
rename to assets/serverdata/beatmaps/Live_s1443.json
diff --git a/assets/serverdata/notes/Live_s1444.json b/assets/serverdata/beatmaps/Live_s1444.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1444.json
rename to assets/serverdata/beatmaps/Live_s1444.json
diff --git a/assets/serverdata/notes/Live_s1445.json b/assets/serverdata/beatmaps/Live_s1445.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1445.json
rename to assets/serverdata/beatmaps/Live_s1445.json
diff --git a/assets/serverdata/notes/Live_s1446.json b/assets/serverdata/beatmaps/Live_s1446.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1446.json
rename to assets/serverdata/beatmaps/Live_s1446.json
diff --git a/assets/serverdata/notes/Live_s1447.json b/assets/serverdata/beatmaps/Live_s1447.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1447.json
rename to assets/serverdata/beatmaps/Live_s1447.json
diff --git a/assets/serverdata/notes/Live_s1448.json b/assets/serverdata/beatmaps/Live_s1448.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1448.json
rename to assets/serverdata/beatmaps/Live_s1448.json
diff --git a/assets/serverdata/notes/Live_s1449.json b/assets/serverdata/beatmaps/Live_s1449.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1449.json
rename to assets/serverdata/beatmaps/Live_s1449.json
diff --git a/assets/serverdata/notes/Live_s1450.json b/assets/serverdata/beatmaps/Live_s1450.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1450.json
rename to assets/serverdata/beatmaps/Live_s1450.json
diff --git a/assets/serverdata/notes/Live_s1451.json b/assets/serverdata/beatmaps/Live_s1451.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1451.json
rename to assets/serverdata/beatmaps/Live_s1451.json
diff --git a/assets/serverdata/notes/Live_s1452.json b/assets/serverdata/beatmaps/Live_s1452.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1452.json
rename to assets/serverdata/beatmaps/Live_s1452.json
diff --git a/assets/serverdata/notes/Live_s1453.json b/assets/serverdata/beatmaps/Live_s1453.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1453.json
rename to assets/serverdata/beatmaps/Live_s1453.json
diff --git a/assets/serverdata/notes/Live_s1454.json b/assets/serverdata/beatmaps/Live_s1454.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1454.json
rename to assets/serverdata/beatmaps/Live_s1454.json
diff --git a/assets/serverdata/notes/Live_s1455.json b/assets/serverdata/beatmaps/Live_s1455.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1455.json
rename to assets/serverdata/beatmaps/Live_s1455.json
diff --git a/assets/serverdata/notes/Live_s1456.json b/assets/serverdata/beatmaps/Live_s1456.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1456.json
rename to assets/serverdata/beatmaps/Live_s1456.json
diff --git a/assets/serverdata/notes/Live_s1457.json b/assets/serverdata/beatmaps/Live_s1457.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1457.json
rename to assets/serverdata/beatmaps/Live_s1457.json
diff --git a/assets/serverdata/notes/Live_s1458.json b/assets/serverdata/beatmaps/Live_s1458.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1458.json
rename to assets/serverdata/beatmaps/Live_s1458.json
diff --git a/assets/serverdata/notes/Live_s1459.json b/assets/serverdata/beatmaps/Live_s1459.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1459.json
rename to assets/serverdata/beatmaps/Live_s1459.json
diff --git a/assets/serverdata/notes/Live_s1460.json b/assets/serverdata/beatmaps/Live_s1460.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1460.json
rename to assets/serverdata/beatmaps/Live_s1460.json
diff --git a/assets/serverdata/notes/Live_s1461.json b/assets/serverdata/beatmaps/Live_s1461.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1461.json
rename to assets/serverdata/beatmaps/Live_s1461.json
diff --git a/assets/serverdata/notes/Live_s1462.json b/assets/serverdata/beatmaps/Live_s1462.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1462.json
rename to assets/serverdata/beatmaps/Live_s1462.json
diff --git a/assets/serverdata/notes/Live_s1463.json b/assets/serverdata/beatmaps/Live_s1463.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1463.json
rename to assets/serverdata/beatmaps/Live_s1463.json
diff --git a/assets/serverdata/notes/Live_s1464.json b/assets/serverdata/beatmaps/Live_s1464.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1464.json
rename to assets/serverdata/beatmaps/Live_s1464.json
diff --git a/assets/serverdata/notes/Live_s1465.json b/assets/serverdata/beatmaps/Live_s1465.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1465.json
rename to assets/serverdata/beatmaps/Live_s1465.json
diff --git a/assets/serverdata/notes/Live_s1466.json b/assets/serverdata/beatmaps/Live_s1466.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1466.json
rename to assets/serverdata/beatmaps/Live_s1466.json
diff --git a/assets/serverdata/notes/Live_s1467.json b/assets/serverdata/beatmaps/Live_s1467.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1467.json
rename to assets/serverdata/beatmaps/Live_s1467.json
diff --git a/assets/serverdata/notes/Live_s1468.json b/assets/serverdata/beatmaps/Live_s1468.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1468.json
rename to assets/serverdata/beatmaps/Live_s1468.json
diff --git a/assets/serverdata/notes/Live_s1469.json b/assets/serverdata/beatmaps/Live_s1469.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1469.json
rename to assets/serverdata/beatmaps/Live_s1469.json
diff --git a/assets/serverdata/notes/Live_s1470.json b/assets/serverdata/beatmaps/Live_s1470.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1470.json
rename to assets/serverdata/beatmaps/Live_s1470.json
diff --git a/assets/serverdata/notes/Live_s1471.json b/assets/serverdata/beatmaps/Live_s1471.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1471.json
rename to assets/serverdata/beatmaps/Live_s1471.json
diff --git a/assets/serverdata/notes/Live_s1472.json b/assets/serverdata/beatmaps/Live_s1472.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1472.json
rename to assets/serverdata/beatmaps/Live_s1472.json
diff --git a/assets/serverdata/notes/Live_s1473.json b/assets/serverdata/beatmaps/Live_s1473.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1473.json
rename to assets/serverdata/beatmaps/Live_s1473.json
diff --git a/assets/serverdata/notes/Live_s1474.json b/assets/serverdata/beatmaps/Live_s1474.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1474.json
rename to assets/serverdata/beatmaps/Live_s1474.json
diff --git a/assets/serverdata/notes/Live_s1475.json b/assets/serverdata/beatmaps/Live_s1475.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1475.json
rename to assets/serverdata/beatmaps/Live_s1475.json
diff --git a/assets/serverdata/notes/Live_s1476.json b/assets/serverdata/beatmaps/Live_s1476.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1476.json
rename to assets/serverdata/beatmaps/Live_s1476.json
diff --git a/assets/serverdata/notes/Live_s1477.json b/assets/serverdata/beatmaps/Live_s1477.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1477.json
rename to assets/serverdata/beatmaps/Live_s1477.json
diff --git a/assets/serverdata/notes/Live_s1478.json b/assets/serverdata/beatmaps/Live_s1478.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1478.json
rename to assets/serverdata/beatmaps/Live_s1478.json
diff --git a/assets/serverdata/notes/Live_s1479.json b/assets/serverdata/beatmaps/Live_s1479.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1479.json
rename to assets/serverdata/beatmaps/Live_s1479.json
diff --git a/assets/serverdata/notes/Live_s1480.json b/assets/serverdata/beatmaps/Live_s1480.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1480.json
rename to assets/serverdata/beatmaps/Live_s1480.json
diff --git a/assets/serverdata/notes/Live_s1481.json b/assets/serverdata/beatmaps/Live_s1481.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1481.json
rename to assets/serverdata/beatmaps/Live_s1481.json
diff --git a/assets/serverdata/notes/Live_s1482.json b/assets/serverdata/beatmaps/Live_s1482.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1482.json
rename to assets/serverdata/beatmaps/Live_s1482.json
diff --git a/assets/serverdata/notes/Live_s1483.json b/assets/serverdata/beatmaps/Live_s1483.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1483.json
rename to assets/serverdata/beatmaps/Live_s1483.json
diff --git a/assets/serverdata/notes/Live_s1484.json b/assets/serverdata/beatmaps/Live_s1484.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1484.json
rename to assets/serverdata/beatmaps/Live_s1484.json
diff --git a/assets/serverdata/notes/Live_s1485.json b/assets/serverdata/beatmaps/Live_s1485.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1485.json
rename to assets/serverdata/beatmaps/Live_s1485.json
diff --git a/assets/serverdata/notes/Live_s1486.json b/assets/serverdata/beatmaps/Live_s1486.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1486.json
rename to assets/serverdata/beatmaps/Live_s1486.json
diff --git a/assets/serverdata/notes/Live_s1487.json b/assets/serverdata/beatmaps/Live_s1487.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1487.json
rename to assets/serverdata/beatmaps/Live_s1487.json
diff --git a/assets/serverdata/notes/Live_s1488.json b/assets/serverdata/beatmaps/Live_s1488.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1488.json
rename to assets/serverdata/beatmaps/Live_s1488.json
diff --git a/assets/serverdata/notes/Live_s1489.json b/assets/serverdata/beatmaps/Live_s1489.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1489.json
rename to assets/serverdata/beatmaps/Live_s1489.json
diff --git a/assets/serverdata/notes/Live_s1490.json b/assets/serverdata/beatmaps/Live_s1490.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1490.json
rename to assets/serverdata/beatmaps/Live_s1490.json
diff --git a/assets/serverdata/notes/Live_s1491.json b/assets/serverdata/beatmaps/Live_s1491.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1491.json
rename to assets/serverdata/beatmaps/Live_s1491.json
diff --git a/assets/serverdata/notes/Live_s1492.json b/assets/serverdata/beatmaps/Live_s1492.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1492.json
rename to assets/serverdata/beatmaps/Live_s1492.json
diff --git a/assets/serverdata/notes/Live_s1493.json b/assets/serverdata/beatmaps/Live_s1493.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1493.json
rename to assets/serverdata/beatmaps/Live_s1493.json
diff --git a/assets/serverdata/notes/Live_s1494.json b/assets/serverdata/beatmaps/Live_s1494.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1494.json
rename to assets/serverdata/beatmaps/Live_s1494.json
diff --git a/assets/serverdata/notes/Live_s1495.json b/assets/serverdata/beatmaps/Live_s1495.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1495.json
rename to assets/serverdata/beatmaps/Live_s1495.json
diff --git a/assets/serverdata/notes/Live_s1496.json b/assets/serverdata/beatmaps/Live_s1496.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1496.json
rename to assets/serverdata/beatmaps/Live_s1496.json
diff --git a/assets/serverdata/notes/Live_s1497.json b/assets/serverdata/beatmaps/Live_s1497.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1497.json
rename to assets/serverdata/beatmaps/Live_s1497.json
diff --git a/assets/serverdata/notes/Live_s1498.json b/assets/serverdata/beatmaps/Live_s1498.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1498.json
rename to assets/serverdata/beatmaps/Live_s1498.json
diff --git a/assets/serverdata/notes/Live_s1499.json b/assets/serverdata/beatmaps/Live_s1499.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1499.json
rename to assets/serverdata/beatmaps/Live_s1499.json
diff --git a/assets/serverdata/notes/Live_s1500.json b/assets/serverdata/beatmaps/Live_s1500.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1500.json
rename to assets/serverdata/beatmaps/Live_s1500.json
diff --git a/assets/serverdata/notes/Live_s1501.json b/assets/serverdata/beatmaps/Live_s1501.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1501.json
rename to assets/serverdata/beatmaps/Live_s1501.json
diff --git a/assets/serverdata/notes/Live_s1502.json b/assets/serverdata/beatmaps/Live_s1502.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1502.json
rename to assets/serverdata/beatmaps/Live_s1502.json
diff --git a/assets/serverdata/notes/Live_s1503.json b/assets/serverdata/beatmaps/Live_s1503.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1503.json
rename to assets/serverdata/beatmaps/Live_s1503.json
diff --git a/assets/serverdata/notes/Live_s1504.json b/assets/serverdata/beatmaps/Live_s1504.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1504.json
rename to assets/serverdata/beatmaps/Live_s1504.json
diff --git a/assets/serverdata/notes/Live_s1505.json b/assets/serverdata/beatmaps/Live_s1505.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1505.json
rename to assets/serverdata/beatmaps/Live_s1505.json
diff --git a/assets/serverdata/notes/Live_s1506.json b/assets/serverdata/beatmaps/Live_s1506.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1506.json
rename to assets/serverdata/beatmaps/Live_s1506.json
diff --git a/assets/serverdata/notes/Live_s1507.json b/assets/serverdata/beatmaps/Live_s1507.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1507.json
rename to assets/serverdata/beatmaps/Live_s1507.json
diff --git a/assets/serverdata/notes/Live_s1508.json b/assets/serverdata/beatmaps/Live_s1508.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1508.json
rename to assets/serverdata/beatmaps/Live_s1508.json
diff --git a/assets/serverdata/notes/Live_s1509.json b/assets/serverdata/beatmaps/Live_s1509.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1509.json
rename to assets/serverdata/beatmaps/Live_s1509.json
diff --git a/assets/serverdata/notes/Live_s1510.json b/assets/serverdata/beatmaps/Live_s1510.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1510.json
rename to assets/serverdata/beatmaps/Live_s1510.json
diff --git a/assets/serverdata/notes/Live_s1511.json b/assets/serverdata/beatmaps/Live_s1511.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1511.json
rename to assets/serverdata/beatmaps/Live_s1511.json
diff --git a/assets/serverdata/notes/Live_s1512.json b/assets/serverdata/beatmaps/Live_s1512.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1512.json
rename to assets/serverdata/beatmaps/Live_s1512.json
diff --git a/assets/serverdata/notes/Live_s1513.json b/assets/serverdata/beatmaps/Live_s1513.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1513.json
rename to assets/serverdata/beatmaps/Live_s1513.json
diff --git a/assets/serverdata/notes/Live_s1514.json b/assets/serverdata/beatmaps/Live_s1514.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1514.json
rename to assets/serverdata/beatmaps/Live_s1514.json
diff --git a/assets/serverdata/notes/Live_s1515.json b/assets/serverdata/beatmaps/Live_s1515.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1515.json
rename to assets/serverdata/beatmaps/Live_s1515.json
diff --git a/assets/serverdata/notes/Live_s1516.json b/assets/serverdata/beatmaps/Live_s1516.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1516.json
rename to assets/serverdata/beatmaps/Live_s1516.json
diff --git a/assets/serverdata/notes/Live_s1517.json b/assets/serverdata/beatmaps/Live_s1517.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1517.json
rename to assets/serverdata/beatmaps/Live_s1517.json
diff --git a/assets/serverdata/notes/Live_s1518.json b/assets/serverdata/beatmaps/Live_s1518.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1518.json
rename to assets/serverdata/beatmaps/Live_s1518.json
diff --git a/assets/serverdata/notes/Live_s1519.json b/assets/serverdata/beatmaps/Live_s1519.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1519.json
rename to assets/serverdata/beatmaps/Live_s1519.json
diff --git a/assets/serverdata/notes/Live_s1520.json b/assets/serverdata/beatmaps/Live_s1520.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1520.json
rename to assets/serverdata/beatmaps/Live_s1520.json
diff --git a/assets/serverdata/notes/Live_s1521.json b/assets/serverdata/beatmaps/Live_s1521.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1521.json
rename to assets/serverdata/beatmaps/Live_s1521.json
diff --git a/assets/serverdata/notes/Live_s1522.json b/assets/serverdata/beatmaps/Live_s1522.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1522.json
rename to assets/serverdata/beatmaps/Live_s1522.json
diff --git a/assets/serverdata/notes/Live_s1523.json b/assets/serverdata/beatmaps/Live_s1523.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1523.json
rename to assets/serverdata/beatmaps/Live_s1523.json
diff --git a/assets/serverdata/notes/Live_s1524.json b/assets/serverdata/beatmaps/Live_s1524.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1524.json
rename to assets/serverdata/beatmaps/Live_s1524.json
diff --git a/assets/serverdata/notes/Live_s1525.json b/assets/serverdata/beatmaps/Live_s1525.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1525.json
rename to assets/serverdata/beatmaps/Live_s1525.json
diff --git a/assets/serverdata/notes/Live_s1526.json b/assets/serverdata/beatmaps/Live_s1526.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1526.json
rename to assets/serverdata/beatmaps/Live_s1526.json
diff --git a/assets/serverdata/notes/Live_s1527.json b/assets/serverdata/beatmaps/Live_s1527.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1527.json
rename to assets/serverdata/beatmaps/Live_s1527.json
diff --git a/assets/serverdata/notes/Live_s1528.json b/assets/serverdata/beatmaps/Live_s1528.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1528.json
rename to assets/serverdata/beatmaps/Live_s1528.json
diff --git a/assets/serverdata/notes/Live_s1529.json b/assets/serverdata/beatmaps/Live_s1529.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1529.json
rename to assets/serverdata/beatmaps/Live_s1529.json
diff --git a/assets/serverdata/notes/Live_s1530.json b/assets/serverdata/beatmaps/Live_s1530.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1530.json
rename to assets/serverdata/beatmaps/Live_s1530.json
diff --git a/assets/serverdata/notes/Live_s1531.json b/assets/serverdata/beatmaps/Live_s1531.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1531.json
rename to assets/serverdata/beatmaps/Live_s1531.json
diff --git a/assets/serverdata/notes/Live_s1532.json b/assets/serverdata/beatmaps/Live_s1532.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1532.json
rename to assets/serverdata/beatmaps/Live_s1532.json
diff --git a/assets/serverdata/notes/Live_s1533.json b/assets/serverdata/beatmaps/Live_s1533.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1533.json
rename to assets/serverdata/beatmaps/Live_s1533.json
diff --git a/assets/serverdata/notes/Live_s1534.json b/assets/serverdata/beatmaps/Live_s1534.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1534.json
rename to assets/serverdata/beatmaps/Live_s1534.json
diff --git a/assets/serverdata/notes/Live_s1535.json b/assets/serverdata/beatmaps/Live_s1535.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1535.json
rename to assets/serverdata/beatmaps/Live_s1535.json
diff --git a/assets/serverdata/notes/Live_s1536.json b/assets/serverdata/beatmaps/Live_s1536.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1536.json
rename to assets/serverdata/beatmaps/Live_s1536.json
diff --git a/assets/serverdata/notes/Live_s1537.json b/assets/serverdata/beatmaps/Live_s1537.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1537.json
rename to assets/serverdata/beatmaps/Live_s1537.json
diff --git a/assets/serverdata/notes/Live_s1538.json b/assets/serverdata/beatmaps/Live_s1538.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1538.json
rename to assets/serverdata/beatmaps/Live_s1538.json
diff --git a/assets/serverdata/notes/Live_s1539.json b/assets/serverdata/beatmaps/Live_s1539.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1539.json
rename to assets/serverdata/beatmaps/Live_s1539.json
diff --git a/assets/serverdata/notes/Live_s1540.json b/assets/serverdata/beatmaps/Live_s1540.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1540.json
rename to assets/serverdata/beatmaps/Live_s1540.json
diff --git a/assets/serverdata/notes/Live_s1541.json b/assets/serverdata/beatmaps/Live_s1541.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1541.json
rename to assets/serverdata/beatmaps/Live_s1541.json
diff --git a/assets/serverdata/notes/Live_s1542.json b/assets/serverdata/beatmaps/Live_s1542.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1542.json
rename to assets/serverdata/beatmaps/Live_s1542.json
diff --git a/assets/serverdata/notes/Live_s1543.json b/assets/serverdata/beatmaps/Live_s1543.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1543.json
rename to assets/serverdata/beatmaps/Live_s1543.json
diff --git a/assets/serverdata/notes/Live_s1544.json b/assets/serverdata/beatmaps/Live_s1544.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1544.json
rename to assets/serverdata/beatmaps/Live_s1544.json
diff --git a/assets/serverdata/notes/Live_s1545.json b/assets/serverdata/beatmaps/Live_s1545.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1545.json
rename to assets/serverdata/beatmaps/Live_s1545.json
diff --git a/assets/serverdata/notes/Live_s1546.json b/assets/serverdata/beatmaps/Live_s1546.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1546.json
rename to assets/serverdata/beatmaps/Live_s1546.json
diff --git a/assets/serverdata/notes/Live_s1547.json b/assets/serverdata/beatmaps/Live_s1547.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1547.json
rename to assets/serverdata/beatmaps/Live_s1547.json
diff --git a/assets/serverdata/notes/Live_s1548.json b/assets/serverdata/beatmaps/Live_s1548.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1548.json
rename to assets/serverdata/beatmaps/Live_s1548.json
diff --git a/assets/serverdata/notes/Live_s1549.json b/assets/serverdata/beatmaps/Live_s1549.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1549.json
rename to assets/serverdata/beatmaps/Live_s1549.json
diff --git a/assets/serverdata/notes/Live_s1550.json b/assets/serverdata/beatmaps/Live_s1550.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1550.json
rename to assets/serverdata/beatmaps/Live_s1550.json
diff --git a/assets/serverdata/notes/Live_s1551.json b/assets/serverdata/beatmaps/Live_s1551.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1551.json
rename to assets/serverdata/beatmaps/Live_s1551.json
diff --git a/assets/serverdata/notes/Live_s1552.json b/assets/serverdata/beatmaps/Live_s1552.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1552.json
rename to assets/serverdata/beatmaps/Live_s1552.json
diff --git a/assets/serverdata/notes/Live_s1553.json b/assets/serverdata/beatmaps/Live_s1553.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1553.json
rename to assets/serverdata/beatmaps/Live_s1553.json
diff --git a/assets/serverdata/notes/Live_s1554.json b/assets/serverdata/beatmaps/Live_s1554.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1554.json
rename to assets/serverdata/beatmaps/Live_s1554.json
diff --git a/assets/serverdata/notes/Live_s1555.json b/assets/serverdata/beatmaps/Live_s1555.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1555.json
rename to assets/serverdata/beatmaps/Live_s1555.json
diff --git a/assets/serverdata/notes/Live_s1556.json b/assets/serverdata/beatmaps/Live_s1556.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1556.json
rename to assets/serverdata/beatmaps/Live_s1556.json
diff --git a/assets/serverdata/notes/Live_s1557.json b/assets/serverdata/beatmaps/Live_s1557.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1557.json
rename to assets/serverdata/beatmaps/Live_s1557.json
diff --git a/assets/serverdata/notes/Live_s1558.json b/assets/serverdata/beatmaps/Live_s1558.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1558.json
rename to assets/serverdata/beatmaps/Live_s1558.json
diff --git a/assets/serverdata/notes/Live_s1559.json b/assets/serverdata/beatmaps/Live_s1559.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1559.json
rename to assets/serverdata/beatmaps/Live_s1559.json
diff --git a/assets/serverdata/notes/Live_s1560.json b/assets/serverdata/beatmaps/Live_s1560.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1560.json
rename to assets/serverdata/beatmaps/Live_s1560.json
diff --git a/assets/serverdata/notes/Live_s1561.json b/assets/serverdata/beatmaps/Live_s1561.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1561.json
rename to assets/serverdata/beatmaps/Live_s1561.json
diff --git a/assets/serverdata/notes/Live_s1562.json b/assets/serverdata/beatmaps/Live_s1562.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1562.json
rename to assets/serverdata/beatmaps/Live_s1562.json
diff --git a/assets/serverdata/notes/Live_s1563.json b/assets/serverdata/beatmaps/Live_s1563.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1563.json
rename to assets/serverdata/beatmaps/Live_s1563.json
diff --git a/assets/serverdata/notes/Live_s1564.json b/assets/serverdata/beatmaps/Live_s1564.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1564.json
rename to assets/serverdata/beatmaps/Live_s1564.json
diff --git a/assets/serverdata/notes/Live_s1565.json b/assets/serverdata/beatmaps/Live_s1565.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1565.json
rename to assets/serverdata/beatmaps/Live_s1565.json
diff --git a/assets/serverdata/notes/Live_s1566.json b/assets/serverdata/beatmaps/Live_s1566.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1566.json
rename to assets/serverdata/beatmaps/Live_s1566.json
diff --git a/assets/serverdata/notes/Live_s1567.json b/assets/serverdata/beatmaps/Live_s1567.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1567.json
rename to assets/serverdata/beatmaps/Live_s1567.json
diff --git a/assets/serverdata/notes/Live_s1568.json b/assets/serverdata/beatmaps/Live_s1568.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1568.json
rename to assets/serverdata/beatmaps/Live_s1568.json
diff --git a/assets/serverdata/notes/Live_s1569.json b/assets/serverdata/beatmaps/Live_s1569.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1569.json
rename to assets/serverdata/beatmaps/Live_s1569.json
diff --git a/assets/serverdata/notes/Live_s1570.json b/assets/serverdata/beatmaps/Live_s1570.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1570.json
rename to assets/serverdata/beatmaps/Live_s1570.json
diff --git a/assets/serverdata/notes/Live_s1571.json b/assets/serverdata/beatmaps/Live_s1571.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1571.json
rename to assets/serverdata/beatmaps/Live_s1571.json
diff --git a/assets/serverdata/notes/Live_s1572.json b/assets/serverdata/beatmaps/Live_s1572.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1572.json
rename to assets/serverdata/beatmaps/Live_s1572.json
diff --git a/assets/serverdata/notes/Live_s1573.json b/assets/serverdata/beatmaps/Live_s1573.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1573.json
rename to assets/serverdata/beatmaps/Live_s1573.json
diff --git a/assets/serverdata/notes/Live_s1574.json b/assets/serverdata/beatmaps/Live_s1574.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1574.json
rename to assets/serverdata/beatmaps/Live_s1574.json
diff --git a/assets/serverdata/notes/Live_s1575.json b/assets/serverdata/beatmaps/Live_s1575.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1575.json
rename to assets/serverdata/beatmaps/Live_s1575.json
diff --git a/assets/serverdata/notes/Live_s1576.json b/assets/serverdata/beatmaps/Live_s1576.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1576.json
rename to assets/serverdata/beatmaps/Live_s1576.json
diff --git a/assets/serverdata/notes/Live_s1577.json b/assets/serverdata/beatmaps/Live_s1577.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1577.json
rename to assets/serverdata/beatmaps/Live_s1577.json
diff --git a/assets/serverdata/notes/Live_s1578.json b/assets/serverdata/beatmaps/Live_s1578.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1578.json
rename to assets/serverdata/beatmaps/Live_s1578.json
diff --git a/assets/serverdata/notes/Live_s1579.json b/assets/serverdata/beatmaps/Live_s1579.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1579.json
rename to assets/serverdata/beatmaps/Live_s1579.json
diff --git a/assets/serverdata/notes/Live_s1580.json b/assets/serverdata/beatmaps/Live_s1580.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1580.json
rename to assets/serverdata/beatmaps/Live_s1580.json
diff --git a/assets/serverdata/notes/Live_s1581.json b/assets/serverdata/beatmaps/Live_s1581.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1581.json
rename to assets/serverdata/beatmaps/Live_s1581.json
diff --git a/assets/serverdata/notes/Live_s1582.json b/assets/serverdata/beatmaps/Live_s1582.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1582.json
rename to assets/serverdata/beatmaps/Live_s1582.json
diff --git a/assets/serverdata/notes/Live_s1583.json b/assets/serverdata/beatmaps/Live_s1583.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1583.json
rename to assets/serverdata/beatmaps/Live_s1583.json
diff --git a/assets/serverdata/notes/Live_s1584.json b/assets/serverdata/beatmaps/Live_s1584.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1584.json
rename to assets/serverdata/beatmaps/Live_s1584.json
diff --git a/assets/serverdata/notes/Live_s1585.json b/assets/serverdata/beatmaps/Live_s1585.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1585.json
rename to assets/serverdata/beatmaps/Live_s1585.json
diff --git a/assets/serverdata/notes/Live_s1586.json b/assets/serverdata/beatmaps/Live_s1586.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1586.json
rename to assets/serverdata/beatmaps/Live_s1586.json
diff --git a/assets/serverdata/notes/Live_s1587.json b/assets/serverdata/beatmaps/Live_s1587.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1587.json
rename to assets/serverdata/beatmaps/Live_s1587.json
diff --git a/assets/serverdata/notes/Live_s1588.json b/assets/serverdata/beatmaps/Live_s1588.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1588.json
rename to assets/serverdata/beatmaps/Live_s1588.json
diff --git a/assets/serverdata/notes/Live_s1589.json b/assets/serverdata/beatmaps/Live_s1589.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1589.json
rename to assets/serverdata/beatmaps/Live_s1589.json
diff --git a/assets/serverdata/notes/Live_s1590.json b/assets/serverdata/beatmaps/Live_s1590.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1590.json
rename to assets/serverdata/beatmaps/Live_s1590.json
diff --git a/assets/serverdata/notes/Live_s1591.json b/assets/serverdata/beatmaps/Live_s1591.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1591.json
rename to assets/serverdata/beatmaps/Live_s1591.json
diff --git a/assets/serverdata/notes/Live_s1592.json b/assets/serverdata/beatmaps/Live_s1592.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1592.json
rename to assets/serverdata/beatmaps/Live_s1592.json
diff --git a/assets/serverdata/notes/Live_s1593.json b/assets/serverdata/beatmaps/Live_s1593.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1593.json
rename to assets/serverdata/beatmaps/Live_s1593.json
diff --git a/assets/serverdata/notes/Live_s1594.json b/assets/serverdata/beatmaps/Live_s1594.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1594.json
rename to assets/serverdata/beatmaps/Live_s1594.json
diff --git a/assets/serverdata/notes/Live_s1595.json b/assets/serverdata/beatmaps/Live_s1595.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1595.json
rename to assets/serverdata/beatmaps/Live_s1595.json
diff --git a/assets/serverdata/notes/Live_s1596.json b/assets/serverdata/beatmaps/Live_s1596.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1596.json
rename to assets/serverdata/beatmaps/Live_s1596.json
diff --git a/assets/serverdata/notes/Live_s1597.json b/assets/serverdata/beatmaps/Live_s1597.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1597.json
rename to assets/serverdata/beatmaps/Live_s1597.json
diff --git a/assets/serverdata/notes/Live_s1598.json b/assets/serverdata/beatmaps/Live_s1598.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1598.json
rename to assets/serverdata/beatmaps/Live_s1598.json
diff --git a/assets/serverdata/notes/Live_s1599.json b/assets/serverdata/beatmaps/Live_s1599.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1599.json
rename to assets/serverdata/beatmaps/Live_s1599.json
diff --git a/assets/serverdata/notes/Live_s1600.json b/assets/serverdata/beatmaps/Live_s1600.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1600.json
rename to assets/serverdata/beatmaps/Live_s1600.json
diff --git a/assets/serverdata/notes/Live_s1601.json b/assets/serverdata/beatmaps/Live_s1601.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1601.json
rename to assets/serverdata/beatmaps/Live_s1601.json
diff --git a/assets/serverdata/notes/Live_s1602.json b/assets/serverdata/beatmaps/Live_s1602.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1602.json
rename to assets/serverdata/beatmaps/Live_s1602.json
diff --git a/assets/serverdata/notes/Live_s1603.json b/assets/serverdata/beatmaps/Live_s1603.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1603.json
rename to assets/serverdata/beatmaps/Live_s1603.json
diff --git a/assets/serverdata/notes/Live_s1604.json b/assets/serverdata/beatmaps/Live_s1604.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1604.json
rename to assets/serverdata/beatmaps/Live_s1604.json
diff --git a/assets/serverdata/notes/Live_s1605.json b/assets/serverdata/beatmaps/Live_s1605.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1605.json
rename to assets/serverdata/beatmaps/Live_s1605.json
diff --git a/assets/serverdata/notes/Live_s1606.json b/assets/serverdata/beatmaps/Live_s1606.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1606.json
rename to assets/serverdata/beatmaps/Live_s1606.json
diff --git a/assets/serverdata/notes/Live_s1607.json b/assets/serverdata/beatmaps/Live_s1607.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1607.json
rename to assets/serverdata/beatmaps/Live_s1607.json
diff --git a/assets/serverdata/notes/Live_s1608.json b/assets/serverdata/beatmaps/Live_s1608.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1608.json
rename to assets/serverdata/beatmaps/Live_s1608.json
diff --git a/assets/serverdata/notes/Live_s1609.json b/assets/serverdata/beatmaps/Live_s1609.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1609.json
rename to assets/serverdata/beatmaps/Live_s1609.json
diff --git a/assets/serverdata/notes/Live_s1610.json b/assets/serverdata/beatmaps/Live_s1610.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1610.json
rename to assets/serverdata/beatmaps/Live_s1610.json
diff --git a/assets/serverdata/notes/Live_s1611.json b/assets/serverdata/beatmaps/Live_s1611.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1611.json
rename to assets/serverdata/beatmaps/Live_s1611.json
diff --git a/assets/serverdata/notes/Live_s1613.json b/assets/serverdata/beatmaps/Live_s1613.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1613.json
rename to assets/serverdata/beatmaps/Live_s1613.json
diff --git a/assets/serverdata/notes/Live_s1614.json b/assets/serverdata/beatmaps/Live_s1614.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1614.json
rename to assets/serverdata/beatmaps/Live_s1614.json
diff --git a/assets/serverdata/notes/Live_s1615.json b/assets/serverdata/beatmaps/Live_s1615.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1615.json
rename to assets/serverdata/beatmaps/Live_s1615.json
diff --git a/assets/serverdata/notes/Live_s1616.json b/assets/serverdata/beatmaps/Live_s1616.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1616.json
rename to assets/serverdata/beatmaps/Live_s1616.json
diff --git a/assets/serverdata/notes/Live_s1617.json b/assets/serverdata/beatmaps/Live_s1617.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1617.json
rename to assets/serverdata/beatmaps/Live_s1617.json
diff --git a/assets/serverdata/notes/Live_s1618.json b/assets/serverdata/beatmaps/Live_s1618.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1618.json
rename to assets/serverdata/beatmaps/Live_s1618.json
diff --git a/assets/serverdata/notes/Live_s1619.json b/assets/serverdata/beatmaps/Live_s1619.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1619.json
rename to assets/serverdata/beatmaps/Live_s1619.json
diff --git a/assets/serverdata/notes/Live_s1622.json b/assets/serverdata/beatmaps/Live_s1622.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1622.json
rename to assets/serverdata/beatmaps/Live_s1622.json
diff --git a/assets/serverdata/notes/Live_s1623.json b/assets/serverdata/beatmaps/Live_s1623.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1623.json
rename to assets/serverdata/beatmaps/Live_s1623.json
diff --git a/assets/serverdata/notes/Live_s1625.json b/assets/serverdata/beatmaps/Live_s1625.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1625.json
rename to assets/serverdata/beatmaps/Live_s1625.json
diff --git a/assets/serverdata/notes/Live_s1626.json b/assets/serverdata/beatmaps/Live_s1626.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1626.json
rename to assets/serverdata/beatmaps/Live_s1626.json
diff --git a/assets/serverdata/notes/Live_s1627.json b/assets/serverdata/beatmaps/Live_s1627.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1627.json
rename to assets/serverdata/beatmaps/Live_s1627.json
diff --git a/assets/serverdata/notes/Live_s1630.json b/assets/serverdata/beatmaps/Live_s1630.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1630.json
rename to assets/serverdata/beatmaps/Live_s1630.json
diff --git a/assets/serverdata/notes/Live_s1631.json b/assets/serverdata/beatmaps/Live_s1631.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1631.json
rename to assets/serverdata/beatmaps/Live_s1631.json
diff --git a/assets/serverdata/notes/Live_s1632.json b/assets/serverdata/beatmaps/Live_s1632.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1632.json
rename to assets/serverdata/beatmaps/Live_s1632.json
diff --git a/assets/serverdata/notes/Live_s1633.json b/assets/serverdata/beatmaps/Live_s1633.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1633.json
rename to assets/serverdata/beatmaps/Live_s1633.json
diff --git a/assets/serverdata/notes/Live_s1634.json b/assets/serverdata/beatmaps/Live_s1634.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1634.json
rename to assets/serverdata/beatmaps/Live_s1634.json
diff --git a/assets/serverdata/notes/Live_s1635.json b/assets/serverdata/beatmaps/Live_s1635.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1635.json
rename to assets/serverdata/beatmaps/Live_s1635.json
diff --git a/assets/serverdata/notes/Live_s1636.json b/assets/serverdata/beatmaps/Live_s1636.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1636.json
rename to assets/serverdata/beatmaps/Live_s1636.json
diff --git a/assets/serverdata/notes/Live_s1637.json b/assets/serverdata/beatmaps/Live_s1637.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1637.json
rename to assets/serverdata/beatmaps/Live_s1637.json
diff --git a/assets/serverdata/notes/Live_s1638.json b/assets/serverdata/beatmaps/Live_s1638.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1638.json
rename to assets/serverdata/beatmaps/Live_s1638.json
diff --git a/assets/serverdata/notes/Live_s1639.json b/assets/serverdata/beatmaps/Live_s1639.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1639.json
rename to assets/serverdata/beatmaps/Live_s1639.json
diff --git a/assets/serverdata/notes/Live_s1640.json b/assets/serverdata/beatmaps/Live_s1640.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1640.json
rename to assets/serverdata/beatmaps/Live_s1640.json
diff --git a/assets/serverdata/notes/Live_s1641.json b/assets/serverdata/beatmaps/Live_s1641.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1641.json
rename to assets/serverdata/beatmaps/Live_s1641.json
diff --git a/assets/serverdata/notes/Live_s1642.json b/assets/serverdata/beatmaps/Live_s1642.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1642.json
rename to assets/serverdata/beatmaps/Live_s1642.json
diff --git a/assets/serverdata/notes/Live_s1643.json b/assets/serverdata/beatmaps/Live_s1643.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1643.json
rename to assets/serverdata/beatmaps/Live_s1643.json
diff --git a/assets/serverdata/notes/Live_s1644.json b/assets/serverdata/beatmaps/Live_s1644.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1644.json
rename to assets/serverdata/beatmaps/Live_s1644.json
diff --git a/assets/serverdata/notes/Live_s1646.json b/assets/serverdata/beatmaps/Live_s1646.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1646.json
rename to assets/serverdata/beatmaps/Live_s1646.json
diff --git a/assets/serverdata/notes/Live_s1647.json b/assets/serverdata/beatmaps/Live_s1647.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1647.json
rename to assets/serverdata/beatmaps/Live_s1647.json
diff --git a/assets/serverdata/notes/Live_s1648.json b/assets/serverdata/beatmaps/Live_s1648.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1648.json
rename to assets/serverdata/beatmaps/Live_s1648.json
diff --git a/assets/serverdata/notes/Live_s1649.json b/assets/serverdata/beatmaps/Live_s1649.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1649.json
rename to assets/serverdata/beatmaps/Live_s1649.json
diff --git a/assets/serverdata/notes/Live_s1650.json b/assets/serverdata/beatmaps/Live_s1650.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1650.json
rename to assets/serverdata/beatmaps/Live_s1650.json
diff --git a/assets/serverdata/notes/Live_s1651.json b/assets/serverdata/beatmaps/Live_s1651.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1651.json
rename to assets/serverdata/beatmaps/Live_s1651.json
diff --git a/assets/serverdata/notes/Live_s1652.json b/assets/serverdata/beatmaps/Live_s1652.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1652.json
rename to assets/serverdata/beatmaps/Live_s1652.json
diff --git a/assets/serverdata/notes/Live_s1655.json b/assets/serverdata/beatmaps/Live_s1655.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1655.json
rename to assets/serverdata/beatmaps/Live_s1655.json
diff --git a/assets/serverdata/notes/Live_s1656.json b/assets/serverdata/beatmaps/Live_s1656.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1656.json
rename to assets/serverdata/beatmaps/Live_s1656.json
diff --git a/assets/serverdata/notes/Live_s1658.json b/assets/serverdata/beatmaps/Live_s1658.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1658.json
rename to assets/serverdata/beatmaps/Live_s1658.json
diff --git a/assets/serverdata/notes/Live_s1659.json b/assets/serverdata/beatmaps/Live_s1659.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1659.json
rename to assets/serverdata/beatmaps/Live_s1659.json
diff --git a/assets/serverdata/notes/Live_s1660.json b/assets/serverdata/beatmaps/Live_s1660.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1660.json
rename to assets/serverdata/beatmaps/Live_s1660.json
diff --git a/assets/serverdata/notes/Live_s1663.json b/assets/serverdata/beatmaps/Live_s1663.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1663.json
rename to assets/serverdata/beatmaps/Live_s1663.json
diff --git a/assets/serverdata/notes/Live_s1664.json b/assets/serverdata/beatmaps/Live_s1664.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1664.json
rename to assets/serverdata/beatmaps/Live_s1664.json
diff --git a/assets/serverdata/notes/Live_s1665.json b/assets/serverdata/beatmaps/Live_s1665.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1665.json
rename to assets/serverdata/beatmaps/Live_s1665.json
diff --git a/assets/serverdata/notes/Live_s1666.json b/assets/serverdata/beatmaps/Live_s1666.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1666.json
rename to assets/serverdata/beatmaps/Live_s1666.json
diff --git a/assets/serverdata/notes/Live_s1667.json b/assets/serverdata/beatmaps/Live_s1667.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1667.json
rename to assets/serverdata/beatmaps/Live_s1667.json
diff --git a/assets/serverdata/notes/Live_s1668.json b/assets/serverdata/beatmaps/Live_s1668.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1668.json
rename to assets/serverdata/beatmaps/Live_s1668.json
diff --git a/assets/serverdata/notes/Live_s1670.json b/assets/serverdata/beatmaps/Live_s1670.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1670.json
rename to assets/serverdata/beatmaps/Live_s1670.json
diff --git a/assets/serverdata/notes/Live_s1671.json b/assets/serverdata/beatmaps/Live_s1671.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1671.json
rename to assets/serverdata/beatmaps/Live_s1671.json
diff --git a/assets/serverdata/notes/Live_s1672.json b/assets/serverdata/beatmaps/Live_s1672.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1672.json
rename to assets/serverdata/beatmaps/Live_s1672.json
diff --git a/assets/serverdata/notes/Live_s1673.json b/assets/serverdata/beatmaps/Live_s1673.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1673.json
rename to assets/serverdata/beatmaps/Live_s1673.json
diff --git a/assets/serverdata/notes/Live_s1674.json b/assets/serverdata/beatmaps/Live_s1674.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1674.json
rename to assets/serverdata/beatmaps/Live_s1674.json
diff --git a/assets/serverdata/notes/Live_s1675.json b/assets/serverdata/beatmaps/Live_s1675.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1675.json
rename to assets/serverdata/beatmaps/Live_s1675.json
diff --git a/assets/serverdata/notes/Live_s1676.json b/assets/serverdata/beatmaps/Live_s1676.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1676.json
rename to assets/serverdata/beatmaps/Live_s1676.json
diff --git a/assets/serverdata/notes/Live_s1679.json b/assets/serverdata/beatmaps/Live_s1679.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1679.json
rename to assets/serverdata/beatmaps/Live_s1679.json
diff --git a/assets/serverdata/notes/Live_s1680.json b/assets/serverdata/beatmaps/Live_s1680.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1680.json
rename to assets/serverdata/beatmaps/Live_s1680.json
diff --git a/assets/serverdata/notes/Live_s1682.json b/assets/serverdata/beatmaps/Live_s1682.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1682.json
rename to assets/serverdata/beatmaps/Live_s1682.json
diff --git a/assets/serverdata/notes/Live_s1683.json b/assets/serverdata/beatmaps/Live_s1683.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1683.json
rename to assets/serverdata/beatmaps/Live_s1683.json
diff --git a/assets/serverdata/notes/Live_s1684.json b/assets/serverdata/beatmaps/Live_s1684.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1684.json
rename to assets/serverdata/beatmaps/Live_s1684.json
diff --git a/assets/serverdata/notes/Live_s1687.json b/assets/serverdata/beatmaps/Live_s1687.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1687.json
rename to assets/serverdata/beatmaps/Live_s1687.json
diff --git a/assets/serverdata/notes/Live_s1688.json b/assets/serverdata/beatmaps/Live_s1688.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1688.json
rename to assets/serverdata/beatmaps/Live_s1688.json
diff --git a/assets/serverdata/notes/Live_s1689.json b/assets/serverdata/beatmaps/Live_s1689.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1689.json
rename to assets/serverdata/beatmaps/Live_s1689.json
diff --git a/assets/serverdata/notes/Live_s1690.json b/assets/serverdata/beatmaps/Live_s1690.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1690.json
rename to assets/serverdata/beatmaps/Live_s1690.json
diff --git a/assets/serverdata/notes/Live_s1691.json b/assets/serverdata/beatmaps/Live_s1691.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1691.json
rename to assets/serverdata/beatmaps/Live_s1691.json
diff --git a/assets/serverdata/notes/Live_s1692.json b/assets/serverdata/beatmaps/Live_s1692.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1692.json
rename to assets/serverdata/beatmaps/Live_s1692.json
diff --git a/assets/serverdata/notes/Live_s1693.json b/assets/serverdata/beatmaps/Live_s1693.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1693.json
rename to assets/serverdata/beatmaps/Live_s1693.json
diff --git a/assets/serverdata/notes/Live_s1694.json b/assets/serverdata/beatmaps/Live_s1694.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1694.json
rename to assets/serverdata/beatmaps/Live_s1694.json
diff --git a/assets/serverdata/notes/Live_s1695.json b/assets/serverdata/beatmaps/Live_s1695.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1695.json
rename to assets/serverdata/beatmaps/Live_s1695.json
diff --git a/assets/serverdata/notes/Live_s1696.json b/assets/serverdata/beatmaps/Live_s1696.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1696.json
rename to assets/serverdata/beatmaps/Live_s1696.json
diff --git a/assets/serverdata/notes/Live_s1697.json b/assets/serverdata/beatmaps/Live_s1697.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1697.json
rename to assets/serverdata/beatmaps/Live_s1697.json
diff --git a/assets/serverdata/notes/Live_s1698.json b/assets/serverdata/beatmaps/Live_s1698.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1698.json
rename to assets/serverdata/beatmaps/Live_s1698.json
diff --git a/assets/serverdata/notes/Live_s1699.json b/assets/serverdata/beatmaps/Live_s1699.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1699.json
rename to assets/serverdata/beatmaps/Live_s1699.json
diff --git a/assets/serverdata/notes/Live_s1700.json b/assets/serverdata/beatmaps/Live_s1700.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1700.json
rename to assets/serverdata/beatmaps/Live_s1700.json
diff --git a/assets/serverdata/notes/Live_s1701.json b/assets/serverdata/beatmaps/Live_s1701.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1701.json
rename to assets/serverdata/beatmaps/Live_s1701.json
diff --git a/assets/serverdata/notes/Live_s1702.json b/assets/serverdata/beatmaps/Live_s1702.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1702.json
rename to assets/serverdata/beatmaps/Live_s1702.json
diff --git a/assets/serverdata/notes/Live_s1703.json b/assets/serverdata/beatmaps/Live_s1703.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1703.json
rename to assets/serverdata/beatmaps/Live_s1703.json
diff --git a/assets/serverdata/notes/Live_s1704.json b/assets/serverdata/beatmaps/Live_s1704.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1704.json
rename to assets/serverdata/beatmaps/Live_s1704.json
diff --git a/assets/serverdata/notes/Live_s1705.json b/assets/serverdata/beatmaps/Live_s1705.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1705.json
rename to assets/serverdata/beatmaps/Live_s1705.json
diff --git a/assets/serverdata/notes/Live_s1706.json b/assets/serverdata/beatmaps/Live_s1706.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1706.json
rename to assets/serverdata/beatmaps/Live_s1706.json
diff --git a/assets/serverdata/notes/Live_s1708.json b/assets/serverdata/beatmaps/Live_s1708.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1708.json
rename to assets/serverdata/beatmaps/Live_s1708.json
diff --git a/assets/serverdata/notes/Live_s1709.json b/assets/serverdata/beatmaps/Live_s1709.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1709.json
rename to assets/serverdata/beatmaps/Live_s1709.json
diff --git a/assets/serverdata/notes/Live_s1710.json b/assets/serverdata/beatmaps/Live_s1710.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1710.json
rename to assets/serverdata/beatmaps/Live_s1710.json
diff --git a/assets/serverdata/notes/Live_s1711.json b/assets/serverdata/beatmaps/Live_s1711.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1711.json
rename to assets/serverdata/beatmaps/Live_s1711.json
diff --git a/assets/serverdata/notes/Live_s1712.json b/assets/serverdata/beatmaps/Live_s1712.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1712.json
rename to assets/serverdata/beatmaps/Live_s1712.json
diff --git a/assets/serverdata/notes/Live_s1713.json b/assets/serverdata/beatmaps/Live_s1713.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1713.json
rename to assets/serverdata/beatmaps/Live_s1713.json
diff --git a/assets/serverdata/notes/Live_s1714.json b/assets/serverdata/beatmaps/Live_s1714.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1714.json
rename to assets/serverdata/beatmaps/Live_s1714.json
diff --git a/assets/serverdata/notes/Live_s1715.json b/assets/serverdata/beatmaps/Live_s1715.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1715.json
rename to assets/serverdata/beatmaps/Live_s1715.json
diff --git a/assets/serverdata/notes/Live_s1716.json b/assets/serverdata/beatmaps/Live_s1716.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1716.json
rename to assets/serverdata/beatmaps/Live_s1716.json
diff --git a/assets/serverdata/notes/Live_s1717.json b/assets/serverdata/beatmaps/Live_s1717.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1717.json
rename to assets/serverdata/beatmaps/Live_s1717.json
diff --git a/assets/serverdata/notes/Live_s1718.json b/assets/serverdata/beatmaps/Live_s1718.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1718.json
rename to assets/serverdata/beatmaps/Live_s1718.json
diff --git a/assets/serverdata/notes/Live_s1719.json b/assets/serverdata/beatmaps/Live_s1719.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1719.json
rename to assets/serverdata/beatmaps/Live_s1719.json
diff --git a/assets/serverdata/notes/Live_s1720.json b/assets/serverdata/beatmaps/Live_s1720.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1720.json
rename to assets/serverdata/beatmaps/Live_s1720.json
diff --git a/assets/serverdata/notes/Live_s1721.json b/assets/serverdata/beatmaps/Live_s1721.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1721.json
rename to assets/serverdata/beatmaps/Live_s1721.json
diff --git a/assets/serverdata/notes/Live_s1722.json b/assets/serverdata/beatmaps/Live_s1722.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1722.json
rename to assets/serverdata/beatmaps/Live_s1722.json
diff --git a/assets/serverdata/notes/Live_s1723.json b/assets/serverdata/beatmaps/Live_s1723.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1723.json
rename to assets/serverdata/beatmaps/Live_s1723.json
diff --git a/assets/serverdata/notes/Live_s1724.json b/assets/serverdata/beatmaps/Live_s1724.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1724.json
rename to assets/serverdata/beatmaps/Live_s1724.json
diff --git a/assets/serverdata/notes/Live_s1725.json b/assets/serverdata/beatmaps/Live_s1725.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1725.json
rename to assets/serverdata/beatmaps/Live_s1725.json
diff --git a/assets/serverdata/notes/Live_s1726.json b/assets/serverdata/beatmaps/Live_s1726.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1726.json
rename to assets/serverdata/beatmaps/Live_s1726.json
diff --git a/assets/serverdata/notes/Live_s1727.json b/assets/serverdata/beatmaps/Live_s1727.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1727.json
rename to assets/serverdata/beatmaps/Live_s1727.json
diff --git a/assets/serverdata/notes/Live_s1728.json b/assets/serverdata/beatmaps/Live_s1728.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1728.json
rename to assets/serverdata/beatmaps/Live_s1728.json
diff --git a/assets/serverdata/notes/Live_s1729.json b/assets/serverdata/beatmaps/Live_s1729.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1729.json
rename to assets/serverdata/beatmaps/Live_s1729.json
diff --git a/assets/serverdata/notes/Live_s1730.json b/assets/serverdata/beatmaps/Live_s1730.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1730.json
rename to assets/serverdata/beatmaps/Live_s1730.json
diff --git a/assets/serverdata/notes/Live_s1731.json b/assets/serverdata/beatmaps/Live_s1731.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1731.json
rename to assets/serverdata/beatmaps/Live_s1731.json
diff --git a/assets/serverdata/notes/Live_s1732.json b/assets/serverdata/beatmaps/Live_s1732.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1732.json
rename to assets/serverdata/beatmaps/Live_s1732.json
diff --git a/assets/serverdata/notes/Live_s1733.json b/assets/serverdata/beatmaps/Live_s1733.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1733.json
rename to assets/serverdata/beatmaps/Live_s1733.json
diff --git a/assets/serverdata/notes/Live_s1734.json b/assets/serverdata/beatmaps/Live_s1734.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1734.json
rename to assets/serverdata/beatmaps/Live_s1734.json
diff --git a/assets/serverdata/notes/Live_s1735.json b/assets/serverdata/beatmaps/Live_s1735.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1735.json
rename to assets/serverdata/beatmaps/Live_s1735.json
diff --git a/assets/serverdata/notes/Live_s1736.json b/assets/serverdata/beatmaps/Live_s1736.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1736.json
rename to assets/serverdata/beatmaps/Live_s1736.json
diff --git a/assets/serverdata/notes/Live_s1737.json b/assets/serverdata/beatmaps/Live_s1737.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1737.json
rename to assets/serverdata/beatmaps/Live_s1737.json
diff --git a/assets/serverdata/notes/Live_s1738.json b/assets/serverdata/beatmaps/Live_s1738.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1738.json
rename to assets/serverdata/beatmaps/Live_s1738.json
diff --git a/assets/serverdata/notes/Live_s1739.json b/assets/serverdata/beatmaps/Live_s1739.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1739.json
rename to assets/serverdata/beatmaps/Live_s1739.json
diff --git a/assets/serverdata/notes/Live_s1740.json b/assets/serverdata/beatmaps/Live_s1740.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1740.json
rename to assets/serverdata/beatmaps/Live_s1740.json
diff --git a/assets/serverdata/notes/Live_s1741.json b/assets/serverdata/beatmaps/Live_s1741.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1741.json
rename to assets/serverdata/beatmaps/Live_s1741.json
diff --git a/assets/serverdata/notes/Live_s1742.json b/assets/serverdata/beatmaps/Live_s1742.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1742.json
rename to assets/serverdata/beatmaps/Live_s1742.json
diff --git a/assets/serverdata/notes/Live_s1743.json b/assets/serverdata/beatmaps/Live_s1743.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1743.json
rename to assets/serverdata/beatmaps/Live_s1743.json
diff --git a/assets/serverdata/notes/Live_s1744.json b/assets/serverdata/beatmaps/Live_s1744.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1744.json
rename to assets/serverdata/beatmaps/Live_s1744.json
diff --git a/assets/serverdata/notes/Live_s1745.json b/assets/serverdata/beatmaps/Live_s1745.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1745.json
rename to assets/serverdata/beatmaps/Live_s1745.json
diff --git a/assets/serverdata/notes/Live_s1746.json b/assets/serverdata/beatmaps/Live_s1746.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1746.json
rename to assets/serverdata/beatmaps/Live_s1746.json
diff --git a/assets/serverdata/notes/Live_s1747.json b/assets/serverdata/beatmaps/Live_s1747.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1747.json
rename to assets/serverdata/beatmaps/Live_s1747.json
diff --git a/assets/serverdata/notes/Live_s1748.json b/assets/serverdata/beatmaps/Live_s1748.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1748.json
rename to assets/serverdata/beatmaps/Live_s1748.json
diff --git a/assets/serverdata/notes/Live_s1749.json b/assets/serverdata/beatmaps/Live_s1749.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1749.json
rename to assets/serverdata/beatmaps/Live_s1749.json
diff --git a/assets/serverdata/notes/Live_s1750.json b/assets/serverdata/beatmaps/Live_s1750.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1750.json
rename to assets/serverdata/beatmaps/Live_s1750.json
diff --git a/assets/serverdata/notes/Live_s1751.json b/assets/serverdata/beatmaps/Live_s1751.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1751.json
rename to assets/serverdata/beatmaps/Live_s1751.json
diff --git a/assets/serverdata/notes/Live_s1752.json b/assets/serverdata/beatmaps/Live_s1752.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1752.json
rename to assets/serverdata/beatmaps/Live_s1752.json
diff --git a/assets/serverdata/notes/Live_s1753.json b/assets/serverdata/beatmaps/Live_s1753.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1753.json
rename to assets/serverdata/beatmaps/Live_s1753.json
diff --git a/assets/serverdata/notes/Live_s1754.json b/assets/serverdata/beatmaps/Live_s1754.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1754.json
rename to assets/serverdata/beatmaps/Live_s1754.json
diff --git a/assets/serverdata/notes/Live_s1755.json b/assets/serverdata/beatmaps/Live_s1755.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1755.json
rename to assets/serverdata/beatmaps/Live_s1755.json
diff --git a/assets/serverdata/notes/Live_s1756.json b/assets/serverdata/beatmaps/Live_s1756.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1756.json
rename to assets/serverdata/beatmaps/Live_s1756.json
diff --git a/assets/serverdata/notes/Live_s1757.json b/assets/serverdata/beatmaps/Live_s1757.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1757.json
rename to assets/serverdata/beatmaps/Live_s1757.json
diff --git a/assets/serverdata/notes/Live_s1758.json b/assets/serverdata/beatmaps/Live_s1758.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1758.json
rename to assets/serverdata/beatmaps/Live_s1758.json
diff --git a/assets/serverdata/notes/Live_s1759.json b/assets/serverdata/beatmaps/Live_s1759.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1759.json
rename to assets/serverdata/beatmaps/Live_s1759.json
diff --git a/assets/serverdata/notes/Live_s1760.json b/assets/serverdata/beatmaps/Live_s1760.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1760.json
rename to assets/serverdata/beatmaps/Live_s1760.json
diff --git a/assets/serverdata/notes/Live_s1761.json b/assets/serverdata/beatmaps/Live_s1761.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1761.json
rename to assets/serverdata/beatmaps/Live_s1761.json
diff --git a/assets/serverdata/notes/Live_s1762.json b/assets/serverdata/beatmaps/Live_s1762.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1762.json
rename to assets/serverdata/beatmaps/Live_s1762.json
diff --git a/assets/serverdata/notes/Live_s1763.json b/assets/serverdata/beatmaps/Live_s1763.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1763.json
rename to assets/serverdata/beatmaps/Live_s1763.json
diff --git a/assets/serverdata/notes/Live_s1764.json b/assets/serverdata/beatmaps/Live_s1764.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1764.json
rename to assets/serverdata/beatmaps/Live_s1764.json
diff --git a/assets/serverdata/notes/Live_s1765.json b/assets/serverdata/beatmaps/Live_s1765.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1765.json
rename to assets/serverdata/beatmaps/Live_s1765.json
diff --git a/assets/serverdata/notes/Live_s1766.json b/assets/serverdata/beatmaps/Live_s1766.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1766.json
rename to assets/serverdata/beatmaps/Live_s1766.json
diff --git a/assets/serverdata/notes/Live_s1767.json b/assets/serverdata/beatmaps/Live_s1767.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1767.json
rename to assets/serverdata/beatmaps/Live_s1767.json
diff --git a/assets/serverdata/notes/Live_s1768.json b/assets/serverdata/beatmaps/Live_s1768.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1768.json
rename to assets/serverdata/beatmaps/Live_s1768.json
diff --git a/assets/serverdata/notes/Live_s1769.json b/assets/serverdata/beatmaps/Live_s1769.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1769.json
rename to assets/serverdata/beatmaps/Live_s1769.json
diff --git a/assets/serverdata/notes/Live_s1770.json b/assets/serverdata/beatmaps/Live_s1770.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1770.json
rename to assets/serverdata/beatmaps/Live_s1770.json
diff --git a/assets/serverdata/notes/Live_s1771.json b/assets/serverdata/beatmaps/Live_s1771.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1771.json
rename to assets/serverdata/beatmaps/Live_s1771.json
diff --git a/assets/serverdata/notes/Live_s1772.json b/assets/serverdata/beatmaps/Live_s1772.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1772.json
rename to assets/serverdata/beatmaps/Live_s1772.json
diff --git a/assets/serverdata/notes/Live_s1773.json b/assets/serverdata/beatmaps/Live_s1773.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1773.json
rename to assets/serverdata/beatmaps/Live_s1773.json
diff --git a/assets/serverdata/notes/Live_s1774.json b/assets/serverdata/beatmaps/Live_s1774.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1774.json
rename to assets/serverdata/beatmaps/Live_s1774.json
diff --git a/assets/serverdata/notes/Live_s1775.json b/assets/serverdata/beatmaps/Live_s1775.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1775.json
rename to assets/serverdata/beatmaps/Live_s1775.json
diff --git a/assets/serverdata/notes/Live_s1776.json b/assets/serverdata/beatmaps/Live_s1776.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1776.json
rename to assets/serverdata/beatmaps/Live_s1776.json
diff --git a/assets/serverdata/notes/Live_s1777.json b/assets/serverdata/beatmaps/Live_s1777.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1777.json
rename to assets/serverdata/beatmaps/Live_s1777.json
diff --git a/assets/serverdata/notes/Live_s1778.json b/assets/serverdata/beatmaps/Live_s1778.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1778.json
rename to assets/serverdata/beatmaps/Live_s1778.json
diff --git a/assets/serverdata/notes/Live_s1779.json b/assets/serverdata/beatmaps/Live_s1779.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1779.json
rename to assets/serverdata/beatmaps/Live_s1779.json
diff --git a/assets/serverdata/notes/Live_s1780.json b/assets/serverdata/beatmaps/Live_s1780.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1780.json
rename to assets/serverdata/beatmaps/Live_s1780.json
diff --git a/assets/serverdata/notes/Live_s1781.json b/assets/serverdata/beatmaps/Live_s1781.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1781.json
rename to assets/serverdata/beatmaps/Live_s1781.json
diff --git a/assets/serverdata/notes/Live_s1782.json b/assets/serverdata/beatmaps/Live_s1782.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1782.json
rename to assets/serverdata/beatmaps/Live_s1782.json
diff --git a/assets/serverdata/notes/Live_s1783.json b/assets/serverdata/beatmaps/Live_s1783.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1783.json
rename to assets/serverdata/beatmaps/Live_s1783.json
diff --git a/assets/serverdata/notes/Live_s1784.json b/assets/serverdata/beatmaps/Live_s1784.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1784.json
rename to assets/serverdata/beatmaps/Live_s1784.json
diff --git a/assets/serverdata/notes/Live_s1785.json b/assets/serverdata/beatmaps/Live_s1785.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1785.json
rename to assets/serverdata/beatmaps/Live_s1785.json
diff --git a/assets/serverdata/notes/Live_s1786.json b/assets/serverdata/beatmaps/Live_s1786.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1786.json
rename to assets/serverdata/beatmaps/Live_s1786.json
diff --git a/assets/serverdata/notes/Live_s1787.json b/assets/serverdata/beatmaps/Live_s1787.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1787.json
rename to assets/serverdata/beatmaps/Live_s1787.json
diff --git a/assets/serverdata/notes/Live_s1788.json b/assets/serverdata/beatmaps/Live_s1788.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1788.json
rename to assets/serverdata/beatmaps/Live_s1788.json
diff --git a/assets/serverdata/notes/Live_s1789.json b/assets/serverdata/beatmaps/Live_s1789.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1789.json
rename to assets/serverdata/beatmaps/Live_s1789.json
diff --git a/assets/serverdata/notes/Live_s1790.json b/assets/serverdata/beatmaps/Live_s1790.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1790.json
rename to assets/serverdata/beatmaps/Live_s1790.json
diff --git a/assets/serverdata/notes/Live_s1791.json b/assets/serverdata/beatmaps/Live_s1791.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1791.json
rename to assets/serverdata/beatmaps/Live_s1791.json
diff --git a/assets/serverdata/notes/Live_s1792.json b/assets/serverdata/beatmaps/Live_s1792.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1792.json
rename to assets/serverdata/beatmaps/Live_s1792.json
diff --git a/assets/serverdata/notes/Live_s1793.json b/assets/serverdata/beatmaps/Live_s1793.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1793.json
rename to assets/serverdata/beatmaps/Live_s1793.json
diff --git a/assets/serverdata/notes/Live_s1794.json b/assets/serverdata/beatmaps/Live_s1794.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1794.json
rename to assets/serverdata/beatmaps/Live_s1794.json
diff --git a/assets/serverdata/notes/Live_s1795.json b/assets/serverdata/beatmaps/Live_s1795.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1795.json
rename to assets/serverdata/beatmaps/Live_s1795.json
diff --git a/assets/serverdata/notes/Live_s1796.json b/assets/serverdata/beatmaps/Live_s1796.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1796.json
rename to assets/serverdata/beatmaps/Live_s1796.json
diff --git a/assets/serverdata/notes/Live_s1797.json b/assets/serverdata/beatmaps/Live_s1797.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1797.json
rename to assets/serverdata/beatmaps/Live_s1797.json
diff --git a/assets/serverdata/notes/Live_s1798.json b/assets/serverdata/beatmaps/Live_s1798.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1798.json
rename to assets/serverdata/beatmaps/Live_s1798.json
diff --git a/assets/serverdata/notes/Live_s1799.json b/assets/serverdata/beatmaps/Live_s1799.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1799.json
rename to assets/serverdata/beatmaps/Live_s1799.json
diff --git a/assets/serverdata/notes/Live_s1800.json b/assets/serverdata/beatmaps/Live_s1800.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1800.json
rename to assets/serverdata/beatmaps/Live_s1800.json
diff --git a/assets/serverdata/notes/Live_s1801.json b/assets/serverdata/beatmaps/Live_s1801.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1801.json
rename to assets/serverdata/beatmaps/Live_s1801.json
diff --git a/assets/serverdata/notes/Live_s1802.json b/assets/serverdata/beatmaps/Live_s1802.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1802.json
rename to assets/serverdata/beatmaps/Live_s1802.json
diff --git a/assets/serverdata/notes/Live_s1803.json b/assets/serverdata/beatmaps/Live_s1803.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1803.json
rename to assets/serverdata/beatmaps/Live_s1803.json
diff --git a/assets/serverdata/notes/Live_s1804.json b/assets/serverdata/beatmaps/Live_s1804.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1804.json
rename to assets/serverdata/beatmaps/Live_s1804.json
diff --git a/assets/serverdata/notes/Live_s1805.json b/assets/serverdata/beatmaps/Live_s1805.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1805.json
rename to assets/serverdata/beatmaps/Live_s1805.json
diff --git a/assets/serverdata/notes/Live_s1806.json b/assets/serverdata/beatmaps/Live_s1806.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1806.json
rename to assets/serverdata/beatmaps/Live_s1806.json
diff --git a/assets/serverdata/notes/Live_s1807.json b/assets/serverdata/beatmaps/Live_s1807.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1807.json
rename to assets/serverdata/beatmaps/Live_s1807.json
diff --git a/assets/serverdata/notes/Live_s1808.json b/assets/serverdata/beatmaps/Live_s1808.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1808.json
rename to assets/serverdata/beatmaps/Live_s1808.json
diff --git a/assets/serverdata/notes/Live_s1809.json b/assets/serverdata/beatmaps/Live_s1809.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1809.json
rename to assets/serverdata/beatmaps/Live_s1809.json
diff --git a/assets/serverdata/notes/Live_s1810.json b/assets/serverdata/beatmaps/Live_s1810.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1810.json
rename to assets/serverdata/beatmaps/Live_s1810.json
diff --git a/assets/serverdata/notes/Live_s1811.json b/assets/serverdata/beatmaps/Live_s1811.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1811.json
rename to assets/serverdata/beatmaps/Live_s1811.json
diff --git a/assets/serverdata/notes/Live_s1812.json b/assets/serverdata/beatmaps/Live_s1812.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1812.json
rename to assets/serverdata/beatmaps/Live_s1812.json
diff --git a/assets/serverdata/notes/Live_s1813.json b/assets/serverdata/beatmaps/Live_s1813.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1813.json
rename to assets/serverdata/beatmaps/Live_s1813.json
diff --git a/assets/serverdata/notes/Live_s1814.json b/assets/serverdata/beatmaps/Live_s1814.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1814.json
rename to assets/serverdata/beatmaps/Live_s1814.json
diff --git a/assets/serverdata/notes/Live_s1815.json b/assets/serverdata/beatmaps/Live_s1815.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1815.json
rename to assets/serverdata/beatmaps/Live_s1815.json
diff --git a/assets/serverdata/notes/Live_s1816.json b/assets/serverdata/beatmaps/Live_s1816.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1816.json
rename to assets/serverdata/beatmaps/Live_s1816.json
diff --git a/assets/serverdata/notes/Live_s1817.json b/assets/serverdata/beatmaps/Live_s1817.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1817.json
rename to assets/serverdata/beatmaps/Live_s1817.json
diff --git a/assets/serverdata/notes/Live_s1818.json b/assets/serverdata/beatmaps/Live_s1818.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1818.json
rename to assets/serverdata/beatmaps/Live_s1818.json
diff --git a/assets/serverdata/notes/Live_s1819.json b/assets/serverdata/beatmaps/Live_s1819.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1819.json
rename to assets/serverdata/beatmaps/Live_s1819.json
diff --git a/assets/serverdata/notes/Live_s1820.json b/assets/serverdata/beatmaps/Live_s1820.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1820.json
rename to assets/serverdata/beatmaps/Live_s1820.json
diff --git a/assets/serverdata/notes/Live_s1821.json b/assets/serverdata/beatmaps/Live_s1821.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1821.json
rename to assets/serverdata/beatmaps/Live_s1821.json
diff --git a/assets/serverdata/notes/Live_s1822.json b/assets/serverdata/beatmaps/Live_s1822.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1822.json
rename to assets/serverdata/beatmaps/Live_s1822.json
diff --git a/assets/serverdata/notes/Live_s1823.json b/assets/serverdata/beatmaps/Live_s1823.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1823.json
rename to assets/serverdata/beatmaps/Live_s1823.json
diff --git a/assets/serverdata/notes/Live_s1824.json b/assets/serverdata/beatmaps/Live_s1824.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1824.json
rename to assets/serverdata/beatmaps/Live_s1824.json
diff --git a/assets/serverdata/notes/Live_s1825.json b/assets/serverdata/beatmaps/Live_s1825.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1825.json
rename to assets/serverdata/beatmaps/Live_s1825.json
diff --git a/assets/serverdata/notes/Live_s1826.json b/assets/serverdata/beatmaps/Live_s1826.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1826.json
rename to assets/serverdata/beatmaps/Live_s1826.json
diff --git a/assets/serverdata/notes/Live_s1827.json b/assets/serverdata/beatmaps/Live_s1827.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1827.json
rename to assets/serverdata/beatmaps/Live_s1827.json
diff --git a/assets/serverdata/notes/Live_s1828.json b/assets/serverdata/beatmaps/Live_s1828.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1828.json
rename to assets/serverdata/beatmaps/Live_s1828.json
diff --git a/assets/serverdata/notes/Live_s1829.json b/assets/serverdata/beatmaps/Live_s1829.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1829.json
rename to assets/serverdata/beatmaps/Live_s1829.json
diff --git a/assets/serverdata/notes/Live_s1830.json b/assets/serverdata/beatmaps/Live_s1830.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1830.json
rename to assets/serverdata/beatmaps/Live_s1830.json
diff --git a/assets/serverdata/notes/Live_s1831.json b/assets/serverdata/beatmaps/Live_s1831.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1831.json
rename to assets/serverdata/beatmaps/Live_s1831.json
diff --git a/assets/serverdata/notes/Live_s1832.json b/assets/serverdata/beatmaps/Live_s1832.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1832.json
rename to assets/serverdata/beatmaps/Live_s1832.json
diff --git a/assets/serverdata/notes/Live_s1833.json b/assets/serverdata/beatmaps/Live_s1833.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1833.json
rename to assets/serverdata/beatmaps/Live_s1833.json
diff --git a/assets/serverdata/notes/Live_s1834.json b/assets/serverdata/beatmaps/Live_s1834.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1834.json
rename to assets/serverdata/beatmaps/Live_s1834.json
diff --git a/assets/serverdata/notes/Live_s1835.json b/assets/serverdata/beatmaps/Live_s1835.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1835.json
rename to assets/serverdata/beatmaps/Live_s1835.json
diff --git a/assets/serverdata/notes/Live_s1836.json b/assets/serverdata/beatmaps/Live_s1836.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1836.json
rename to assets/serverdata/beatmaps/Live_s1836.json
diff --git a/assets/serverdata/notes/Live_s1837.json b/assets/serverdata/beatmaps/Live_s1837.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1837.json
rename to assets/serverdata/beatmaps/Live_s1837.json
diff --git a/assets/serverdata/notes/Live_s1838.json b/assets/serverdata/beatmaps/Live_s1838.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1838.json
rename to assets/serverdata/beatmaps/Live_s1838.json
diff --git a/assets/serverdata/notes/Live_s1839.json b/assets/serverdata/beatmaps/Live_s1839.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1839.json
rename to assets/serverdata/beatmaps/Live_s1839.json
diff --git a/assets/serverdata/notes/Live_s1840.json b/assets/serverdata/beatmaps/Live_s1840.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1840.json
rename to assets/serverdata/beatmaps/Live_s1840.json
diff --git a/assets/serverdata/notes/Live_s1841.json b/assets/serverdata/beatmaps/Live_s1841.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1841.json
rename to assets/serverdata/beatmaps/Live_s1841.json
diff --git a/assets/serverdata/notes/Live_s1842.json b/assets/serverdata/beatmaps/Live_s1842.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1842.json
rename to assets/serverdata/beatmaps/Live_s1842.json
diff --git a/assets/serverdata/notes/Live_s1843.json b/assets/serverdata/beatmaps/Live_s1843.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1843.json
rename to assets/serverdata/beatmaps/Live_s1843.json
diff --git a/assets/serverdata/notes/Live_s1844.json b/assets/serverdata/beatmaps/Live_s1844.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1844.json
rename to assets/serverdata/beatmaps/Live_s1844.json
diff --git a/assets/serverdata/notes/Live_s1845.json b/assets/serverdata/beatmaps/Live_s1845.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1845.json
rename to assets/serverdata/beatmaps/Live_s1845.json
diff --git a/assets/serverdata/notes/Live_s1846.json b/assets/serverdata/beatmaps/Live_s1846.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1846.json
rename to assets/serverdata/beatmaps/Live_s1846.json
diff --git a/assets/serverdata/notes/Live_s1847.json b/assets/serverdata/beatmaps/Live_s1847.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1847.json
rename to assets/serverdata/beatmaps/Live_s1847.json
diff --git a/assets/serverdata/notes/Live_s1848.json b/assets/serverdata/beatmaps/Live_s1848.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1848.json
rename to assets/serverdata/beatmaps/Live_s1848.json
diff --git a/assets/serverdata/notes/Live_s1849.json b/assets/serverdata/beatmaps/Live_s1849.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1849.json
rename to assets/serverdata/beatmaps/Live_s1849.json
diff --git a/assets/serverdata/notes/Live_s1850.json b/assets/serverdata/beatmaps/Live_s1850.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1850.json
rename to assets/serverdata/beatmaps/Live_s1850.json
diff --git a/assets/serverdata/notes/Live_s1851.json b/assets/serverdata/beatmaps/Live_s1851.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1851.json
rename to assets/serverdata/beatmaps/Live_s1851.json
diff --git a/assets/serverdata/notes/Live_s1852.json b/assets/serverdata/beatmaps/Live_s1852.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1852.json
rename to assets/serverdata/beatmaps/Live_s1852.json
diff --git a/assets/serverdata/notes/Live_s1853.json b/assets/serverdata/beatmaps/Live_s1853.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1853.json
rename to assets/serverdata/beatmaps/Live_s1853.json
diff --git a/assets/serverdata/notes/Live_s1854.json b/assets/serverdata/beatmaps/Live_s1854.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1854.json
rename to assets/serverdata/beatmaps/Live_s1854.json
diff --git a/assets/serverdata/notes/Live_s1855.json b/assets/serverdata/beatmaps/Live_s1855.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1855.json
rename to assets/serverdata/beatmaps/Live_s1855.json
diff --git a/assets/serverdata/notes/Live_s1856.json b/assets/serverdata/beatmaps/Live_s1856.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1856.json
rename to assets/serverdata/beatmaps/Live_s1856.json
diff --git a/assets/serverdata/notes/Live_s1857.json b/assets/serverdata/beatmaps/Live_s1857.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1857.json
rename to assets/serverdata/beatmaps/Live_s1857.json
diff --git a/assets/serverdata/notes/Live_s1858.json b/assets/serverdata/beatmaps/Live_s1858.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1858.json
rename to assets/serverdata/beatmaps/Live_s1858.json
diff --git a/assets/serverdata/notes/Live_s1859.json b/assets/serverdata/beatmaps/Live_s1859.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1859.json
rename to assets/serverdata/beatmaps/Live_s1859.json
diff --git a/assets/serverdata/notes/Live_s1860.json b/assets/serverdata/beatmaps/Live_s1860.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1860.json
rename to assets/serverdata/beatmaps/Live_s1860.json
diff --git a/assets/serverdata/notes/Live_s1861.json b/assets/serverdata/beatmaps/Live_s1861.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1861.json
rename to assets/serverdata/beatmaps/Live_s1861.json
diff --git a/assets/serverdata/notes/Live_s1862.json b/assets/serverdata/beatmaps/Live_s1862.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1862.json
rename to assets/serverdata/beatmaps/Live_s1862.json
diff --git a/assets/serverdata/notes/Live_s1863.json b/assets/serverdata/beatmaps/Live_s1863.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1863.json
rename to assets/serverdata/beatmaps/Live_s1863.json
diff --git a/assets/serverdata/notes/Live_s1864.json b/assets/serverdata/beatmaps/Live_s1864.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1864.json
rename to assets/serverdata/beatmaps/Live_s1864.json
diff --git a/assets/serverdata/notes/Live_s1865.json b/assets/serverdata/beatmaps/Live_s1865.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1865.json
rename to assets/serverdata/beatmaps/Live_s1865.json
diff --git a/assets/serverdata/notes/Live_s1866.json b/assets/serverdata/beatmaps/Live_s1866.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1866.json
rename to assets/serverdata/beatmaps/Live_s1866.json
diff --git a/assets/serverdata/notes/Live_s1867.json b/assets/serverdata/beatmaps/Live_s1867.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1867.json
rename to assets/serverdata/beatmaps/Live_s1867.json
diff --git a/assets/serverdata/notes/Live_s1868.json b/assets/serverdata/beatmaps/Live_s1868.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1868.json
rename to assets/serverdata/beatmaps/Live_s1868.json
diff --git a/assets/serverdata/notes/Live_s1869.json b/assets/serverdata/beatmaps/Live_s1869.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1869.json
rename to assets/serverdata/beatmaps/Live_s1869.json
diff --git a/assets/serverdata/notes/Live_s1870.json b/assets/serverdata/beatmaps/Live_s1870.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1870.json
rename to assets/serverdata/beatmaps/Live_s1870.json
diff --git a/assets/serverdata/notes/Live_s1871.json b/assets/serverdata/beatmaps/Live_s1871.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1871.json
rename to assets/serverdata/beatmaps/Live_s1871.json
diff --git a/assets/serverdata/notes/Live_s1872.json b/assets/serverdata/beatmaps/Live_s1872.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1872.json
rename to assets/serverdata/beatmaps/Live_s1872.json
diff --git a/assets/serverdata/notes/Live_s1873.json b/assets/serverdata/beatmaps/Live_s1873.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1873.json
rename to assets/serverdata/beatmaps/Live_s1873.json
diff --git a/assets/serverdata/notes/Live_s1874.json b/assets/serverdata/beatmaps/Live_s1874.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1874.json
rename to assets/serverdata/beatmaps/Live_s1874.json
diff --git a/assets/serverdata/notes/Live_s1875.json b/assets/serverdata/beatmaps/Live_s1875.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1875.json
rename to assets/serverdata/beatmaps/Live_s1875.json
diff --git a/assets/serverdata/notes/Live_s1876.json b/assets/serverdata/beatmaps/Live_s1876.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1876.json
rename to assets/serverdata/beatmaps/Live_s1876.json
diff --git a/assets/serverdata/notes/Live_s1877.json b/assets/serverdata/beatmaps/Live_s1877.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1877.json
rename to assets/serverdata/beatmaps/Live_s1877.json
diff --git a/assets/serverdata/notes/Live_s1878.json b/assets/serverdata/beatmaps/Live_s1878.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1878.json
rename to assets/serverdata/beatmaps/Live_s1878.json
diff --git a/assets/serverdata/notes/Live_s1879.json b/assets/serverdata/beatmaps/Live_s1879.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1879.json
rename to assets/serverdata/beatmaps/Live_s1879.json
diff --git a/assets/serverdata/notes/Live_s1880.json b/assets/serverdata/beatmaps/Live_s1880.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1880.json
rename to assets/serverdata/beatmaps/Live_s1880.json
diff --git a/assets/serverdata/notes/Live_s1881.json b/assets/serverdata/beatmaps/Live_s1881.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1881.json
rename to assets/serverdata/beatmaps/Live_s1881.json
diff --git a/assets/serverdata/notes/Live_s1882.json b/assets/serverdata/beatmaps/Live_s1882.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1882.json
rename to assets/serverdata/beatmaps/Live_s1882.json
diff --git a/assets/serverdata/notes/Live_s1883.json b/assets/serverdata/beatmaps/Live_s1883.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1883.json
rename to assets/serverdata/beatmaps/Live_s1883.json
diff --git a/assets/serverdata/notes/Live_s1884.json b/assets/serverdata/beatmaps/Live_s1884.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1884.json
rename to assets/serverdata/beatmaps/Live_s1884.json
diff --git a/assets/serverdata/notes/Live_s1885.json b/assets/serverdata/beatmaps/Live_s1885.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1885.json
rename to assets/serverdata/beatmaps/Live_s1885.json
diff --git a/assets/serverdata/notes/Live_s1886.json b/assets/serverdata/beatmaps/Live_s1886.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1886.json
rename to assets/serverdata/beatmaps/Live_s1886.json
diff --git a/assets/serverdata/notes/Live_s1887.json b/assets/serverdata/beatmaps/Live_s1887.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1887.json
rename to assets/serverdata/beatmaps/Live_s1887.json
diff --git a/assets/serverdata/notes/Live_s1888.json b/assets/serverdata/beatmaps/Live_s1888.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1888.json
rename to assets/serverdata/beatmaps/Live_s1888.json
diff --git a/assets/serverdata/notes/Live_s1889.json b/assets/serverdata/beatmaps/Live_s1889.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1889.json
rename to assets/serverdata/beatmaps/Live_s1889.json
diff --git a/assets/serverdata/notes/Live_s1890.json b/assets/serverdata/beatmaps/Live_s1890.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1890.json
rename to assets/serverdata/beatmaps/Live_s1890.json
diff --git a/assets/serverdata/notes/Live_s1891.json b/assets/serverdata/beatmaps/Live_s1891.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1891.json
rename to assets/serverdata/beatmaps/Live_s1891.json
diff --git a/assets/serverdata/notes/Live_s1892.json b/assets/serverdata/beatmaps/Live_s1892.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1892.json
rename to assets/serverdata/beatmaps/Live_s1892.json
diff --git a/assets/serverdata/notes/Live_s1893.json b/assets/serverdata/beatmaps/Live_s1893.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1893.json
rename to assets/serverdata/beatmaps/Live_s1893.json
diff --git a/assets/serverdata/notes/Live_s1894.json b/assets/serverdata/beatmaps/Live_s1894.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1894.json
rename to assets/serverdata/beatmaps/Live_s1894.json
diff --git a/assets/serverdata/notes/Live_s1895.json b/assets/serverdata/beatmaps/Live_s1895.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1895.json
rename to assets/serverdata/beatmaps/Live_s1895.json
diff --git a/assets/serverdata/notes/Live_s1896.json b/assets/serverdata/beatmaps/Live_s1896.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1896.json
rename to assets/serverdata/beatmaps/Live_s1896.json
diff --git a/assets/serverdata/notes/Live_s1897.json b/assets/serverdata/beatmaps/Live_s1897.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1897.json
rename to assets/serverdata/beatmaps/Live_s1897.json
diff --git a/assets/serverdata/notes/Live_s1898.json b/assets/serverdata/beatmaps/Live_s1898.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1898.json
rename to assets/serverdata/beatmaps/Live_s1898.json
diff --git a/assets/serverdata/notes/Live_s1899.json b/assets/serverdata/beatmaps/Live_s1899.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1899.json
rename to assets/serverdata/beatmaps/Live_s1899.json
diff --git a/assets/serverdata/notes/Live_s1900.json b/assets/serverdata/beatmaps/Live_s1900.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1900.json
rename to assets/serverdata/beatmaps/Live_s1900.json
diff --git a/assets/serverdata/notes/Live_s1901.json b/assets/serverdata/beatmaps/Live_s1901.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1901.json
rename to assets/serverdata/beatmaps/Live_s1901.json
diff --git a/assets/serverdata/notes/Live_s1902.json b/assets/serverdata/beatmaps/Live_s1902.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1902.json
rename to assets/serverdata/beatmaps/Live_s1902.json
diff --git a/assets/serverdata/notes/Live_s1903.json b/assets/serverdata/beatmaps/Live_s1903.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1903.json
rename to assets/serverdata/beatmaps/Live_s1903.json
diff --git a/assets/serverdata/notes/Live_s1904.json b/assets/serverdata/beatmaps/Live_s1904.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1904.json
rename to assets/serverdata/beatmaps/Live_s1904.json
diff --git a/assets/serverdata/notes/Live_s1905.json b/assets/serverdata/beatmaps/Live_s1905.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1905.json
rename to assets/serverdata/beatmaps/Live_s1905.json
diff --git a/assets/serverdata/notes/Live_s1906.json b/assets/serverdata/beatmaps/Live_s1906.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1906.json
rename to assets/serverdata/beatmaps/Live_s1906.json
diff --git a/assets/serverdata/notes/Live_s1907.json b/assets/serverdata/beatmaps/Live_s1907.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1907.json
rename to assets/serverdata/beatmaps/Live_s1907.json
diff --git a/assets/serverdata/notes/Live_s1908.json b/assets/serverdata/beatmaps/Live_s1908.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1908.json
rename to assets/serverdata/beatmaps/Live_s1908.json
diff --git a/assets/serverdata/notes/Live_s1909.json b/assets/serverdata/beatmaps/Live_s1909.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1909.json
rename to assets/serverdata/beatmaps/Live_s1909.json
diff --git a/assets/serverdata/notes/Live_s1910.json b/assets/serverdata/beatmaps/Live_s1910.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1910.json
rename to assets/serverdata/beatmaps/Live_s1910.json
diff --git a/assets/serverdata/notes/Live_s1911.json b/assets/serverdata/beatmaps/Live_s1911.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1911.json
rename to assets/serverdata/beatmaps/Live_s1911.json
diff --git a/assets/serverdata/notes/Live_s1912.json b/assets/serverdata/beatmaps/Live_s1912.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1912.json
rename to assets/serverdata/beatmaps/Live_s1912.json
diff --git a/assets/serverdata/notes/Live_s1913.json b/assets/serverdata/beatmaps/Live_s1913.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1913.json
rename to assets/serverdata/beatmaps/Live_s1913.json
diff --git a/assets/serverdata/notes/Live_s1914.json b/assets/serverdata/beatmaps/Live_s1914.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1914.json
rename to assets/serverdata/beatmaps/Live_s1914.json
diff --git a/assets/serverdata/notes/Live_s1915.json b/assets/serverdata/beatmaps/Live_s1915.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1915.json
rename to assets/serverdata/beatmaps/Live_s1915.json
diff --git a/assets/serverdata/notes/Live_s1916.json b/assets/serverdata/beatmaps/Live_s1916.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1916.json
rename to assets/serverdata/beatmaps/Live_s1916.json
diff --git a/assets/serverdata/notes/Live_s1917.json b/assets/serverdata/beatmaps/Live_s1917.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1917.json
rename to assets/serverdata/beatmaps/Live_s1917.json
diff --git a/assets/serverdata/notes/Live_s1918.json b/assets/serverdata/beatmaps/Live_s1918.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1918.json
rename to assets/serverdata/beatmaps/Live_s1918.json
diff --git a/assets/serverdata/notes/Live_s1919.json b/assets/serverdata/beatmaps/Live_s1919.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1919.json
rename to assets/serverdata/beatmaps/Live_s1919.json
diff --git a/assets/serverdata/notes/Live_s1920.json b/assets/serverdata/beatmaps/Live_s1920.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1920.json
rename to assets/serverdata/beatmaps/Live_s1920.json
diff --git a/assets/serverdata/notes/Live_s1921.json b/assets/serverdata/beatmaps/Live_s1921.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1921.json
rename to assets/serverdata/beatmaps/Live_s1921.json
diff --git a/assets/serverdata/notes/Live_s1922.json b/assets/serverdata/beatmaps/Live_s1922.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1922.json
rename to assets/serverdata/beatmaps/Live_s1922.json
diff --git a/assets/serverdata/notes/Live_s1923.json b/assets/serverdata/beatmaps/Live_s1923.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1923.json
rename to assets/serverdata/beatmaps/Live_s1923.json
diff --git a/assets/serverdata/notes/Live_s1924.json b/assets/serverdata/beatmaps/Live_s1924.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1924.json
rename to assets/serverdata/beatmaps/Live_s1924.json
diff --git a/assets/serverdata/notes/Live_s1925.json b/assets/serverdata/beatmaps/Live_s1925.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1925.json
rename to assets/serverdata/beatmaps/Live_s1925.json
diff --git a/assets/serverdata/notes/Live_s1926.json b/assets/serverdata/beatmaps/Live_s1926.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1926.json
rename to assets/serverdata/beatmaps/Live_s1926.json
diff --git a/assets/serverdata/notes/Live_s1927.json b/assets/serverdata/beatmaps/Live_s1927.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1927.json
rename to assets/serverdata/beatmaps/Live_s1927.json
diff --git a/assets/serverdata/notes/Live_s1928.json b/assets/serverdata/beatmaps/Live_s1928.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1928.json
rename to assets/serverdata/beatmaps/Live_s1928.json
diff --git a/assets/serverdata/notes/Live_s1929.json b/assets/serverdata/beatmaps/Live_s1929.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1929.json
rename to assets/serverdata/beatmaps/Live_s1929.json
diff --git a/assets/serverdata/notes/Live_s1930.json b/assets/serverdata/beatmaps/Live_s1930.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1930.json
rename to assets/serverdata/beatmaps/Live_s1930.json
diff --git a/assets/serverdata/notes/Live_s1931.json b/assets/serverdata/beatmaps/Live_s1931.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1931.json
rename to assets/serverdata/beatmaps/Live_s1931.json
diff --git a/assets/serverdata/notes/Live_s1932.json b/assets/serverdata/beatmaps/Live_s1932.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1932.json
rename to assets/serverdata/beatmaps/Live_s1932.json
diff --git a/assets/serverdata/notes/Live_s1933.json b/assets/serverdata/beatmaps/Live_s1933.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1933.json
rename to assets/serverdata/beatmaps/Live_s1933.json
diff --git a/assets/serverdata/notes/Live_s1934.json b/assets/serverdata/beatmaps/Live_s1934.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1934.json
rename to assets/serverdata/beatmaps/Live_s1934.json
diff --git a/assets/serverdata/notes/Live_s1935.json b/assets/serverdata/beatmaps/Live_s1935.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1935.json
rename to assets/serverdata/beatmaps/Live_s1935.json
diff --git a/assets/serverdata/notes/Live_s1936.json b/assets/serverdata/beatmaps/Live_s1936.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1936.json
rename to assets/serverdata/beatmaps/Live_s1936.json
diff --git a/assets/serverdata/notes/Live_s1937.json b/assets/serverdata/beatmaps/Live_s1937.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1937.json
rename to assets/serverdata/beatmaps/Live_s1937.json
diff --git a/assets/serverdata/notes/Live_s1938.json b/assets/serverdata/beatmaps/Live_s1938.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1938.json
rename to assets/serverdata/beatmaps/Live_s1938.json
diff --git a/assets/serverdata/notes/Live_s1939.json b/assets/serverdata/beatmaps/Live_s1939.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1939.json
rename to assets/serverdata/beatmaps/Live_s1939.json
diff --git a/assets/serverdata/notes/Live_s1940.json b/assets/serverdata/beatmaps/Live_s1940.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1940.json
rename to assets/serverdata/beatmaps/Live_s1940.json
diff --git a/assets/serverdata/notes/Live_s1941.json b/assets/serverdata/beatmaps/Live_s1941.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1941.json
rename to assets/serverdata/beatmaps/Live_s1941.json
diff --git a/assets/serverdata/notes/Live_s1942.json b/assets/serverdata/beatmaps/Live_s1942.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1942.json
rename to assets/serverdata/beatmaps/Live_s1942.json
diff --git a/assets/serverdata/notes/Live_s1943.json b/assets/serverdata/beatmaps/Live_s1943.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1943.json
rename to assets/serverdata/beatmaps/Live_s1943.json
diff --git a/assets/serverdata/notes/Live_s1944.json b/assets/serverdata/beatmaps/Live_s1944.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1944.json
rename to assets/serverdata/beatmaps/Live_s1944.json
diff --git a/assets/serverdata/notes/Live_s1945.json b/assets/serverdata/beatmaps/Live_s1945.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1945.json
rename to assets/serverdata/beatmaps/Live_s1945.json
diff --git a/assets/serverdata/notes/Live_s1946.json b/assets/serverdata/beatmaps/Live_s1946.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1946.json
rename to assets/serverdata/beatmaps/Live_s1946.json
diff --git a/assets/serverdata/notes/Live_s1947.json b/assets/serverdata/beatmaps/Live_s1947.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1947.json
rename to assets/serverdata/beatmaps/Live_s1947.json
diff --git a/assets/serverdata/notes/Live_s1948.json b/assets/serverdata/beatmaps/Live_s1948.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1948.json
rename to assets/serverdata/beatmaps/Live_s1948.json
diff --git a/assets/serverdata/notes/Live_s1949.json b/assets/serverdata/beatmaps/Live_s1949.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1949.json
rename to assets/serverdata/beatmaps/Live_s1949.json
diff --git a/assets/serverdata/notes/Live_s1950.json b/assets/serverdata/beatmaps/Live_s1950.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1950.json
rename to assets/serverdata/beatmaps/Live_s1950.json
diff --git a/assets/serverdata/notes/Live_s1951.json b/assets/serverdata/beatmaps/Live_s1951.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1951.json
rename to assets/serverdata/beatmaps/Live_s1951.json
diff --git a/assets/serverdata/notes/Live_s1952.json b/assets/serverdata/beatmaps/Live_s1952.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1952.json
rename to assets/serverdata/beatmaps/Live_s1952.json
diff --git a/assets/serverdata/notes/Live_s1953.json b/assets/serverdata/beatmaps/Live_s1953.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1953.json
rename to assets/serverdata/beatmaps/Live_s1953.json
diff --git a/assets/serverdata/notes/Live_s1954.json b/assets/serverdata/beatmaps/Live_s1954.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1954.json
rename to assets/serverdata/beatmaps/Live_s1954.json
diff --git a/assets/serverdata/notes/Live_s1955.json b/assets/serverdata/beatmaps/Live_s1955.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1955.json
rename to assets/serverdata/beatmaps/Live_s1955.json
diff --git a/assets/serverdata/notes/Live_s1956.json b/assets/serverdata/beatmaps/Live_s1956.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1956.json
rename to assets/serverdata/beatmaps/Live_s1956.json
diff --git a/assets/serverdata/notes/Live_s1957.json b/assets/serverdata/beatmaps/Live_s1957.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1957.json
rename to assets/serverdata/beatmaps/Live_s1957.json
diff --git a/assets/serverdata/notes/Live_s1958.json b/assets/serverdata/beatmaps/Live_s1958.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1958.json
rename to assets/serverdata/beatmaps/Live_s1958.json
diff --git a/assets/serverdata/notes/Live_s1959.json b/assets/serverdata/beatmaps/Live_s1959.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1959.json
rename to assets/serverdata/beatmaps/Live_s1959.json
diff --git a/assets/serverdata/notes/Live_s1960.json b/assets/serverdata/beatmaps/Live_s1960.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1960.json
rename to assets/serverdata/beatmaps/Live_s1960.json
diff --git a/assets/serverdata/notes/Live_s1961.json b/assets/serverdata/beatmaps/Live_s1961.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1961.json
rename to assets/serverdata/beatmaps/Live_s1961.json
diff --git a/assets/serverdata/notes/Live_s1962.json b/assets/serverdata/beatmaps/Live_s1962.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1962.json
rename to assets/serverdata/beatmaps/Live_s1962.json
diff --git a/assets/serverdata/notes/Live_s1963.json b/assets/serverdata/beatmaps/Live_s1963.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1963.json
rename to assets/serverdata/beatmaps/Live_s1963.json
diff --git a/assets/serverdata/notes/Live_s1964.json b/assets/serverdata/beatmaps/Live_s1964.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1964.json
rename to assets/serverdata/beatmaps/Live_s1964.json
diff --git a/assets/serverdata/notes/Live_s1965.json b/assets/serverdata/beatmaps/Live_s1965.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1965.json
rename to assets/serverdata/beatmaps/Live_s1965.json
diff --git a/assets/serverdata/notes/Live_s1966.json b/assets/serverdata/beatmaps/Live_s1966.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1966.json
rename to assets/serverdata/beatmaps/Live_s1966.json
diff --git a/assets/serverdata/notes/Live_s1967.json b/assets/serverdata/beatmaps/Live_s1967.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1967.json
rename to assets/serverdata/beatmaps/Live_s1967.json
diff --git a/assets/serverdata/notes/Live_s1968.json b/assets/serverdata/beatmaps/Live_s1968.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1968.json
rename to assets/serverdata/beatmaps/Live_s1968.json
diff --git a/assets/serverdata/notes/Live_s1969.json b/assets/serverdata/beatmaps/Live_s1969.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1969.json
rename to assets/serverdata/beatmaps/Live_s1969.json
diff --git a/assets/serverdata/notes/Live_s1970.json b/assets/serverdata/beatmaps/Live_s1970.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1970.json
rename to assets/serverdata/beatmaps/Live_s1970.json
diff --git a/assets/serverdata/notes/Live_s1971.json b/assets/serverdata/beatmaps/Live_s1971.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1971.json
rename to assets/serverdata/beatmaps/Live_s1971.json
diff --git a/assets/serverdata/notes/Live_s1972.json b/assets/serverdata/beatmaps/Live_s1972.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1972.json
rename to assets/serverdata/beatmaps/Live_s1972.json
diff --git a/assets/serverdata/notes/Live_s1973.json b/assets/serverdata/beatmaps/Live_s1973.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1973.json
rename to assets/serverdata/beatmaps/Live_s1973.json
diff --git a/assets/serverdata/notes/Live_s1974.json b/assets/serverdata/beatmaps/Live_s1974.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1974.json
rename to assets/serverdata/beatmaps/Live_s1974.json
diff --git a/assets/serverdata/notes/Live_s1975.json b/assets/serverdata/beatmaps/Live_s1975.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1975.json
rename to assets/serverdata/beatmaps/Live_s1975.json
diff --git a/assets/serverdata/notes/Live_s1976.json b/assets/serverdata/beatmaps/Live_s1976.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1976.json
rename to assets/serverdata/beatmaps/Live_s1976.json
diff --git a/assets/serverdata/notes/Live_s1977.json b/assets/serverdata/beatmaps/Live_s1977.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1977.json
rename to assets/serverdata/beatmaps/Live_s1977.json
diff --git a/assets/serverdata/notes/Live_s1978.json b/assets/serverdata/beatmaps/Live_s1978.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1978.json
rename to assets/serverdata/beatmaps/Live_s1978.json
diff --git a/assets/serverdata/notes/Live_s1979.json b/assets/serverdata/beatmaps/Live_s1979.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1979.json
rename to assets/serverdata/beatmaps/Live_s1979.json
diff --git a/assets/serverdata/notes/Live_s1980.json b/assets/serverdata/beatmaps/Live_s1980.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1980.json
rename to assets/serverdata/beatmaps/Live_s1980.json
diff --git a/assets/serverdata/notes/Live_s1981.json b/assets/serverdata/beatmaps/Live_s1981.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1981.json
rename to assets/serverdata/beatmaps/Live_s1981.json
diff --git a/assets/serverdata/notes/Live_s1982.json b/assets/serverdata/beatmaps/Live_s1982.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1982.json
rename to assets/serverdata/beatmaps/Live_s1982.json
diff --git a/assets/serverdata/notes/Live_s1983.json b/assets/serverdata/beatmaps/Live_s1983.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1983.json
rename to assets/serverdata/beatmaps/Live_s1983.json
diff --git a/assets/serverdata/notes/Live_s1984.json b/assets/serverdata/beatmaps/Live_s1984.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1984.json
rename to assets/serverdata/beatmaps/Live_s1984.json
diff --git a/assets/serverdata/notes/Live_s1985.json b/assets/serverdata/beatmaps/Live_s1985.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1985.json
rename to assets/serverdata/beatmaps/Live_s1985.json
diff --git a/assets/serverdata/notes/Live_s1986.json b/assets/serverdata/beatmaps/Live_s1986.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1986.json
rename to assets/serverdata/beatmaps/Live_s1986.json
diff --git a/assets/serverdata/notes/Live_s1987.json b/assets/serverdata/beatmaps/Live_s1987.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1987.json
rename to assets/serverdata/beatmaps/Live_s1987.json
diff --git a/assets/serverdata/notes/Live_s1988.json b/assets/serverdata/beatmaps/Live_s1988.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1988.json
rename to assets/serverdata/beatmaps/Live_s1988.json
diff --git a/assets/serverdata/notes/Live_s1989.json b/assets/serverdata/beatmaps/Live_s1989.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1989.json
rename to assets/serverdata/beatmaps/Live_s1989.json
diff --git a/assets/serverdata/notes/Live_s1990.json b/assets/serverdata/beatmaps/Live_s1990.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1990.json
rename to assets/serverdata/beatmaps/Live_s1990.json
diff --git a/assets/serverdata/notes/Live_s1991.json b/assets/serverdata/beatmaps/Live_s1991.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1991.json
rename to assets/serverdata/beatmaps/Live_s1991.json
diff --git a/assets/serverdata/notes/Live_s1992.json b/assets/serverdata/beatmaps/Live_s1992.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1992.json
rename to assets/serverdata/beatmaps/Live_s1992.json
diff --git a/assets/serverdata/notes/Live_s1993.json b/assets/serverdata/beatmaps/Live_s1993.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1993.json
rename to assets/serverdata/beatmaps/Live_s1993.json
diff --git a/assets/serverdata/notes/Live_s1994.json b/assets/serverdata/beatmaps/Live_s1994.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1994.json
rename to assets/serverdata/beatmaps/Live_s1994.json
diff --git a/assets/serverdata/notes/Live_s1995.json b/assets/serverdata/beatmaps/Live_s1995.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1995.json
rename to assets/serverdata/beatmaps/Live_s1995.json
diff --git a/assets/serverdata/notes/Live_s1996.json b/assets/serverdata/beatmaps/Live_s1996.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1996.json
rename to assets/serverdata/beatmaps/Live_s1996.json
diff --git a/assets/serverdata/notes/Live_s1997.json b/assets/serverdata/beatmaps/Live_s1997.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1997.json
rename to assets/serverdata/beatmaps/Live_s1997.json
diff --git a/assets/serverdata/notes/Live_s1998.json b/assets/serverdata/beatmaps/Live_s1998.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1998.json
rename to assets/serverdata/beatmaps/Live_s1998.json
diff --git a/assets/serverdata/notes/Live_s1999.json b/assets/serverdata/beatmaps/Live_s1999.json
similarity index 100%
rename from assets/serverdata/notes/Live_s1999.json
rename to assets/serverdata/beatmaps/Live_s1999.json
diff --git a/assets/serverdata/notes/Live_s2000.json b/assets/serverdata/beatmaps/Live_s2000.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2000.json
rename to assets/serverdata/beatmaps/Live_s2000.json
diff --git a/assets/serverdata/notes/Live_s20001.json b/assets/serverdata/beatmaps/Live_s20001.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20001.json
rename to assets/serverdata/beatmaps/Live_s20001.json
diff --git a/assets/serverdata/notes/Live_s20002.json b/assets/serverdata/beatmaps/Live_s20002.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20002.json
rename to assets/serverdata/beatmaps/Live_s20002.json
diff --git a/assets/serverdata/notes/Live_s20003.json b/assets/serverdata/beatmaps/Live_s20003.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20003.json
rename to assets/serverdata/beatmaps/Live_s20003.json
diff --git a/assets/serverdata/notes/Live_s20004.json b/assets/serverdata/beatmaps/Live_s20004.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20004.json
rename to assets/serverdata/beatmaps/Live_s20004.json
diff --git a/assets/serverdata/notes/Live_s20005.json b/assets/serverdata/beatmaps/Live_s20005.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20005.json
rename to assets/serverdata/beatmaps/Live_s20005.json
diff --git a/assets/serverdata/notes/Live_s20006.json b/assets/serverdata/beatmaps/Live_s20006.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20006.json
rename to assets/serverdata/beatmaps/Live_s20006.json
diff --git a/assets/serverdata/notes/Live_s20007.json b/assets/serverdata/beatmaps/Live_s20007.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20007.json
rename to assets/serverdata/beatmaps/Live_s20007.json
diff --git a/assets/serverdata/notes/Live_s20008.json b/assets/serverdata/beatmaps/Live_s20008.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20008.json
rename to assets/serverdata/beatmaps/Live_s20008.json
diff --git a/assets/serverdata/notes/Live_s20009.json b/assets/serverdata/beatmaps/Live_s20009.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20009.json
rename to assets/serverdata/beatmaps/Live_s20009.json
diff --git a/assets/serverdata/notes/Live_s2001.json b/assets/serverdata/beatmaps/Live_s2001.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2001.json
rename to assets/serverdata/beatmaps/Live_s2001.json
diff --git a/assets/serverdata/notes/Live_s20010.json b/assets/serverdata/beatmaps/Live_s20010.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20010.json
rename to assets/serverdata/beatmaps/Live_s20010.json
diff --git a/assets/serverdata/notes/Live_s20011.json b/assets/serverdata/beatmaps/Live_s20011.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20011.json
rename to assets/serverdata/beatmaps/Live_s20011.json
diff --git a/assets/serverdata/notes/Live_s20012.json b/assets/serverdata/beatmaps/Live_s20012.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20012.json
rename to assets/serverdata/beatmaps/Live_s20012.json
diff --git a/assets/serverdata/notes/Live_s20013.json b/assets/serverdata/beatmaps/Live_s20013.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20013.json
rename to assets/serverdata/beatmaps/Live_s20013.json
diff --git a/assets/serverdata/notes/Live_s20014.json b/assets/serverdata/beatmaps/Live_s20014.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20014.json
rename to assets/serverdata/beatmaps/Live_s20014.json
diff --git a/assets/serverdata/notes/Live_s20015.json b/assets/serverdata/beatmaps/Live_s20015.json
similarity index 100%
rename from assets/serverdata/notes/Live_s20015.json
rename to assets/serverdata/beatmaps/Live_s20015.json
diff --git a/assets/serverdata/notes/Live_s2002.json b/assets/serverdata/beatmaps/Live_s2002.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2002.json
rename to assets/serverdata/beatmaps/Live_s2002.json
diff --git a/assets/serverdata/notes/Live_s2003.json b/assets/serverdata/beatmaps/Live_s2003.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2003.json
rename to assets/serverdata/beatmaps/Live_s2003.json
diff --git a/assets/serverdata/notes/Live_s2004.json b/assets/serverdata/beatmaps/Live_s2004.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2004.json
rename to assets/serverdata/beatmaps/Live_s2004.json
diff --git a/assets/serverdata/notes/Live_s2005.json b/assets/serverdata/beatmaps/Live_s2005.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2005.json
rename to assets/serverdata/beatmaps/Live_s2005.json
diff --git a/assets/serverdata/notes/Live_s2006.json b/assets/serverdata/beatmaps/Live_s2006.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2006.json
rename to assets/serverdata/beatmaps/Live_s2006.json
diff --git a/assets/serverdata/notes/Live_s2007.json b/assets/serverdata/beatmaps/Live_s2007.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2007.json
rename to assets/serverdata/beatmaps/Live_s2007.json
diff --git a/assets/serverdata/notes/Live_s2008.json b/assets/serverdata/beatmaps/Live_s2008.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2008.json
rename to assets/serverdata/beatmaps/Live_s2008.json
diff --git a/assets/serverdata/notes/Live_s2009.json b/assets/serverdata/beatmaps/Live_s2009.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2009.json
rename to assets/serverdata/beatmaps/Live_s2009.json
diff --git a/assets/serverdata/notes/Live_s2010.json b/assets/serverdata/beatmaps/Live_s2010.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2010.json
rename to assets/serverdata/beatmaps/Live_s2010.json
diff --git a/assets/serverdata/notes/Live_s2011.json b/assets/serverdata/beatmaps/Live_s2011.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2011.json
rename to assets/serverdata/beatmaps/Live_s2011.json
diff --git a/assets/serverdata/notes/Live_s2012.json b/assets/serverdata/beatmaps/Live_s2012.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2012.json
rename to assets/serverdata/beatmaps/Live_s2012.json
diff --git a/assets/serverdata/notes/Live_s2013.json b/assets/serverdata/beatmaps/Live_s2013.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2013.json
rename to assets/serverdata/beatmaps/Live_s2013.json
diff --git a/assets/serverdata/notes/Live_s2014.json b/assets/serverdata/beatmaps/Live_s2014.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2014.json
rename to assets/serverdata/beatmaps/Live_s2014.json
diff --git a/assets/serverdata/notes/Live_s2015.json b/assets/serverdata/beatmaps/Live_s2015.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2015.json
rename to assets/serverdata/beatmaps/Live_s2015.json
diff --git a/assets/serverdata/notes/Live_s2016.json b/assets/serverdata/beatmaps/Live_s2016.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2016.json
rename to assets/serverdata/beatmaps/Live_s2016.json
diff --git a/assets/serverdata/notes/Live_s2017.json b/assets/serverdata/beatmaps/Live_s2017.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2017.json
rename to assets/serverdata/beatmaps/Live_s2017.json
diff --git a/assets/serverdata/notes/Live_s2018.json b/assets/serverdata/beatmaps/Live_s2018.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2018.json
rename to assets/serverdata/beatmaps/Live_s2018.json
diff --git a/assets/serverdata/notes/Live_s2019.json b/assets/serverdata/beatmaps/Live_s2019.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2019.json
rename to assets/serverdata/beatmaps/Live_s2019.json
diff --git a/assets/serverdata/notes/Live_s2020.json b/assets/serverdata/beatmaps/Live_s2020.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2020.json
rename to assets/serverdata/beatmaps/Live_s2020.json
diff --git a/assets/serverdata/notes/Live_s2021.json b/assets/serverdata/beatmaps/Live_s2021.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2021.json
rename to assets/serverdata/beatmaps/Live_s2021.json
diff --git a/assets/serverdata/notes/Live_s2022.json b/assets/serverdata/beatmaps/Live_s2022.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2022.json
rename to assets/serverdata/beatmaps/Live_s2022.json
diff --git a/assets/serverdata/notes/Live_s2023.json b/assets/serverdata/beatmaps/Live_s2023.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2023.json
rename to assets/serverdata/beatmaps/Live_s2023.json
diff --git a/assets/serverdata/notes/Live_s2024.json b/assets/serverdata/beatmaps/Live_s2024.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2024.json
rename to assets/serverdata/beatmaps/Live_s2024.json
diff --git a/assets/serverdata/notes/Live_s2025.json b/assets/serverdata/beatmaps/Live_s2025.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2025.json
rename to assets/serverdata/beatmaps/Live_s2025.json
diff --git a/assets/serverdata/notes/Live_s2026.json b/assets/serverdata/beatmaps/Live_s2026.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2026.json
rename to assets/serverdata/beatmaps/Live_s2026.json
diff --git a/assets/serverdata/notes/Live_s2027.json b/assets/serverdata/beatmaps/Live_s2027.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2027.json
rename to assets/serverdata/beatmaps/Live_s2027.json
diff --git a/assets/serverdata/notes/Live_s2028.json b/assets/serverdata/beatmaps/Live_s2028.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2028.json
rename to assets/serverdata/beatmaps/Live_s2028.json
diff --git a/assets/serverdata/notes/Live_s2029.json b/assets/serverdata/beatmaps/Live_s2029.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2029.json
rename to assets/serverdata/beatmaps/Live_s2029.json
diff --git a/assets/serverdata/notes/Live_s2030.json b/assets/serverdata/beatmaps/Live_s2030.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2030.json
rename to assets/serverdata/beatmaps/Live_s2030.json
diff --git a/assets/serverdata/notes/Live_s2031.json b/assets/serverdata/beatmaps/Live_s2031.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2031.json
rename to assets/serverdata/beatmaps/Live_s2031.json
diff --git a/assets/serverdata/notes/Live_s2032.json b/assets/serverdata/beatmaps/Live_s2032.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2032.json
rename to assets/serverdata/beatmaps/Live_s2032.json
diff --git a/assets/serverdata/notes/Live_s2033.json b/assets/serverdata/beatmaps/Live_s2033.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2033.json
rename to assets/serverdata/beatmaps/Live_s2033.json
diff --git a/assets/serverdata/notes/Live_s2034.json b/assets/serverdata/beatmaps/Live_s2034.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2034.json
rename to assets/serverdata/beatmaps/Live_s2034.json
diff --git a/assets/serverdata/notes/Live_s2035.json b/assets/serverdata/beatmaps/Live_s2035.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2035.json
rename to assets/serverdata/beatmaps/Live_s2035.json
diff --git a/assets/serverdata/notes/Live_s2036.json b/assets/serverdata/beatmaps/Live_s2036.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2036.json
rename to assets/serverdata/beatmaps/Live_s2036.json
diff --git a/assets/serverdata/notes/Live_s2037.json b/assets/serverdata/beatmaps/Live_s2037.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2037.json
rename to assets/serverdata/beatmaps/Live_s2037.json
diff --git a/assets/serverdata/notes/Live_s2038.json b/assets/serverdata/beatmaps/Live_s2038.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2038.json
rename to assets/serverdata/beatmaps/Live_s2038.json
diff --git a/assets/serverdata/notes/Live_s2039.json b/assets/serverdata/beatmaps/Live_s2039.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2039.json
rename to assets/serverdata/beatmaps/Live_s2039.json
diff --git a/assets/serverdata/notes/Live_s2040.json b/assets/serverdata/beatmaps/Live_s2040.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2040.json
rename to assets/serverdata/beatmaps/Live_s2040.json
diff --git a/assets/serverdata/notes/Live_s2041.json b/assets/serverdata/beatmaps/Live_s2041.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2041.json
rename to assets/serverdata/beatmaps/Live_s2041.json
diff --git a/assets/serverdata/notes/Live_s2042.json b/assets/serverdata/beatmaps/Live_s2042.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2042.json
rename to assets/serverdata/beatmaps/Live_s2042.json
diff --git a/assets/serverdata/notes/Live_s2043.json b/assets/serverdata/beatmaps/Live_s2043.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2043.json
rename to assets/serverdata/beatmaps/Live_s2043.json
diff --git a/assets/serverdata/notes/Live_s2044.json b/assets/serverdata/beatmaps/Live_s2044.json
similarity index 100%
rename from assets/serverdata/notes/Live_s2044.json
rename to assets/serverdata/beatmaps/Live_s2044.json
diff --git a/config/config.go b/config/config.go
index 425bbc4..fed83af 100644
--- a/config/config.go
+++ b/config/config.go
@@ -18,9 +18,8 @@ var (
 )
 
 type AppConfigs struct {
-	AppName   string    `json:"app_name"`
-	Settings  Settings  `json:"settings"`
-	UserPrefs UserPrefs `json:"user_prefs"`
+	AppName  string   `json:"app_name"`
+	Settings Settings `json:"settings"`
 }
 
 type Settings struct {
@@ -29,19 +28,7 @@ type Settings struct {
 	BackupCdnServer string `json:"backup_cdn_server"`
 }
 
-type UserPrefs struct {
-	Name           string `json:"name"`            // 用户名
-	Level          int    `json:"level"`           // 用户等级
-	ExpNumerator   int    `json:"exp_numerator"`   // Exp 分子
-	ExpDenominator int    `json:"exp_denominator"` // Exp 分母
-	GameCoin       int    `json:"game_coin"`       // 游戏金币
-	SnsCoin        int    `json:"sns_coin"`        // 游戏爱心
-	EnergyMax      int    `json:"energy_max"`      // 体力上限
-	OverMaxEnergy  int    `json:"over_max_energy"` // 实际体力，为 0 时与 EnergyMax 一致
-	InviteCode     string `json:"invite_code"`     // 用户 ID
-}
-
-func init() {
+func InitConfig() {
 	Conf = Load("./config.json")
 }
 
@@ -50,20 +37,9 @@ func DefaultConfigs() *AppConfigs {
 		AppName: "honoka-chan",
 		Settings: Settings{
 			ListenPort:      "8080",
-			CdnServer:       "http://192.168.1.123/static",
+			CdnServer:       "http://127.0.0.1:8080/static",
 			BackupCdnServer: "",
 		},
-		UserPrefs: UserPrefs{
-			Name:           "梦路 @bilibili",
-			Level:          1028,
-			ExpNumerator:   1089696,
-			ExpDenominator: 1207185,
-			GameCoin:       112124104,
-			SnsCoin:        0,
-			EnergyMax:      417,
-			OverMaxEnergy:  0,
-			InviteCode:     "377385143",
-		},
 	}
 }
 
diff --git a/internal/handler/album.go b/internal/handler/album/seriesall.go
similarity index 56%
rename from internal/handler/album.go
rename to internal/handler/album/seriesall.go
index bf91074..9f2ece9 100644
--- a/internal/handler/album.go
+++ b/internal/handler/album/seriesall.go
@@ -1,39 +1,38 @@
-package handler
+package album
 
 import (
-	"honoka-chan/internal/model"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/album"
 	"honoka-chan/internal/session"
-	"honoka-chan/internal/utils"
 
 	"github.com/gin-gonic/gin"
 )
 
-type AlbumRes struct {
-	UnitId int `xorm:"unit_id"`
-	Rarity int `xorm:"rarity"`
-}
-
-func AlbumSeriesAll(ctx *gin.Context) {
-	ss := session.New(ctx)
+func seriesAll(ctx *gin.Context) {
+	ss := session.Get(ctx)
 	defer ss.Finalize()
 
-	var albumIds []int
-	err := ss.MainEng.Table("album_series_m").Select("album_series_id").Find(&albumIds)
+	var albumID []int
+	err := ss.MainEng.Table("album_series_m").Select("album_series_id").Find(&albumID)
 	if ss.CheckErr(err) {
 		return
 	}
 
-	albumSeriesAllRes := []model.AlbumSeriesRes{}
-	for _, albumId := range albumIds {
-		unitList := []AlbumRes{}
-		err = ss.MainEng.Table("unit_m").Where("album_series_id = ?", albumId).Cols("unit_id,rarity").Find(&unitList)
+	albumSeriesAllRes := []album.SeriesAllData{}
+	for _, id := range albumID {
+		var unitList []struct {
+			UnitId int `xorm:"unit_id"`
+			Rarity int `xorm:"rarity"`
+		}
+		err = ss.MainEng.Table("unit_m").Where("album_series_id = ?", id).Cols("unit_id,rarity").Find(&unitList)
 		if ss.CheckErr(err) {
 			return
 		}
 
-		albumSeriesAll := []model.AlbumResult{}
+		albumSeriesAll := []album.UnitList{}
 		for _, unit := range unitList {
-			albumSeries := model.AlbumResult{
+			albumSeries := album.UnitList{
 				UnitID:           unit.UnitId,
 				RankMaxFlag:      true,
 				LoveMaxFlag:      true,
@@ -63,23 +62,29 @@ func AlbumSeriesAll(ctx *gin.Context) {
 				albumSeries.HighestLovePerUnit = 1000
 
 				// IsSigned
-				albumSeries.SignFlag = utils.IsSigned(unit.UnitId)
+				albumSeries.SignFlag, err = ss.MainEng.Table("unit_sign_asset_m").Where("unit_id = ?", unit.UnitId).Exist()
+				if ss.CheckErr(err) {
+					return
+				}
+
 			}
 
 			albumSeriesAll = append(albumSeriesAll, albumSeries)
 		}
 
-		albumSeriesAllRes = append(albumSeriesAllRes, model.AlbumSeriesRes{
-			SeriesID: albumId,
+		albumSeriesAllRes = append(albumSeriesAllRes, album.SeriesAllData{
+			SeriesID: id,
 			UnitList: albumSeriesAll,
 		})
 	}
 
-	resp := model.AlbumSeriesResp{
+	ss.Respond(album.SeriesAllResp{
 		ResponseData: albumSeriesAllRes,
 		ReleaseInfo:  []any{},
 		StatusCode:   200,
-	}
+	})
+}
 
-	ss.Respond(resp)
+func init() {
+	router.AddHandler("main.php", "POST", "/album/seriesAll", middleware.Common, seriesAll)
 }
diff --git a/internal/handler/announce/checkstate.go b/internal/handler/announce/checkstate.go
new file mode 100644
index 0000000..be2999c
--- /dev/null
+++ b/internal/handler/announce/checkstate.go
@@ -0,0 +1,29 @@
+package announce
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/announce"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func checkState(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(announce.CheckStateDataResp{
+		ResponseData: announce.CheckStateData{
+			HasUnreadAnnounce: false,
+			ServerTimestamp:   time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/announce/checkState", middleware.Common, checkState)
+}
diff --git a/internal/handler/announce.go b/internal/handler/announce/index.go
similarity index 58%
rename from internal/handler/announce.go
rename to internal/handler/announce/index.go
index 8b01447..9be9785 100644
--- a/internal/handler/announce.go
+++ b/internal/handler/announce/index.go
@@ -1,16 +1,14 @@
-package handler
+package announce
 
 import (
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
+	"honoka-chan/internal/router"
 	"html/template"
 	"net/http"
-	"time"
 
 	"github.com/gin-gonic/gin"
 )
 
-func AnnounceIndex(ctx *gin.Context) {
+func index(ctx *gin.Context) {
 	ctx.HTML(http.StatusOK, "common/announce.html", gin.H{
 		"title": "Love Live! 学园偶像祭 本地服务器",
 		"content": template.HTML(`目前开发完毕的功能包括：<br><ul><li>登录</li><li>相册</li><li>编队</li><li>饰品</li><li>宝石</li><li>Live</li><li>个人信息设置</li><li>官方漫画</li><ul><br>
@@ -19,18 +17,6 @@ func AnnounceIndex(ctx *gin.Context) {
 	})
 }
 
-func AnnounceCheckState(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	resp := model.AnnounceResp{
-		ResponseData: model.AnnounceRes{
-			HasUnreadAnnounce: false,
-			ServerTimestamp:   time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(resp)
+func init() {
+	router.AddHandler("webview.php", "GET", "/announce/index", index)
 }
diff --git a/internal/handler/api.go b/internal/handler/api.go
deleted file mode 100644
index 4fbc377..0000000
--- a/internal/handler/api.go
+++ /dev/null
@@ -1,1324 +0,0 @@
-package handler
-
-import (
-	"encoding/json"
-	"fmt"
-	"honoka-chan/config"
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"honoka-chan/internal/tools"
-	"honoka-chan/internal/utils"
-	honokautils "honoka-chan/pkg/utils"
-	"net/http"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-type EventRes struct {
-	EventScenarioId int    `xorm:"event_scenario_id"`
-	Chapter         int    `xorm:"chapter"`
-	ChapterAsset    string `xorm:"chapter_asset"`
-	OpenDate        string `xorm:"open_date"`
-}
-
-type MultiRes struct {
-	MultiUnitScenarioId       int    `xorm:"multi_unit_scenario_id"`
-	Chapter                   int    `xorm:"chapter"`
-	MultiUnitScenarioBtnAsset string `xorm:"multi_unit_scenario_btn_asset"`
-	OpenDate                  string `xorm:"open_date"`
-}
-
-type MuseumRes struct {
-	MuseumContentsId int `xorm:"museum_contents_id"`
-	SmileBuff        int `xorm:"smile_buff"`
-	PureBuff         int `xorm:"pure_buff"`
-	CoolBuff         int `xorm:"cool_buff"`
-}
-
-func Api(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	apiReq := []model.ApiReq{}
-	err := json.Unmarshal([]byte(ctx.GetString("request_data")), &apiReq)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	results := []any{}
-	for _, v := range apiReq {
-		// fmt.Println(v)
-		// fmt.Println(v.Module, v.Action)
-
-		switch v.Module {
-		case "login":
-			switch v.Action {
-			case "topInfo":
-				// key = "login_topinfo_result"
-				topInfoResp := model.TopInfoResp{
-					Result: model.TopInfoRes{
-						FriendActionCnt:        0,
-						FriendGreetCnt:         0,
-						FriendVarietyCnt:       0,
-						FriendNewCnt:           0,
-						PresentCnt:             0,
-						SecretBoxBadgeFlag:     false,
-						ServerDatetime:         time.Now().Format("2006-01-02 15:04:05"),
-						ServerTimestamp:        time.Now().Unix(),
-						NoticeFriendDatetime:   time.Now().Format("2006-01-02 15:04:05"),
-						NoticeMailDatetime:     "2000-01-01 12:00:00",
-						FriendsApprovalWaitCnt: 0,
-						FriendsRequestCnt:      0,
-						IsTodayBirthday:        false,
-						LicenseInfo: model.TopInfoLicenseInfo{
-							LicenseList:  []any{},
-							LicensedInfo: []any{},
-							ExpiredInfo:  []any{},
-							BadgeFlag:    false,
-						},
-						UsingBuffInfo:     []any{},
-						IsKlabIDTaskFlag:  false,
-						KlabIDTaskCanSync: false,
-						HasUnreadAnnounce: false,
-						ExchangeBadgeCnt:  []int{0, 0, 0},
-						AdFlag:            false,
-						HasAdReward:       false,
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, topInfoResp)
-			case "topInfoOnce":
-				// key = "login_topinfo_once_result"
-				topInfoOnceResp := model.TopInfoOnceResp{
-					Result: model.TopInfoOnceRes{
-						NewAchievementCnt:            0,
-						UnaccomplishedAchievementCnt: 0,
-						LiveDailyRewardExist:         false,
-						TrainingEnergy:               10,
-						TrainingEnergyMax:            10,
-						Notification: model.TopInfoOnceNotification{
-							Push:       false,
-							Lp:         false,
-							UpdateInfo: false,
-							Campaign:   false,
-							Live:       false,
-							Lbonus:     false,
-							Event:      false,
-							Secretbox:  false,
-							Birthday:   true,
-						},
-						OpenArena:               true,
-						CostumeStatus:           true,
-						OpenAccessory:           true,
-						ArenaSiSkillUniqueCheck: true,
-						OpenV98:                 true,
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, topInfoOnceResp)
-			default:
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "live":
-			switch v.Action {
-			case "liveStatus":
-				// key = "live_status_result"
-				var liveDifficultyId []int
-				normalLives := []model.NormalLiveStatusList{}
-				err = ss.MainEng.Table("normal_live_m").Cols("live_difficulty_id").OrderBy("live_difficulty_id ASC").Find(&liveDifficultyId)
-				if ss.CheckErr(err) {
-					return
-				}
-				for _, id := range liveDifficultyId {
-					normalLive := model.NormalLiveStatusList{
-						LiveDifficultyID:   id,
-						Status:             1,
-						HiScore:            0,
-						HiComboCount:       0,
-						ClearCnt:           0,
-						AchievedGoalIDList: []int{},
-					}
-					normalLives = append(normalLives, normalLive)
-				}
-
-				specialLives := []model.SpecialLiveStatusList{}
-				err = ss.MainEng.Table("special_live_m").Cols("live_difficulty_id").OrderBy("live_difficulty_id ASC").Find(&liveDifficultyId)
-				if ss.CheckErr(err) {
-					return
-				}
-				for _, id := range liveDifficultyId {
-					specialLive := model.SpecialLiveStatusList{
-						LiveDifficultyID:   id,
-						Status:             1,
-						HiScore:            0,
-						HiComboCount:       0,
-						ClearCnt:           0,
-						AchievedGoalIDList: []int{},
-					}
-					specialLives = append(specialLives, specialLive)
-				}
-
-				LiveStatusResp := model.LiveStatusResp{
-					Result: model.LiveStatusRes{
-						NormalLiveStatusList:   normalLives,
-						SpecialLiveStatusList:  specialLives,
-						TrainingLiveStatusList: []model.TrainingLiveStatusList{},
-						MarathonLiveStatusList: []any{},
-						FreeLiveStatusList:     []any{},
-						CanResumeLive:          false,
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, LiveStatusResp)
-			case "schedule":
-				// key = "live_list_result"
-				var liveDifficultyId []int
-				specialLives := []model.SpecialLiveStatusList{}
-				err = ss.MainEng.Table("special_live_m").Cols("live_difficulty_id").OrderBy("live_difficulty_id ASC").Find(&liveDifficultyId)
-				if ss.CheckErr(err) {
-					return
-				}
-				for _, id := range liveDifficultyId {
-					specialLive := model.SpecialLiveStatusList{
-						LiveDifficultyID:   id,
-						Status:             1,
-						HiScore:            0,
-						HiComboCount:       0,
-						ClearCnt:           0,
-						AchievedGoalIDList: []int{},
-					}
-					specialLives = append(specialLives, specialLive)
-				}
-
-				livesList := []model.LiveList{}
-				for _, v := range specialLives {
-					livesList = append(livesList, model.LiveList{
-						LiveDifficultyID: v.LiveDifficultyID,
-						StartDate:        "2023-01-01 00:00:00",
-						EndDate:          "2037-01-01 00:00:00",
-						IsRandom:         false,
-					})
-				}
-				liveListResp := model.LiveScheduleResp{
-					Result: model.LiveScheduleRes{
-						EventList:              []any{},
-						LiveList:               livesList,
-						LimitedBonusList:       []any{},
-						LimitedBonusCommonList: []model.LimitedBonusCommonList{}, // 特效道具
-						RandomLiveList:         []model.RandomLiveList{},         // 随机歌曲
-						FreeLiveList:           []any{},
-						TrainingLiveList:       []model.TrainingLiveList{}, // 挑战歌曲
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, liveListResp)
-			default:
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "unit":
-			switch v.Action {
-			case "unitAll":
-				// key = "unit_list_result"
-				unitsData := []model.Active{}
-				err = ss.MainEng.Table("common_unit_m").Find(&unitsData)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				userUnits := []model.Active{}
-				err = ss.UserEng.Table("user_unit_m").Where("user_id = ?", ctx.GetString("userid")).Find(&userUnits)
-				if ss.CheckErr(err) {
-					return
-				}
-				unitsData = append(unitsData, userUnits...)
-
-				unitListResp := model.UnitAllResp{
-					Result: model.UnitAllRes{
-						Active:  unitsData,
-						Waiting: []model.Waiting{},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, unitListResp)
-			case "deckInfo":
-				// key = "unit_deck_result"
-				userDeck := []model.UserDeckData{}
-				err = ss.UserEng.Table("user_deck_m").Where("user_id = ?", ctx.GetString("userid")).Asc("deck_id").Find(&userDeck)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				unitDeckInfo := []model.UnitDeckInfoRes{}
-				for _, deck := range userDeck {
-					deckUnit := []model.UnitDeckData{}
-					err = ss.UserEng.Table("deck_unit_m").Where("user_deck_id = ?", deck.ID).Asc("position").Find(&deckUnit)
-					if ss.CheckErr(err) {
-						return
-					}
-
-					oUids := []model.UnitOwningUserIds{}
-					for _, unit := range deckUnit {
-						oUids = append(oUids, model.UnitOwningUserIds{
-							Position:         unit.Position,
-							UnitOwningUserID: unit.UnitOwningUserID,
-						})
-					}
-
-					mainFlag := false
-					if deck.MainFlag == 1 {
-						mainFlag = true
-					}
-					unitDeckInfo = append(unitDeckInfo, model.UnitDeckInfoRes{
-						UnitDeckID:        deck.DeckID,
-						MainFlag:          mainFlag,
-						DeckName:          deck.DeckName,
-						UnitOwningUserIds: oUids,
-					})
-				}
-				unitDeckResp := model.UnitDeckInfoResp{
-					Result:     unitDeckInfo,
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, unitDeckResp)
-			case "supporterAll":
-				// key = "unit_support_result"
-				unitSupportResp := model.UnitSupportResp{
-					Result: model.UnitSupportRes{
-						UnitSupportList: []model.UnitSupportList{},
-					}, // 练习道具
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, unitSupportResp)
-			case "removableSkillInfo":
-				// key = "owning_equip_result"
-				var skillEquipCount []model.SkillEquipCount
-				err := ss.UserEng.Table("skill_equip_m").Where("user_id = ?", ctx.GetString("userid")).Select("unit_removable_skill_id,COUNT(*) AS ct").
-					GroupBy("unit_removable_skill_id").Find(&skillEquipCount)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				var rmSkillIds []int
-				err = ss.MainEng.Table("unit_removable_skill_m").Where("effect_range = 1").Cols("unit_removable_skill_id").Find(&rmSkillIds)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				owingInfo := []model.OwningInfo{}
-				for _, id := range rmSkillIds {
-					info := model.OwningInfo{
-						UnitRemovableSkillID: id,
-						TotalAmount:          9,
-						EquippedAmount:       0,
-						InsertDate:           "2023-01-01 12:00:00",
-					}
-					for _, sk := range skillEquipCount {
-						if id == sk.UnitRemovableSkillId {
-							info.EquippedAmount = sk.Count
-							break
-						}
-					}
-					owingInfo = append(owingInfo, info)
-				}
-
-				var unitOwningIds []int
-				err = ss.UserEng.Table("skill_equip_m").Where("user_id = ?", ctx.GetString("userid")).Cols("unit_owning_user_id").GroupBy("unit_owning_user_id").Find(&unitOwningIds)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				equipInfo := map[int]any{}
-				for _, v := range unitOwningIds {
-					detail := []model.SkillEquipDetail{}
-					err = ss.UserEng.Table("skill_equip_m").Where("user_id = ? AND unit_owning_user_id = ?", ctx.GetString("userid"), v).
-						Cols("unit_removable_skill_id").Find(&detail)
-					if ss.CheckErr(err) {
-						return
-					}
-
-					equipInfo[v] = model.SkillEquipList{
-						UnitOwningUserID: v,
-						Detail:           detail,
-					}
-				}
-
-				rmSkillResp := model.RemovableSkillResp{
-					Result: model.RemovableSkillRes{
-						OwningInfo:    owingInfo,
-						EquipmentInfo: equipInfo,
-					}, // 宝石
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, rmSkillResp)
-			case "accessoryAll":
-				// key = "unit_accessory_result"
-				accessoryList := []model.AccessoryList{}
-				err := ss.MainEng.Table("common_accessory_m").Find(&accessoryList)
-				if ss.CheckErr(err) {
-					return
-				}
-				for k := range accessoryList {
-					accessoryList[k].NextExp = 0
-					accessoryList[k].Level = 8
-					accessoryList[k].MaxLevel = 8
-					accessoryList[k].RankUpCount = 4
-					accessoryList[k].FavoriteFlag = true
-				}
-				wearingInfo := []model.WearingInfo{}
-				err = ss.UserEng.Table("accessory_wear_m").Where("user_id = ?", ctx.GetString("userid")).Find(&wearingInfo)
-				if ss.CheckErr(err) {
-					return
-				}
-				unitAccResp := model.UnitAccessoryAllResp{
-					Result: model.UnitAccessoryAllResult{
-						AccessoryList:      accessoryList,
-						WearingInfo:        wearingInfo,
-						EspecialCreateFlag: false,
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, unitAccResp)
-			default:
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "costume":
-			if v.Action == "costumeList" {
-				// key = "costume_list_result"
-				costumeListResp := model.CostumeListResp{
-					Result: model.CostumeListRes{
-						CostumeList: []model.CostumeList{},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, costumeListResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "album":
-			if v.Action == "albumAll" {
-				// key = "album_unit_result"
-				albumLists := []model.AlbumResult{}
-				unitList := []AlbumRes{}
-				err = ss.MainEng.Table("unit_m").Cols("unit_id,rarity").OrderBy("unit_id ASC").Find(&unitList)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				for _, unit := range unitList {
-					albumList := model.AlbumResult{
-						RankMaxFlag:      true,
-						LoveMaxFlag:      true,
-						RankLevelMaxFlag: true,
-						AllMaxFlag:       true,
-						FavoritePoint:    1000,
-					}
-					albumList.UnitID = unit.UnitId
-					if unit.Rarity != 4 {
-						albumList.SignFlag = false
-						switch unit.Rarity {
-						case 1:
-							albumList.HighestLovePerUnit = 50
-							albumList.TotalLove = 50
-						case 2:
-							albumList.HighestLovePerUnit = 200
-							albumList.TotalLove = 200
-						case 3:
-							albumList.HighestLovePerUnit = 500
-							albumList.TotalLove = 500
-						case 5:
-							albumList.HighestLovePerUnit = 750
-							albumList.TotalLove = 750
-						}
-					} else {
-						albumList.HighestLovePerUnit = 1000
-						albumList.TotalLove = 1000
-
-						// IsSigned
-						albumList.SignFlag = utils.IsSigned(unit.UnitId)
-					}
-					albumLists = append(albumLists, albumList)
-				}
-
-				albumResp := model.AlbumResp{
-					Result:     albumLists,
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, albumResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "scenario":
-			if v.Action == "scenarioStatus" {
-				// key = "scenario_status_result"
-				var scenarioIds []int
-				scenarioLists := []model.ScenarioStatusList{}
-				err = ss.MainEng.Table("scenario_m").Cols("scenario_id").OrderBy("scenario_id ASC").Find(&scenarioIds)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				for _, id := range scenarioIds {
-					scenarioLists = append(scenarioLists, model.ScenarioStatusList{
-						ScenarioID: id,
-						Status:     2,
-					})
-				}
-				scenarioResp := model.ScenarioStatusResp{
-					Result: model.ScenarioStatusRes{
-						ScenarioStatusList: scenarioLists,
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, scenarioResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "subscenario":
-			if v.Action == "subscenarioStatus" {
-				// key = "subscenario_status_result"
-				var subScenarioIds []int
-				subScenarioLists := []model.SubscenarioStatusList{}
-				err = ss.MainEng.Table("subscenario_m").Cols("subscenario_id").OrderBy("subscenario_id ASC").Find(&subScenarioIds)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				for _, id := range subScenarioIds {
-					subScenarioLists = append(subScenarioLists, model.SubscenarioStatusList{
-						SubscenarioID: id,
-						Status:        2,
-					})
-				}
-				subScenarioResp := model.SubscenarioStatusResp{
-					Result: model.SubscenarioStatusRes{
-						SubscenarioStatusList:  subScenarioLists,
-						UnlockedSubscenarioIds: []any{},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, subScenarioResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "eventscenario":
-			if v.Action == "status" {
-				// key = "event_scenario_result"
-				var eventIds []int
-				eventsList := []model.EventScenarioList{}
-				err = ss.MainEng.Table("event_scenario_m").Cols("event_id").GroupBy("event_id").OrderBy("event_id DESC").Find(&eventIds)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				for _, id := range eventIds {
-					eventRes := []EventRes{}
-					chapsList := []model.EventScenarioChapterList{}
-					err = ss.MainEng.Table("event_scenario_m").Where("event_id = ?", id).Cols("event_scenario_id,chapter,chapter_asset,open_date").
-						OrderBy("chapter DESC").Find(&eventRes)
-					if ss.CheckErr(err) {
-						return
-					}
-
-					for _, res := range eventRes {
-						chapList := model.EventScenarioChapterList{
-							EventScenarioID: res.EventScenarioId,
-							Chapter:         res.Chapter,
-							ChapterAsset:    res.ChapterAsset,
-							Status:          2,
-							OpenFlashFlag:   0,
-							IsReward:        false,
-							CostType:        1000,
-							ItemID:          1200,
-							Amount:          1,
-						}
-						chapsList = append(chapsList, chapList)
-					}
-
-					eventList := model.EventScenarioList{
-						EventID:     id,
-						OpenDate:    strings.ReplaceAll(eventRes[0].OpenDate, "/", "-"),
-						ChapterList: chapsList,
-					}
-
-					// HACK event_scenario_btn_asset
-					switch id {
-					case 10001:
-						eventList.EventScenarioBtnAsset = "assets/image/ui/eventscenario/38_se_ba_t.png"
-					case 221:
-						eventList.EventScenarioBtnAsset = "assets/image/ui/eventscenario/215_se_ba_t.png"
-					default:
-						eventList.EventScenarioBtnAsset = fmt.Sprintf("assets/image/ui/eventscenario/%d_se_ba_t.png", id)
-					}
-
-					eventsList = append(eventsList, eventList)
-				}
-				eventScenarioResp := model.EventScenarioStatusResp{
-					Result: model.EventScenarioStatusRes{
-						EventScenarioList: eventsList,
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, eventScenarioResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "multiunit":
-			if v.Action == "multiunitscenarioStatus" {
-				// key = "multi_unit_scenario_result"
-				var multiIds []int
-				multiUnitsList := []model.MultiUnitScenarioStatusList{}
-				err = ss.MainEng.Table("multi_unit_scenario_m").Cols("multi_unit_id").GroupBy("multi_unit_id").OrderBy("multi_unit_id ASC").Find(&multiIds)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				for _, id := range multiIds {
-					multiRes := MultiRes{}
-					_, err = ss.MainEng.Table("multi_unit_scenario_m").
-						Join("LEFT", "multi_unit_scenario_open_m", "multi_unit_scenario_m.multi_unit_id = multi_unit_scenario_open_m.multi_unit_id").
-						Cols("multi_unit_scenario_btn_asset,open_date,multi_unit_scenario_id,chapter").
-						Where("multi_unit_scenario_m.multi_unit_id = ?", id).Get(&multiRes)
-					if ss.CheckErr(err) {
-						return
-					}
-
-					multiUnitsList = append(multiUnitsList, model.MultiUnitScenarioStatusList{
-						MultiUnitID:               id,
-						Status:                    2,
-						MultiUnitScenarioBtnAsset: multiRes.MultiUnitScenarioBtnAsset,
-						OpenDate:                  strings.ReplaceAll(multiRes.OpenDate, "/", "-"),
-						ChapterList: []model.MultiUnitScenarioChapterList{
-							{
-								MultiUnitScenarioID: multiRes.MultiUnitScenarioId,
-								Chapter:             multiRes.Chapter,
-								Status:              2,
-							},
-						},
-					})
-				}
-				unitsResp := model.MultiUnitScenarioStatusResp{
-					Result: model.MultiUnitScenarioStatusRes{
-						MultiUnitScenarioStatusList:  multiUnitsList,
-						UnlockedMultiUnitScenarioIds: []any{},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, unitsResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "payment":
-			if v.Action == "productList" {
-				// key = "product_result"
-				productResp := model.ProductListResp{
-					Result: model.ProductListRes{
-						RestrictionInfo: model.RestrictionInfo{
-							Restricted: false,
-						},
-						UnderAgeInfo: model.UnderAgeInfo{
-							BirthSet:    false,
-							HasLimit:    false,
-							LimitAmount: nil,
-							MonthUsed:   0,
-						},
-						SnsProductList:   []model.SnsProductList{},
-						ProductList:      []model.ProductList{},
-						SubscriptionList: []model.SubscriptionList{},
-						ShowPointShop:    false,
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, productResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "banner":
-			if v.Action == "bannerList" {
-				// key = "banner_result"
-				bannerResp := model.BannerListResp{
-					Result: model.BannerListRes{
-						TimeLimit: "2037-12-31 23:59:59",
-						BannerList: []model.BannerList{
-							{
-								BannerType:       1,
-								TargetID:         1743,
-								AssetPath:        "assets/image/secretbox/icon/s_ba_1718_1.png",
-								FixedFlag:        false,
-								BackSide:         false,
-								BannerID:         101151,
-								StartDate:        "2013-04-15 00:00:00",
-								EndDate:          "2037-12-31 23:59:59",
-								AddUnitStartDate: "2022-01-01 00:00:00",
-							},
-							{
-								BannerType:       1,
-								TargetID:         1741,
-								AssetPath:        "assets/image/secretbox/icon/s_ba_1719_1.png",
-								FixedFlag:        false,
-								BackSide:         false,
-								BannerID:         101150,
-								StartDate:        "2013-04-15 00:00:00",
-								EndDate:          "2037-12-31 23:59:59",
-								AddUnitStartDate: "2022-01-01 00:00:00",
-							},
-							{
-								BannerType:       1,
-								TargetID:         1740,
-								AssetPath:        "assets/image/secretbox/icon/s_ba_1720_1.png",
-								FixedFlag:        false,
-								BackSide:         false,
-								BannerID:         101149,
-								StartDate:        "2013-04-15 00:00:00",
-								EndDate:          "2037-12-31 23:59:59",
-								AddUnitStartDate: "2022-01-01 00:00:00",
-							},
-							{
-								BannerType:       1,
-								TargetID:         1739,
-								AssetPath:        "assets/image/secretbox/icon/s_ba_1721_1.png",
-								FixedFlag:        false,
-								BackSide:         false,
-								BannerID:         101144,
-								StartDate:        "2013-04-15 00:00:00",
-								EndDate:          "2037-12-31 23:59:59",
-								AddUnitStartDate: "2022-01-01 00:00:00",
-							},
-							{
-								BannerType: 2,
-								TargetID:   1,
-								AssetPath:  "assets/image/webview/wv_ba_01.png",
-								WebviewURL: "/manga",
-								FixedFlag:  false,
-								BackSide:   true,
-								BannerID:   200001,
-								StartDate:  "2016-10-15 15:00:00",
-								EndDate:    "2037-12-31 23:59:59",
-							},
-						},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, bannerResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "notice":
-			if v.Action == "noticeMarquee" {
-				// key = "item_marquee_result"
-				marqueeResp := model.NoticeMarqueeResp{
-					Result: model.NoticeMarqueeRes{
-						ItemCount:   0,
-						MarqueeList: []any{},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, marqueeResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "user":
-			switch v.Action {
-			case "getNavi":
-				// key = "user_intro_result"
-				var uId, oId int
-				_, err := ss.UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Cols("user_id,unit_owning_user_id").Get(&uId, &oId)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				userIntroResp := model.UserNaviResp{
-					Result: model.UserNaviRes{
-						User: model.User{
-							UserID:           uId,
-							UnitOwningUserID: oId,
-						},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, userIntroResp)
-			case "userInfo":
-				userId, err := strconv.Atoi(ctx.GetString("userid"))
-				if ss.CheckErr(err) {
-					return
-				}
-
-				pref := tools.UserPref{}
-				exists, err := ss.UserEng.Table("user_preference_m").Where("user_id = ?", userId).Get(&pref)
-				if ss.CheckErr(err) {
-					return
-				}
-				if !exists {
-					ctx.String(http.StatusForbidden, ErrorMsg)
-					return
-				}
-
-				userInfoResp := model.ApiUserInfoResp{
-					Result: model.UserInfo{
-						UserID:                         userId,
-						Name:                           pref.UserName,
-						Level:                          config.Conf.UserPrefs.Level,
-						Exp:                            config.Conf.UserPrefs.ExpNumerator,
-						PreviousExp:                    0,
-						NextExp:                        config.Conf.UserPrefs.ExpDenominator,
-						GameCoin:                       config.Conf.UserPrefs.GameCoin,
-						SnsCoin:                        config.Conf.UserPrefs.SnsCoin,
-						FreeSnsCoin:                    config.Conf.UserPrefs.SnsCoin,
-						PaidSnsCoin:                    0,
-						SocialPoint:                    1438395,
-						UnitMax:                        5000,
-						WaitingUnitMax:                 1000,
-						EnergyMax:                      config.Conf.UserPrefs.EnergyMax,
-						EnergyFullTime:                 "2023-03-20 03:58:55",
-						LicenseLiveEnergyRecoverlyTime: 60,
-						EnergyFullNeedTime:             0,
-						OverMaxEnergy:                  config.Conf.UserPrefs.OverMaxEnergy,
-						TrainingEnergy:                 100,
-						TrainingEnergyMax:              100,
-						FriendMax:                      99,
-						InviteCode:                     config.Conf.UserPrefs.InviteCode,
-						InsertDate:                     "2015-08-10 18:58:30",
-						UpdateDate:                     "2018-08-09 18:13:12",
-						TutorialState:                  -1,
-						DiamondCoin:                    0,
-						CrystalCoin:                    0,
-						LpRecoveryItem:                 []model.LpRecoveryItem{},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, userInfoResp)
-			default:
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "navigation":
-			if v.Action == "specialCutin" {
-				// key = "special_cutin_result"
-				cutinResp := model.SpecialCutinResp{
-					Result: model.SpecialCutinRes{
-						SpecialCutinList: []any{},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, cutinResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "award":
-			if v.Action == "awardInfo" {
-				// key = "award_result"
-				var aIdList []int
-				err := ss.MainEng.Table("award_m").Cols("award_id").Find(&aIdList)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				var aId int
-				_, err = ss.UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Cols("award_id").Get(&aId)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				awardsList := []model.AwardInfo{}
-				for _, id := range aIdList {
-					isSet := false
-					if id == aId {
-						isSet = true
-					}
-					awardsList = append(awardsList, model.AwardInfo{
-						AwardID:    id,
-						IsSet:      isSet,
-						InsertDate: time.Now().Format("2006-01-02 03:04:05"),
-					})
-				}
-
-				awardResp := model.AwardInfoResp{
-					Result: model.AwardInfoRes{
-						AwardInfo: awardsList,
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, awardResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "background":
-			if v.Action == "backgroundInfo" {
-				// key = "background_result"
-				var bIdList []int
-				err := ss.MainEng.Table("background_m").Cols("background_id").Find(&bIdList)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				var bId int
-				_, err = ss.UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Cols("background_id").Get(&bId)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				backgroundsList := []model.BackgroundInfo{}
-				for _, id := range bIdList {
-					isSet := false
-					if id == bId {
-						isSet = true
-					}
-					backgroundsList = append(backgroundsList, model.BackgroundInfo{
-						BackgroundID: id,
-						IsSet:        isSet,
-						InsertDate:   time.Now().Format("2006-01-02 03:04:05"),
-					})
-				}
-
-				backgroundResp := model.BackgroundInfoResp{
-					Result: model.BackgroundInfoRes{
-						BackgroundInfo: backgroundsList,
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, backgroundResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "stamp":
-			if v.Action == "stampInfo" {
-				// key = "stamp_result"
-				stampResp := honokautils.ReadAllText("assets/serverdata/stamp.json")
-				var mStampResp any
-				err = json.Unmarshal([]byte(stampResp), &mStampResp)
-				if ss.CheckErr(err) {
-					return
-				}
-				results = append(results, mStampResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "exchange":
-			if v.Action == "owningPoint" {
-				// key = "exchange_point_result"
-				var exchangeIds []int
-				exPointsList := []model.ExchangePointList{}
-				err = ss.MainEng.Table("exchange_point_m").Cols("exchange_point_id").OrderBy("exchange_point_id ASC").Find(&exchangeIds)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				for _, id := range exchangeIds {
-					exPointsList = append(exPointsList, model.ExchangePointList{
-						Rarity:        id,
-						ExchangePoint: 9999,
-					})
-				}
-				exPointsResp := model.ExchangePointResp{
-					Result: model.ExchangePointRes{
-						ExchangePointList: exPointsList,
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, exPointsResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "livese":
-			if v.Action == "liveseInfo" {
-				// key = "live_se_result"
-				liveSeResp := model.LiveSeInfoResp{
-					Result: model.LiveSeInfoRes{
-						LiveSeList: []int{1, 2, 3},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, liveSeResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "liveicon":
-			if v.Action == "liveiconInfo" {
-				// key = "live_icon_result"
-				liveIconResp := model.LiveIconInfoResp{
-					Result: model.LiveIconInfoRes{
-						LiveNotesIconList: []int{1, 2, 3},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, liveIconResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "item":
-			if v.Action == "list" {
-				// key = "item_list_result"
-				itemResp := honokautils.ReadAllText("assets/serverdata/item.json")
-				var mItemResp any
-				err = json.Unmarshal([]byte(itemResp), &mItemResp)
-				if ss.CheckErr(err) {
-					return
-				}
-				results = append(results, mItemResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "marathon":
-			if v.Action == "marathonInfo" {
-				// key = "marathon_result"
-				marathonResp := model.MarathonInfoResp{
-					Result:     []any{},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, marathonResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "challenge":
-			if v.Action == "challengeInfo" {
-				// key = "challenge_result"
-				challengeResp := model.ChallengeInfoResp{
-					Result:     []any{},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, challengeResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "museum":
-			if v.Action == "info" {
-				// key = "museum_result"
-				museumRes := []MuseumRes{}
-				var museumIds []int
-				var smileBuff, pureBuff, coolBuff int
-				err = ss.MainEng.Table("museum_contents_m").Cols("museum_contents_id,smile_buff,pure_buff,cool_buff").
-					OrderBy("museum_contents_id ASC").Find(&museumRes)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				for _, res := range museumRes {
-					smileBuff += res.SmileBuff
-					pureBuff += res.PureBuff
-					coolBuff += res.CoolBuff
-					museumIds = append(museumIds, res.MuseumContentsId)
-				}
-				museumInfoResp := model.MuseumInfoResp{
-					Result: model.MuseumInfoRes{
-						MuseumInfo: model.Museum{
-							Parameter: model.MuseumParameter{
-								Smile: smileBuff,
-								Pure:  pureBuff,
-								Cool:  coolBuff,
-							},
-							ContentsIDList: museumIds,
-						},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, museumInfoResp)
-			} else {
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		case "profile":
-			switch v.Action {
-			case "liveCnt":
-				// key = "profile_livecnt_result"
-				difficultyResp := model.DifficultyResp{
-					Result: []model.DifficultyRes{
-						{
-							Difficulty: 1,
-							ClearCnt:   315,
-						},
-						{
-							Difficulty: 2,
-							ClearCnt:   310,
-						},
-						{
-							Difficulty: 3,
-							ClearCnt:   314,
-						},
-						{
-							Difficulty: 4,
-							ClearCnt:   455,
-						},
-						{
-							Difficulty: 6,
-							ClearCnt:   233,
-						},
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, difficultyResp)
-			case "cardRanking":
-				// key = "profile_card_ranking_result"
-				var result []any
-				love := honokautils.ReadAllText("assets/serverdata/love.json")
-				err := json.Unmarshal([]byte(love), &result)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				loveResp := model.LoveResp{
-					Result:     result,
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, loveResp)
-			case "profileInfo":
-				// key = "profile_info_result"
-				pref := tools.UserPref{}
-				exists, err := ss.UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Get(&pref)
-				if ss.CheckErr(err) {
-					return
-				}
-				if !exists {
-					ctx.String(http.StatusForbidden, ErrorMsg)
-					return
-				}
-
-				commonUnit, err := ss.MainEng.Table("common_unit_m").Count()
-				if ss.CheckErr(err) {
-					return
-				}
-				userUnit, err := ss.UserEng.Table("user_unit_m").Where("user_id = ?", ctx.GetString("userid")).Count()
-				if ss.CheckErr(err) {
-					return
-				}
-
-				unitData := model.UnitData{}
-				exists, err = ss.MainEng.Table("common_unit_m").Where("unit_owning_user_id = ?", pref.UnitOwningUserID).Get(&unitData)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				isCommon := true
-				if !exists {
-					_, err = ss.UserEng.Table("user_unit_m").
-						Where("unit_owning_user_id = ? AND user_id = ?", pref.UnitOwningUserID, ctx.GetString("userid")).Get(&unitData)
-					if ss.CheckErr(err) {
-						return
-					}
-					isCommon = false
-				}
-
-				var attrId, maxHp, baseSmile, basePure, baseCool int
-				var smileMax, pureMax, coolMax int
-				if isCommon {
-					// 公共卡片仅为100级属性
-					_, err = ss.MainEng.Table("unit_m").Where("unit_id = ?", unitData.UnitID).
-						Cols("attribute_id,hp_max,smile_max,pure_max,cool_max").Get(&attrId, &maxHp, &baseSmile, &basePure, &baseCool)
-					utils.CheckErr(err)
-
-					// 偷懒起见不计算饰品、宝石、回忆画廊等属性加成
-					smileMax = baseSmile
-					pureMax = basePure
-					coolMax = baseCool
-					// } else {
-					// 	// 用户卡片需要根据等级计算属性
-					// 	// TODO
-				}
-
-				var accessoryOwningId, accessoryId, exp int
-				_, err = ss.UserEng.Table("accessory_wear_m").Where("unit_owning_user_id = ? AND user_id = ?", pref.UnitOwningUserID, ctx.GetString("userid")).
-					Cols("accessory_owning_user_id").Get(&accessoryOwningId)
-				if ss.CheckErr(err) {
-					return
-				}
-				_, err = ss.MainEng.Table("common_accessory_m").Where("accessory_owning_user_id = ?", accessoryOwningId).
-					Cols("accessory_id,exp").Get(&accessoryId, &exp)
-				if ss.CheckErr(err) {
-					return
-				}
-				accessoryInfo := model.AccessoryInfo{
-					AccessoryOwningUserID: accessoryOwningId,
-					AccessoryID:           accessoryId,
-					Exp:                   exp,
-					NextExp:               0,
-					Level:                 8,
-					MaxLevel:              8,
-					RankUpCount:           4,
-					FavoriteFlag:          true,
-				}
-
-				removeSkillIds := []int{}
-				err = ss.UserEng.Table("skill_equip_m").Where("unit_owning_user_id = ? AND user_id = ?", pref.UnitOwningUserID, ctx.GetString("userid")).
-					Cols("unit_removable_skill_id").Find(&removeSkillIds)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				userId, err := strconv.Atoi(config.Conf.UserPrefs.InviteCode)
-				if ss.CheckErr(err) {
-					return
-				}
-
-				profileResp := model.ProfileResp{
-					Result: model.ProfileRes{
-						UserInfo: model.ProfileUserInfo{
-							UserID:               userId,
-							Name:                 pref.UserName,
-							Level:                config.Conf.UserPrefs.Level,
-							CostMax:              100,
-							UnitMax:              5000,
-							EnergyMax:            config.Conf.UserPrefs.EnergyMax,
-							FriendMax:            99,
-							UnitCnt:              int(commonUnit + userUnit),
-							InviteCode:           config.Conf.UserPrefs.InviteCode,
-							ElapsedTimeFromLogin: "14\u5c0f\u65f6\u524d",
-							Introduction:         pref.UserDesc,
-						},
-						CenterUnitInfo: model.CenterUnitInfo{
-							UnitOwningUserID:           unitData.UnitOwningUserID,
-							UnitID:                     unitData.UnitID,
-							Exp:                        unitData.Exp,
-							NextExp:                    unitData.NextExp,
-							Level:                      unitData.Level,
-							LevelLimitID:               unitData.LevelLimitID,
-							MaxLevel:                   unitData.MaxLevel,
-							Rank:                       unitData.Rank,
-							MaxRank:                    unitData.MaxRank,
-							Love:                       unitData.Love,
-							MaxLove:                    unitData.MaxLove,
-							UnitSkillLevel:             unitData.UnitSkillLevel,
-							MaxHp:                      unitData.MaxHp,
-							FavoriteFlag:               unitData.FavoriteFlag,
-							DisplayRank:                unitData.DisplayRank,
-							UnitSkillExp:               unitData.UnitSkillExp,
-							UnitRemovableSkillCapacity: unitData.UnitRemovableSkillCapacity,
-							Attribute:                  attrId,
-							Smile:                      baseSmile,
-							Cute:                       basePure,
-							Cool:                       baseCool,
-							IsLoveMax:                  unitData.IsLoveMax,
-							IsLevelMax:                 unitData.IsLevelMax,
-							IsRankMax:                  unitData.IsRankMax,
-							IsSigned:                   unitData.IsSigned,
-							IsSkillLevelMax:            unitData.IsSkillLevelMax,
-							SettingAwardID:             pref.AwardID,
-							RemovableSkillIds:          removeSkillIds,
-							AccessoryInfo:              accessoryInfo,
-							Costume:                    model.Costume{},
-							TotalSmile:                 smileMax,
-							TotalCute:                  pureMax,
-							TotalCool:                  coolMax,
-							TotalHp:                    maxHp,
-						},
-						NaviUnitInfo: model.NaviUnitInfo{
-							UnitOwningUserID:            unitData.UnitOwningUserID,
-							UnitID:                      unitData.UnitID,
-							Exp:                         unitData.Exp,
-							NextExp:                     unitData.NextExp,
-							Level:                       unitData.Level,
-							MaxLevel:                    unitData.MaxLevel,
-							LevelLimitID:                unitData.LevelLimitID,
-							Rank:                        unitData.Rank,
-							MaxRank:                     unitData.MaxRank,
-							Love:                        unitData.Love,
-							MaxLove:                     unitData.MaxLove,
-							UnitSkillExp:                unitData.UnitSkillExp,
-							UnitSkillLevel:              unitData.UnitSkillLevel,
-							MaxHp:                       unitData.MaxHp,
-							UnitRemovableSkillCapacity:  unitData.UnitRemovableSkillCapacity,
-							FavoriteFlag:                unitData.FavoriteFlag,
-							DisplayRank:                 unitData.DisplayRank,
-							IsLoveMax:                   unitData.IsLoveMax,
-							IsLevelMax:                  unitData.IsLevelMax,
-							IsRankMax:                   unitData.IsRankMax,
-							IsSigned:                    unitData.IsSigned,
-							IsSkillLevelMax:             unitData.IsSkillLevelMax,
-							IsRemovableSkillCapacityMax: unitData.IsRemovableSkillCapacityMax,
-							InsertDate:                  "2016-10-11 10:33:03",
-							TotalSmile:                  smileMax,
-							TotalCute:                   pureMax,
-							TotalCool:                   coolMax,
-							TotalHp:                     maxHp,
-							RemovableSkillIds:           removeSkillIds,
-						},
-						IsAlliance:          false,
-						FriendStatus:        0,
-						SettingAwardID:      113,
-						SettingBackgroundID: 143,
-					},
-					Status:     200,
-					CommandNum: false,
-					TimeStamp:  time.Now().Unix(),
-				}
-				results = append(results, profileResp)
-			default:
-				err = fmt.Errorf("unimplemented: %s", v.Module+":"+v.Action)
-			}
-		default:
-			err = fmt.Errorf("unimplemented: %s", v.Module)
-		}
-	}
-
-	if ss.CheckErr(err) {
-		return
-	}
-
-	apiResp := model.ApiResp{
-		ResponseData: results,
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(apiResp)
-}
diff --git a/internal/handler/api/album/album.go b/internal/handler/api/album/album.go
new file mode 100644
index 0000000..3cd8eac
--- /dev/null
+++ b/internal/handler/api/album/album.go
@@ -0,0 +1,17 @@
+package album
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func AlbumApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "albumAll":
+		res, err = albumAll(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: album: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/album/all.go b/internal/handler/api/album/all.go
new file mode 100644
index 0000000..4ddfbd0
--- /dev/null
+++ b/internal/handler/api/album/all.go
@@ -0,0 +1,70 @@
+package album
+
+import (
+	"honoka-chan/internal/schema/api/album"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func albumAll(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	albumLists := []album.UnitList{}
+	var unitList []struct {
+		UnitId int `xorm:"unit_id"`
+		Rarity int `xorm:"rarity"`
+	}
+	err = ss.MainEng.Table("unit_m").Cols("unit_id,rarity").OrderBy("unit_id ASC").Find(&unitList)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, unit := range unitList {
+		albumList := album.UnitList{
+			RankMaxFlag:      true,
+			LoveMaxFlag:      true,
+			RankLevelMaxFlag: true,
+			AllMaxFlag:       true,
+			FavoritePoint:    1000,
+		}
+		albumList.UnitID = unit.UnitId
+		if unit.Rarity != 4 {
+			albumList.SignFlag = false
+			switch unit.Rarity {
+			case 1:
+				albumList.HighestLovePerUnit = 50
+				albumList.TotalLove = 50
+			case 2:
+				albumList.HighestLovePerUnit = 200
+				albumList.TotalLove = 200
+			case 3:
+				albumList.HighestLovePerUnit = 500
+				albumList.TotalLove = 500
+			case 5:
+				albumList.HighestLovePerUnit = 750
+				albumList.TotalLove = 750
+			}
+		} else {
+			albumList.HighestLovePerUnit = 1000
+			albumList.TotalLove = 1000
+
+			// IsSigned
+			albumList.SignFlag, err = ss.MainEng.Table("unit_sign_asset_m").Where("unit_id = ?", unit.UnitId).Exist()
+			if err != nil {
+				return nil, err
+			}
+		}
+		albumLists = append(albumLists, albumList)
+	}
+
+	res = album.AllResp{
+		Result:     albumLists,
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/api.go b/internal/handler/api/api.go
new file mode 100644
index 0000000..7e92f22
--- /dev/null
+++ b/internal/handler/api/api.go
@@ -0,0 +1,125 @@
+package api
+
+import (
+	"encoding/json"
+	"fmt"
+	"honoka-chan/internal/handler/api/album"
+	"honoka-chan/internal/handler/api/award"
+	"honoka-chan/internal/handler/api/background"
+	"honoka-chan/internal/handler/api/banner"
+	"honoka-chan/internal/handler/api/challenge"
+	"honoka-chan/internal/handler/api/costume"
+	"honoka-chan/internal/handler/api/eventscenario"
+	"honoka-chan/internal/handler/api/exchange"
+	"honoka-chan/internal/handler/api/item"
+	"honoka-chan/internal/handler/api/live"
+	"honoka-chan/internal/handler/api/liveicon"
+	"honoka-chan/internal/handler/api/livese"
+	"honoka-chan/internal/handler/api/login"
+	"honoka-chan/internal/handler/api/marathon"
+	"honoka-chan/internal/handler/api/multiunit"
+	"honoka-chan/internal/handler/api/museum"
+	"honoka-chan/internal/handler/api/navigation"
+	"honoka-chan/internal/handler/api/notice"
+	"honoka-chan/internal/handler/api/payment"
+	"honoka-chan/internal/handler/api/profile"
+	"honoka-chan/internal/handler/api/scenario"
+	"honoka-chan/internal/handler/api/stamp"
+	"honoka-chan/internal/handler/api/subscenario"
+	"honoka-chan/internal/handler/api/unit"
+	"honoka-chan/internal/handler/api/user"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	apischema "honoka-chan/internal/schema/api"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func api(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	apiReq := []apischema.ApiReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &apiReq)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	var result any
+	var results []any
+	for _, v := range apiReq {
+		// fmt.Println(v.Module, v.Action)
+		switch v.Module {
+		case "album":
+			result, err = album.AlbumApi(ctx, v.Action)
+		case "award":
+			result, err = award.AwardApi(ctx, v.Action)
+		case "background":
+			result, err = background.BackgroundApi(ctx, v.Action)
+		case "banner":
+			result, err = banner.BannerApi(v.Action)
+		case "challenge":
+			result, err = challenge.ChallengeApi(v.Action)
+		case "costume":
+			result, err = costume.CostumeApi(v.Action)
+		case "eventscenario":
+			result, err = eventscenario.EventScenarioApi(ctx, v.Action)
+		case "exchange":
+			result, err = exchange.ExchangeApi(ctx, v.Action)
+		case "item":
+			result, err = item.ItemApi(v.Action)
+		case "live":
+			result, err = live.LiveApi(ctx, v.Action)
+		case "liveicon":
+			result, err = liveicon.LiveIconApi(v.Action)
+		case "livese":
+			result, err = livese.LiveSeApi(v.Action)
+		case "login":
+			result, err = login.LoginApi(v.Action)
+		case "marathon":
+			result, err = marathon.MarathonApi(v.Action)
+		case "multiunit":
+			result, err = multiunit.MultiUnitApi(ctx, v.Action)
+		case "museum":
+			result, err = museum.MuseumApi(ctx, v.Action)
+		case "navigation":
+			result, err = navigation.NavigationApi(v.Action)
+		case "notice":
+			result, err = notice.NoticeApi(v.Action)
+		case "payment":
+			result, err = payment.PaymentApi(v.Action)
+		case "profile":
+			result, err = profile.ProfileApi(ctx, v.Action)
+		case "scenario":
+			result, err = scenario.ScenarioApi(ctx, v.Action)
+		case "stamp":
+			result, err = stamp.StampApi(v.Action)
+		case "subscenario":
+			result, err = subscenario.SubscenarioApi(ctx, v.Action)
+		case "unit":
+			result, err = unit.UnitApi(ctx, v.Action)
+		case "user":
+			result, err = user.UserApi(ctx, v.Action)
+		default:
+			err = fmt.Errorf("unimplemented api module: %s", v.Module)
+		}
+
+		if ss.CheckErr(err) {
+			return
+		}
+		results = append(results, result)
+	}
+
+	apiResp := apischema.ApiResp{
+		ResponseData: results,
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	}
+
+	ss.Respond(apiResp)
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/api", middleware.Common, api)
+}
diff --git a/internal/handler/api/award/award.go b/internal/handler/api/award/award.go
new file mode 100644
index 0000000..42e65d4
--- /dev/null
+++ b/internal/handler/api/award/award.go
@@ -0,0 +1,17 @@
+package award
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func AwardApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "awardInfo":
+		res, err = awardInfo(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: award: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/award/info.go b/internal/handler/api/award/info.go
new file mode 100644
index 0000000..c68c27b
--- /dev/null
+++ b/internal/handler/api/award/info.go
@@ -0,0 +1,49 @@
+package award
+
+import (
+	"honoka-chan/internal/schema/api/award"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func awardInfo(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	var awardList []int
+	err = ss.MainEng.Table("award_m").Cols("award_id").Find(&awardList)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	var awardID int
+	_, err = ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Cols("award_id").Get(&awardID)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	awardsList := []award.Info{}
+	for _, id := range awardList {
+		isSet := false
+		if id == awardID {
+			isSet = true
+		}
+		awardsList = append(awardsList, award.Info{
+			AwardID:    id,
+			IsSet:      isSet,
+			InsertDate: time.Now().Format("2006-01-02 03:04:05"),
+		})
+	}
+
+	res = award.InfoResp{
+		Result: award.InfoData{
+			AwardInfo: awardsList,
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/background/background.go b/internal/handler/api/background/background.go
new file mode 100644
index 0000000..371020c
--- /dev/null
+++ b/internal/handler/api/background/background.go
@@ -0,0 +1,17 @@
+package background
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func BackgroundApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "backgroundInfo":
+		res, err = backgroundInfo(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: background: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/background/info.go b/internal/handler/api/background/info.go
new file mode 100644
index 0000000..453a603
--- /dev/null
+++ b/internal/handler/api/background/info.go
@@ -0,0 +1,49 @@
+package background
+
+import (
+	"honoka-chan/internal/schema/api/background"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func backgroundInfo(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	var backgroundList []int
+	err = ss.MainEng.Table("background_m").Cols("background_id").Find(&backgroundList)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	var backgroundID int
+	_, err = ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Cols("background_id").Get(&backgroundID)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	backgroundsList := []background.Info{}
+	for _, id := range backgroundList {
+		isSet := false
+		if id == backgroundID {
+			isSet = true
+		}
+		backgroundsList = append(backgroundsList, background.Info{
+			BackgroundID: id,
+			IsSet:        isSet,
+			InsertDate:   time.Now().Format("2006-01-02 03:04:05"),
+		})
+	}
+
+	res = background.InfoResp{
+		Result: background.InfoData{
+			BackgroundInfo: backgroundsList,
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/banner/banner.go b/internal/handler/api/banner/banner.go
new file mode 100644
index 0000000..08900ec
--- /dev/null
+++ b/internal/handler/api/banner/banner.go
@@ -0,0 +1,13 @@
+package banner
+
+import "fmt"
+
+func BannerApi(action string) (res any, err error) {
+	switch action {
+	case "bannerList":
+		res, err = bannerList()
+	default:
+		err = fmt.Errorf("unimplemented action: banner: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/banner/list.go b/internal/handler/api/banner/list.go
new file mode 100644
index 0000000..80c8f60
--- /dev/null
+++ b/internal/handler/api/banner/list.go
@@ -0,0 +1,76 @@
+package banner
+
+import (
+	"honoka-chan/internal/schema/api/banner"
+	"time"
+)
+
+func bannerList() (res any, err error) {
+	res = banner.ListResp{
+		Result: banner.ListData{
+			TimeLimit: "2037-12-31 23:59:59",
+			BannerList: []banner.BannerList{
+				{
+					BannerType:       1,
+					TargetID:         1743,
+					AssetPath:        "assets/image/secretbox/icon/s_ba_1718_1.png",
+					FixedFlag:        false,
+					BackSide:         false,
+					BannerID:         101151,
+					StartDate:        "2013-04-15 00:00:00",
+					EndDate:          "2037-12-31 23:59:59",
+					AddUnitStartDate: "2022-01-01 00:00:00",
+				},
+				{
+					BannerType:       1,
+					TargetID:         1741,
+					AssetPath:        "assets/image/secretbox/icon/s_ba_1719_1.png",
+					FixedFlag:        false,
+					BackSide:         false,
+					BannerID:         101150,
+					StartDate:        "2013-04-15 00:00:00",
+					EndDate:          "2037-12-31 23:59:59",
+					AddUnitStartDate: "2022-01-01 00:00:00",
+				},
+				{
+					BannerType:       1,
+					TargetID:         1740,
+					AssetPath:        "assets/image/secretbox/icon/s_ba_1720_1.png",
+					FixedFlag:        false,
+					BackSide:         false,
+					BannerID:         101149,
+					StartDate:        "2013-04-15 00:00:00",
+					EndDate:          "2037-12-31 23:59:59",
+					AddUnitStartDate: "2022-01-01 00:00:00",
+				},
+				{
+					BannerType:       1,
+					TargetID:         1739,
+					AssetPath:        "assets/image/secretbox/icon/s_ba_1721_1.png",
+					FixedFlag:        false,
+					BackSide:         false,
+					BannerID:         101144,
+					StartDate:        "2013-04-15 00:00:00",
+					EndDate:          "2037-12-31 23:59:59",
+					AddUnitStartDate: "2022-01-01 00:00:00",
+				},
+				{
+					BannerType: 2,
+					TargetID:   1,
+					AssetPath:  "assets/image/webview/wv_ba_01.png",
+					WebviewURL: "/manga",
+					FixedFlag:  false,
+					BackSide:   true,
+					BannerID:   200001,
+					StartDate:  "2016-10-15 15:00:00",
+					EndDate:    "2037-12-31 23:59:59",
+				},
+			},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/challenge/challenge.go b/internal/handler/api/challenge/challenge.go
new file mode 100644
index 0000000..24f0828
--- /dev/null
+++ b/internal/handler/api/challenge/challenge.go
@@ -0,0 +1,15 @@
+package challenge
+
+import (
+	"fmt"
+)
+
+func ChallengeApi(action string) (res any, err error) {
+	switch action {
+	case "challengeInfo":
+		res, err = challengeInfo()
+	default:
+		err = fmt.Errorf("unimplemented action: challenge: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/challenge/info.go b/internal/handler/api/challenge/info.go
new file mode 100644
index 0000000..94ebe05
--- /dev/null
+++ b/internal/handler/api/challenge/info.go
@@ -0,0 +1,16 @@
+package challenge
+
+import (
+	"honoka-chan/internal/schema/api/challenge"
+	"time"
+)
+
+func challengeInfo() (res any, err error) {
+	res = challenge.InfoResp{
+		Result:     []any{},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+	return res, err
+}
diff --git a/internal/handler/api/costume/costume.go b/internal/handler/api/costume/costume.go
new file mode 100644
index 0000000..63885eb
--- /dev/null
+++ b/internal/handler/api/costume/costume.go
@@ -0,0 +1,13 @@
+package costume
+
+import "fmt"
+
+func CostumeApi(action string) (res any, err error) {
+	switch action {
+	case "costumeList":
+		res, err = costumeList()
+	default:
+		err = fmt.Errorf("unimplemented action: costume: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/costume/list.go b/internal/handler/api/costume/list.go
new file mode 100644
index 0000000..7a2f99d
--- /dev/null
+++ b/internal/handler/api/costume/list.go
@@ -0,0 +1,19 @@
+package costume
+
+import (
+	"honoka-chan/internal/schema/api/costume"
+	"time"
+)
+
+func costumeList() (res any, err error) {
+	res = costume.ListResp{
+		Result: costume.ListData{
+			CostumeList: []costume.CostumeList{},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/eventscenario/eventscenario.go b/internal/handler/api/eventscenario/eventscenario.go
new file mode 100644
index 0000000..f690b17
--- /dev/null
+++ b/internal/handler/api/eventscenario/eventscenario.go
@@ -0,0 +1,17 @@
+package eventscenario
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func EventScenarioApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "status":
+		res, err = eventScenarioStatus(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: costume: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/eventscenario/status.go b/internal/handler/api/eventscenario/status.go
new file mode 100644
index 0000000..d1f313e
--- /dev/null
+++ b/internal/handler/api/eventscenario/status.go
@@ -0,0 +1,80 @@
+package eventscenario
+
+import (
+	"fmt"
+	"honoka-chan/internal/schema/api/eventscenario"
+	"honoka-chan/internal/session"
+	"strings"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func eventScenarioStatus(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	var eventID []int
+	eventsList := []eventscenario.EventScenarioList{}
+	err = ss.MainEng.Table("event_scenario_m").Cols("event_id").GroupBy("event_id").OrderBy("event_id DESC").Find(&eventID)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	for _, id := range eventID {
+		var eventRes []struct {
+			EventScenarioId int    `xorm:"event_scenario_id"`
+			Chapter         int    `xorm:"chapter"`
+			ChapterAsset    string `xorm:"chapter_asset"`
+			OpenDate        string `xorm:"open_date"`
+		}
+		chapsList := []eventscenario.ChapterList{}
+		err = ss.MainEng.Table("event_scenario_m").Where("event_id = ?", id).Cols("event_scenario_id,chapter,chapter_asset,open_date").
+			OrderBy("chapter DESC").Find(&eventRes)
+		if ss.CheckErr(err) {
+			return
+		}
+
+		for _, res := range eventRes {
+			chapList := eventscenario.ChapterList{
+				EventScenarioID: res.EventScenarioId,
+				Chapter:         res.Chapter,
+				ChapterAsset:    res.ChapterAsset,
+				Status:          2,
+				OpenFlashFlag:   0,
+				IsReward:        false,
+				CostType:        1000,
+				ItemID:          1200,
+				Amount:          1,
+			}
+			chapsList = append(chapsList, chapList)
+		}
+
+		event := eventscenario.EventScenarioList{
+			EventID:     id,
+			OpenDate:    strings.ReplaceAll(eventRes[0].OpenDate, "/", "-"),
+			ChapterList: chapsList,
+		}
+
+		// HACK event_scenario_btn_asset
+		switch id {
+		case 10001:
+			event.EventScenarioBtnAsset = "assets/image/ui/eventscenario/38_se_ba_t.png"
+		case 221:
+			event.EventScenarioBtnAsset = "assets/image/ui/eventscenario/215_se_ba_t.png"
+		default:
+			event.EventScenarioBtnAsset = fmt.Sprintf("assets/image/ui/eventscenario/%d_se_ba_t.png", id)
+		}
+
+		eventsList = append(eventsList, event)
+	}
+	res = eventscenario.StatusResp{
+		Result: eventscenario.StatusData{
+			EventScenarioList: eventsList,
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/exchange/exchange.go b/internal/handler/api/exchange/exchange.go
new file mode 100644
index 0000000..d262aea
--- /dev/null
+++ b/internal/handler/api/exchange/exchange.go
@@ -0,0 +1,17 @@
+package exchange
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func ExchangeApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "owningPoint":
+		res, err = owningPoint(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: exchange: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/exchange/owningpoint.go b/internal/handler/api/exchange/owningpoint.go
new file mode 100644
index 0000000..d17077e
--- /dev/null
+++ b/internal/handler/api/exchange/owningpoint.go
@@ -0,0 +1,37 @@
+package exchange
+
+import (
+	"honoka-chan/internal/schema/api/exchange"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func owningPoint(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	var exchangeID []int
+	exPointsList := []exchange.ExchangePointList{}
+	err = ss.MainEng.Table("exchange_point_m").Cols("exchange_point_id").OrderBy("exchange_point_id ASC").Find(&exchangeID)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	for _, id := range exchangeID {
+		exPointsList = append(exPointsList, exchange.ExchangePointList{
+			Rarity:        id,
+			ExchangePoint: 9999,
+		})
+	}
+	res = exchange.OwningPointResp{
+		Result: exchange.OwningPointData{
+			ExchangePointList: exPointsList,
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/item/item.go b/internal/handler/api/item/item.go
new file mode 100644
index 0000000..d23065b
--- /dev/null
+++ b/internal/handler/api/item/item.go
@@ -0,0 +1,13 @@
+package item
+
+import "fmt"
+
+func ItemApi(action string) (res any, err error) {
+	switch action {
+	case "list":
+		res, err = itemList()
+	default:
+		err = fmt.Errorf("unimplemented action: item: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/item/list.go b/internal/handler/api/item/list.go
new file mode 100644
index 0000000..64a6611
--- /dev/null
+++ b/internal/handler/api/item/list.go
@@ -0,0 +1,13 @@
+package item
+
+import (
+	"encoding/json"
+	honokautils "honoka-chan/pkg/utils"
+)
+
+func itemList() (res any, err error) {
+	itemResp := honokautils.ReadAllText("assets/serverdata/item.json")
+	err = json.Unmarshal([]byte(itemResp), &res)
+
+	return res, err
+}
diff --git a/internal/handler/api/live/live.go b/internal/handler/api/live/live.go
new file mode 100644
index 0000000..f06b872
--- /dev/null
+++ b/internal/handler/api/live/live.go
@@ -0,0 +1,19 @@
+package live
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func LiveApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "liveStatus":
+		res, err = liveStatus(ctx)
+	case "schedule":
+		res, err = liveSchedule(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: live: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/live/schedule.go b/internal/handler/api/live/schedule.go
new file mode 100644
index 0000000..7ef5e6f
--- /dev/null
+++ b/internal/handler/api/live/schedule.go
@@ -0,0 +1,57 @@
+package live
+
+import (
+	"honoka-chan/internal/schema/api/live"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func liveSchedule(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	var liveDifficultyID []int
+	specialLives := []live.SpecialLiveStatusList{}
+	err = ss.MainEng.Table("special_live_m").Cols("live_difficulty_id").OrderBy("live_difficulty_id ASC").Find(&liveDifficultyID)
+	if ss.CheckErr(err) {
+		return
+	}
+	for _, id := range liveDifficultyID {
+		specialLive := live.SpecialLiveStatusList{
+			LiveDifficultyID:   id,
+			Status:             1,
+			HiScore:            0,
+			HiComboCount:       0,
+			ClearCnt:           0,
+			AchievedGoalIDList: []int{},
+		}
+		specialLives = append(specialLives, specialLive)
+	}
+
+	livesList := []live.LiveList{}
+	for _, v := range specialLives {
+		livesList = append(livesList, live.LiveList{
+			LiveDifficultyID: v.LiveDifficultyID,
+			StartDate:        "2023-01-01 00:00:00",
+			EndDate:          "2037-01-01 00:00:00",
+			IsRandom:         false,
+		})
+	}
+	res = live.ScheduleResp{
+		Result: live.ScheduleData{
+			EventList:              []any{},
+			LiveList:               livesList,
+			LimitedBonusList:       []any{},
+			LimitedBonusCommonList: []live.LimitedBonusCommonList{}, // 特效道具
+			RandomLiveList:         []live.RandomLiveList{},         // 随机歌曲
+			FreeLiveList:           []any{},
+			TrainingLiveList:       []live.TrainingLiveList{}, // 挑战歌曲
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/live/status.go b/internal/handler/api/live/status.go
new file mode 100644
index 0000000..1531833
--- /dev/null
+++ b/internal/handler/api/live/status.go
@@ -0,0 +1,64 @@
+package live
+
+import (
+	"honoka-chan/internal/schema/api/live"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func liveStatus(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	var liveDifficultyID []int
+	normalLives := []live.NormalLiveStatusList{}
+	err = ss.MainEng.Table("normal_live_m").Cols("live_difficulty_id").OrderBy("live_difficulty_id ASC").Find(&liveDifficultyID)
+	if ss.CheckErr(err) {
+		return
+	}
+	for _, id := range liveDifficultyID {
+		normalLive := live.NormalLiveStatusList{
+			LiveDifficultyID:   id,
+			Status:             1,
+			HiScore:            0,
+			HiComboCount:       0,
+			ClearCnt:           0,
+			AchievedGoalIDList: []int{},
+		}
+		normalLives = append(normalLives, normalLive)
+	}
+
+	specialLives := []live.SpecialLiveStatusList{}
+	err = ss.MainEng.Table("special_live_m").Cols("live_difficulty_id").OrderBy("live_difficulty_id ASC").Find(&liveDifficultyID)
+	if ss.CheckErr(err) {
+		return
+	}
+	for _, id := range liveDifficultyID {
+		specialLive := live.SpecialLiveStatusList{
+			LiveDifficultyID:   id,
+			Status:             1,
+			HiScore:            0,
+			HiComboCount:       0,
+			ClearCnt:           0,
+			AchievedGoalIDList: []int{},
+		}
+		specialLives = append(specialLives, specialLive)
+	}
+
+	res = live.StatusResp{
+		Result: live.StatusData{
+			NormalLiveStatusList:   normalLives,
+			SpecialLiveStatusList:  specialLives,
+			TrainingLiveStatusList: []live.TrainingLiveStatusList{},
+			MarathonLiveStatusList: []any{},
+			FreeLiveStatusList:     []any{},
+			CanResumeLive:          false,
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/liveicon/info.go b/internal/handler/api/liveicon/info.go
new file mode 100644
index 0000000..6d2a2de
--- /dev/null
+++ b/internal/handler/api/liveicon/info.go
@@ -0,0 +1,19 @@
+package liveicon
+
+import (
+	"honoka-chan/internal/schema/api/liveicon"
+	"time"
+)
+
+func liveIconInfo() (res any, err error) {
+	res = liveicon.InfoResp{
+		Result: liveicon.InfoData{
+			LiveNotesIconList: []int{1, 2, 3},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/liveicon/liveicon.go b/internal/handler/api/liveicon/liveicon.go
new file mode 100644
index 0000000..33bf93a
--- /dev/null
+++ b/internal/handler/api/liveicon/liveicon.go
@@ -0,0 +1,13 @@
+package liveicon
+
+import "fmt"
+
+func LiveIconApi(action string) (res any, err error) {
+	switch action {
+	case "liveiconInfo":
+		res, err = liveIconInfo()
+	default:
+		err = fmt.Errorf("unimplemented action: liveicon: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/livese/info.go b/internal/handler/api/livese/info.go
new file mode 100644
index 0000000..9b8ad46
--- /dev/null
+++ b/internal/handler/api/livese/info.go
@@ -0,0 +1,19 @@
+package livese
+
+import (
+	"honoka-chan/internal/schema/api/livese"
+	"time"
+)
+
+func LiveSeInfo() (res any, err error) {
+	res = livese.InfoResp{
+		Result: livese.InfoData{
+			LiveSeList: []int{1, 2, 3},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/livese/livese.go b/internal/handler/api/livese/livese.go
new file mode 100644
index 0000000..f681a9d
--- /dev/null
+++ b/internal/handler/api/livese/livese.go
@@ -0,0 +1,13 @@
+package livese
+
+import "fmt"
+
+func LiveSeApi(action string) (res any, err error) {
+	switch action {
+	case "liveseInfo":
+		res, err = LiveSeInfo()
+	default:
+		err = fmt.Errorf("unimplemented action: livese: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/login/login.go b/internal/handler/api/login/login.go
new file mode 100644
index 0000000..5ea6f16
--- /dev/null
+++ b/internal/handler/api/login/login.go
@@ -0,0 +1,17 @@
+package login
+
+import (
+	"fmt"
+)
+
+func LoginApi(action string) (res any, err error) {
+	switch action {
+	case "topInfo":
+		res, err = loginTopInfo()
+	case "topInfoOnce":
+		res, err = loginTopInfoOnce()
+	default:
+		err = fmt.Errorf("unimplemented action: login: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/login/topinfo.go b/internal/handler/api/login/topinfo.go
new file mode 100644
index 0000000..48f6ba7
--- /dev/null
+++ b/internal/handler/api/login/topinfo.go
@@ -0,0 +1,44 @@
+package login
+
+import (
+	"honoka-chan/internal/schema/api/login"
+	"time"
+)
+
+func loginTopInfo() (res any, err error) {
+	res = login.TopInfoResp{
+		Result: login.TopInfoData{
+			FriendActionCnt:        0,
+			FriendGreetCnt:         0,
+			FriendVarietyCnt:       0,
+			FriendNewCnt:           0,
+			PresentCnt:             0,
+			SecretBoxBadgeFlag:     false,
+			ServerDatetime:         time.Now().Format("2006-01-02 15:04:05"),
+			ServerTimestamp:        time.Now().Unix(),
+			NoticeFriendDatetime:   time.Now().Format("2006-01-02 15:04:05"),
+			NoticeMailDatetime:     "2000-01-01 12:00:00",
+			FriendsApprovalWaitCnt: 0,
+			FriendsRequestCnt:      0,
+			IsTodayBirthday:        false,
+			LicenseInfo: login.LicenseInfo{
+				LicenseList:  []any{},
+				LicensedInfo: []any{},
+				ExpiredInfo:  []any{},
+				BadgeFlag:    false,
+			},
+			UsingBuffInfo:     []any{},
+			IsKlabIDTaskFlag:  false,
+			KlabIDTaskCanSync: false,
+			HasUnreadAnnounce: false,
+			ExchangeBadgeCnt:  []int{0, 0, 0},
+			AdFlag:            false,
+			HasAdReward:       false,
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/login/topinfoonce.go b/internal/handler/api/login/topinfoonce.go
new file mode 100644
index 0000000..73f9578
--- /dev/null
+++ b/internal/handler/api/login/topinfoonce.go
@@ -0,0 +1,39 @@
+package login
+
+import (
+	"honoka-chan/internal/schema/api/login"
+	"time"
+)
+
+func loginTopInfoOnce() (res any, err error) {
+	res = login.TopInfoOnceResp{
+		Result: login.TopInfoOnceData{
+			NewAchievementCnt:            0,
+			UnaccomplishedAchievementCnt: 0,
+			LiveDailyRewardExist:         false,
+			TrainingEnergy:               10,
+			TrainingEnergyMax:            10,
+			Notification: login.Notification{
+				Push:       false,
+				Lp:         false,
+				UpdateInfo: false,
+				Campaign:   false,
+				Live:       false,
+				Lbonus:     false,
+				Event:      false,
+				Secretbox:  false,
+				Birthday:   true,
+			},
+			OpenArena:               true,
+			CostumeStatus:           true,
+			OpenAccessory:           true,
+			ArenaSiSkillUniqueCheck: true,
+			OpenV98:                 true,
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/marathon/info.go b/internal/handler/api/marathon/info.go
new file mode 100644
index 0000000..55a1859
--- /dev/null
+++ b/internal/handler/api/marathon/info.go
@@ -0,0 +1,17 @@
+package marathon
+
+import (
+	"honoka-chan/internal/schema/api/marathon"
+	"time"
+)
+
+func marathonInfo() (res any, err error) {
+	res = marathon.InfoResp{
+		Result:     []any{},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/marathon/marathon.go b/internal/handler/api/marathon/marathon.go
new file mode 100644
index 0000000..69f9939
--- /dev/null
+++ b/internal/handler/api/marathon/marathon.go
@@ -0,0 +1,13 @@
+package marathon
+
+import "fmt"
+
+func MarathonApi(action string) (res any, err error) {
+	switch action {
+	case "marathonInfo":
+		res, err = marathonInfo()
+	default:
+		err = fmt.Errorf("unimplemented action: marathon: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/multiunit/multiunit.go b/internal/handler/api/multiunit/multiunit.go
new file mode 100644
index 0000000..349b80d
--- /dev/null
+++ b/internal/handler/api/multiunit/multiunit.go
@@ -0,0 +1,17 @@
+package multiunit
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func MultiUnitApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "multiunitscenarioStatus":
+		res, err = MultiUnitScenarioStatus(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: multiunit: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/multiunit/scenariostatus.go b/internal/handler/api/multiunit/scenariostatus.go
new file mode 100644
index 0000000..2af2205
--- /dev/null
+++ b/internal/handler/api/multiunit/scenariostatus.go
@@ -0,0 +1,62 @@
+package multiunit
+
+import (
+	"honoka-chan/internal/schema/api/multiunit"
+	"honoka-chan/internal/session"
+	"strings"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func MultiUnitScenarioStatus(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	var statusID []int
+	multiUnitsList := []multiunit.StatusList{}
+	err = ss.MainEng.Table("multi_unit_scenario_m").Cols("multi_unit_id").GroupBy("multi_unit_id").OrderBy("multi_unit_id ASC").Find(&statusID)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	for _, id := range statusID {
+		var multiRes struct {
+			MultiUnitScenarioId       int    `xorm:"multi_unit_scenario_id"`
+			Chapter                   int    `xorm:"chapter"`
+			MultiUnitScenarioBtnAsset string `xorm:"multi_unit_scenario_btn_asset"`
+			OpenDate                  string `xorm:"open_date"`
+		}
+		_, err = ss.MainEng.Table("multi_unit_scenario_m").
+			Join("LEFT", "multi_unit_scenario_open_m", "multi_unit_scenario_m.multi_unit_id = multi_unit_scenario_open_m.multi_unit_id").
+			Cols("multi_unit_scenario_btn_asset,open_date,multi_unit_scenario_id,chapter").
+			Where("multi_unit_scenario_m.multi_unit_id = ?", id).Get(&multiRes)
+		if ss.CheckErr(err) {
+			return
+		}
+
+		multiUnitsList = append(multiUnitsList, multiunit.StatusList{
+			MultiUnitID:               id,
+			Status:                    2,
+			MultiUnitScenarioBtnAsset: multiRes.MultiUnitScenarioBtnAsset,
+			OpenDate:                  strings.ReplaceAll(multiRes.OpenDate, "/", "-"),
+			ChapterList: []multiunit.ChapterList{
+				{
+					MultiUnitScenarioID: multiRes.MultiUnitScenarioId,
+					Chapter:             multiRes.Chapter,
+					Status:              2,
+				},
+			},
+		})
+	}
+	res = multiunit.StatusResp{
+		Result: multiunit.StatusData{
+			MultiUnitScenarioStatusList:  multiUnitsList,
+			UnlockedMultiUnitScenarioIds: []any{},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/museum/info.go b/internal/handler/api/museum/info.go
new file mode 100644
index 0000000..ea4746d
--- /dev/null
+++ b/internal/handler/api/museum/info.go
@@ -0,0 +1,51 @@
+package museum
+
+import (
+	"honoka-chan/internal/schema/api/museum"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func museumInfo(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	var museumRes []struct {
+		MuseumContentsId int `xorm:"museum_contents_id"`
+		SmileBuff        int `xorm:"smile_buff"`
+		PureBuff         int `xorm:"pure_buff"`
+		CoolBuff         int `xorm:"cool_buff"`
+	}
+	var museumID []int
+	var smileBuff, pureBuff, coolBuff int
+	err = ss.MainEng.Table("museum_contents_m").Cols("museum_contents_id,smile_buff,pure_buff,cool_buff").
+		OrderBy("museum_contents_id ASC").Find(&museumRes)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	for _, res := range museumRes {
+		smileBuff += res.SmileBuff
+		pureBuff += res.PureBuff
+		coolBuff += res.CoolBuff
+		museumID = append(museumID, res.MuseumContentsId)
+	}
+	res = museum.InfoResp{
+		Result: museum.InfoData{
+			MuseumInfo: museum.Info{
+				Parameter: museum.Parameter{
+					Smile: smileBuff,
+					Pure:  pureBuff,
+					Cool:  coolBuff,
+				},
+				ContentsIDList: museumID,
+			},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/museum/museum.go b/internal/handler/api/museum/museum.go
new file mode 100644
index 0000000..53f436e
--- /dev/null
+++ b/internal/handler/api/museum/museum.go
@@ -0,0 +1,17 @@
+package museum
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func MuseumApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "info":
+		res, err = museumInfo(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: museum: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/navigation/navigation.go b/internal/handler/api/navigation/navigation.go
new file mode 100644
index 0000000..64d9767
--- /dev/null
+++ b/internal/handler/api/navigation/navigation.go
@@ -0,0 +1,15 @@
+package navigation
+
+import (
+	"fmt"
+)
+
+func NavigationApi(action string) (res any, err error) {
+	switch action {
+	case "specialCutin":
+		res, err = SpecialCutin()
+	default:
+		err = fmt.Errorf("unimplemented action: navigation: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/navigation/specialcutin.go b/internal/handler/api/navigation/specialcutin.go
new file mode 100644
index 0000000..2834177
--- /dev/null
+++ b/internal/handler/api/navigation/specialcutin.go
@@ -0,0 +1,19 @@
+package navigation
+
+import (
+	"honoka-chan/internal/schema/api/navigation"
+	"time"
+)
+
+func SpecialCutin() (res any, err error) {
+	res = navigation.SpecialCutinResp{
+		Result: navigation.SpecialCutinData{
+			SpecialCutinList: []any{},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/notice/marquee.go b/internal/handler/api/notice/marquee.go
new file mode 100644
index 0000000..a037ba1
--- /dev/null
+++ b/internal/handler/api/notice/marquee.go
@@ -0,0 +1,20 @@
+package notice
+
+import (
+	"honoka-chan/internal/schema/api/notice"
+	"time"
+)
+
+func noticeMarquee() (res any, err error) {
+	res = notice.MarqueeResp{
+		Result: notice.MarqueeData{
+			ItemCount:   0,
+			MarqueeList: []any{},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/notice/notice.go b/internal/handler/api/notice/notice.go
new file mode 100644
index 0000000..327fa3f
--- /dev/null
+++ b/internal/handler/api/notice/notice.go
@@ -0,0 +1,13 @@
+package notice
+
+import "fmt"
+
+func NoticeApi(action string) (res any, err error) {
+	switch action {
+	case "noticeMarquee":
+		res, err = noticeMarquee()
+	default:
+		err = fmt.Errorf("unimplemented action: notice: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/payment/payment.go b/internal/handler/api/payment/payment.go
new file mode 100644
index 0000000..a2ca6cc
--- /dev/null
+++ b/internal/handler/api/payment/payment.go
@@ -0,0 +1,13 @@
+package payment
+
+import "fmt"
+
+func PaymentApi(action string) (res any, err error) {
+	switch action {
+	case "productList":
+		res, err = productList()
+	default:
+		err = fmt.Errorf("unimplemented action: payment: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/payment/productlist.go b/internal/handler/api/payment/productlist.go
new file mode 100644
index 0000000..3b6a400
--- /dev/null
+++ b/internal/handler/api/payment/productlist.go
@@ -0,0 +1,31 @@
+package payment
+
+import (
+	"honoka-chan/internal/schema/api/payment"
+	"time"
+)
+
+func productList() (res any, err error) {
+	res = payment.ProductListResp{
+		Result: payment.ProductListData{
+			RestrictionInfo: payment.RestrictionInfo{
+				Restricted: false,
+			},
+			UnderAgeInfo: payment.UnderAgeInfo{
+				BirthSet:    false,
+				HasLimit:    false,
+				LimitAmount: nil,
+				MonthUsed:   0,
+			},
+			SnsProductList:   []payment.SnsProduct{},
+			ProductList:      []payment.Product{},
+			SubscriptionList: []payment.Subscription{},
+			ShowPointShop:    false,
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/profile/cardranking.go b/internal/handler/api/profile/cardranking.go
new file mode 100644
index 0000000..4b88bb3
--- /dev/null
+++ b/internal/handler/api/profile/cardranking.go
@@ -0,0 +1,26 @@
+package profile
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/schema/api/profile"
+	honokautils "honoka-chan/pkg/utils"
+	"time"
+)
+
+func cardRanking() (res any, err error) {
+	var result []any
+	love := honokautils.ReadAllText("assets/serverdata/love.json")
+	err = json.Unmarshal([]byte(love), &result)
+	if err != nil {
+		return nil, err
+	}
+
+	res = profile.CardRankingResp{
+		Result:     result,
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/profile/info.go b/internal/handler/api/profile/info.go
new file mode 100644
index 0000000..a11812b
--- /dev/null
+++ b/internal/handler/api/profile/info.go
@@ -0,0 +1,188 @@
+package profile
+
+import (
+	"honoka-chan/internal/model/user"
+	"honoka-chan/internal/schema/api/profile"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func profileInfo(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	pref := user.UserPref{}
+	_, err = ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Get(&pref)
+	if err != nil {
+		return nil, err
+	}
+
+	commonUnit, err := ss.MainEng.Table("common_unit_m").Count()
+	if err != nil {
+		return nil, err
+	}
+
+	userUnit, err := ss.UserEng.Table("user_unit").Where("user_id = ?", ss.UserID).Count()
+	if err != nil {
+		return nil, err
+	}
+
+	unitData := profile.UnitData{}
+	exists, err := ss.MainEng.Table("common_unit_m").Where("unit_owning_user_id = ?", pref.UnitOwningUserID).Get(&unitData)
+	if err != nil {
+		return nil, err
+	}
+
+	isCommon := true
+	if !exists {
+		_, err = ss.UserEng.Table("user_unit").
+			Where("unit_owning_user_id = ? AND user_id = ?", pref.UnitOwningUserID, ss.UserID).Get(&unitData)
+		if err != nil {
+			return nil, err
+		}
+		isCommon = false
+	}
+
+	var attrId, maxHp, baseSmile, basePure, baseCool int
+	var smileMax, pureMax, coolMax int
+	if isCommon {
+		// 公共卡片仅为100级属性
+		_, err = ss.MainEng.Table("unit_m").Where("unit_id = ?", unitData.UnitID).
+			Cols("attribute_id,hp_max,smile_max,pure_max,cool_max").Get(&attrId, &maxHp, &baseSmile, &basePure, &baseCool)
+		if err != nil {
+			return nil, err
+		}
+
+		// 偷懒起见不计算饰品、宝石、回忆画廊等属性加成
+		smileMax = baseSmile
+		pureMax = basePure
+		coolMax = baseCool
+		// } else {
+		// 	// 用户卡片需要根据等级计算属性
+		// 	// TODO
+	}
+
+	var accessoryOwningId, accessoryId, exp int
+	_, err = ss.UserEng.Table("user_accessory_wear").Where("unit_owning_user_id = ? AND user_id = ?", pref.UnitOwningUserID, ss.UserID).
+		Cols("accessory_owning_user_id").Get(&accessoryOwningId)
+	if err != nil {
+		return nil, err
+	}
+	_, err = ss.MainEng.Table("common_accessory_m").Where("accessory_owning_user_id = ?", accessoryOwningId).
+		Cols("accessory_id,exp").Get(&accessoryId, &exp)
+	if err != nil {
+		return nil, err
+	}
+	accessoryInfo := profile.AccessoryInfo{
+		AccessoryOwningUserID: accessoryOwningId,
+		AccessoryID:           accessoryId,
+		Exp:                   exp,
+		NextExp:               0,
+		Level:                 8,
+		MaxLevel:              8,
+		RankUpCount:           4,
+		FavoriteFlag:          true,
+	}
+
+	removeSkillIds := []int{}
+	err = ss.UserEng.Table("user_unit_skill_equip").Where("unit_owning_user_id = ? AND user_id = ?", pref.UnitOwningUserID, ss.UserID).
+		Cols("unit_removable_skill_id").Find(&removeSkillIds)
+	if err != nil {
+		return nil, err
+	}
+
+	res = profile.InfoResp{
+		Result: profile.InfoData{
+			UserInfo: profile.UserInfo{
+				UserID:               pref.UserID,
+				Name:                 pref.UserName,
+				Level:                pref.UserLevel,
+				CostMax:              100,
+				UnitMax:              5000,
+				EnergyMax:            417,
+				FriendMax:            99,
+				UnitCnt:              int(commonUnit + userUnit),
+				InviteCode:           pref.InviteCode,
+				ElapsedTimeFromLogin: "14\u5c0f\u65f6\u524d",
+				Introduction:         pref.UserDesc,
+			},
+			CenterUnitInfo: profile.CenterUnitInfo{
+				UnitOwningUserID:           unitData.UnitOwningUserID,
+				UnitID:                     unitData.UnitID,
+				Exp:                        unitData.Exp,
+				NextExp:                    unitData.NextExp,
+				Level:                      unitData.Level,
+				LevelLimitID:               unitData.LevelLimitID,
+				MaxLevel:                   unitData.MaxLevel,
+				Rank:                       unitData.Rank,
+				MaxRank:                    unitData.MaxRank,
+				Love:                       unitData.Love,
+				MaxLove:                    unitData.MaxLove,
+				UnitSkillLevel:             unitData.UnitSkillLevel,
+				MaxHp:                      unitData.MaxHp,
+				FavoriteFlag:               unitData.FavoriteFlag,
+				DisplayRank:                unitData.DisplayRank,
+				UnitSkillExp:               unitData.UnitSkillExp,
+				UnitRemovableSkillCapacity: unitData.UnitRemovableSkillCapacity,
+				Attribute:                  attrId,
+				Smile:                      baseSmile,
+				Cute:                       basePure,
+				Cool:                       baseCool,
+				IsLoveMax:                  unitData.IsLoveMax,
+				IsLevelMax:                 unitData.IsLevelMax,
+				IsRankMax:                  unitData.IsRankMax,
+				IsSigned:                   unitData.IsSigned,
+				IsSkillLevelMax:            unitData.IsSkillLevelMax,
+				SettingAwardID:             pref.AwardID,
+				RemovableSkillIds:          removeSkillIds,
+				AccessoryInfo:              accessoryInfo,
+				Costume:                    profile.Costume{},
+				TotalSmile:                 smileMax,
+				TotalCute:                  pureMax,
+				TotalCool:                  coolMax,
+				TotalHp:                    maxHp,
+			},
+			NaviUnitInfo: profile.NaviUnitInfo{
+				UnitOwningUserID:            unitData.UnitOwningUserID,
+				UnitID:                      unitData.UnitID,
+				Exp:                         unitData.Exp,
+				NextExp:                     unitData.NextExp,
+				Level:                       unitData.Level,
+				MaxLevel:                    unitData.MaxLevel,
+				LevelLimitID:                unitData.LevelLimitID,
+				Rank:                        unitData.Rank,
+				MaxRank:                     unitData.MaxRank,
+				Love:                        unitData.Love,
+				MaxLove:                     unitData.MaxLove,
+				UnitSkillExp:                unitData.UnitSkillExp,
+				UnitSkillLevel:              unitData.UnitSkillLevel,
+				MaxHp:                       unitData.MaxHp,
+				UnitRemovableSkillCapacity:  unitData.UnitRemovableSkillCapacity,
+				FavoriteFlag:                unitData.FavoriteFlag,
+				DisplayRank:                 unitData.DisplayRank,
+				IsLoveMax:                   unitData.IsLoveMax,
+				IsLevelMax:                  unitData.IsLevelMax,
+				IsRankMax:                   unitData.IsRankMax,
+				IsSigned:                    unitData.IsSigned,
+				IsSkillLevelMax:             unitData.IsSkillLevelMax,
+				IsRemovableSkillCapacityMax: unitData.IsRemovableSkillCapacityMax,
+				InsertDate:                  "2016-10-11 10:33:03",
+				TotalSmile:                  smileMax,
+				TotalCute:                   pureMax,
+				TotalCool:                   coolMax,
+				TotalHp:                     maxHp,
+				RemovableSkillIds:           removeSkillIds,
+			},
+			IsAlliance:          false,
+			FriendStatus:        0,
+			SettingAwardID:      pref.AwardID,
+			SettingBackgroundID: pref.BackgroundID,
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/profile/livecnt.go b/internal/handler/api/profile/livecnt.go
new file mode 100644
index 0000000..357bba6
--- /dev/null
+++ b/internal/handler/api/profile/livecnt.go
@@ -0,0 +1,38 @@
+package profile
+
+import (
+	"honoka-chan/internal/schema/api/profile"
+	"time"
+)
+
+func liveCnt() (res any, err error) {
+	res = profile.LiveCntResp{
+		Result: []profile.LiveCntData{
+			{
+				Difficulty: 1,
+				ClearCnt:   315,
+			},
+			{
+				Difficulty: 2,
+				ClearCnt:   310,
+			},
+			{
+				Difficulty: 3,
+				ClearCnt:   314,
+			},
+			{
+				Difficulty: 4,
+				ClearCnt:   455,
+			},
+			{
+				Difficulty: 6,
+				ClearCnt:   233,
+			},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/profile/profile.go b/internal/handler/api/profile/profile.go
new file mode 100644
index 0000000..5454534
--- /dev/null
+++ b/internal/handler/api/profile/profile.go
@@ -0,0 +1,21 @@
+package profile
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func ProfileApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "cardRanking":
+		res, err = cardRanking()
+	case "liveCnt":
+		res, err = liveCnt()
+	case "profileInfo":
+		res, err = profileInfo(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: profile: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/scenario/scenario.go b/internal/handler/api/scenario/scenario.go
new file mode 100644
index 0000000..894cd38
--- /dev/null
+++ b/internal/handler/api/scenario/scenario.go
@@ -0,0 +1,17 @@
+package scenario
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func ScenarioApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "scenarioStatus":
+		res, err = scenarioStatus(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: scenario: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/scenario/status.go b/internal/handler/api/scenario/status.go
new file mode 100644
index 0000000..c821475
--- /dev/null
+++ b/internal/handler/api/scenario/status.go
@@ -0,0 +1,37 @@
+package scenario
+
+import (
+	"honoka-chan/internal/schema/api/scenario"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func scenarioStatus(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	var scenarioID []int
+	scenarioLists := []scenario.StatusList{}
+	err = ss.MainEng.Table("scenario_m").Cols("scenario_id").OrderBy("scenario_id ASC").Find(&scenarioID)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	for _, id := range scenarioID {
+		scenarioLists = append(scenarioLists, scenario.StatusList{
+			ScenarioID: id,
+			Status:     2,
+		})
+	}
+	res = scenario.StatusResp{
+		Result: scenario.StatusData{
+			ScenarioStatusList: scenarioLists,
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/stamp/info.go b/internal/handler/api/stamp/info.go
new file mode 100644
index 0000000..4744701
--- /dev/null
+++ b/internal/handler/api/stamp/info.go
@@ -0,0 +1,13 @@
+package stamp
+
+import (
+	"encoding/json"
+	honokautils "honoka-chan/pkg/utils"
+)
+
+func stampInfo() (res any, err error) {
+	stampResp := honokautils.ReadAllText("assets/serverdata/stamp.json")
+	err = json.Unmarshal([]byte(stampResp), &res)
+
+	return res, err
+}
diff --git a/internal/handler/api/stamp/stamp.go b/internal/handler/api/stamp/stamp.go
new file mode 100644
index 0000000..b971070
--- /dev/null
+++ b/internal/handler/api/stamp/stamp.go
@@ -0,0 +1,13 @@
+package stamp
+
+import "fmt"
+
+func StampApi(action string) (res any, err error) {
+	switch action {
+	case "stampInfo":
+		res, err = stampInfo()
+	default:
+		err = fmt.Errorf("unimplemented action: stamp: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/subscenario/status.go b/internal/handler/api/subscenario/status.go
new file mode 100644
index 0000000..8d28fa2
--- /dev/null
+++ b/internal/handler/api/subscenario/status.go
@@ -0,0 +1,38 @@
+package subscenario
+
+import (
+	"honoka-chan/internal/schema/api/subscenario"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func subscenarioStatus(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	var subScenarioID []int
+	subScenarioLists := []subscenario.StatusList{}
+	err = ss.MainEng.Table("subscenario_m").Cols("subscenario_id").OrderBy("subscenario_id ASC").Find(&subScenarioID)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	for _, id := range subScenarioID {
+		subScenarioLists = append(subScenarioLists, subscenario.StatusList{
+			SubscenarioID: id,
+			Status:        2,
+		})
+	}
+	res = subscenario.StatusResp{
+		Result: subscenario.StatusData{
+			SubscenarioStatusList:  subScenarioLists,
+			UnlockedSubscenarioIds: []any{},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/subscenario/subscenario.go b/internal/handler/api/subscenario/subscenario.go
new file mode 100644
index 0000000..c69347c
--- /dev/null
+++ b/internal/handler/api/subscenario/subscenario.go
@@ -0,0 +1,17 @@
+package subscenario
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func SubscenarioApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "subscenarioStatus":
+		res, err = subscenarioStatus(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: subscenario: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/unit/accessoryall.go b/internal/handler/api/unit/accessoryall.go
new file mode 100644
index 0000000..29395f0
--- /dev/null
+++ b/internal/handler/api/unit/accessoryall.go
@@ -0,0 +1,43 @@
+package unit
+
+import (
+	"honoka-chan/internal/schema/api/unit"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func unitAccessoryAll(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	accessoryList := []unit.AccessoryList{}
+	err = ss.MainEng.Table("common_accessory_m").Find(&accessoryList)
+	if ss.CheckErr(err) {
+		return
+	}
+	for k := range accessoryList {
+		accessoryList[k].NextExp = 0
+		accessoryList[k].Level = 8
+		accessoryList[k].MaxLevel = 8
+		accessoryList[k].RankUpCount = 4
+		accessoryList[k].FavoriteFlag = true
+	}
+	wearingInfo := []unit.WearingInfo{}
+	err = ss.UserEng.Table("user_accessory_wear").Where("user_id = ?", ss.UserID).Find(&wearingInfo)
+	if ss.CheckErr(err) {
+		return
+	}
+	res = unit.AccessoryAllResp{
+		Result: unit.AccessoryAllData{
+			AccessoryList:      accessoryList,
+			WearingInfo:        wearingInfo,
+			EspecialCreateFlag: false,
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/unit/all.go b/internal/handler/api/unit/all.go
new file mode 100644
index 0000000..4649331
--- /dev/null
+++ b/internal/handler/api/unit/all.go
@@ -0,0 +1,38 @@
+package unit
+
+import (
+	"honoka-chan/internal/schema/api/unit"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func unitAll(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	unitsData := []unit.Active{}
+	err = ss.MainEng.Table("common_unit_m").Find(&unitsData)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	userUnits := []unit.Active{}
+	err = ss.UserEng.Table("user_unit").Where("user_id = ?", ss.UserID).Find(&userUnits)
+	if ss.CheckErr(err) {
+		return
+	}
+	unitsData = append(unitsData, userUnits...)
+
+	res = unit.AllResp{
+		Result: unit.AllData{
+			Active:  unitsData,
+			Waiting: []unit.Waiting{},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/unit/deckinfo.go b/internal/handler/api/unit/deckinfo.go
new file mode 100644
index 0000000..3ac93f8
--- /dev/null
+++ b/internal/handler/api/unit/deckinfo.go
@@ -0,0 +1,55 @@
+package unit
+
+import (
+	"honoka-chan/internal/schema/api/unit"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func unitDeckInfo(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	userDeck := []unit.UserDeckData{}
+	err = ss.UserEng.Table("user_deck").Where("user_id = ?", ss.UserID).Asc("deck_id").Find(&userDeck)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	unitDeckInfo := []unit.DeckInfoData{}
+	for _, deck := range userDeck {
+		deckUnit := []unit.UnitDeckData{}
+		err = ss.UserEng.Table("user_deck_unit").Where("user_deck_id = ?", deck.ID).Asc("position").Find(&deckUnit)
+		if ss.CheckErr(err) {
+			return
+		}
+
+		oUID := []unit.UnitOwningUserIds{}
+		for _, u := range deckUnit {
+			oUID = append(oUID, unit.UnitOwningUserIds{
+				Position:         u.Position,
+				UnitOwningUserID: u.UnitOwningUserID,
+			})
+		}
+
+		mainFlag := false
+		if deck.MainFlag == 1 {
+			mainFlag = true
+		}
+		unitDeckInfo = append(unitDeckInfo, unit.DeckInfoData{
+			UnitDeckID:        deck.DeckID,
+			MainFlag:          mainFlag,
+			DeckName:          deck.DeckName,
+			UnitOwningUserIds: oUID,
+		})
+	}
+	res = unit.DeckInfoResp{
+		Result:     unitDeckInfo,
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/unit/removableskillinfo.go b/internal/handler/api/unit/removableskillinfo.go
new file mode 100644
index 0000000..99d49a6
--- /dev/null
+++ b/internal/handler/api/unit/removableskillinfo.go
@@ -0,0 +1,76 @@
+package unit
+
+import (
+	"honoka-chan/internal/schema/api/unit"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func unitRemovableSkillInfo(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	var skillEquipCount []unit.SkillEquipCount
+	err = ss.UserEng.Table("user_unit_skill_equip").Where("user_id = ?", ss.UserID).Select("unit_removable_skill_id,COUNT(*) AS ct").
+		GroupBy("unit_removable_skill_id").Find(&skillEquipCount)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	var rmSkillIds []int
+	err = ss.MainEng.Table("unit_removable_skill_m").Where("effect_range = 1").Cols("unit_removable_skill_id").Find(&rmSkillIds)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	owingInfo := []unit.OwningInfo{}
+	for _, id := range rmSkillIds {
+		info := unit.OwningInfo{
+			UnitRemovableSkillID: id,
+			TotalAmount:          9,
+			EquippedAmount:       0,
+			InsertDate:           "2023-01-01 12:00:00",
+		}
+		for _, sk := range skillEquipCount {
+			if id == sk.UnitRemovableSkillId {
+				info.EquippedAmount = sk.Count
+				break
+			}
+		}
+		owingInfo = append(owingInfo, info)
+	}
+
+	var unitOwningIds []int
+	err = ss.UserEng.Table("user_unit_skill_equip").Where("user_id = ?", ss.UserID).Cols("unit_owning_user_id").GroupBy("unit_owning_user_id").Find(&unitOwningIds)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	equipInfo := map[int]any{}
+	for _, v := range unitOwningIds {
+		detail := []unit.SkillEquipDetail{}
+		err = ss.UserEng.Table("user_unit_skill_equip").Where("user_id = ? AND unit_owning_user_id = ?", ss.UserID, v).
+			Cols("unit_removable_skill_id").Find(&detail)
+		if ss.CheckErr(err) {
+			return
+		}
+
+		equipInfo[v] = unit.SkillEquipList{
+			UnitOwningUserID: v,
+			Detail:           detail,
+		}
+	}
+
+	res = unit.RemovableSkillInfoResp{
+		Result: unit.RemovableSkillInfoData{
+			OwningInfo:    owingInfo,
+			EquipmentInfo: equipInfo,
+		}, // 宝石
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/unit/supporterall.go b/internal/handler/api/unit/supporterall.go
new file mode 100644
index 0000000..9b6fb61
--- /dev/null
+++ b/internal/handler/api/unit/supporterall.go
@@ -0,0 +1,19 @@
+package unit
+
+import (
+	"honoka-chan/internal/schema/api/unit"
+	"time"
+)
+
+func unitSupporterAll() (res any, err error) {
+	res = unit.SupporterAllResp{
+		Result: unit.SupporterAllData{
+			UnitSupportList: []unit.SupporterList{},
+		}, // 练习道具
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/unit/unit.go b/internal/handler/api/unit/unit.go
new file mode 100644
index 0000000..2ed19fa
--- /dev/null
+++ b/internal/handler/api/unit/unit.go
@@ -0,0 +1,25 @@
+package unit
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func UnitApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "accessoryAll":
+		res, err = unitAccessoryAll(ctx)
+	case "deckInfo":
+		res, err = unitDeckInfo(ctx)
+	case "removableSkillInfo":
+		res, err = unitRemovableSkillInfo(ctx)
+	case "supporterAll":
+		res, err = unitSupporterAll()
+	case "unitAll":
+		res, err = unitAll(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: unit: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/api/user/getnavi.go b/internal/handler/api/user/getnavi.go
new file mode 100644
index 0000000..9520705
--- /dev/null
+++ b/internal/handler/api/user/getnavi.go
@@ -0,0 +1,33 @@
+package user
+
+import (
+	"honoka-chan/internal/schema/api/user"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func userGetNavi(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	var uID, oID int
+	_, err = ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Cols("user_id,unit_owning_user_id").Get(&uID, &oID)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	res = user.GetNaviResp{
+		Result: user.GetNaviData{
+			User: user.User{
+				UserID:           uID,
+				UnitOwningUserID: oID,
+			},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/user/info.go b/internal/handler/api/user/info.go
new file mode 100644
index 0000000..67c6d8e
--- /dev/null
+++ b/internal/handler/api/user/info.go
@@ -0,0 +1,58 @@
+package user
+
+import (
+	"honoka-chan/internal/model/user"
+	userapischema "honoka-chan/internal/schema/api/user"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func userInfo(ctx *gin.Context) (res any, err error) {
+	ss := session.Get(ctx)
+
+	pref := user.UserPref{}
+	_, err = ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Get(&pref)
+	if err != nil {
+		return nil, err
+	}
+
+	res = userapischema.InfoResp{
+		Result: userapischema.UserInfo{
+			UserID:                         ss.UserID,
+			Name:                           pref.UserName,
+			Level:                          pref.UserLevel,
+			Exp:                            1089696,
+			PreviousExp:                    0,
+			NextExp:                        1207185,
+			GameCoin:                       999999999,
+			SnsCoin:                        100000,
+			FreeSnsCoin:                    50000,
+			PaidSnsCoin:                    50000,
+			SocialPoint:                    1438395,
+			UnitMax:                        5000,
+			WaitingUnitMax:                 1000,
+			EnergyMax:                      417,
+			EnergyFullTime:                 "2023-03-20 03:58:55",
+			LicenseLiveEnergyRecoverlyTime: 60,
+			EnergyFullNeedTime:             0,
+			OverMaxEnergy:                  417,
+			TrainingEnergy:                 100,
+			TrainingEnergyMax:              100,
+			FriendMax:                      99,
+			InviteCode:                     pref.InviteCode,
+			InsertDate:                     "2015-08-10 18:58:30",
+			UpdateDate:                     "2018-08-09 18:13:12",
+			TutorialState:                  -1,
+			DiamondCoin:                    0,
+			CrystalCoin:                    0,
+			LpRecoveryItem:                 []userapischema.LpRecoveryItem{},
+		},
+		Status:     200,
+		CommandNum: false,
+		TimeStamp:  time.Now().Unix(),
+	}
+
+	return res, err
+}
diff --git a/internal/handler/api/user/user.go b/internal/handler/api/user/user.go
new file mode 100644
index 0000000..f2cddc1
--- /dev/null
+++ b/internal/handler/api/user/user.go
@@ -0,0 +1,19 @@
+package user
+
+import (
+	"fmt"
+
+	"github.com/gin-gonic/gin"
+)
+
+func UserApi(ctx *gin.Context, action string) (res any, err error) {
+	switch action {
+	case "getNavi":
+		res, err = userGetNavi(ctx)
+	case "userInfo":
+		res, err = userInfo(ctx)
+	default:
+		err = fmt.Errorf("unimplemented action: user: %s", action)
+	}
+	return res, err
+}
diff --git a/internal/handler/award.go b/internal/handler/award.go
deleted file mode 100644
index 78b344a..0000000
--- a/internal/handler/award.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package handler
-
-import (
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"honoka-chan/internal/tools"
-
-	"github.com/gin-gonic/gin"
-	"github.com/tidwall/gjson"
-)
-
-func AwardSet(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	req := gjson.Parse(ctx.PostForm("request_data"))
-	pref := tools.UserPref{
-		AwardID: int(req.Get("award_id").Int()),
-	}
-
-	_, err := ss.UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Update(&pref)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	awardResp := model.AwardSetResp{
-		ResponseData: []any{},
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(awardResp)
-}
diff --git a/internal/handler/award/set.go b/internal/handler/award/set.go
new file mode 100644
index 0000000..f554d10
--- /dev/null
+++ b/internal/handler/award/set.go
@@ -0,0 +1,37 @@
+package award
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/model/user"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/award"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+	"github.com/tidwall/gjson"
+)
+
+func set(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	reqData := gjson.Parse(ctx.MustGet("request_data").(string))
+	pref := user.UserPref{
+		AwardID: int(reqData.Get("award_id").Int()),
+	}
+
+	_, err := ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Update(&pref)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(award.SetResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/award/set", middleware.Common, set)
+}
diff --git a/internal/handler/background.go b/internal/handler/background.go
deleted file mode 100644
index 646b082..0000000
--- a/internal/handler/background.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package handler
-
-import (
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"honoka-chan/internal/tools"
-
-	"github.com/gin-gonic/gin"
-	"github.com/tidwall/gjson"
-)
-
-func BackgroundSet(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	req := gjson.Parse(ctx.PostForm("request_data"))
-	pref := tools.UserPref{
-		BackgroundID: int(req.Get("background_id").Int()),
-	}
-
-	_, err := ss.UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Update(&pref)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	backgroundResp := model.BackgroundSetResp{
-		ResponseData: []any{},
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(backgroundResp)
-}
diff --git a/internal/handler/background/set.go b/internal/handler/background/set.go
new file mode 100644
index 0000000..4cfca5a
--- /dev/null
+++ b/internal/handler/background/set.go
@@ -0,0 +1,37 @@
+package background
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/model/user"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/background"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+	"github.com/tidwall/gjson"
+)
+
+func set(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	reqData := gjson.Parse(ctx.MustGet("request_data").(string))
+	pref := user.UserPref{
+		BackgroundID: int(reqData.Get("background_id").Int()),
+	}
+
+	_, err := ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Update(&pref)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(background.SetResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/background/set", middleware.Common, set)
+}
diff --git a/internal/handler/download.go b/internal/handler/download.go
deleted file mode 100644
index f0e38a8..0000000
--- a/internal/handler/download.go
+++ /dev/null
@@ -1,196 +0,0 @@
-package handler
-
-import (
-	"encoding/json"
-	"fmt"
-	"honoka-chan/config"
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"io"
-	"net/http"
-	"strings"
-
-	"github.com/gin-gonic/gin"
-	"xorm.io/builder"
-)
-
-type PkgInfo struct {
-	Id    int `xorm:"pkg_id"`
-	Order int `xorm:"pkg_order"`
-	Size  int `xorm:"pkg_size"`
-}
-
-func DownloadAdditional(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	downloadReq := model.AdditionalReq{}
-	err := json.Unmarshal([]byte(ctx.GetString("request_data")), &downloadReq)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	pkgList := []model.AdditionalRes{}
-	pkgType, pkgId := downloadReq.PackageType, downloadReq.PackageID
-	var pkgInfo []PkgInfo
-	err = ss.MainEng.Table("download_m").Where("pkg_type = ? AND pkg_id = ? AND pkg_os = ?", pkgType, pkgId, downloadReq.TargetOs).
-		Cols("pkg_id,pkg_order,pkg_size").
-		OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	for _, pkg := range pkgInfo {
-		pkgList = append(pkgList, model.AdditionalRes{
-			Size: pkg.Size,
-			URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip",
-				config.Conf.Settings.CdnServer, downloadReq.TargetOs, pkgType, pkg.Id, pkg.Order),
-		})
-	}
-
-	addResp := model.AdditionalResp{
-		ResponseData: pkgList,
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(addResp)
-}
-
-func DownloadBatch(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	downloadReq := model.BatchReq{}
-	err := json.Unmarshal([]byte(ctx.GetString("request_data")), &downloadReq)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	pkgList := []model.BatchRes{}
-	if downloadReq.ClientVersion == config.PackageVersion {
-		pkgType := downloadReq.PackageType
-		var pkgInfo []PkgInfo
-		err := ss.MainEng.Table("download_m").Where(builder.NotIn("pkg_id", downloadReq.ExcludedPackageIds)).Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.Os).
-			Cols("pkg_id,pkg_order,pkg_size").
-			OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
-		if ss.CheckErr(err) {
-			return
-		}
-
-		for _, pkg := range pkgInfo {
-			pkgList = append(pkgList, model.BatchRes{
-				Size: pkg.Size,
-				URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip",
-					config.Conf.Settings.CdnServer, downloadReq.Os, pkgType, pkg.Id, pkg.Order),
-			})
-		}
-	}
-
-	batchResp := model.BatchResp{
-		ResponseData: pkgList,
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(batchResp)
-}
-
-func DownloadUpdate(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	downloadReq := model.UpdateReq{}
-	err := json.Unmarshal([]byte(ctx.GetString("request_data")), &downloadReq)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	pkgList := []model.UpdateRes{}
-	if downloadReq.ExternalVersion != config.PackageVersion {
-		pkgType := 99
-		var pkgInfo []PkgInfo
-		err := ss.MainEng.Table("download_m").Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.TargetOs).
-			Cols("pkg_id,pkg_order,pkg_size").
-			OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
-		if ss.CheckErr(err) {
-			return
-		}
-
-		for _, pkg := range pkgInfo {
-			pkgList = append(pkgList, model.UpdateRes{
-				Size: pkg.Size,
-				URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip",
-					config.Conf.Settings.CdnServer, downloadReq.TargetOs, pkgType, pkg.Id, pkg.Order),
-				Version: config.PackageVersion,
-			})
-		}
-
-		patchFileUrl := fmt.Sprintf("%s/%s/archives/99_0_115.zip",
-			config.Conf.Settings.CdnServer, downloadReq.TargetOs)
-		resp, err := http.Get(patchFileUrl)
-		if err == nil {
-			res, err := io.ReadAll(resp.Body)
-			if err == nil {
-				pkgList = append(pkgList, model.UpdateRes{
-					Size:    len(res),
-					URL:     patchFileUrl,
-					Version: config.PackageVersion,
-				})
-			}
-			defer resp.Body.Close()
-		}
-	}
-
-	updateResp := model.UpdateResp{
-		ResponseData: pkgList,
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(updateResp)
-}
-
-func DownloadUrl(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	downloadReq := model.UrlReq{}
-	err := json.Unmarshal([]byte(ctx.GetString("request_data")), &downloadReq)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	cdnServer := config.Conf.Settings.BackupCdnServer
-	if cdnServer == "" {
-		cdnServer = config.Conf.Settings.CdnServer
-	}
-
-	urlList := []string{}
-	for _, v := range downloadReq.PathList {
-		urlList = append(urlList, fmt.Sprintf("%s/%s/extracted/%s",
-			cdnServer, downloadReq.Os, strings.ReplaceAll(v, "\\", "")))
-	}
-	urlResp := model.UrlResp{
-		ResponseData: model.UrlRes{
-			UrlList: urlList,
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(urlResp)
-}
-
-func DownloadEvent(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	eventResp := model.EventResp{
-		ResponseData: []any{},
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(eventResp)
-}
diff --git a/internal/handler/download/additional.go b/internal/handler/download/additional.go
new file mode 100644
index 0000000..59930a8
--- /dev/null
+++ b/internal/handler/download/additional.go
@@ -0,0 +1,58 @@
+package download
+
+import (
+	"encoding/json"
+	"fmt"
+	"honoka-chan/config"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/download"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+type PkgInfo struct {
+	Id    int `xorm:"pkg_id"`
+	Order int `xorm:"pkg_order"`
+	Size  int `xorm:"pkg_size"`
+}
+
+func additional(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	downloadReq := download.AdditionalReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &downloadReq)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	pkgList := []download.AdditionalData{}
+	pkgType, pkgId := downloadReq.PackageType, downloadReq.PackageID
+	var pkgInfo []PkgInfo
+	err = ss.MainEng.Table("download_m").Where("pkg_type = ? AND pkg_id = ? AND pkg_os = ?", pkgType, pkgId, downloadReq.TargetOs).
+		Cols("pkg_id,pkg_order,pkg_size").
+		OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	for _, pkg := range pkgInfo {
+		pkgList = append(pkgList, download.AdditionalData{
+			Size: pkg.Size,
+			URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip",
+				config.Conf.Settings.CdnServer, downloadReq.TargetOs, pkgType, pkg.Id, pkg.Order),
+		})
+	}
+
+	ss.Respond(download.AdditionalResp{
+		ResponseData: pkgList,
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/download/additional", middleware.Common, additional)
+}
diff --git a/internal/handler/download/batch.go b/internal/handler/download/batch.go
new file mode 100644
index 0000000..2de4f15
--- /dev/null
+++ b/internal/handler/download/batch.go
@@ -0,0 +1,55 @@
+package download
+
+import (
+	"encoding/json"
+	"fmt"
+	"honoka-chan/config"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/download"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+	"xorm.io/builder"
+)
+
+func batch(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	downloadReq := download.BatchReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &downloadReq)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	pkgList := []download.BatchData{}
+	if downloadReq.ClientVersion == config.PackageVersion {
+		pkgType := downloadReq.PackageType
+		var pkgInfo []PkgInfo
+		err := ss.MainEng.Table("download_m").Where(builder.NotIn("pkg_id", downloadReq.ExcludedPackageIds)).Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.Os).
+			Cols("pkg_id,pkg_order,pkg_size").
+			OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
+		if ss.CheckErr(err) {
+			return
+		}
+
+		for _, pkg := range pkgInfo {
+			pkgList = append(pkgList, download.BatchData{
+				Size: pkg.Size,
+				URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip",
+					config.Conf.Settings.CdnServer, downloadReq.Os, pkgType, pkg.Id, pkg.Order),
+			})
+		}
+	}
+
+	ss.Respond(download.BatchResp{
+		ResponseData: pkgList,
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/download/batch", middleware.Common, batch)
+}
diff --git a/internal/handler/download/event.go b/internal/handler/download/event.go
new file mode 100644
index 0000000..2bcea28
--- /dev/null
+++ b/internal/handler/download/event.go
@@ -0,0 +1,25 @@
+package download
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/download"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func event(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(download.EventResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/download/event", middleware.Common, event)
+}
diff --git a/internal/handler/download/update.go b/internal/handler/download/update.go
new file mode 100644
index 0000000..c04ea2a
--- /dev/null
+++ b/internal/handler/download/update.go
@@ -0,0 +1,72 @@
+package download
+
+import (
+	"encoding/json"
+	"fmt"
+	"honoka-chan/config"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/download"
+	"honoka-chan/internal/session"
+	"io"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+func update(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	downloadReq := download.UpdateReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &downloadReq)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	pkgList := []download.UpdateData{}
+	if downloadReq.ExternalVersion != config.PackageVersion {
+		pkgType := 99
+		var pkgInfo []PkgInfo
+		err := ss.MainEng.Table("download_m").Where("pkg_type = ? AND pkg_os = ?", pkgType, downloadReq.TargetOs).
+			Cols("pkg_id,pkg_order,pkg_size").
+			OrderBy("pkg_id ASC, pkg_order ASC").Find(&pkgInfo)
+		if ss.CheckErr(err) {
+			return
+		}
+
+		for _, pkg := range pkgInfo {
+			pkgList = append(pkgList, download.UpdateData{
+				Size: pkg.Size,
+				URL: fmt.Sprintf("%s/%s/archives/%d_%d_%d.zip",
+					config.Conf.Settings.CdnServer, downloadReq.TargetOs, pkgType, pkg.Id, pkg.Order),
+				Version: config.PackageVersion,
+			})
+		}
+
+		patchFileURL := fmt.Sprintf("%s/%s/archives/99_0_115.zip",
+			config.Conf.Settings.CdnServer, downloadReq.TargetOs)
+		resp, err := http.Get(patchFileURL)
+		if err == nil {
+			res, err := io.ReadAll(resp.Body)
+			if err == nil {
+				pkgList = append(pkgList, download.UpdateData{
+					Size:    len(res),
+					URL:     patchFileURL,
+					Version: config.PackageVersion,
+				})
+			}
+			defer resp.Body.Close()
+		}
+	}
+
+	ss.Respond(download.UpdateResp{
+		ResponseData: pkgList,
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/download/update", middleware.Common, update)
+}
diff --git a/internal/handler/download/url.go b/internal/handler/download/url.go
new file mode 100644
index 0000000..e1d9a25
--- /dev/null
+++ b/internal/handler/download/url.go
@@ -0,0 +1,48 @@
+package download
+
+import (
+	"encoding/json"
+	"fmt"
+	"honoka-chan/config"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/download"
+	"honoka-chan/internal/session"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+)
+
+func url(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	downloadReq := download.UrlReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &downloadReq)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	cdnServer := config.Conf.Settings.BackupCdnServer
+	if cdnServer == "" {
+		cdnServer = config.Conf.Settings.CdnServer
+	}
+
+	urlList := []string{}
+	for _, v := range downloadReq.PathList {
+		urlList = append(urlList, fmt.Sprintf("%s/%s/extracted/%s",
+			cdnServer, downloadReq.Os, strings.ReplaceAll(v, "\\", "")))
+	}
+
+	ss.Respond(download.UrlResp{
+		ResponseData: download.UrlData{
+			UrlList: urlList,
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/download/url", middleware.Common, url)
+}
diff --git a/internal/handler/event.go b/internal/handler/event.go
deleted file mode 100644
index c04a8eb..0000000
--- a/internal/handler/event.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package handler
-
-import (
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func EventList(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	targets := []model.TargetList{}
-	for i := range 6 {
-		targets = append(targets, model.TargetList{
-			Position:      i + 1,
-			IsDisplayable: false,
-		})
-	}
-	eventsResp := model.EventsResp{
-		ResponseData: model.EventsRes{
-			TargetList:      targets,
-			ServerTimestamp: time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(eventsResp)
-}
diff --git a/internal/handler/event/list.go b/internal/handler/event/list.go
new file mode 100644
index 0000000..c521881
--- /dev/null
+++ b/internal/handler/event/list.go
@@ -0,0 +1,45 @@
+package event
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/event"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func list(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	targets := []event.TargetList{}
+	for i := range 6 {
+		targets = append(targets, event.TargetList{
+			Position:      i + 1,
+			IsDisplayable: false,
+		})
+	}
+
+	// ss.Respond(event.ListResp{
+	// 	ResponseData: map[string]int{
+	// 		"error_code": 10004,
+	// 	},
+	// 	ReleaseInfo: []any{},
+	// 	StatusCode:  600,
+	// })
+
+	ss.Respond(event.ListResp{
+		ResponseData: event.ListData{
+			TargetList:      targets,
+			ServerTimestamp: time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/event/eventList", middleware.Common, list)
+}
diff --git a/internal/handler/gdpr.go b/internal/handler/gdpr.go
deleted file mode 100644
index 195ed9c..0000000
--- a/internal/handler/gdpr.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package handler
-
-import (
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func Gdpr(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	gdprResp := model.GdprResp{
-		ResponseData: model.GdprRes{
-			EnableGdpr:      true,
-			IsEea:           false,
-			ServerTimestamp: time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(gdprResp)
-}
diff --git a/internal/handler/gdpr/get.go b/internal/handler/gdpr/get.go
new file mode 100644
index 0000000..4454860
--- /dev/null
+++ b/internal/handler/gdpr/get.go
@@ -0,0 +1,30 @@
+package gdpr
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/gdpr"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func get(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(gdpr.GetResp{
+		ResponseData: gdpr.GetData{
+			EnableGdpr:      true,
+			IsEea:           false,
+			ServerTimestamp: time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/gdpr/get", middleware.Common, get)
+}
diff --git a/internal/handler/ghome/account/active.go b/internal/handler/ghome/account/active.go
new file mode 100644
index 0000000..e95e0d7
--- /dev/null
+++ b/internal/handler/ghome/account/active.go
@@ -0,0 +1,27 @@
+package account
+
+import (
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func active(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(ghome.ActiveResp{
+		Code: 0,
+		Msg:  "ok",
+		Data: ghome.ActiveData{
+			Message: "ok",
+			Result:  0,
+		},
+	})
+}
+
+func init() {
+	router.AddHandler("v1", "POST", "/account/active", active)
+}
diff --git a/internal/handler/ghome/account/initialize.go b/internal/handler/ghome/account/initialize.go
new file mode 100644
index 0000000..f8973dc
--- /dev/null
+++ b/internal/handler/ghome/account/initialize.go
@@ -0,0 +1,50 @@
+package account
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-think/openssl"
+)
+
+func initialize(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	initData := ghome.InitializeData{
+		BrandLogo:                 "http://gskd.sdo.com/ghome/ztc/logo/og/logo_xhdpi.png",
+		BrandName:                 "盛趣游戏",
+		ForceShowAgreement:        1,
+		GreportLogLevel:           "off",
+		LogLevel:                  "off",
+		LoginButton:               []string{"official"},
+		LoginIcon:                 []any{},
+		NeedFloatWindowPermission: 1,
+		NewDeviceIDServer:         strings.ToUpper(openssl.Md5ToString(ss.GetDeviceID())),
+		ShowGuestConfirm:          1,
+		VoicetipButton:            1,
+	}
+	data, err := json.Marshal(initData)
+	if ss.CheckErr(err) {
+		return
+	}
+	encryptedData, err := openssl.Des3ECBEncrypt([]byte(data), ss.GetRandKey()[0:24], openssl.PKCS7_PADDING)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(ghome.InitializeResp{
+		Code: 0,
+		Msg:  "ok",
+		Data: base64.StdEncoding.EncodeToString(encryptedData),
+	})
+}
+
+func init() {
+	router.AddHandler("v1", "POST", "/account/initialize", initialize)
+}
diff --git a/internal/handler/ghome/account/login.go b/internal/handler/ghome/account/login.go
new file mode 100644
index 0000000..8f2f9d5
--- /dev/null
+++ b/internal/handler/ghome/account/login.go
@@ -0,0 +1,248 @@
+package account
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"honoka-chan/internal/model/user"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/api/profile"
+	"honoka-chan/internal/schema/api/unit"
+	ghomeschema "honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+	honokautils "honoka-chan/pkg/utils"
+	"net/url"
+	"strconv"
+	"strings"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-think/openssl"
+)
+
+func login(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	data, err := ctx.GetRawData()
+	if ss.CheckErr(err) {
+		return
+	}
+
+	data, err = base64.StdEncoding.DecodeString(string(data))
+	if ss.CheckErr(err) {
+		return
+	}
+
+	randKey := ss.GetRandKey()
+	decryptedData, err := openssl.Des3ECBDecrypt(data, randKey[0:24], openssl.PKCS7_PADDING)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	queryStr, _ := url.QueryUnescape(string(decryptedData))
+	params, _ := url.ParseQuery(queryStr)
+	phone, password := params.Get("phone"), params.Get("password")
+
+	var userID int
+	var pass, autoKey, ticket string
+	_, err = ss.UserEng.Table("users").Cols("password,autokey,ticket,user_id").
+		Where("phone = ?", phone).Get(&pass, &autoKey, &ticket, &userID)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	loginData := ghomeschema.LoginData{}
+	loginCode := 0
+	loginMsg := "ok"
+	loginTime := time.Now().Unix()
+	if pass == "" {
+		// 未注册 - 自动注册
+		// 检查是否 userID 已经注册
+		userID, _ = checkUserID(ss, int(loginTime))
+
+		pass = openssl.Md5ToString(password)
+		autoKey = "AUTO" + strings.ToUpper(honokautils.RandomStr(32))
+		ticket = fmt.Sprintf("9999999%d%d", userID, userID)
+
+		userData := user.Users{
+			Phone:         phone,
+			Password:      pass,
+			Autokey:       autoKey,
+			Ticket:        ticket,
+			UserID:        userID,
+			LastLoginTime: loginTime,
+		}
+		_, err = ss.UserEng.Table("users").Insert(&userData)
+		if ss.CheckErr(err) {
+			return
+		}
+
+		// 方便起见初始化 userid 和 key 一样
+		// 注意：user_key 表中的 key 是上文生成的用于登录的 userid，而 userid 则是用于 Authorize Token 生成用的
+		userKey := user.UserKey{
+			UserID: userID,
+			Key:    userID,
+		}
+		_, err = ss.UserEng.Table("user_key").Insert(&userKey)
+		if ss.CheckErr(err) {
+			return
+		}
+
+		// 检查用户配置
+		exists, err := ss.UserEng.Table("user_pref").Where("user_id = ?", userID).Exist()
+		if ss.CheckErr(err) {
+			return
+		}
+
+		if !exists {
+			// 默认中心成员
+			var unitOwningUserID int
+			_, err = ss.MainEng.Table("common_unit_m").Cols("unit_owning_user_id").Where("unit_id = ?", 31).Get(&unitOwningUserID)
+			if ss.CheckErr(err) {
+				return
+			}
+
+			userPref := user.UserPref{
+				UserID:           userID,
+				AwardID:          1, // 音乃木坂学生
+				BackgroundID:     1, // 初始背景
+				UnitOwningUserID: unitOwningUserID,
+				UserName:         "音乃木坂学生",
+				UserLevel:        1,
+				UserDesc:         "你好。",
+				InviteCode:       strconv.Itoa(userID),
+				UpdateTime:       time.Now().Unix(),
+			}
+			_, err = ss.UserEng.Table("user_pref").Insert(&userPref)
+			if ss.CheckErr(err) {
+				return
+			}
+		}
+
+		// 检查用户卡组配置
+		exists, err = ss.UserEng.Table("user_deck").Where("user_id = ?", userID).Exist()
+		if ss.CheckErr(err) {
+			return
+		}
+
+		if !exists {
+			// 默认队伍
+			userDeck := unit.UserDeckData{
+				DeckID:     1,
+				MainFlag:   1,
+				DeckName:   "队伍A",
+				UserID:     userID,
+				InsertDate: time.Now().Unix(),
+			}
+			_, err = ss.UserEng.Table("user_deck").Insert(&userDeck)
+			userDeckID := userDeck.ID
+
+			// 默认卡组 - 仆光
+			unitID := []int{}
+			err = ss.MainEng.Table("unit_m").Cols("unit_id").Where("album_series_id = ?", 615).Find(&unitID)
+			if ss.CheckErr(err) {
+				return
+			}
+
+			unitData := []profile.UnitData{}
+			err = ss.MainEng.Table("common_unit_m").In("unit_id", unitID).Find(&unitData)
+			if ss.CheckErr(err) {
+				return
+			}
+
+			position := 1
+			for _, u := range unitData {
+				unitDeckData := unit.UnitDeckData{
+					UserDeckID:       userDeckID,
+					UnitOwningUserID: u.UnitOwningUserID,
+					UnitID:           u.UnitID,
+					Position:         position,
+					Level:            100,
+					LevelLimitID:     1,
+					DisplayRank:      2,
+					Love:             1000,
+					UnitSkillLevel:   8,
+					IsRankMax:        true,
+					IsLoveMax:        true,
+					IsLevelMax:       true,
+					IsSigned:         u.IsSigned,
+					BeforeLove:       1000,
+					MaxLove:          1000,
+					InsertData:       time.Now().Unix(),
+				}
+				_, err = ss.UserEng.Table("user_deck_unit").Insert(&unitDeckData)
+				if ss.CheckErr(err) {
+					return
+				}
+
+				position++
+			}
+		}
+
+		loginData.Autokey = autoKey
+		loginData.HasRealInfo = 1
+		loginData.Message = "ok"
+		loginData.RealInfoForce = 1
+		loginData.Ticket = ticket
+		loginData.UserAttribute = "0"
+		loginData.UserID = userID
+	} else {
+		// 已注册 - 检查密码
+		if pass != openssl.Md5ToString(password) {
+			loginCode = 31
+			loginMsg = "账号不存在或者密码有误！"
+		} else {
+			userData := user.Users{
+				Autokey:       autoKey,
+				Ticket:        ticket,
+				LastLoginTime: loginTime,
+			}
+			_, err = ss.UserEng.Table("users").Where("user_id = ?", userID).Update(&userData)
+			if ss.CheckErr(err) {
+				return
+			}
+
+			loginData.Autokey = autoKey // 注意：更换设备（deviceId 发生变化）应重新生成 autokey
+			loginData.HasRealInfo = 1
+			loginData.Message = "ok"
+			loginData.RealInfoForce = 1
+			loginData.Ticket = fmt.Sprintf("9999999%d%d", userID, loginTime) // 实际登录用的密码（每次登录都会重新生成新的）
+			loginData.UserAttribute = "0"
+			loginData.UserID = userID // 实际登录用的账号
+		}
+	}
+
+	data, err = json.Marshal(loginData)
+	if ss.CheckErr(err) {
+		return
+	}
+	encryptedData, err := openssl.Des3ECBEncrypt([]byte(data), randKey[0:24], openssl.PKCS7_PADDING)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(ghomeschema.LoginResp{
+		Code: loginCode,
+		Msg:  loginMsg,
+		Data: base64.StdEncoding.EncodeToString(encryptedData),
+	})
+}
+
+func checkUserID(ss *session.Session, userID int) (int, bool) {
+	exist, err := ss.UserEng.Table("users").Where("user_id = ?", userID).Exist()
+	if ss.CheckErr(err) {
+		return 0, false
+	}
+
+	if exist {
+		userID = int(time.Now().Unix())
+		return checkUserID(ss, userID)
+	}
+
+	return userID, true
+}
+
+func init() {
+	router.AddHandler("v1", "POST", "/account/login", login)
+}
diff --git a/internal/handler/ghome/account/loginauto.go b/internal/handler/ghome/account/loginauto.go
new file mode 100644
index 0000000..ce1bb2a
--- /dev/null
+++ b/internal/handler/ghome/account/loginauto.go
@@ -0,0 +1,83 @@
+package account
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+	"net/url"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-think/openssl"
+)
+
+func loginAuto(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	data, err := ctx.GetRawData()
+	if ss.CheckErr(err) {
+		return
+	}
+
+	data, err = base64.StdEncoding.DecodeString(string(data))
+	if ss.CheckErr(err) {
+		return
+	}
+
+	randKey := ss.GetRandKey()
+	decryptedData, err := openssl.Des3ECBDecrypt(data, randKey[0:24], openssl.PKCS7_PADDING)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	queryStr, _ := url.QueryUnescape(string(decryptedData))
+	params, _ := url.ParseQuery(queryStr)
+	autoKey := params.Get("autokey")
+
+	var uid, ticket string
+	_, err = ss.UserEng.Table("users").Cols("user_id,ticket").Where("autokey = ?", autoKey).Get(&uid, &ticket)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	loginAutoData := ghome.LoginAutoData{}
+	loginAutoCode := 0
+	loginAutoMsg := "ok"
+	if uid != "" {
+		loginAutoData = ghome.LoginAutoData{
+			Result:  loginAutoCode,
+			Message: loginAutoMsg,
+			Autokey: autoKey,
+			UserId:  uid,
+			Ticket:  ticket,
+		}
+	} else {
+		loginAutoCode = 31
+		loginAutoMsg = "账号不存在或者登陆状态已过期！"
+		loginAutoData = ghome.LoginAutoData{
+			Result:  loginAutoCode,
+			Message: loginAutoMsg,
+		}
+	}
+
+	data, err = json.Marshal(loginAutoData)
+	if ss.CheckErr(err) {
+		return
+	}
+	encryptedData, err := openssl.Des3ECBEncrypt([]byte(data), randKey[0:24], openssl.PKCS7_PADDING)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(ghome.LoginAutoResp{
+		Code: loginAutoCode,
+		Msg:  loginAutoMsg,
+		Data: base64.StdEncoding.EncodeToString(encryptedData),
+	})
+}
+
+func init() {
+	router.AddHandler("v1", "POST", "/account/loginauto", loginAuto)
+}
diff --git a/internal/handler/ghome/account/reportrole.go b/internal/handler/ghome/account/reportrole.go
new file mode 100644
index 0000000..515a1ba
--- /dev/null
+++ b/internal/handler/ghome/account/reportrole.go
@@ -0,0 +1,33 @@
+package account
+
+import (
+	"encoding/base64"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-think/openssl"
+)
+
+func reportRole(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	randKey := ss.GetRandKey()
+	token := `{"message":"ok"}`
+	encryptedToken, err := openssl.Des3ECBEncrypt([]byte(token), randKey[0:24], openssl.PKCS7_PADDING)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(ghome.ReportRoleResp{
+		Code: 0,
+		Msg:  "ok",
+		Data: base64.StdEncoding.EncodeToString(encryptedToken),
+	})
+}
+
+func init() {
+	router.AddHandler("v1", "POST", "/account/reportRole", reportRole)
+}
diff --git a/internal/handler/ghome/basic/getcode.go b/internal/handler/ghome/basic/getcode.go
new file mode 100644
index 0000000..9241671
--- /dev/null
+++ b/internal/handler/ghome/basic/getcode.go
@@ -0,0 +1,33 @@
+package basic
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func getCode(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	codeArray := `{"codeArray":[{"btntext":"好的","code":"-10264022","msg_from":2,"text":"","title":"短信验证码被阻止","type":1},{"btntext":"","code":"-10869623","msg_from":2,"text":"","title":"网络连接失败，无法一键登录","type":2},{"btntext":"","code":"10298300","msg_from":2,"text":"","title":"","type":3},{"btntext":"","code":"10298311","msg_from":2,"text":"","title":"","type":3},{"btntext":"","code":"10298312","msg_from":2,"text":"","title":"","type":3},{"btntext":"","code":"10298313","msg_from":2,"text":"","title":"","type":1},{"btntext":"","code":"10298321","msg_from":2,"text":"","title":"","type":3},{"btntext":"","code":"10298322","msg_from":2,"text":"","title":"","type":3}],"codeVersion":"1.0.5"}`
+	getCodeData := map[string]any{}
+	err := json.Unmarshal([]byte(codeArray), &getCodeData)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(ghome.GetCodeResp{
+		Code: 0,
+		Msg:  "ok",
+		Data: getCodeData,
+	})
+}
+
+func init() {
+	router.AddHandler("v1", "GET", "/basic/getcode", getCode)
+	router.AddHandler("v1", "POST", "/basic/getcode", getCode)
+}
diff --git a/internal/handler/ghome/basic/getproductlist.go b/internal/handler/ghome/basic/getproductlist.go
new file mode 100644
index 0000000..2930d17
--- /dev/null
+++ b/internal/handler/ghome/basic/getproductlist.go
@@ -0,0 +1,29 @@
+package basic
+
+import (
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func getProductList(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	getProductListData := ghome.GetProductListData{
+		Message: []string{},
+		Result:  0,
+	}
+
+	ss.Respond(ghome.GetProductListResp{
+		Code: 1,
+		Msg:  "ok",
+		Data: getProductListData,
+	})
+}
+
+func init() {
+	router.AddHandler("v1", "POST", "/basic/getProductList", getProductList)
+}
diff --git a/internal/handler/ghome/basic/handshake.go b/internal/handler/ghome/basic/handshake.go
new file mode 100644
index 0000000..7a5b69c
--- /dev/null
+++ b/internal/handler/ghome/basic/handshake.go
@@ -0,0 +1,60 @@
+package basic
+
+import (
+	"encoding/base64"
+	"fmt"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+	"honoka-chan/pkg/db"
+	"honoka-chan/pkg/encrypt"
+	honokautils "honoka-chan/pkg/utils"
+	"net/url"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+	"github.com/go-think/openssl"
+)
+
+func handshake(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	data, err := ctx.GetRawData()
+	if ss.CheckErr(err) {
+		return
+	}
+
+	data, err = base64.StdEncoding.DecodeString(string(data))
+	if ss.CheckErr(err) {
+		return
+	}
+
+	decryptedData := encrypt.RSADecrypt(data)
+
+	params, _ := url.ParseQuery(string(decryptedData))
+
+	randKey := []byte(params.Get("randkey"))
+	deviceID := ss.GetDeviceID()
+
+	err = db.Ldb.Set([]byte(deviceID), randKey)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	token := fmt.Sprintf(`{"message":"ok","result":0,"token":"%s"}`, strings.ToUpper(honokautils.RandomStr(33)))
+	encryptedToken, err := openssl.Des3ECBEncrypt([]byte(token), randKey[0:24], openssl.PKCS7_PADDING)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(ghome.HandshakeResp{
+		Code: 0,
+		Msg:  "ok",
+		Data: base64.StdEncoding.EncodeToString(encryptedToken),
+	})
+}
+
+func init() {
+	router.AddHandler("v1", "POST", "/basic/handshake", handshake)
+}
diff --git a/internal/handler/ghome/basic/loginarea.go b/internal/handler/ghome/basic/loginarea.go
new file mode 100644
index 0000000..81ff233
--- /dev/null
+++ b/internal/handler/ghome/basic/loginarea.go
@@ -0,0 +1,26 @@
+package basic
+
+import (
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func loginArea(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(ghome.LoginAreaResp{
+		Code: 0,
+		Msg:  "ok",
+		Data: ghome.LoginAreaData{
+			UserID: ctx.PostForm("userid"),
+		},
+	})
+}
+
+func init() {
+	router.AddHandler("v1", "POST", "/basic/loginarea", loginArea)
+}
diff --git a/internal/handler/ghome/basic/publickey.go b/internal/handler/ghome/basic/publickey.go
new file mode 100644
index 0000000..14258f6
--- /dev/null
+++ b/internal/handler/ghome/basic/publickey.go
@@ -0,0 +1,45 @@
+package basic
+
+import (
+	"encoding/base64"
+	"encoding/pem"
+	"honoka-chan/config"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+	honokautils "honoka-chan/pkg/utils"
+
+	"github.com/gin-gonic/gin"
+)
+
+func publicKey(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	publicKeyCode := 0
+	publicKeyMsg := "ok"
+	publicKeyData := ghome.PublicKeyData{
+		Result:  publicKeyCode,
+		Message: publicKeyMsg,
+	}
+
+	publicKey := honokautils.ReadAllText(config.PublicKeyPath)
+	block, _ := pem.Decode([]byte(publicKey))
+	if block == nil || block.Type != "PUBLIC KEY" {
+		publicKeyMsg = "公钥读取失败！"
+		publicKeyCode = 31
+	} else {
+		publicKeyData.Key = base64.StdEncoding.EncodeToString(block.Bytes)
+		publicKeyData.Method = "rsa"
+	}
+
+	ss.Respond(ghome.PublicKeyResp{
+		Code: publicKeyCode,
+		Msg:  publicKeyMsg,
+		Data: publicKeyData,
+	})
+}
+
+func init() {
+	router.AddHandler("v1", "POST", "/basic/publickey", publicKey)
+}
diff --git a/internal/handler/ghome/ghome.go b/internal/handler/ghome/ghome.go
new file mode 100644
index 0000000..a85bcaf
--- /dev/null
+++ b/internal/handler/ghome/ghome.go
@@ -0,0 +1,8 @@
+package ghome
+
+import (
+	_ "honoka-chan/internal/handler/ghome/account"
+	_ "honoka-chan/internal/handler/ghome/basic"
+	_ "honoka-chan/internal/handler/ghome/guest"
+	_ "honoka-chan/internal/handler/ghome/misc"
+)
diff --git a/internal/handler/ghome/guest/status.go b/internal/handler/ghome/guest/status.go
new file mode 100644
index 0000000..018cc23
--- /dev/null
+++ b/internal/handler/ghome/guest/status.go
@@ -0,0 +1,29 @@
+package guest
+
+import (
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func status(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(ghome.GuestStatusResp{
+		Code: 0,
+		Msg:  "ok",
+		Data: ghome.GuestStatusData{
+			Disablead:   1,
+			Loginswitch: 1,
+			Message:     "ok",
+			Result:      0,
+		},
+	})
+}
+
+func init() {
+	router.AddHandler("v1", "POST", "/guest/status", status)
+}
diff --git a/internal/handler/ghome/misc/agreement.go b/internal/handler/ghome/misc/agreement.go
new file mode 100644
index 0000000..249e50e
--- /dev/null
+++ b/internal/handler/ghome/misc/agreement.go
@@ -0,0 +1,25 @@
+package misc
+
+import (
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func agreement(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(ghome.AgreementResp{
+		ReturnCode:    0,
+		ErrorType:     0,
+		ReturnMessage: "",
+		Data:          ghome.AgreementData{},
+	})
+}
+
+func init() {
+	router.AddHandler("/", "GET", "/agreement/all", agreement)
+}
diff --git a/internal/handler/ghome/misc/integration.go b/internal/handler/ghome/misc/integration.go
new file mode 100644
index 0000000..336a4bb
--- /dev/null
+++ b/internal/handler/ghome/misc/integration.go
@@ -0,0 +1,26 @@
+package misc
+
+import (
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/ghome"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func appReport(ctx *gin.Context) {
+	ss := session.New(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(ghome.AppReportResp{
+		Code: 0,
+		Msg:  "",
+		Data: ghome.AppReportData{
+			NeedReport: 0,
+		},
+	})
+}
+
+func init() {
+	router.AddHandler("/", "GET", "/integration/appReport/initialize", appReport)
+}
diff --git a/internal/handler/ghome/misc/report.go b/internal/handler/ghome/misc/report.go
new file mode 100644
index 0000000..669a6c5
--- /dev/null
+++ b/internal/handler/ghome/misc/report.go
@@ -0,0 +1,16 @@
+package misc
+
+import (
+	"honoka-chan/internal/router"
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+func report(ctx *gin.Context) {
+	ctx.Status(http.StatusOK)
+}
+
+func init() {
+	router.AddHandler("/", "POST", "/report/ge/app", report)
+}
diff --git a/internal/handler/handler.go b/internal/handler/handler.go
index 6e390f8..da5eb86 100644
--- a/internal/handler/handler.go
+++ b/internal/handler/handler.go
@@ -1,5 +1,28 @@
 package handler
 
-var (
-	ErrorMsg = `{"code":20001,"message":""}`
+import (
+	_ "honoka-chan/internal/handler/album"
+	_ "honoka-chan/internal/handler/announce"
+	_ "honoka-chan/internal/handler/api"
+	_ "honoka-chan/internal/handler/award"
+	_ "honoka-chan/internal/handler/background"
+	_ "honoka-chan/internal/handler/download"
+	_ "honoka-chan/internal/handler/event"
+	_ "honoka-chan/internal/handler/gdpr"
+	_ "honoka-chan/internal/handler/ghome"
+	_ "honoka-chan/internal/handler/lbonus"
+	_ "honoka-chan/internal/handler/live"
+	_ "honoka-chan/internal/handler/login"
+	_ "honoka-chan/internal/handler/multiunit"
+	_ "honoka-chan/internal/handler/museum"
+	_ "honoka-chan/internal/handler/notice"
+	_ "honoka-chan/internal/handler/payment"
+	_ "honoka-chan/internal/handler/personalnotice"
+	_ "honoka-chan/internal/handler/profile"
+	_ "honoka-chan/internal/handler/scenario"
+	_ "honoka-chan/internal/handler/subscenario"
+	_ "honoka-chan/internal/handler/tos"
+	_ "honoka-chan/internal/handler/unit"
+	_ "honoka-chan/internal/handler/user"
+	_ "honoka-chan/internal/handler/webui"
 )
diff --git a/internal/handler/lbonus.go b/internal/handler/lbonus/execute.go
similarity index 72%
rename from internal/handler/lbonus.go
rename to internal/handler/lbonus/execute.go
index 35dde43..626d817 100644
--- a/internal/handler/lbonus.go
+++ b/internal/handler/lbonus/execute.go
@@ -1,15 +1,17 @@
-package handler
+package lbonus
 
 import (
-	"honoka-chan/internal/model"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/lbonus"
 	"honoka-chan/internal/session"
 	"time"
 
 	"github.com/gin-gonic/gin"
 )
 
-func LBonusExecute(ctx *gin.Context) {
-	ss := session.New(ctx)
+func execute(ctx *gin.Context) {
+	ss := session.Get(ctx)
 	defer ss.Finalize()
 
 	weeks := map[string]int{
@@ -33,7 +35,7 @@ func LBonusExecute(ctx *gin.Context) {
 	d2 := d1.AddDate(0, 1, -1)
 	// fmt.Println(d2)
 
-	weeksList := []model.LbDays{}
+	weeksList := []lbonus.Day{}
 	for c := d1; ; c = c.AddDate(0, 0, 1) {
 		_, _, rd := c.Date()
 		received := false
@@ -41,14 +43,14 @@ func LBonusExecute(ctx *gin.Context) {
 			received = true
 		}
 		rw := weeks[c.Weekday().String()]
-		weeksList = append(weeksList, model.LbDays{
+		weeksList = append(weeksList, lbonus.Day{
 			Day:               rd,
 			DayOfTheWeek:      rw,
 			SpecialDay:        false,
 			SpecialImageAsset: "",
 			Received:          received,
 			AdReceived:        false,
-			Item: model.LbDayItem{
+			Item: lbonus.Item{
 				ItemID:  4,
 				AddType: 3001,
 				Amount:  1,
@@ -70,18 +72,18 @@ func LBonusExecute(ctx *gin.Context) {
 	d2 = d1.AddDate(0, 1, -1)
 	// fmt.Println(d2)
 
-	nextWeeksList := []model.LbDays{}
+	nextWeeksList := []lbonus.Day{}
 	for c := d1; ; c = c.AddDate(0, 0, 1) {
 		_, _, rd := c.Date()
 		rw := weeks[c.Weekday().String()]
-		nextWeeksList = append(nextWeeksList, model.LbDays{
+		nextWeeksList = append(nextWeeksList, lbonus.Day{
 			Day:               rd,
 			DayOfTheWeek:      rw,
 			SpecialDay:        false,
 			SpecialImageAsset: "",
 			Received:          false,
 			AdReceived:        false,
-			Item: model.LbDayItem{
+			Item: lbonus.Item{
 				ItemID:  4,
 				AddType: 3001,
 				Amount:  1,
@@ -92,26 +94,26 @@ func LBonusExecute(ctx *gin.Context) {
 		}
 	}
 
-	LbRes := model.LbResp{
-		ResponseData: model.LbRes{
+	resp := lbonus.ExecuteResp{
+		ResponseData: lbonus.ExecuteData{
 			Sheets: []any{},
-			CalendarInfo: model.CalendarInfo{
+			CalendarInfo: lbonus.CalendarInfo{
 				CurrentDate: time.Now().Format("2006-01-02 03:04:05"),
-				CurrentMonth: model.LbMonth{
+				CurrentMonth: lbonus.Month{
 					Year:  y,
 					Month: int(cm),
 					Days:  weeksList,
 				},
-				NextMonth: model.LbMonth{
+				NextMonth: lbonus.Month{
 					Year:  y,
 					Month: int(m),
 					Days:  nextWeeksList,
 				},
 			},
-			TotalLoginInfo: model.TotalLoginInfo{
+			TotalLoginInfo: lbonus.TotalLoginInfo{
 				LoginCount:     2626,
 				RemainingCount: 74,
-				Reward: []model.Reward{
+				Reward: []lbonus.Reward{
 					{
 						ItemID:  5,
 						AddType: 1000,
@@ -120,8 +122,8 @@ func LBonusExecute(ctx *gin.Context) {
 				},
 			},
 			LicenseLbonusList: []any{},
-			ClassSystem: model.LbClassSystem{
-				RankInfo: model.LbRankInfo{
+			ClassSystem: lbonus.ClassSystem{
+				RankInfo: lbonus.RankInfo{
 					BeforeClassRankID: 10,
 					AfterClassRankID:  10,
 					RankUpDate:        "2020-02-12 11:57:15",
@@ -131,17 +133,17 @@ func LBonusExecute(ctx *gin.Context) {
 				IsVisible:    true,
 			},
 			StartDashSheets: []any{},
-			EffortPoint: []model.EffortPoint{
+			EffortPoint: []lbonus.EffortPoint{
 				{
 					LiveEffortPointBoxSpecID: 5,
 					Capacity:                 4000000,
 					Before:                   1400116,
 					After:                    1400116,
-					Rewards:                  []model.Rewards{},
+					Rewards:                  []lbonus.Rewards{},
 				},
 			},
 			LimitedEffortBox: []any{},
-			MuseumInfo:       model.Museum{},
+			MuseumInfo:       lbonus.Museum{},
 			ServerTimestamp:  time.Now().Unix(),
 			PresentCnt:       0,
 		},
@@ -149,5 +151,9 @@ func LBonusExecute(ctx *gin.Context) {
 		StatusCode:  200,
 	}
 
-	ss.Respond(LbRes)
+	ss.Respond(resp)
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/lbonus/execute", middleware.Common, execute)
 }
diff --git a/internal/handler/live/gameover.go b/internal/handler/live/gameover.go
new file mode 100644
index 0000000..b19413f
--- /dev/null
+++ b/internal/handler/live/gameover.go
@@ -0,0 +1,25 @@
+package live
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/live"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func gameOver(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(live.GameOverResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/live/gameover", middleware.Common, gameOver)
+}
diff --git a/internal/handler/live/partylist.go b/internal/handler/live/partylist.go
new file mode 100644
index 0000000..1f6660c
--- /dev/null
+++ b/internal/handler/live/partylist.go
@@ -0,0 +1,29 @@
+package live
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/session"
+	honokautils "honoka-chan/pkg/utils"
+
+	"github.com/gin-gonic/gin"
+)
+
+func partyList(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	data := honokautils.ReadAllText("assets/serverdata/partylist.json")
+	var partyResp map[string]any
+	err := json.Unmarshal([]byte(data), &partyResp)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(partyResp)
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/live/partyList", middleware.Common, partyList)
+}
diff --git a/internal/handler/live.go b/internal/handler/live/play.go
similarity index 54%
rename from internal/handler/live.go
rename to internal/handler/live/play.go
index 747ad8e..f2d1e6c 100644
--- a/internal/handler/live.go
+++ b/internal/handler/live/play.go
@@ -1,10 +1,11 @@
-package handler
+package live
 
 import (
 	"encoding/json"
 	"fmt"
-	"honoka-chan/config"
-	"honoka-chan/internal/model"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/live"
 	"honoka-chan/internal/session"
 	"honoka-chan/pkg/db"
 	honokautils "honoka-chan/pkg/utils"
@@ -16,26 +17,12 @@ import (
 	"github.com/tidwall/gjson"
 )
 
-func PartyList(ctx *gin.Context) {
-	ss := session.New(ctx)
+func play(ctx *gin.Context) {
+	ss := session.Get(ctx)
 	defer ss.Finalize()
 
-	data := honokautils.ReadAllText("assets/serverdata/partylist.json")
-	var partyResp map[string]any
-	err := json.Unmarshal([]byte(data), &partyResp)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	ss.Respond(partyResp)
-}
-
-func PlayLive(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	playReq := model.PlayReq{}
-	err := json.Unmarshal([]byte(ctx.GetString("request_data")), &playReq)
+	playReq := live.PlayReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &playReq)
 	if ss.CheckErr(err) {
 		return
 	}
@@ -48,8 +35,8 @@ func PlayLive(ctx *gin.Context) {
 	deckId := playReq.UnitDeckID
 
 	// Save Deck Id for /live/reward
-	key := "live_deck_" + ctx.GetString("userid")
-	err = db.DB.Set([]byte(key), []byte(strconv.Itoa(deckId)))
+	key := "live_deck_" + strconv.Itoa(ss.UserID)
+	err = db.Ldb.Set([]byte(key), []byte(strconv.Itoa(deckId)))
 	if ss.CheckErr(err) {
 		return
 	}
@@ -67,32 +54,32 @@ func PlayLive(ctx *gin.Context) {
 	// fmt.Println(notes_setting_asset)
 	// fmt.Println(c_rank_score, b_rank_score, a_rank_score, s_rank_score)
 
-	notes := []model.NotesList{}
-	// fmt.Println("./assets/notes/" + notes_setting_asset)
-	notes_list := honokautils.ReadAllText("./assets/serverdata/notes/" + notes_setting_asset)
+	notes := []live.NotesList{}
+	// fmt.Println("./assets/serverdata/beatmaps/" + notes_setting_asset)
+	notes_list := honokautils.ReadAllText("./assets/serverdata/beatmaps/" + notes_setting_asset)
 	err = json.Unmarshal([]byte(notes_list), &notes)
 	if ss.CheckErr(err) {
 		return
 	}
 
-	ranks := []model.RankInfo{}
-	ranks = append(ranks, model.RankInfo{
+	ranks := []live.RankInfo{}
+	ranks = append(ranks, live.RankInfo{
 		Rank:    5,
 		RankMin: 0,
 		RankMax: c_rank_score,
-	}, model.RankInfo{
+	}, live.RankInfo{
 		Rank:    4,
 		RankMin: c_rank_score + 1,
 		RankMax: b_rank_score,
-	}, model.RankInfo{
+	}, live.RankInfo{
 		Rank:    3,
 		RankMin: b_rank_score + 1,
 		RankMax: a_rank_score,
-	}, model.RankInfo{
+	}, live.RankInfo{
 		Rank:    2,
 		RankMin: a_rank_score + 1,
 		RankMax: s_rank_score,
-	}, model.RankInfo{
+	}, live.RankInfo{
 		Rank:    1,
 		RankMin: s_rank_score + 1,
 		RankMax: 0,
@@ -101,14 +88,14 @@ func PlayLive(ctx *gin.Context) {
 	//  ss.UserEng.ShowSQL(true)
 	// ss.MainEng.ShowSQL(true)
 	owningIdList := []int{}
-	err = ss.UserEng.Table("deck_unit_m").Join("LEFT", "user_deck_m", "deck_unit_m.user_deck_id = user_deck_m.id").
-		Where("user_id = ? AND deck_id = ?", ctx.GetString("userid"), deckId).Cols("unit_owning_user_id").
-		OrderBy("deck_unit_m.position ASC").Find(&owningIdList)
+	err = ss.UserEng.Table("user_deck_unit").Join("LEFT", "user_deck", "user_deck_unit.user_deck_id = user_deck.id").
+		Where("user_id = ? AND deck_id = ?", ss.UserID, deckId).Cols("unit_owning_user_id").
+		OrderBy("user_deck_unit.position ASC").Find(&owningIdList)
 	if ss.CheckErr(err) {
 		return
 	}
 
-	unitList := []model.UnitList{}
+	unitList := []live.UnitList{}
 	var totalSmile, totalPure, totalCool, maxLove float64
 	var totalHp int
 	for _, owningId := range owningIdList {
@@ -131,7 +118,7 @@ func PlayLive(ctx *gin.Context) {
 			}
 		} else {
 			// 用户卡片暂时固定为满级350级
-			exists, err := ss.UserEng.Table("user_unit_m").Where("unit_owning_user_id = ?", owningId).Cols("unit_id").Get(&uId)
+			exists, err := ss.UserEng.Table("user_unit").Where("unit_owning_user_id = ?", owningId).Cols("unit_id").Get(&uId)
 			if ss.CheckErr(err) {
 				return
 			}
@@ -168,7 +155,7 @@ func PlayLive(ctx *gin.Context) {
 
 		// 饰品属性加成（满级）
 		var accessoryOwningId int
-		_, err = ss.UserEng.Table("accessory_wear_m").Where("unit_owning_user_id = ?", owningId).
+		_, err = ss.UserEng.Table("user_accessory_wear").Where("unit_owning_user_id = ?", owningId).
 			Cols("accessory_owning_user_id").Get(&accessoryOwningId)
 		if ss.CheckErr(err) {
 			return
@@ -221,7 +208,7 @@ func PlayLive(ctx *gin.Context) {
 
 		// 宝石加成（满级）
 		removableSkillIds := []int{}
-		err = ss.UserEng.Table("skill_equip_m").Where("unit_owning_user_id = ? AND user_id = ?", owningId, ctx.GetString("userid")).
+		err = ss.UserEng.Table("user_unit_skill_equip").Where("unit_owning_user_id = ? AND user_id = ?", owningId, ss.UserID).
 			Cols("unit_removable_skill_id").Find(&removableSkillIds)
 		if ss.CheckErr(err) {
 			return
@@ -289,9 +276,9 @@ func PlayLive(ctx *gin.Context) {
 
 		// 主唱技能加成
 		var myCenterUnitId int
-		_, err = ss.UserEng.Table("deck_unit_m").Join("LEFT", "user_deck_m", "deck_unit_m.user_deck_id = user_deck_m.id").
-			Where("user_deck_m.deck_id = ? AND user_deck_m.user_id = ? AND deck_unit_m.position = 5", playReq.UnitDeckID, ctx.GetString("userid")).
-			Cols("deck_unit_m.unit_id").Get(&myCenterUnitId)
+		_, err = ss.UserEng.Table("user_deck_unit").Join("LEFT", "user_deck", "user_deck_unit.user_deck_id = user_deck.id").
+			Where("user_deck.deck_id = ? AND user_deck.user_id = ? AND user_deck_unit.position = 5", playReq.UnitDeckID, ss.UserID).
+			Cols("user_deck_unit.unit_id").Get(&myCenterUnitId)
 		if ss.CheckErr(err) {
 			return
 		}
@@ -421,7 +408,7 @@ func PlayLive(ctx *gin.Context) {
 		fixedCoolMax := int(coolMax)
 		// fmt.Println("单卡属性:", fixedSmileMax, fixedPureMax, fixedCoolMax)
 
-		unitList = append(unitList, model.UnitList{
+		unitList = append(unitList, live.UnitList{
 			Smile: fixedSmileMax,
 			Cute:  fixedPureMax,
 			Cool:  fixedCoolMax,
@@ -434,16 +421,16 @@ func PlayLive(ctx *gin.Context) {
 	fixedTotalCool := int(math.Ceil(totalCool))
 	// fmt.Println("全卡组属性:", fixedTotalSmile, fixedTotalPure, fixedTotalCool)
 
-	lives := []model.PlayLiveList{}
-	lives = append(lives, model.PlayLiveList{
-		LiveInfo: model.LiveInfo{
+	lives := []live.PlayLiveList{}
+	lives = append(lives, live.PlayLiveList{
+		LiveInfo: live.LiveInfo{
 			LiveDifficultyID: difficultyId,
 			IsRandom:         false,
 			AcFlag:           ac_flag,
 			SwingFlag:        swing_flag,
 			NotesList:        notes,
 		},
-		DeckInfo: model.DeckInfo{
+		DeckInfo: live.DeckInfo{
 			UnitDeckID:       deckId,
 			TotalSmile:       fixedTotalSmile,
 			TotalCute:        fixedTotalPure,
@@ -454,8 +441,8 @@ func PlayLive(ctx *gin.Context) {
 		},
 	})
 
-	playResp := model.PlayResp{
-		ResponseData: model.PlayRes{
+	playResp := live.PlayResp{
+		ResponseData: live.PlayData{
 			RankInfo:            ranks,
 			EnergyFullTime:      "2023-03-20 01:28:55",
 			OverMaxEnergy:       0,
@@ -474,296 +461,6 @@ func PlayLive(ctx *gin.Context) {
 	ss.Respond(playResp)
 }
 
-func GameOver(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	overResp := model.GameOverResp{
-		ResponseData: []any{},
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(overResp)
-}
-
-func PlayScore(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	playScoreReq := model.PlayScoreReq{}
-	err := json.Unmarshal([]byte(ctx.GetString("request_data")), &playScoreReq)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	tDifficultyId := playScoreReq.LiveDifficultyID
-	difficultyId, err := strconv.Atoi(tDifficultyId)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	// Song type: normal / special
-	// sqlite3 doesn't support FULL OUTER JOIN so use UNION ALL here.
-	sql := `SELECT notes_setting_asset,c_rank_score,b_rank_score,a_rank_score,s_rank_score,ac_flag,swing_flag FROM live_setting_m WHERE live_setting_id IN (SELECT live_setting_id FROM normal_live_m WHERE live_difficulty_id = ? UNION ALL SELECT live_setting_id FROM special_live_m WHERE live_difficulty_id = ?)`
-	var notes_setting_asset string
-	var c_rank_score, b_rank_score, a_rank_score, s_rank_score, ac_flag, swing_flag int
-	err = ss.MainEng.DB().QueryRow(sql, difficultyId, difficultyId).Scan(&notes_setting_asset, &c_rank_score, &b_rank_score, &a_rank_score, &s_rank_score, &ac_flag, &swing_flag)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	// fmt.Println(notes_setting_asset)
-	// fmt.Println(c_rank_score, b_rank_score, a_rank_score, s_rank_score)
-
-	notes := []model.NotesList{}
-	// fmt.Println("./assets/notes/" + notes_setting_asset)
-	notes_list := honokautils.ReadAllText("./assets/serverdata/notes/" + notes_setting_asset)
-	err = json.Unmarshal([]byte(notes_list), &notes)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	ranks := []model.RankInfo{}
-	ranks = append(ranks, model.RankInfo{
-		Rank:    5,
-		RankMin: 0,
-		RankMax: c_rank_score,
-	}, model.RankInfo{
-		Rank:    4,
-		RankMin: c_rank_score + 1,
-		RankMax: b_rank_score,
-	}, model.RankInfo{
-		Rank:    3,
-		RankMin: b_rank_score + 1,
-		RankMax: a_rank_score,
-	}, model.RankInfo{
-		Rank:    2,
-		RankMin: a_rank_score + 1,
-		RankMax: s_rank_score,
-	}, model.RankInfo{
-		Rank:    1,
-		RankMin: s_rank_score + 1,
-		RankMax: 0,
-	})
-
-	playResp := model.PlayScoreResp{
-		ResponseData: model.PlayScoreRes{
-			On: model.On{
-				HasRecord: false,
-				LiveInfo: model.LiveInfo{
-					LiveDifficultyID: difficultyId,
-					IsRandom:         false,
-					AcFlag:           ac_flag,
-					SwingFlag:        swing_flag,
-					NotesList:        notes,
-				},
-			},
-			Off: model.Off{
-				HasRecord: false,
-				LiveInfo: model.LiveInfo{
-					LiveDifficultyID: difficultyId,
-					IsRandom:         false,
-					AcFlag:           ac_flag,
-					SwingFlag:        swing_flag,
-					NotesList:        notes,
-				},
-			},
-			RankInfo:          ranks,
-			CanActivateEffect: true,
-			ServerTimestamp:   time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(playResp)
-}
-
-func PlayReward(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	playRewardReq := model.PlayRewardReq{}
-	err := json.Unmarshal([]byte(ctx.GetString("request_data")), &playRewardReq)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	difficultyId := playRewardReq.LiveDifficultyID
-
-	// Song type: normal / special
-	// sqlite3 doesn't support FULL OUTER JOIN so use UNION ALL here.
-	sql := `SELECT c_rank_score,b_rank_score,a_rank_score,s_rank_score,c_rank_combo,b_rank_combo,a_rank_combo,s_rank_combo,ac_flag,swing_flag FROM live_setting_m WHERE live_setting_id IN (SELECT live_setting_id FROM normal_live_m WHERE live_difficulty_id = ? UNION ALL SELECT live_setting_id FROM special_live_m WHERE live_difficulty_id = ?)`
-	var c_rank_score, b_rank_score, a_rank_score, s_rank_score, c_rank_combo, b_rank_combo, a_rank_combo, s_rank_combo, ac_flag, swing_flag int
-	err = ss.MainEng.DB().QueryRow(sql, difficultyId, difficultyId).Scan(&c_rank_score, &b_rank_score, &a_rank_score, &s_rank_score, &c_rank_combo, &b_rank_combo, &a_rank_combo, &s_rank_combo, &ac_flag, &swing_flag)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	key := "live_deck_" + ctx.GetString("userid")
-	deckId, err := db.DB.Get([]byte(key))
-	if ss.CheckErr(err) {
-		return
-	}
-	unitsList := []model.PlayRewardUnitList{}
-	err = ss.UserEng.Table("deck_unit_m").Join("LEFT", "user_deck_m", "deck_unit_m.user_deck_id = user_deck_m.id").
-		Where("user_id = ? AND deck_id = ?", ctx.GetString("userid"), string(deckId)).Find(&unitsList)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	totalScore := playRewardReq.ScoreSmile + playRewardReq.ScoreCool + playRewardReq.ScoreCute
-	playResp := model.RewardResp{
-		ResponseData: model.RewardRes{
-			LiveInfo: []model.RewardLiveInfo{
-				{
-					LiveDifficultyID: difficultyId,
-					IsRandom:         false,
-					AcFlag:           ac_flag,
-					SwingFlag:        swing_flag,
-				},
-			},
-			TotalLove:   0,
-			IsHighScore: true,
-			HiScore:     totalScore,
-			BaseRewardInfo: model.BaseRewardInfo{
-				PlayerExp: 0,
-				PlayerExpUnitMax: model.PlayerExpUnitMax{
-					Before: 0,
-					After:  0,
-				},
-				PlayerExpFriendMax: model.PlayerExpFriendMax{
-					Before: 99,
-					After:  99,
-				},
-				PlayerExpLpMax: model.PlayerExpLpMax{
-					Before: config.Conf.UserPrefs.EnergyMax,
-					After:  config.Conf.UserPrefs.EnergyMax,
-				},
-				GameCoin:              0,
-				GameCoinRewardBoxFlag: false,
-				SocialPoint:           0,
-			},
-			RewardUnitList: model.RewardUnitList{
-				LiveClear: []model.LiveClear{},
-				LiveRank:  []model.LiveRank{},
-				LiveCombo: []any{},
-			},
-			UnlockedSubscenarioIds:       []any{},
-			UnlockedMultiUnitScenarioIds: []any{},
-			EffortPoint:                  []model.EffortPoint{},
-			IsEffortPointVisible:         false,
-			LimitedEffortBox:             []any{},
-			UnitList:                     unitsList,
-			BeforeUserInfo: model.BeforeUserInfo{
-				Level:                          config.Conf.UserPrefs.Level,
-				Exp:                            config.Conf.UserPrefs.ExpNumerator,
-				PreviousExp:                    0,
-				NextExp:                        config.Conf.UserPrefs.ExpDenominator,
-				GameCoin:                       config.Conf.UserPrefs.GameCoin,
-				SnsCoin:                        config.Conf.UserPrefs.SnsCoin,
-				FreeSnsCoin:                    config.Conf.UserPrefs.SnsCoin,
-				PaidSnsCoin:                    0,
-				SocialPoint:                    1438165,
-				UnitMax:                        5000,
-				WaitingUnitMax:                 1000,
-				CurrentEnergy:                  config.Conf.UserPrefs.EnergyMax,
-				EnergyMax:                      config.Conf.UserPrefs.EnergyMax,
-				TrainingEnergy:                 9,
-				TrainingEnergyMax:              10,
-				EnergyFullTime:                 "2023-03-20 01:28:55",
-				LicenseLiveEnergyRecoverlyTime: 60,
-				FriendMax:                      99,
-				TutorialState:                  -1,
-				OverMaxEnergy:                  config.Conf.UserPrefs.OverMaxEnergy,
-				UnlockRandomLiveMuse:           1,
-				UnlockRandomLiveAqours:         1,
-			},
-			AfterUserInfo: model.AfterUserInfo{
-				Level:                          config.Conf.UserPrefs.Level,
-				Exp:                            config.Conf.UserPrefs.ExpNumerator,
-				PreviousExp:                    0,
-				NextExp:                        config.Conf.UserPrefs.ExpDenominator,
-				GameCoin:                       config.Conf.UserPrefs.GameCoin,
-				SnsCoin:                        config.Conf.UserPrefs.SnsCoin,
-				FreeSnsCoin:                    config.Conf.UserPrefs.SnsCoin,
-				PaidSnsCoin:                    0,
-				SocialPoint:                    1438375,
-				UnitMax:                        5000,
-				WaitingUnitMax:                 1000,
-				CurrentEnergy:                  config.Conf.UserPrefs.EnergyMax,
-				EnergyMax:                      config.Conf.UserPrefs.EnergyMax,
-				TrainingEnergy:                 9,
-				TrainingEnergyMax:              10,
-				EnergyFullTime:                 "2023-03-20 01:28:55",
-				LicenseLiveEnergyRecoverlyTime: 60,
-				FriendMax:                      99,
-				TutorialState:                  -1,
-				OverMaxEnergy:                  config.Conf.UserPrefs.OverMaxEnergy,
-				UnlockRandomLiveMuse:           1,
-				UnlockRandomLiveAqours:         1,
-			},
-			NextLevelInfo: []model.NextLevelInfo{
-				{
-					Level:   config.Conf.UserPrefs.Level,
-					FromExp: config.Conf.UserPrefs.ExpNumerator,
-				},
-			},
-			GoalAccompInfo: model.GoalAccompInfo{
-				AchievedIds: []any{},
-				Rewards:     []any{},
-			},
-			SpecialRewardInfo:    []any{},
-			EventInfo:            []any{},
-			DailyRewardInfo:      []any{},
-			CanSendFriendRequest: false,
-			UsingBuffInfo:        []any{},
-			ClassSystem: model.ClassSystem{
-				RankInfo: model.RewardRankInfo{
-					BeforeClassRankID: 10,
-					AfterClassRankID:  10,
-					RankUpDate:        "2020-02-12 11:57:15",
-				},
-				CompleteFlag: false,
-				IsOpened:     true,
-				IsVisible:    true,
-			},
-			AccomplishedAchievementList:  []model.AccomplishedAchievementList{},
-			UnaccomplishedAchievementCnt: 0,
-			AddedAchievementList:         []any{},
-			MuseumInfo:                   model.Museum{},
-			UnitSupportList:              []model.RewardUnitSupportList{},
-			ServerTimestamp:              time.Now().Unix(),
-			PresentCnt:                   0,
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	if playRewardReq.MaxCombo > s_rank_combo {
-		playResp.ResponseData.ComboRank = 1
-	} else if playRewardReq.MaxCombo > a_rank_combo {
-		playResp.ResponseData.ComboRank = 2
-	} else if playRewardReq.MaxCombo > b_rank_combo {
-		playResp.ResponseData.ComboRank = 3
-	} else if playRewardReq.MaxCombo > c_rank_combo {
-		playResp.ResponseData.ComboRank = 4
-	} else {
-		playResp.ResponseData.ComboRank = 5
-	}
-
-	if totalScore > s_rank_score {
-		playResp.ResponseData.Rank = 1
-	} else if totalScore > a_rank_score {
-		playResp.ResponseData.Rank = 2
-	} else if totalScore > b_rank_score {
-		playResp.ResponseData.Rank = 3
-	} else if totalScore > c_rank_score {
-		playResp.ResponseData.Rank = 4
-	} else {
-		playResp.ResponseData.Rank = 5
-	}
-
-	ss.Respond(playResp)
+func init() {
+	router.AddHandler("main.php", "POST", "/live/play", middleware.Common, play)
 }
diff --git a/internal/handler/live/precisescore.go b/internal/handler/live/precisescore.go
new file mode 100644
index 0000000..9ec6362
--- /dev/null
+++ b/internal/handler/live/precisescore.go
@@ -0,0 +1,111 @@
+package live
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/live"
+	"honoka-chan/internal/session"
+	honokautils "honoka-chan/pkg/utils"
+	"strconv"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func preciseScore(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	playScoreReq := live.PlayScoreReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &playScoreReq)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	tDifficultyId := playScoreReq.LiveDifficultyID
+	difficultyId, err := strconv.Atoi(tDifficultyId)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	// Song type: normal / special
+	// sqlite3 doesn't support FULL OUTER JOIN so use UNION ALL here.
+	sql := `SELECT notes_setting_asset,c_rank_score,b_rank_score,a_rank_score,s_rank_score,ac_flag,swing_flag FROM live_setting_m WHERE live_setting_id IN (SELECT live_setting_id FROM normal_live_m WHERE live_difficulty_id = ? UNION ALL SELECT live_setting_id FROM special_live_m WHERE live_difficulty_id = ?)`
+	var notes_setting_asset string
+	var c_rank_score, b_rank_score, a_rank_score, s_rank_score, ac_flag, swing_flag int
+	err = ss.MainEng.DB().QueryRow(sql, difficultyId, difficultyId).Scan(&notes_setting_asset, &c_rank_score, &b_rank_score, &a_rank_score, &s_rank_score, &ac_flag, &swing_flag)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	// fmt.Println(notes_setting_asset)
+	// fmt.Println(c_rank_score, b_rank_score, a_rank_score, s_rank_score)
+
+	notes := []live.NotesList{}
+	// fmt.Println("./assets/serverdata/beatmaps/" + notes_setting_asset)
+	notes_list := honokautils.ReadAllText("./assets/serverdata/beatmaps/" + notes_setting_asset)
+	err = json.Unmarshal([]byte(notes_list), &notes)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ranks := []live.RankInfo{}
+	ranks = append(ranks, live.RankInfo{
+		Rank:    5,
+		RankMin: 0,
+		RankMax: c_rank_score,
+	}, live.RankInfo{
+		Rank:    4,
+		RankMin: c_rank_score + 1,
+		RankMax: b_rank_score,
+	}, live.RankInfo{
+		Rank:    3,
+		RankMin: b_rank_score + 1,
+		RankMax: a_rank_score,
+	}, live.RankInfo{
+		Rank:    2,
+		RankMin: a_rank_score + 1,
+		RankMax: s_rank_score,
+	}, live.RankInfo{
+		Rank:    1,
+		RankMin: s_rank_score + 1,
+		RankMax: 0,
+	})
+
+	playResp := live.PreciseScoreResp{
+		ResponseData: live.PreciseScoreData{
+			On: live.On{
+				HasRecord: false,
+				LiveInfo: live.LiveInfo{
+					LiveDifficultyID: difficultyId,
+					IsRandom:         false,
+					AcFlag:           ac_flag,
+					SwingFlag:        swing_flag,
+					NotesList:        notes,
+				},
+			},
+			Off: live.Off{
+				HasRecord: false,
+				LiveInfo: live.LiveInfo{
+					LiveDifficultyID: difficultyId,
+					IsRandom:         false,
+					AcFlag:           ac_flag,
+					SwingFlag:        swing_flag,
+					NotesList:        notes,
+				},
+			},
+			RankInfo:          ranks,
+			CanActivateEffect: true,
+			ServerTimestamp:   time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	}
+
+	ss.Respond(playResp)
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/live/preciseScore", middleware.Common, preciseScore)
+}
diff --git a/internal/handler/live/reward.go b/internal/handler/live/reward.go
new file mode 100644
index 0000000..5d4f9bc
--- /dev/null
+++ b/internal/handler/live/reward.go
@@ -0,0 +1,213 @@
+package live
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/model/user"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/live"
+	"honoka-chan/internal/session"
+	"honoka-chan/pkg/db"
+	"strconv"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func reward(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	playRewardReq := live.RewardReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &playRewardReq)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	difficultyId := playRewardReq.LiveDifficultyID
+
+	// Song type: normal / special
+	// sqlite3 doesn't support FULL OUTER JOIN so use UNION ALL here.
+	sql := `SELECT c_rank_score,b_rank_score,a_rank_score,s_rank_score,c_rank_combo,b_rank_combo,a_rank_combo,s_rank_combo,ac_flag,swing_flag FROM live_setting_m WHERE live_setting_id IN (SELECT live_setting_id FROM normal_live_m WHERE live_difficulty_id = ? UNION ALL SELECT live_setting_id FROM special_live_m WHERE live_difficulty_id = ?)`
+	var c_rank_score, b_rank_score, a_rank_score, s_rank_score, c_rank_combo, b_rank_combo, a_rank_combo, s_rank_combo, ac_flag, swing_flag int
+	err = ss.MainEng.DB().QueryRow(sql, difficultyId, difficultyId).Scan(&c_rank_score, &b_rank_score, &a_rank_score, &s_rank_score, &c_rank_combo, &b_rank_combo, &a_rank_combo, &s_rank_combo, &ac_flag, &swing_flag)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	key := "live_deck_" + strconv.Itoa(ss.UserID)
+	deckId, err := db.Ldb.Get([]byte(key))
+	if ss.CheckErr(err) {
+		return
+	}
+	unitsList := []live.PlayRewardUnitList{}
+	err = ss.UserEng.Table("user_deck_unit").Join("LEFT", "user_deck", "user_deck_unit.user_deck_id = user_deck.id").
+		Where("user_id = ? AND deck_id = ?", ss.UserID, string(deckId)).Find(&unitsList)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	pref := user.UserPref{}
+	_, err = ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Get(&pref)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	totalScore := playRewardReq.ScoreSmile + playRewardReq.ScoreCool + playRewardReq.ScoreCute
+	playResp := live.RewardResp{
+		ResponseData: live.RewardData{
+			LiveInfo: []live.RewardLiveInfo{
+				{
+					LiveDifficultyID: difficultyId,
+					IsRandom:         false,
+					AcFlag:           ac_flag,
+					SwingFlag:        swing_flag,
+				},
+			},
+			TotalLove:   0,
+			IsHighScore: true,
+			HiScore:     totalScore,
+			BaseRewardInfo: live.BaseRewardInfo{
+				PlayerExp: 0,
+				PlayerExpUnitMax: live.PlayerExpUnitMax{
+					Before: 0,
+					After:  0,
+				},
+				PlayerExpFriendMax: live.PlayerExpFriendMax{
+					Before: 99,
+					After:  99,
+				},
+				PlayerExpLpMax: live.PlayerExpLpMax{
+					Before: 417,
+					After:  417,
+				},
+				GameCoin:              0,
+				GameCoinRewardBoxFlag: false,
+				SocialPoint:           0,
+			},
+			RewardUnitList: live.RewardUnitList{
+				LiveClear: []live.LiveClear{},
+				LiveRank:  []live.LiveRank{},
+				LiveCombo: []any{},
+			},
+			UnlockedSubscenarioIds:       []any{},
+			UnlockedMultiUnitScenarioIds: []any{},
+			EffortPoint:                  []live.EffortPoint{},
+			IsEffortPointVisible:         false,
+			LimitedEffortBox:             []any{},
+			UnitList:                     unitsList,
+			BeforeUserInfo: live.BeforeUserInfo{
+				Level:                          pref.UserLevel,
+				Exp:                            1089696,
+				PreviousExp:                    0,
+				NextExp:                        1207185,
+				GameCoin:                       999999999,
+				SnsCoin:                        10000,
+				FreeSnsCoin:                    50000,
+				PaidSnsCoin:                    50000,
+				SocialPoint:                    1438165,
+				UnitMax:                        5000,
+				WaitingUnitMax:                 1000,
+				CurrentEnergy:                  417,
+				EnergyMax:                      417,
+				TrainingEnergy:                 9,
+				TrainingEnergyMax:              10,
+				EnergyFullTime:                 "2023-03-20 01:28:55",
+				LicenseLiveEnergyRecoverlyTime: 60,
+				FriendMax:                      99,
+				TutorialState:                  -1,
+				OverMaxEnergy:                  417,
+				UnlockRandomLiveMuse:           1,
+				UnlockRandomLiveAqours:         1,
+			},
+			AfterUserInfo: live.AfterUserInfo{
+				Level:                          pref.UserLevel,
+				Exp:                            1089696,
+				PreviousExp:                    0,
+				NextExp:                        1207185,
+				GameCoin:                       999999999,
+				SnsCoin:                        100000,
+				FreeSnsCoin:                    50000,
+				PaidSnsCoin:                    50000,
+				SocialPoint:                    1438375,
+				UnitMax:                        5000,
+				WaitingUnitMax:                 1000,
+				CurrentEnergy:                  417,
+				EnergyMax:                      417,
+				TrainingEnergy:                 9,
+				TrainingEnergyMax:              10,
+				EnergyFullTime:                 "2023-03-20 01:28:55",
+				LicenseLiveEnergyRecoverlyTime: 60,
+				FriendMax:                      99,
+				TutorialState:                  -1,
+				OverMaxEnergy:                  417,
+				UnlockRandomLiveMuse:           1,
+				UnlockRandomLiveAqours:         1,
+			},
+			NextLevelInfo: []live.NextLevelInfo{
+				{
+					Level:   pref.UserLevel,
+					FromExp: 1089696,
+				},
+			},
+			GoalAccompInfo: live.GoalAccompInfo{
+				AchievedIds: []any{},
+				Rewards:     []any{},
+			},
+			SpecialRewardInfo:    []any{},
+			EventInfo:            []any{},
+			DailyRewardInfo:      []any{},
+			CanSendFriendRequest: false,
+			UsingBuffInfo:        []any{},
+			ClassSystem: live.ClassSystem{
+				RankInfo: live.RewardRankInfo{
+					BeforeClassRankID: 10,
+					AfterClassRankID:  10,
+					RankUpDate:        "2020-02-12 11:57:15",
+				},
+				CompleteFlag: false,
+				IsOpened:     true,
+				IsVisible:    true,
+			},
+			AccomplishedAchievementList:  []live.AccomplishedAchievementList{},
+			UnaccomplishedAchievementCnt: 0,
+			AddedAchievementList:         []any{},
+			MuseumInfo:                   live.Museum{},
+			UnitSupportList:              []live.RewardUnitSupportList{},
+			ServerTimestamp:              time.Now().Unix(),
+			PresentCnt:                   0,
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	}
+
+	if playRewardReq.MaxCombo > s_rank_combo {
+		playResp.ResponseData.ComboRank = 1
+	} else if playRewardReq.MaxCombo > a_rank_combo {
+		playResp.ResponseData.ComboRank = 2
+	} else if playRewardReq.MaxCombo > b_rank_combo {
+		playResp.ResponseData.ComboRank = 3
+	} else if playRewardReq.MaxCombo > c_rank_combo {
+		playResp.ResponseData.ComboRank = 4
+	} else {
+		playResp.ResponseData.ComboRank = 5
+	}
+
+	if totalScore > s_rank_score {
+		playResp.ResponseData.Rank = 1
+	} else if totalScore > a_rank_score {
+		playResp.ResponseData.Rank = 2
+	} else if totalScore > b_rank_score {
+		playResp.ResponseData.Rank = 3
+	} else if totalScore > c_rank_score {
+		playResp.ResponseData.Rank = 4
+	} else {
+		playResp.ResponseData.Rank = 5
+	}
+
+	ss.Respond(playResp)
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/live/reward", middleware.Common, reward)
+}
diff --git a/internal/handler/login.go b/internal/handler/login.go
deleted file mode 100644
index 5910bb9..0000000
--- a/internal/handler/login.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package handler
-
-import (
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"honoka-chan/pkg/db"
-	"strconv"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func AuthKey(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	authResp := model.AuthKeyResp{
-		ResponseData: model.AuthKeyRes{
-			AuthorizeToken: ctx.GetString("authorize_token"),
-			DummyToken:     ctx.GetString("dummy_token"),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(authResp)
-}
-
-func Login(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	loginKey := ctx.GetString("login_key")
-	var userId int
-	exists, err := ss.UserEng.Table("user_key").Where("key = ?", loginKey).Cols("userid").Get(&userId)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	if !exists || userId == 0 {
-		userId = 9999999
-	}
-	ctx.Set("userid", userId)
-
-	err = db.DB.Set([]byte(strconv.Itoa(userId)), []byte(ctx.GetString("authorize_token")))
-	if ss.CheckErr(err) {
-		return
-	}
-
-	loginResp := model.LoginResp{
-		ResponseData: model.LoginRes{
-			AuthorizeToken:  ctx.GetString("authorize_token"),
-			UserId:          userId,
-			ServerTimestamp: time.Now().Unix(),
-			AdultFlag:       2,
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(loginResp)
-}
diff --git a/internal/handler/login/authkey.go b/internal/handler/login/authkey.go
new file mode 100644
index 0000000..dc2f310
--- /dev/null
+++ b/internal/handler/login/authkey.go
@@ -0,0 +1,66 @@
+package login
+
+import (
+	"encoding/base64"
+	"encoding/json"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	loginschema "honoka-chan/internal/schema/login"
+	"honoka-chan/internal/session"
+	"honoka-chan/pkg/db"
+	"honoka-chan/pkg/encrypt"
+	honokautils "honoka-chan/pkg/utils"
+
+	"github.com/gin-gonic/gin"
+	"github.com/tidwall/gjson"
+)
+
+func authKey(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	reqData := gjson.Parse(ctx.MustGet("request_data").(string))
+	dummyToken, err := base64.StdEncoding.DecodeString(reqData.Get("dummy_token").String())
+	if ss.CheckErr(err) {
+		return
+	}
+	dummyTokenDecrypted := encrypt.RSADecrypt(dummyToken)
+
+	// aesKey := dummyTokenDecrypted[0:16]
+	// authData, err := base64.StdEncoding.DecodeString(reqData.Get("auth_data").String())
+	// if ss.CheckErr(err) {
+	// 	return
+	// }
+	// authDataDecrypted := encrypt.AESCBCDecrypt(authData, aesKey)[16:]
+	// fmt.Println(string(authDataDecrypted))
+
+	clientToken := base64.StdEncoding.EncodeToString(dummyTokenDecrypted)
+	serverToken := base64.StdEncoding.EncodeToString([]byte(honokautils.RandomStr(32)))
+	authorizeToken := base64.StdEncoding.EncodeToString([]byte(honokautils.RandomStr(32)))
+
+	authJson, err := json.Marshal(map[string]any{
+		"client_token": clientToken,
+		"server_token": serverToken,
+	})
+	if ss.CheckErr(err) {
+		return
+	}
+
+	err = db.Ldb.Set([]byte(authorizeToken), authJson)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(loginschema.AuthKeyResp{
+		ResponseData: loginschema.AuthKeyData{
+			AuthorizeToken: authorizeToken,
+			DummyToken:     serverToken,
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/login/authkey", middleware.Common, authKey)
+}
diff --git a/internal/handler/login/login.go b/internal/handler/login/login.go
new file mode 100644
index 0000000..cce9ef4
--- /dev/null
+++ b/internal/handler/login/login.go
@@ -0,0 +1,88 @@
+package login
+
+import (
+	"encoding/base64"
+	"errors"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	loginschema "honoka-chan/internal/schema/login"
+	"honoka-chan/internal/session"
+	"honoka-chan/pkg/db"
+	"honoka-chan/pkg/encrypt"
+	honokautils "honoka-chan/pkg/utils"
+	"strconv"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/tidwall/gjson"
+)
+
+func login(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	authData, err := db.Ldb.Get([]byte(ctx.MustGet("token").(string)))
+	if ss.CheckErr(err) {
+		return
+	}
+
+	clientToken, err := base64.StdEncoding.DecodeString(gjson.Get(string(authData), "client_token").String())
+	if ss.CheckErr(err) {
+		return
+	}
+	serverToken, err := base64.StdEncoding.DecodeString(gjson.Get(string(authData), "server_token").String())
+	if ss.CheckErr(err) {
+		return
+	}
+
+	xmcKey := honokautils.XOR(clientToken, serverToken)
+	aesKey := xmcKey[0:16]
+
+	reqData := gjson.Parse(ctx.MustGet("request_data").(string))
+	key, err := base64.StdEncoding.DecodeString(reqData.Get("login_key").String())
+	if ss.CheckErr(err) {
+		return
+	}
+	loginKey := encrypt.AESCBCDecrypt(key, aesKey)[16:]
+	// fmt.Println("loginKey", string(loginKey))
+
+	// password, err := base64.StdEncoding.DecodeString(reqData.Get("login_passwd").String())
+	// if ss.CheckErr(err) {
+	// 	return
+	// }
+	// loginPasswd := encrypt.AESCBCDecrypt(password, aesKey)[16:]
+	// fmt.Println("loginPasswd", string(loginPasswd))
+
+	authorizeToken := base64.StdEncoding.EncodeToString([]byte(honokautils.RandomStr(32)))
+
+	var userID int // 需要更新为字符串
+	exists, err := ss.UserEng.Table("user_key").Where("key = ?", string(loginKey)).Cols("user_id").Get(&userID)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	if !exists || userID == 0 {
+		ss.Abort(errors.New("invalid user"))
+		return
+	}
+
+	err = db.Ldb.Set([]byte(strconv.Itoa(userID)), []byte(authorizeToken))
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(loginschema.LoginResp{
+		ResponseData: loginschema.LoginData{
+			AuthorizeToken:  authorizeToken,
+			UserId:          userID,
+			ServerTimestamp: time.Now().Unix(),
+			AdultFlag:       2,
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/login/login", middleware.Common, login)
+}
diff --git a/internal/handler/multiunit.go b/internal/handler/multiunit.go
deleted file mode 100644
index 14c46d2..0000000
--- a/internal/handler/multiunit.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package handler
-
-import (
-	"encoding/json"
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func MultiUnitStartUp(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	startReq := model.MultiUnitStartUpReq{}
-	err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &startReq)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	startResp := model.MultiUnitStartUpResp{
-		ResponseData: model.MultiUnitStartUpRes{
-			MultiUnitScenarioID: startReq.MultiUnitScenarioID,
-			ScenarioAdjustment:  50,
-			ServerTimestamp:     time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(startResp)
-}
diff --git a/internal/handler/multiunit/scenariostartup.go b/internal/handler/multiunit/scenariostartup.go
new file mode 100644
index 0000000..b9d2817
--- /dev/null
+++ b/internal/handler/multiunit/scenariostartup.go
@@ -0,0 +1,37 @@
+package multiunit
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/multiunit"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func scenarioStartup(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	startReq := multiunit.ScenarioStartUpReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &startReq)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(multiunit.ScenarioStartUpResp{
+		ResponseData: multiunit.ScenarioStartUpData{
+			MultiUnitScenarioID: startReq.MultiUnitScenarioID,
+			ScenarioAdjustment:  50,
+			ServerTimestamp:     time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/multiunit/scenarioStartup", middleware.Common, scenarioStartup)
+}
diff --git a/internal/handler/museum.go b/internal/handler/museum/info.go
similarity index 55%
rename from internal/handler/museum.go
rename to internal/handler/museum/info.go
index 4c8d1fd..ff09cf8 100644
--- a/internal/handler/museum.go
+++ b/internal/handler/museum/info.go
@@ -1,25 +1,25 @@
-package handler
+package museum
 
 import (
-	"honoka-chan/internal/model"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/museum"
 	"honoka-chan/internal/session"
 	"time"
 
 	"github.com/gin-gonic/gin"
 )
 
-type MuseumContent struct {
-	MuseumContentsId int `xorm:"museum_contents_id"`
-	SmileBuff        int `xorm:"smile_buff"`
-	PureBuff         int `xorm:"pure_buff"`
-	CoolBuff         int `xorm:"cool_buff"`
-}
-
-func MuseumInfo(ctx *gin.Context) {
-	ss := session.New(ctx)
+func info(ctx *gin.Context) {
+	ss := session.Get(ctx)
 	defer ss.Finalize()
 
-	var contents []MuseumContent
+	var contents []struct {
+		MuseumContentsId int `xorm:"museum_contents_id"`
+		SmileBuff        int `xorm:"smile_buff"`
+		PureBuff         int `xorm:"pure_buff"`
+		CoolBuff         int `xorm:"cool_buff"`
+	}
 	err := ss.MainEng.Table("museum_contents_m").Cols("museum_contents_id,smile_buff,pure_buff,cool_buff").Find(&contents)
 	if ss.CheckErr(err) {
 		return
@@ -33,10 +33,10 @@ func MuseumInfo(ctx *gin.Context) {
 		coolBuff += content.CoolBuff
 		contentsList = append(contentsList, content.MuseumContentsId)
 	}
-	museumResp := model.MuseumResp{
-		ResponseData: model.MuseumRes{
-			MuseumInfo: model.Museum{
-				Parameter: model.MuseumParameter{
+	museumResp := museum.InfoResp{
+		ResponseData: museum.InfoData{
+			MuseumInfo: museum.Museum{
+				Parameter: museum.Parameter{
 					Smile: smileBuff,
 					Pure:  pureBuff,
 					Cool:  coolBuff,
@@ -51,3 +51,7 @@ func MuseumInfo(ctx *gin.Context) {
 
 	ss.Respond(museumResp)
 }
+
+func init() {
+	router.AddHandler("main.php", "POST", "/museum/info", middleware.Common, info)
+}
diff --git a/internal/handler/notice.go b/internal/handler/notice.go
deleted file mode 100644
index 591bd38..0000000
--- a/internal/handler/notice.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package handler
-
-import (
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func NoticeFriendVariety(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	noticeResp := model.NoticeFriendVarietyResp{
-		ResponseData: model.NoticeFriendVarietyRes{
-			ItemCount:       1,
-			NoticeList:      []any{},
-			ServerTimestamp: time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(noticeResp)
-}
-
-func NoticeFriendGreeting(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	noticeResp := model.NoticeFriendGreetingResp{
-		ResponseData: model.NoticeFriendGreetingRes{
-			NextId:          0,
-			NoticeList:      []any{},
-			ServerTimestamp: time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(noticeResp)
-}
-
-func NoticeUserGreeting(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	noticeResp := model.NoticeUserGreetingResp{
-		ResponseData: model.NoticeUserGreetingRes{
-			ItemCount:       0,
-			HasNext:         false,
-			NoticeList:      []any{},
-			ServerTimestamp: time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(noticeResp)
-}
diff --git a/internal/handler/notice/friendgreeting.go b/internal/handler/notice/friendgreeting.go
new file mode 100644
index 0000000..edac7b8
--- /dev/null
+++ b/internal/handler/notice/friendgreeting.go
@@ -0,0 +1,30 @@
+package notice
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/notice"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func friendGreeting(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(notice.FriendGreetingResp{
+		ResponseData: notice.FriendGreetingData{
+			NextId:          0,
+			NoticeList:      []any{},
+			ServerTimestamp: time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/notice/noticeFriendGreeting", middleware.Common, friendGreeting)
+}
diff --git a/internal/handler/notice/friendvariety.go b/internal/handler/notice/friendvariety.go
new file mode 100644
index 0000000..16bb8b3
--- /dev/null
+++ b/internal/handler/notice/friendvariety.go
@@ -0,0 +1,30 @@
+package notice
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/notice"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func friendVariety(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(notice.FriendVarietyResp{
+		ResponseData: notice.FriendVarietyData{
+			ItemCount:       1,
+			NoticeList:      []any{},
+			ServerTimestamp: time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/notice/noticeFriendVariety", middleware.Common, friendVariety)
+}
diff --git a/internal/handler/notice/usergreetinghistory.go b/internal/handler/notice/usergreetinghistory.go
new file mode 100644
index 0000000..2bd9ec8
--- /dev/null
+++ b/internal/handler/notice/usergreetinghistory.go
@@ -0,0 +1,31 @@
+package notice
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/notice"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func userGreetingHistory(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(notice.UserGreetingResp{
+		ResponseData: notice.UserGreetingData{
+			ItemCount:       0,
+			HasNext:         false,
+			NoticeList:      []any{},
+			ServerTimestamp: time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/notice/noticeUserGreetingHistory", middleware.Common, userGreetingHistory)
+}
diff --git a/internal/handler/payment.go b/internal/handler/payment.go
deleted file mode 100644
index c9de73b..0000000
--- a/internal/handler/payment.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package handler
-
-import (
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func ProductList(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	prodReesp := model.ProductResp{
-		ResponseData: model.ProductRes{
-			RestrictionInfo: model.RestrictionInfo{
-				Restricted: false,
-			},
-			UnderAgeInfo: model.UnderAgeInfo{
-				BirthSet:    true,
-				HasLimit:    false,
-				LimitAmount: nil,
-				MonthUsed:   0,
-			},
-			SnsProductList:   []any{},
-			ProductList:      []any{},
-			SubscriptionList: []any{},
-			ShowPointShop:    true,
-			ServerTimestamp:  time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(prodReesp)
-}
diff --git a/internal/handler/payment/productlist.go b/internal/handler/payment/productlist.go
new file mode 100644
index 0000000..740fe69
--- /dev/null
+++ b/internal/handler/payment/productlist.go
@@ -0,0 +1,44 @@
+package payment
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	paymentapischema "honoka-chan/internal/schema/api/payment"
+	"honoka-chan/internal/schema/payment"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func productList(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	prodResp := payment.ProductListResp{
+		ResponseData: payment.ProductListData{
+			RestrictionInfo: paymentapischema.RestrictionInfo{
+				Restricted: false,
+			},
+			UnderAgeInfo: paymentapischema.UnderAgeInfo{
+				BirthSet:    true,
+				HasLimit:    false,
+				LimitAmount: nil,
+				MonthUsed:   0,
+			},
+			SnsProductList:   []any{},
+			ProductList:      []any{},
+			SubscriptionList: []any{},
+			ShowPointShop:    true,
+			ServerTimestamp:  time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	}
+
+	ss.Respond(prodResp)
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/payment/productList", middleware.Common, productList)
+}
diff --git a/internal/handler/personalnotice.go b/internal/handler/personalnotice.go
deleted file mode 100644
index 11263ad..0000000
--- a/internal/handler/personalnotice.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package handler
-
-import (
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func PersonalNotice(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	noticeResp := model.PersonalNoticeResp{
-		ResponseData: model.PersonalNoticeRes{
-			HasNotice:       false,
-			NoticeID:        0,
-			Type:            0,
-			Title:           "",
-			Contents:        "",
-			ServerTimestamp: time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(noticeResp)
-}
diff --git a/internal/handler/personalnotice/get.go b/internal/handler/personalnotice/get.go
new file mode 100644
index 0000000..f1c1410
--- /dev/null
+++ b/internal/handler/personalnotice/get.go
@@ -0,0 +1,35 @@
+package personalnotice
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/personalnotice"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func get(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	noticeResp := personalnotice.GetResp{
+		ResponseData: personalnotice.GetData{
+			HasNotice:       false,
+			NoticeID:        0,
+			Type:            0,
+			Title:           "",
+			Contents:        "",
+			ServerTimestamp: time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	}
+
+	ss.Respond(noticeResp)
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/personalnotice/get", middleware.Common, get)
+}
diff --git a/internal/handler/private.go b/internal/handler/private.go
deleted file mode 100644
index c246000..0000000
--- a/internal/handler/private.go
+++ /dev/null
@@ -1,495 +0,0 @@
-package handler
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"honoka-chan/config"
-	"honoka-chan/internal/tools"
-	"honoka-chan/internal/utils"
-	"honoka-chan/pkg/db"
-	"honoka-chan/pkg/encrypt"
-	honokautils "honoka-chan/pkg/utils"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/go-think/openssl"
-)
-
-type LoginResp struct {
-	Activation           int    `json:"activation"`
-	Autokey              string `json:"autokey"`
-	CaptchaParams        string `json:"captchaParams"`
-	CheckCodeGUID        string `json:"checkCodeGuid"`
-	CheckCodeURL         string `json:"checkCodeUrl"`
-	HasExtendAccs        int    `json:"hasExtendAccs"`
-	HasRealInfo          int    `json:"has_realInfo"`
-	ImagecodeType        int    `json:"imagecodeType"`
-	IsNewUser            int    `json:"isNewUser"`
-	Message              string `json:"message"`
-	NextAction           int    `json:"nextAction"`
-	PromptMsg            string `json:"prompt_msg"`
-	RealInfoNotification string `json:"realInfoNotification"`
-	RealInfoForce        int    `json:"realInfo_force"`
-	RealInfoForcePay     int    `json:"realInfo_force_pay"`
-	RealInfoStatus       int    `json:"realInfo_status"`
-	RealInfoStatusPay    int    `json:"realInfo_status_pay"`
-	Result               int    `json:"result"`
-	SdgHeight            int    `json:"sdg_height"`
-	SdgWidth             int    `json:"sdg_width"`
-	Ticket               string `json:"ticket"`
-	UserAttribute        string `json:"userAttribute"`
-	Userid               string `json:"userid"`
-}
-
-type LoginAutoResp struct {
-	Result  int    `json:"result"`
-	Message string `json:"message"`
-	Autokey string `json:"autokey"`
-	UserId  string `json:"userid"`
-	Ticket  string `json:"ticket"`
-}
-
-type InitializeResp struct {
-	BrandLogo                 string   `json:"brand_logo"`
-	BrandName                 string   `json:"brand_name"`
-	DaoyuClientid             string   `json:"daoyu_clientid"`
-	DaoyuDownloadURL          string   `json:"daoyu_download_url"`
-	DeviceFeature             string   `json:"device_feature"`
-	DisplayThirdaccout        int      `json:"display_thirdaccout"`
-	ForceShowAgreement        int      `json:"force_show_agreement"`
-	GreportLogLevel           string   `json:"greport_log_level"`
-	GuestEnable               int      `json:"guest_enable"`
-	IsMatch                   int      `json:"is_match"`
-	LogLevel                  string   `json:"log_level"`
-	LoginButton               []string `json:"login_button"`
-	LoginIcon                 []any    `json:"login_icon"`
-	LoginLimitEnable          int      `json:"login_limit_enable"`
-	NeedFloatWindowPermission int      `json:"need_float_window_permission"`
-	NewDeviceIDServer         string   `json:"new_device_id_server"`
-	QqAppID                   string   `json:"qq_appId"`
-	QqKey                     string   `json:"qq_key"`
-	ShowGuestConfirm          int      `json:"show_guest_confirm"`
-	VoicetipButton            int      `json:"voicetip_button"`
-	VoicetipOne               string   `json:"voicetip_one"`
-	VoicetipTwo               string   `json:"voicetip_two"`
-	WegameAppid               string   `json:"wegame_appid"`
-	WegameAppkey              string   `json:"wegame_appkey"`
-	WegameClientid            string   `json:"wegame_clientid"`
-	WegameCompanyID           string   `json:"wegame_companyId"`
-	WegameLoginURL            string   `json:"wegame_loginUrl"`
-	WeiboAppKey               string   `json:"weibo_appKey"`
-	WeiboRedirectURL          string   `json:"weibo_redirectUrl"`
-	WeixinAppID               string   `json:"weixin_appId"`
-	WeixinKey                 string   `json:"weixin_key"`
-}
-
-func Active(ctx *gin.Context) {
-	// body, err := io.ReadAll(ctx.Request.Body)
-	// utils.CheckErr(err)
-	// defer ctx.Request.Body.Close()
-	// fmt.Println(string(body))
-
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, `{ "code": 0, "msg": "ok", "data": { "message": "ok", "result": 0 } }`)
-}
-
-func PublicKey(ctx *gin.Context) {
-	publicKey := honokautils.ReadAllText(config.PublicKeyPath)
-	publicKey = strings.ReplaceAll(publicKey, "\n", "")
-	publicKey = strings.ReplaceAll(publicKey, "-----BEGIN PUBLIC KEY-----", "")
-	publicKey = strings.ReplaceAll(publicKey, "-----END PUBLIC KEY-----", "")
-	publicKey = strings.ReplaceAll(publicKey, "/", "\\/")
-	// fmt.Println(publicKey)
-	resp := fmt.Sprintf(`{ "code": 0, "msg": "", "data": { "result": 0, "message": "ok", "key": "%s", "method": "rsa" } }`, publicKey)
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, resp)
-}
-
-func Handshake(ctx *gin.Context) {
-	body, err := io.ReadAll(ctx.Request.Body)
-	utils.CheckErr(err)
-	defer ctx.Request.Body.Close()
-	// fmt.Println(string(body))
-
-	body64, err := base64.StdEncoding.DecodeString(string(body))
-	utils.CheckErr(err)
-	decryptedBody := encrypt.RSADecrypt(body64)
-	// fmt.Println(decryptedBody)
-	// fmt.Println(string(decryptedBody))
-
-	params, err := url.ParseQuery(string(decryptedBody))
-	utils.CheckErr(err)
-	randKey := params.Get("randkey")
-	deviceId := ctx.Request.Header.Get("X-DEVICEID")
-	// fmt.Println(randKey)
-	// fmt.Println(deviceId)
-
-	err = db.DB.Set([]byte(deviceId), []byte(randKey))
-	utils.CheckErr(err)
-
-	token := strings.ToUpper(honokautils.RandomStr(33))
-	token = fmt.Sprintf(`{"message":"ok","result":0,"token":"%s"}`, token)
-	encryptedToken, err := openssl.Des3ECBEncrypt([]byte(token), []byte(randKey)[0:24], openssl.PKCS7_PADDING)
-	utils.CheckErr(err)
-	encryptedToken64 := base64.StdEncoding.EncodeToString(encryptedToken)
-	// fmt.Println(encryptedToken64)
-
-	resp := fmt.Sprintf(`{ "code": 0, "msg": "ok", "data": "%s" }`, encryptedToken64)
-
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, resp)
-}
-
-func Initialize(ctx *gin.Context) {
-	// body, err := io.ReadAll(ctx.Request.Body)
-	// utils.CheckErr(err)
-	// defer ctx.Request.Body.Close()
-	// fmt.Println(string(body))
-
-	// body64, err := base64.StdEncoding.DecodeString(string(body))
-	// utils.CheckErr(err)
-	// fmt.Println(string(body64))
-
-	deviceId := ctx.Request.Header.Get("X-DEVICEID")
-	randKey, err := db.DB.Get([]byte(deviceId))
-	utils.CheckErr(err)
-	// decryptedBody, err := openssl.Des3ECBDecrypt(body64, randKey[0:24], openssl.PKCS7_PADDING)
-	// utils.CheckErr(err)
-	// fmt.Println(string(decryptedBody))
-
-	initResp := InitializeResp{
-		BrandLogo:                 "http://gskd.sdo.com/ghome/ztc/logo/og/logo_xhdpi.png",
-		BrandName:                 "盛趣游戏",
-		ForceShowAgreement:        1,
-		GreportLogLevel:           "off",
-		LogLevel:                  "off",
-		LoginButton:               []string{"official"},
-		LoginIcon:                 []any{},
-		NeedFloatWindowPermission: 1,
-		NewDeviceIDServer:         strings.ToUpper(openssl.Md5ToString(deviceId)),
-		ShowGuestConfirm:          1,
-		VoicetipButton:            1,
-	}
-	data, err := json.Marshal(initResp)
-	utils.CheckErr(err)
-	encryptedData, err := openssl.Des3ECBEncrypt([]byte(data), randKey[0:24], openssl.PKCS7_PADDING)
-	utils.CheckErr(err)
-	encryptedData64 := base64.StdEncoding.EncodeToString(encryptedData)
-	// fmt.Println(encryptedToken64)
-
-	resp := fmt.Sprintf(`{ "code": 0, "msg": "ok", "data": "%s" }`, encryptedData64)
-
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, resp)
-}
-
-func GetCode(ctx *gin.Context) {
-	resp := `{ "code": 0, "msg": "ok", "data": { "codeArray": [ { "btntext": "好的", "code": "-10264022", "msg_from": 2, "text": "", "title": "短信验证码被阻止", "type": 1 }, { "btntext": " ", "code": "-10869623", "msg_from": 2, "text": "", "title": "网络连接失败，无法一键登录", "type": 2 }, { "btntext": " ", "code": "10298300", "msg_from": 2, "text": "", "title": " ", "type": 3 }, { "btntext": "", "code": "10298311", "msg_from": 2, "text": "", "title": "", "type": 3 }, { "btntext": " ", "code": "10298312", "msg_from": 2, "text": "", "title": " ", "type": 3 }, { "btntext": " ", "code": "10298313", "msg_from": 2, "text": "", "title": " ", "type": 1 }, { "btntext": " ", "code": "10298321", "msg_from": 2, "text": "", "title": " ", "type": 3 }, { "btntext": " ", "code": "10298322", "msg_from": 2, "text": "", "title": " ", "type": 3 } ], "codeVersion": "1.0.5" } }`
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, resp)
-}
-
-func LoginAuto(ctx *gin.Context) {
-	body, err := io.ReadAll(ctx.Request.Body)
-	utils.CheckErr(err)
-	defer ctx.Request.Body.Close()
-	// fmt.Println(string(body))
-
-	body64, err := base64.StdEncoding.DecodeString(string(body))
-	utils.CheckErr(err)
-	// fmt.Println(string(body64))
-
-	deviceId := ctx.Request.Header.Get("X-DEVICEID")
-	randKey, err := db.DB.Get([]byte(deviceId))
-	utils.CheckErr(err)
-
-	decryptedBody, err := openssl.Des3ECBDecrypt(body64, randKey[0:24], openssl.PKCS7_PADDING)
-	utils.CheckErr(err)
-	queryStr := string(decryptedBody)
-	// fmt.Println(queryStr)
-
-	params, err := url.ParseQuery(queryStr)
-	utils.CheckErr(err)
-	autoKey := params.Get("autokey")
-	// fmt.Println(autoKey)
-	if autoKey == "" {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-
-	var userId, ticket string
-	_, err = db.UserEng.Table("users").Cols("userid,ticket").Where("autokey = ?", autoKey).Get(&userId, &ticket)
-	utils.CheckErr(err)
-
-	var resp string
-	if userId != "" {
-		autoResp := LoginAutoResp{
-			Result:  0,
-			Message: "ok",
-			Autokey: autoKey,
-			UserId:  userId,
-			Ticket:  ticket,
-		}
-		data, err := json.Marshal(autoResp)
-		// fmt.Println(string(data))
-		utils.CheckErr(err)
-		encryptedData, err := openssl.Des3ECBEncrypt(data, randKey[0:24], openssl.PKCS7_PADDING)
-		utils.CheckErr(err)
-		encryptedData64 := base64.StdEncoding.EncodeToString(encryptedData)
-		// fmt.Println(encryptedData64)
-
-		resp = fmt.Sprintf(`{ "code": 0, "msg": "ok", "data": "%s" }`, encryptedData64)
-	} else {
-		data := `{"message":"账号不存在或者登陆状态已过期！","result":31}`
-		encryptedData, err := openssl.Des3ECBEncrypt([]byte(data), randKey[0:24], openssl.PKCS7_PADDING)
-		utils.CheckErr(err)
-		encryptedData64 := base64.StdEncoding.EncodeToString(encryptedData)
-		// fmt.Println(encryptedData64)
-
-		resp = fmt.Sprintf(`{ "code": 31, "msg": "账号不存在或者登陆状态已过期！", "data": "%s" }`, encryptedData64)
-	}
-
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, resp)
-}
-
-func LoginArea(ctx *gin.Context) {
-	userId := ctx.PostForm("userid")
-	if userId != "" {
-		// fmt.Println(userId)
-		resp := fmt.Sprintf(`{ "code": 0, "msg": "ok", "data": { "userid": "%s" } }`, userId)
-		ctx.Header("Content-Type", "text/html;charset=utf-8")
-		ctx.String(http.StatusOK, resp)
-	}
-}
-
-func AccountLogin(ctx *gin.Context) {
-	body, err := io.ReadAll(ctx.Request.Body)
-	utils.CheckErr(err)
-	defer ctx.Request.Body.Close()
-	// fmt.Println(string(body))
-
-	body64, err := base64.StdEncoding.DecodeString(string(body))
-	utils.CheckErr(err)
-	// fmt.Println(string(body64))
-
-	deviceId := ctx.Request.Header.Get("X-DEVICEID")
-	randKey, err := db.DB.Get([]byte(deviceId))
-	utils.CheckErr(err)
-
-	decryptedBody, err := openssl.Des3ECBDecrypt(body64, randKey[0:24], openssl.PKCS7_PADDING)
-	utils.CheckErr(err)
-	queryStr, err := url.QueryUnescape(string(decryptedBody))
-	utils.CheckErr(err)
-
-	params, err := url.ParseQuery(queryStr)
-	utils.CheckErr(err)
-
-	phone, password := params.Get("phone"), params.Get("password")
-	if phone == "" || password == "" {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-
-	// sql := `CREATE TABLE "users" (
-	// 	"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	// 	"phone" TEXT,
-	// 	"password" TEXT,
-	// 	"autokey" TEXT,
-	// 	"ticket" TEXT,
-	// 	"userid" INTEGER,
-	// 	"last_login_time" INTEGER
-	//   );
-	//   CREATE TABLE "user_key" (
-	// 	"id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-	// 	"userid" INTEGER,
-	// 	"key" INTEGER
-	//   );`
-	var pass, autoKey, ticket, userId string
-	_, err = db.UserEng.Table("users").Cols("password,autokey,ticket,userid").Where("phone = ?", phone).
-		Get(&pass, &autoKey, &ticket, &userId)
-	utils.CheckErr(err)
-
-	loginResp := LoginResp{}
-	loginCode := 0
-	loginMsg := "ok"
-	loginTime := time.Now().Unix()
-	if pass == "" {
-		// 未注册 - 自动注册
-		session := db.UserEng.NewSession()
-		defer session.Close()
-
-		// 开始会话
-		if err = session.Begin(); err != nil {
-			session.Rollback()
-			panic(err)
-		}
-
-		pass = openssl.Md5ToString(password)
-		autoKey = "AUTO" + strings.ToUpper(honokautils.RandomStr(32))
-		userId = strconv.Itoa(int(loginTime))
-		ticket = "9999999" + userId + userId
-		userStmt, err := session.DB().Prepare("INSERT INTO users(phone,password,autokey,ticket,userid,last_login_time) VALUES (?,?,?,?,?,?)")
-		if err != nil {
-			session.Rollback()
-			panic(err)
-		}
-		defer userStmt.Close()
-
-		_, err = userStmt.Exec(phone, pass, autoKey, ticket, userId, loginTime)
-		if err != nil {
-			session.Rollback()
-			panic(err)
-		}
-		// id, _ := res.LastInsertId()
-		// fmt.Println("LastInsertId:", id)
-
-		keyStmt, err := session.DB().Prepare("INSERT INTO user_key(userid,key) VALUES(?,?)")
-		if err != nil {
-			session.Rollback()
-			panic(err)
-		}
-		// 方便起见初始化 userid 和 key 一样
-		// 注意：user_key 表中的 key 是上文生成的用于登录的 userid，而 userid 则是用于 Authorize Token 生成用的
-		_, err = keyStmt.Exec(userId, userId)
-		if err != nil {
-			session.Rollback()
-			panic(err)
-		}
-
-		// 结束会话
-		if err = session.Commit(); err != nil {
-			session.Rollback()
-			panic(err)
-		}
-
-		tools.InitUserData(int(loginTime))
-
-		// Login Response
-		loginResp.Autokey = autoKey
-		loginResp.HasRealInfo = 1
-		loginResp.Message = "ok"
-		loginResp.RealInfoForce = 1
-		loginResp.Ticket = ticket
-		loginResp.UserAttribute = "0"
-		loginResp.Userid = userId
-	} else {
-		// 已注册
-		if openssl.Md5ToString(password) == pass {
-			// 密码正确
-			// Login Response
-			loginResp.Autokey = autoKey // 注意：更换设备（deviceId 发生变化）应重新生成 autokey
-			loginResp.HasRealInfo = 1
-			loginResp.Message = "ok"
-			loginResp.RealInfoForce = 1
-			loginResp.Ticket = "9999999" + userId + strconv.Itoa(int(loginTime)) // 实际登录用的密码（每次登录都会重新生成新的）
-			loginResp.UserAttribute = "0"
-			loginResp.Userid = userId // 实际登录用的账号
-
-			// 更新信息
-			userStmt, err := db.UserEng.DB().Prepare("UPDATE users SET autokey=?,ticket=?,last_login_time=? WHERE userid=?")
-			utils.CheckErr(err)
-			defer userStmt.Close()
-
-			_, err = userStmt.Exec(autoKey, ticket, loginTime, userId)
-			utils.CheckErr(err)
-			// aff, _ := res.RowsAffected()
-			// fmt.Println("RowsAffected:", aff)
-		} else {
-			// 密码错误
-			loginCode = 31
-			loginMsg = "账号不存在或者密码有误！"
-		}
-	}
-
-	data, err := json.Marshal(loginResp)
-	utils.CheckErr(err)
-	// fmt.Println(string(data))
-	encryptedData, err := openssl.Des3ECBEncrypt(data, randKey[0:24], openssl.PKCS7_PADDING)
-	utils.CheckErr(err)
-	encryptedData64 := base64.StdEncoding.EncodeToString(encryptedData)
-	// fmt.Println(encryptedToken64)
-
-	resp := fmt.Sprintf(`{ "code": %d, "msg": "%s", "data": "%s" }`, loginCode, loginMsg, encryptedData64)
-
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, resp)
-}
-
-func ReportRole(ctx *gin.Context) {
-	// body, err := io.ReadAll(ctx.Request.Body)
-	// utils.CheckErr(err)
-	// defer ctx.Request.Body.Close()
-	// fmt.Println(string(body))
-
-	// body64, err := base64.StdEncoding.DecodeString(string(body))
-	// utils.CheckErr(err)
-	// fmt.Println(string(body64))
-
-	deviceId := ctx.Request.Header.Get("X-DEVICEID")
-	randKey, err := db.DB.Get([]byte(deviceId))
-	utils.CheckErr(err)
-
-	// decryptedBody, err := openssl.Des3ECBDecrypt(body64, randKey[0:24], openssl.PKCS7_PADDING)
-	// utils.CheckErr(err)
-	// fmt.Println(string(decryptedBody))
-
-	// decrypted, err := url.QueryUnescape(string(decryptedBody))
-	// utils.CheckErr(err)
-	// fmt.Println(decrypted)
-
-	// Unable to decrypt server data
-	token := `{"message":"Hello, world!"}`
-	encryptedToken, err := openssl.Des3ECBEncrypt([]byte(token), randKey[0:24], openssl.PKCS7_PADDING)
-	utils.CheckErr(err)
-	encryptedToken64 := base64.StdEncoding.EncodeToString(encryptedToken)
-	// fmt.Println(encryptedToken64)
-
-	resp := fmt.Sprintf(`{ "code": 0, "msg": "ok", "data": "%s" }`, encryptedToken64)
-
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, resp)
-}
-
-func GetProductList(ctx *gin.Context) {
-	resp := `{ "code": 0, "msg": "ok", "data": { "message": [ ], "result": 0 } }`
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, resp)
-}
-
-func GuestStatus(ctx *gin.Context) {
-	resp := `{"code":0,"msg":"ok","data":{"disablead":1,"loginswitch":1,"message":"ok","result":0}}`
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, resp)
-}
-
-func ReportLog(ctx *gin.Context) {
-	// body, err := io.ReadAll(ctx.Request.Body)
-	// utils.CheckErr(err)
-	// defer ctx.Request.Body.Close()
-	// fmt.Println(string(body))
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, "")
-}
-
-func ReportApp(ctx *gin.Context) {
-	// body, err := io.ReadAll(ctx.Request.Body)
-	// utils.CheckErr(err)
-	// defer ctx.Request.Body.Close()
-	// fmt.Println(string(body))
-	resp := `{ "code": 0, "msg": "", "data": { "needReport": 0 } }`
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, resp)
-}
-
-func Agreement(ctx *gin.Context) {
-	resp := `{ "return_code": 0, "error_type": 0, "return_message": "", "data": { } }`
-	ctx.Header("Content-Type", "text/html;charset=utf-8")
-	ctx.String(http.StatusOK, resp)
-}
diff --git a/internal/handler/profile.go b/internal/handler/profile.go
deleted file mode 100644
index 24053b7..0000000
--- a/internal/handler/profile.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package handler
-
-import (
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"honoka-chan/internal/tools"
-
-	"github.com/gin-gonic/gin"
-	"github.com/tidwall/gjson"
-)
-
-func ProfileRegister(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	req := gjson.Parse(ctx.PostForm("request_data"))
-	pref := tools.UserPref{
-		UserDesc: req.Get("introduction").String(),
-	}
-
-	_, err := ss.UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Update(&pref)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	profileResp := model.ProfileRegisterResp{
-		ResponseData: []any{},
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(profileResp)
-}
diff --git a/internal/handler/profile/register.go b/internal/handler/profile/register.go
new file mode 100644
index 0000000..79b9771
--- /dev/null
+++ b/internal/handler/profile/register.go
@@ -0,0 +1,37 @@
+package profile
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/model/user"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/profile"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+	"github.com/tidwall/gjson"
+)
+
+func register(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	req := gjson.Parse(ctx.PostForm("request_data"))
+	pref := user.UserPref{
+		UserDesc: req.Get("introduction").String(),
+	}
+
+	_, err := ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Update(&pref)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(profile.RegisterResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/profile/profileRegister", middleware.Common, register)
+}
diff --git a/internal/handler/scenario.go b/internal/handler/scenario.go
deleted file mode 100644
index 5d03dbd..0000000
--- a/internal/handler/scenario.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package handler
-
-import (
-	"encoding/json"
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	honokautils "honoka-chan/pkg/utils"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func ScenarioStartup(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	startReq := model.ScenarioReq{}
-	err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &startReq)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	startResp := model.ScenarioResp{
-		ResponseData: model.ScenarioRes{
-			ScenarioID:         startReq.ScenarioID,
-			ScenarioAdjustment: 50,
-			ServerTimestamp:    time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(startResp)
-}
-
-func ScenarioReward(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	data := honokautils.ReadAllText("assets/serverdata/reward.json")
-	var resp map[string]any
-	err := json.Unmarshal([]byte(data), &resp)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	ss.Respond(resp)
-}
diff --git a/internal/handler/scenario/reward.go b/internal/handler/scenario/reward.go
new file mode 100644
index 0000000..6dc11c2
--- /dev/null
+++ b/internal/handler/scenario/reward.go
@@ -0,0 +1,29 @@
+package scenario
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/session"
+	honokautils "honoka-chan/pkg/utils"
+
+	"github.com/gin-gonic/gin"
+)
+
+func reward(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	data := honokautils.ReadAllText("assets/serverdata/reward.json")
+	var resp map[string]any
+	err := json.Unmarshal([]byte(data), &resp)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(resp)
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/scenario/reward", middleware.Common, reward)
+}
diff --git a/internal/handler/scenario/startup.go b/internal/handler/scenario/startup.go
new file mode 100644
index 0000000..377b14d
--- /dev/null
+++ b/internal/handler/scenario/startup.go
@@ -0,0 +1,37 @@
+package scenario
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/scenario"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func startup(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	startReq := scenario.StartUpReq{}
+	err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &startReq)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(scenario.StartUpResp{
+		ResponseData: scenario.StartUpData{
+			ScenarioID:         startReq.ScenarioID,
+			ScenarioAdjustment: 50,
+			ServerTimestamp:    time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/scenario/startup", middleware.Common, startup)
+}
diff --git a/internal/handler/subscenario.go b/internal/handler/subscenario.go
deleted file mode 100644
index b5ddaba..0000000
--- a/internal/handler/subscenario.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package handler
-
-import (
-	"encoding/json"
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	honokautils "honoka-chan/pkg/utils"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func SubScenarioStartup(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	startReq := model.SubScenarioReq{}
-	err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &startReq)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	startResp := model.SubScenarioResp{
-		ResponseData: model.SubScenarioRes{
-			SubscenarioID:      startReq.SubscenarioID,
-			ScenarioAdjustment: 50,
-			ServerTimestamp:    time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(startResp)
-}
-
-func SubScenarioReward(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	data := honokautils.ReadAllText("assets/serverdata/subreward.json")
-	var resp map[string]any
-	err := json.Unmarshal([]byte(data), &resp)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	ss.Respond(resp)
-}
diff --git a/internal/handler/subscenario/reward.go b/internal/handler/subscenario/reward.go
new file mode 100644
index 0000000..84ff1f3
--- /dev/null
+++ b/internal/handler/subscenario/reward.go
@@ -0,0 +1,29 @@
+package subscenario
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/session"
+	honokautils "honoka-chan/pkg/utils"
+
+	"github.com/gin-gonic/gin"
+)
+
+func reward(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	data := honokautils.ReadAllText("assets/serverdata/subreward.json")
+	var resp map[string]any
+	err := json.Unmarshal([]byte(data), &resp)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(resp)
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/subscenario/reward", middleware.Common, reward)
+}
diff --git a/internal/handler/subscenario/startup.go b/internal/handler/subscenario/startup.go
new file mode 100644
index 0000000..5d242b1
--- /dev/null
+++ b/internal/handler/subscenario/startup.go
@@ -0,0 +1,37 @@
+package subscenario
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/subscenario"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func startup(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	startReq := subscenario.StartUpReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &startReq)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(subscenario.StartUpResp{
+		ResponseData: subscenario.StartUpData{
+			SubscenarioID:      startReq.SubscenarioID,
+			ScenarioAdjustment: 50,
+			ServerTimestamp:    time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/subscenario/startup", middleware.Common, startup)
+}
diff --git a/internal/handler/tos.go b/internal/handler/tos.go
deleted file mode 100644
index 54e4474..0000000
--- a/internal/handler/tos.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package handler
-
-import (
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func TosCheck(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	tosResp := model.TosResp{
-		ResponseData: model.TosRes{
-			TosID:           1,
-			TosType:         1,
-			IsAgreed:        true,
-			ServerTimestamp: time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(tosResp)
-}
diff --git a/internal/handler/tos/check.go b/internal/handler/tos/check.go
new file mode 100644
index 0000000..d970071
--- /dev/null
+++ b/internal/handler/tos/check.go
@@ -0,0 +1,31 @@
+package tos
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/tos"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func check(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(tos.CheckResp{
+		ResponseData: tos.CheckData{
+			TosID:           1,
+			TosType:         1,
+			IsAgreed:        true,
+			ServerTimestamp: time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/tos/tosCheck", middleware.Common, check)
+}
diff --git a/internal/handler/unit.go b/internal/handler/unit.go
deleted file mode 100644
index b05e372..0000000
--- a/internal/handler/unit.go
+++ /dev/null
@@ -1,275 +0,0 @@
-package handler
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"net/http"
-	"strconv"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func SetDisplayRank(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	dispResp := model.SetDisplayRankResp{
-		ResponseData: []any{},
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(dispResp)
-}
-
-func SetDeck(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	userId, err := strconv.Atoi(ctx.GetString("userid"))
-	if ss.CheckErr(err) {
-		return
-	}
-
-	deckReq := model.UnitDeckReq{}
-	err = json.Unmarshal([]byte(ctx.PostForm("request_data")), &deckReq)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	// 原有队伍信息
-	var userDeckId []int
-	err = ss.UserEng.Table("user_deck_m").Cols("id").Where("user_id = ?", userId).Find(&userDeckId)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	// 删除全部原有队伍成员
-	_, err = ss.UserEng.Table("deck_unit_m").In("user_deck_id", userDeckId).Delete()
-	if ss.CheckErr(err) {
-		return
-	}
-
-	// 删除全部原有队伍
-	_, err = ss.UserEng.Table("user_deck_m").In("id", userDeckId).Delete()
-	if ss.CheckErr(err) {
-		return
-	}
-
-	// 遍历新队伍
-	for _, deck := range deckReq.UnitDeckList {
-		// 新队伍信息
-		userDeck := model.UserDeckData{
-			DeckID:     deck.UnitDeckID,
-			MainFlag:   deck.MainFlag,
-			DeckName:   deck.DeckName,
-			UserID:     userId,
-			InsertDate: time.Now().Unix(),
-		}
-		_, err = ss.UserEng.Table("user_deck_m").Insert(&userDeck)
-		if ss.CheckErr(err) {
-			return
-		}
-		userDeckId := userDeck.ID
-		// fmt.Println("新队伍 ID:", userDeckId)
-
-		// 队伍成员信息
-		for _, unit := range deck.UnitDeckDetail {
-			// 成员信息
-			newUnitData := model.UnitData{}
-			exists, err := ss.UserEng.Table("user_unit_m").Where("unit_owning_user_id = ?", unit.UnitOwningUserID).Exist()
-			if ss.CheckErr(err) {
-				return
-			}
-			if exists {
-				// fmt.Println("新成员为用户增加成员")
-				_, err = ss.UserEng.Table("user_unit_m").Where("unit_owning_user_id = ?", unit.UnitOwningUserID).Get(&newUnitData)
-				if ss.CheckErr(err) {
-					return
-				}
-			} else {
-				exists, err := ss.MainEng.Table("common_unit_m").Where("unit_owning_user_id = ?", unit.UnitOwningUserID).Exist()
-				if ss.CheckErr(err) {
-					return
-				}
-				if exists {
-					// fmt.Println("新成员为公共成员")
-					_, err = ss.MainEng.Table("common_unit_m").Where("unit_owning_user_id = ?", unit.UnitOwningUserID).Get(&newUnitData)
-					if ss.CheckErr(err) {
-						return
-					}
-				} else {
-					// fmt.Println("新成员不存在")
-					err = errors.New("新成员不存在")
-				}
-				if ss.CheckErr(err) {
-					return
-				}
-			}
-			// fmt.Println("新的成员信息:", newUnitData)
-
-			// 插入新成员信息
-			newUnitDeckData := model.UnitDeckData{}
-			b, err := json.Marshal(newUnitData)
-			if ss.CheckErr(err) {
-				return
-			}
-			err = json.Unmarshal(b, &newUnitDeckData)
-			if ss.CheckErr(err) {
-				return
-			}
-			newUnitDeckData.BeforeLove = newUnitDeckData.MaxLove
-			newUnitDeckData.Position = unit.Position
-			newUnitDeckData.UserDeckID = userDeckId
-			newUnitDeckData.InsertData = time.Now().Unix()
-
-			_, err = ss.UserEng.Table("deck_unit_m").Insert(&newUnitDeckData)
-			if ss.CheckErr(err) {
-				return
-			}
-		}
-	}
-
-	dispResp := model.SetDeckResp{
-		ResponseData: []any{},
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(dispResp)
-}
-
-func SetDeckName(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	userId, err := strconv.Atoi(ctx.GetString("userid"))
-	if ss.CheckErr(err) {
-		return
-	}
-
-	deckReq := model.DeckNameReq{}
-	err = json.Unmarshal([]byte(ctx.PostForm("request_data")), &deckReq)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	exists, err := ss.UserEng.Table("user_deck_m").Where("user_id = ? AND deck_id = ?", userId, deckReq.UnitDeckID).Exist()
-	if ss.CheckErr(err) {
-		return
-	}
-	if !exists {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-	userDeck := model.UserDeckData{
-		DeckName: deckReq.DeckName,
-	}
-	_, err = ss.UserEng.Table("user_deck_m").Update(&userDeck, &model.UserDeckData{
-		UserID: userId,
-		DeckID: deckReq.UnitDeckID,
-	})
-	if ss.CheckErr(err) {
-		return
-	}
-
-	dispResp := model.SetDeckResp{
-		ResponseData: []any{},
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(dispResp)
-}
-
-func WearAccessory(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	req := model.WearAccessoryReq{}
-	err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &req)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	// 取下饰品
-	for _, v := range req.Remove {
-		fmt.Println("Remove:", v.AccessoryOwningUserID, v.UnitOwningUserID)
-		_, err := ss.UserEng.Table("accessory_wear_m").
-			Where("accessory_owning_user_id = ? AND unit_owning_user_id = ? AND user_id = ?", v.AccessoryOwningUserID, v.UnitOwningUserID, ctx.GetString("userid")).
-			Delete()
-		if ss.CheckErr(err) {
-			return
-		}
-	}
-
-	// 佩戴饰品
-	for _, v := range req.Wear {
-		fmt.Println("Wear:", v.AccessoryOwningUserID, v.UnitOwningUserID)
-		data := model.AccessoryWearData{
-			AccessoryOwningUserID: v.AccessoryOwningUserID,
-			UnitOwningUserID:      v.UnitOwningUserID,
-			UserId:                ctx.GetString("userid"),
-		}
-		_, err := ss.UserEng.Table("accessory_wear_m").Insert(&data)
-		if ss.CheckErr(err) {
-			return
-		}
-	}
-
-	wearResp := model.AwardSetResp{
-		ResponseData: []any{},
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(wearResp)
-}
-
-func RemoveSkillEquip(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	req := model.SkillEquipReq{}
-	err := json.Unmarshal([]byte(ctx.PostForm("request_data")), &req)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	// 取下宝石
-	for _, v := range req.Remove {
-		fmt.Println("Remove:", v.UnitOwningUserID, v.UnitRemovableSkillID)
-		_, err := ss.UserEng.Table("skill_equip_m").
-			Where("unit_removable_skill_id = ? AND unit_owning_user_id = ? AND user_id = ?", v.UnitRemovableSkillID, v.UnitOwningUserID, ctx.GetString("userid")).
-			Delete()
-		if ss.CheckErr(err) {
-			return
-		}
-	}
-
-	// 佩戴宝石
-	for _, v := range req.Equip {
-		fmt.Println("Equip:", v.UnitOwningUserID, v.UnitRemovableSkillID)
-		data := model.SkillEquipData{
-			UnitRemovableSkillId: v.UnitRemovableSkillID,
-			UnitOwningUserID:     v.UnitOwningUserID,
-			UserId:               ctx.GetString("userid"),
-		}
-		_, err := ss.UserEng.Table("skill_equip_m").Insert(&data)
-		if ss.CheckErr(err) {
-			return
-		}
-	}
-
-	wearResp := model.AwardSetResp{
-		ResponseData: []any{},
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(wearResp)
-}
diff --git a/internal/handler/unit/deck.go b/internal/handler/unit/deck.go
new file mode 100644
index 0000000..2e8ce6c
--- /dev/null
+++ b/internal/handler/unit/deck.go
@@ -0,0 +1,129 @@
+package unit
+
+import (
+	"encoding/json"
+	"errors"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	profileapischema "honoka-chan/internal/schema/api/profile"
+	unitapischema "honoka-chan/internal/schema/api/unit"
+	"honoka-chan/internal/schema/unit"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func deck(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	deckReq := unit.DeckReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &deckReq)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	// 原有队伍信息
+	var userDeckID []int
+	err = ss.UserEng.Table("user_deck").Cols("id").Where("user_id = ?", ss.UserID).Find(&userDeckID)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	// 删除全部原有队伍成员
+	_, err = ss.UserEng.Table("user_deck_unit").In("user_deck_id", userDeckID).Delete()
+	if ss.CheckErr(err) {
+		return
+	}
+
+	// 删除全部原有队伍
+	_, err = ss.UserEng.Table("user_deck").In("id", userDeckID).Delete()
+	if ss.CheckErr(err) {
+		return
+	}
+
+	// 遍历新队伍
+	for _, deck := range deckReq.UnitDeckList {
+		// 新队伍信息
+		userDeck := unitapischema.UserDeckData{
+			DeckID:     deck.UnitDeckID,
+			MainFlag:   deck.MainFlag,
+			DeckName:   deck.DeckName,
+			UserID:     ss.UserID,
+			InsertDate: time.Now().Unix(),
+		}
+		_, err = ss.UserEng.Table("user_deck").Insert(&userDeck)
+		if ss.CheckErr(err) {
+			return
+		}
+		userDeckId := userDeck.ID
+		// fmt.Println("新队伍 ID:", userDeckId)
+
+		// 队伍成员信息
+		for _, u := range deck.UnitDeckDetail {
+			// 成员信息
+			newUnitData := profileapischema.UnitData{}
+			exists, err := ss.UserEng.Table("user_unit").Where("unit_owning_user_id = ?", u.UnitOwningUserID).Exist()
+			if ss.CheckErr(err) {
+				return
+			}
+			if exists {
+				// fmt.Println("新成员为用户增加成员")
+				_, err = ss.UserEng.Table("user_unit").Where("unit_owning_user_id = ?", u.UnitOwningUserID).Get(&newUnitData)
+				if ss.CheckErr(err) {
+					return
+				}
+			} else {
+				exists, err := ss.MainEng.Table("common_unit_m").Where("unit_owning_user_id = ?", u.UnitOwningUserID).Exist()
+				if ss.CheckErr(err) {
+					return
+				}
+				if exists {
+					// fmt.Println("新成员为公共成员")
+					_, err = ss.MainEng.Table("common_unit_m").Where("unit_owning_user_id = ?", u.UnitOwningUserID).Get(&newUnitData)
+					if ss.CheckErr(err) {
+						return
+					}
+				} else {
+					// fmt.Println("新成员不存在")
+					err = errors.New("新成员不存在")
+				}
+				if ss.CheckErr(err) {
+					return
+				}
+			}
+			// fmt.Println("新的成员信息:", newUnitData)
+
+			// 插入新成员信息
+			newUnitDeckData := unitapischema.UnitDeckData{}
+			b, err := json.Marshal(newUnitData)
+			if ss.CheckErr(err) {
+				return
+			}
+			err = json.Unmarshal(b, &newUnitDeckData)
+			if ss.CheckErr(err) {
+				return
+			}
+			newUnitDeckData.BeforeLove = newUnitDeckData.MaxLove
+			newUnitDeckData.Position = u.Position
+			newUnitDeckData.UserDeckID = userDeckId
+			newUnitDeckData.InsertData = time.Now().Unix()
+
+			_, err = ss.UserEng.Table("user_deck_unit").Insert(&newUnitDeckData)
+			if ss.CheckErr(err) {
+				return
+			}
+		}
+	}
+
+	ss.Respond(unit.DeckResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/unit/deck", middleware.Common, deck)
+}
diff --git a/internal/handler/unit/deckname.go b/internal/handler/unit/deckname.go
new file mode 100644
index 0000000..16b1f4e
--- /dev/null
+++ b/internal/handler/unit/deckname.go
@@ -0,0 +1,49 @@
+package unit
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	unitapischema "honoka-chan/internal/schema/api/unit"
+	"honoka-chan/internal/schema/unit"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func deckName(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	deckReq := unit.DeckNameReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &deckReq)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	_, err = ss.UserEng.Table("user_deck").Where("user_id = ? AND deck_id = ?", ss.UserID, deckReq.UnitDeckID).Exist()
+	if ss.CheckErr(err) {
+		return
+	}
+
+	userDeck := unitapischema.UserDeckData{
+		DeckName: deckReq.DeckName,
+	}
+	_, err = ss.UserEng.Table("user_deck").Update(&userDeck, &unitapischema.UserDeckData{
+		UserID: ss.UserID,
+		DeckID: deckReq.UnitDeckID,
+	})
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(unit.DeckResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/unit/deckName", middleware.Common, deckName)
+}
diff --git a/internal/handler/unit/favorite.go b/internal/handler/unit/favorite.go
new file mode 100644
index 0000000..e767718
--- /dev/null
+++ b/internal/handler/unit/favorite.go
@@ -0,0 +1,25 @@
+package unit
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/unit"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func favorite(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(unit.FavoriteResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/unit/favorite", middleware.Common, favorite)
+}
diff --git a/internal/handler/unit/removableskillequipment.go b/internal/handler/unit/removableskillequipment.go
new file mode 100644
index 0000000..818b193
--- /dev/null
+++ b/internal/handler/unit/removableskillequipment.go
@@ -0,0 +1,57 @@
+package unit
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/unit"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func removableSkillEquipment(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	req := unit.RemovableSkillEquipmentReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &req)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	// 取下宝石
+	for _, v := range req.Remove {
+		// fmt.Println("Remove:", v.UnitOwningUserID, v.UnitRemovableSkillID)
+		_, err := ss.UserEng.Table("user_unit_skill_equip").
+			Where("unit_removable_skill_id = ? AND unit_owning_user_id = ? AND user_id = ?", v.UnitRemovableSkillID, v.UnitOwningUserID, ss.UserID).
+			Delete()
+		if ss.CheckErr(err) {
+			return
+		}
+	}
+
+	// 佩戴宝石
+	for _, v := range req.Equip {
+		// fmt.Println("Equip:", v.UnitOwningUserID, v.UnitRemovableSkillID)
+		data := unit.RemovableSkillEquipmentData{
+			UnitRemovableSkillId: v.UnitRemovableSkillID,
+			UnitOwningUserID:     v.UnitOwningUserID,
+			UserID:               ss.UserID,
+		}
+		_, err := ss.UserEng.Table("user_unit_skill_equip").Insert(&data)
+		if ss.CheckErr(err) {
+			return
+		}
+	}
+
+	ss.Respond(unit.RemovableSkillEquipmentResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/unit/removableSkillEquipment", middleware.Common, removableSkillEquipment)
+}
diff --git a/internal/handler/unit/setdisplayrank.go b/internal/handler/unit/setdisplayrank.go
new file mode 100644
index 0000000..5c7fcf4
--- /dev/null
+++ b/internal/handler/unit/setdisplayrank.go
@@ -0,0 +1,25 @@
+package unit
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/unit"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func setDisplayRank(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(unit.SetDisplayRankResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/unit/setDisplayRank", middleware.Common, setDisplayRank)
+}
diff --git a/internal/handler/unit/wearaccessory.go b/internal/handler/unit/wearaccessory.go
new file mode 100644
index 0000000..98dfe70
--- /dev/null
+++ b/internal/handler/unit/wearaccessory.go
@@ -0,0 +1,57 @@
+package unit
+
+import (
+	"encoding/json"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/unit"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func wearAccessory(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	req := unit.WearAccessoryReq{}
+	err := json.Unmarshal([]byte(ctx.MustGet("request_data").(string)), &req)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	// 取下饰品
+	for _, v := range req.Remove {
+		// fmt.Println("Remove:", v.AccessoryOwningUserID, v.UnitOwningUserID)
+		_, err := ss.UserEng.Table("user_accessory_wear").
+			Where("accessory_owning_user_id = ? AND unit_owning_user_id = ? AND user_id = ?", v.AccessoryOwningUserID, v.UnitOwningUserID, ss.UserID).
+			Delete()
+		if ss.CheckErr(err) {
+			return
+		}
+	}
+
+	// 佩戴饰品
+	for _, v := range req.Wear {
+		// fmt.Println("Wear:", v.AccessoryOwningUserID, v.UnitOwningUserID)
+		data := unit.WearAccessoryData{
+			AccessoryOwningUserID: v.AccessoryOwningUserID,
+			UnitOwningUserID:      v.UnitOwningUserID,
+			UserID:                ss.UserID,
+		}
+		_, err := ss.UserEng.Table("user_accessory_wear").Insert(&data)
+		if ss.CheckErr(err) {
+			return
+		}
+	}
+
+	ss.Respond(unit.WearAccessoryResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/unit/wearAccessory", middleware.Common, wearAccessory)
+}
diff --git a/internal/handler/user.go b/internal/handler/user.go
deleted file mode 100644
index 6f1dbad..0000000
--- a/internal/handler/user.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package handler
-
-import (
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"honoka-chan/internal/tools"
-	"net/http"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/tidwall/gjson"
-)
-
-func SetNotificationToken(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	notifResp := model.NotificationResp{
-		ResponseData: []any{},
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(notifResp)
-}
-
-func ChangeNavi(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	req := gjson.Parse(ctx.PostForm("request_data"))
-	pref := tools.UserPref{
-		UnitOwningUserID: int(req.Get("unit_owning_user_id").Int()),
-	}
-	_, err := ss.UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Update(&pref)
-	if ss.CheckErr(err) {
-		return
-	}
-
-	naviResp := model.UserNaviChangeResp{
-		ResponseData: []any{},
-		ReleaseInfo:  []any{},
-		StatusCode:   200,
-	}
-
-	ss.Respond(naviResp)
-}
-
-func ChangeName(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	req := gjson.Parse(ctx.PostForm("request_data"))
-	var oldName string
-	exists, err := ss.UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Cols("user_name").Get(&oldName)
-	if ss.CheckErr(err) {
-		return
-	}
-	if !exists {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-	pref := tools.UserPref{
-		UserName: req.Get("name").String(),
-	}
-	_, err = ss.UserEng.Table("user_preference_m").Where("user_id = ?", ctx.GetString("userid")).Update(&pref)
-	if ss.CheckErr(err) {
-		return
-	}
-	nameResp := model.UserNameChangeResp{
-		ResponseData: model.UserNameChangeRes{
-			BeforeName:      oldName,
-			AfterName:       req.Get("name").String(),
-			ServerTimestamp: time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(nameResp)
-}
diff --git a/internal/handler/user/changename.go b/internal/handler/user/changename.go
new file mode 100644
index 0000000..cf81e9f
--- /dev/null
+++ b/internal/handler/user/changename.go
@@ -0,0 +1,47 @@
+package user
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/model/user"
+	"honoka-chan/internal/router"
+	userschema "honoka-chan/internal/schema/user"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+	"github.com/tidwall/gjson"
+)
+
+func changeName(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	req := gjson.Parse(ctx.MustGet("request_data").(string))
+	var oldName string
+	_, err := ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Cols("user_name").Get(&oldName)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	pref := user.UserPref{
+		UserName: req.Get("name").String(),
+	}
+	_, err = ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Update(&pref)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(userschema.ChangeNameResp{
+		ResponseData: userschema.ChangeNameData{
+			BeforeName:      oldName,
+			AfterName:       req.Get("name").String(),
+			ServerTimestamp: time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/user/changeName", middleware.Common, changeName)
+}
diff --git a/internal/handler/user/changenavi.go b/internal/handler/user/changenavi.go
new file mode 100644
index 0000000..b150b99
--- /dev/null
+++ b/internal/handler/user/changenavi.go
@@ -0,0 +1,36 @@
+package user
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/model/user"
+	"honoka-chan/internal/router"
+	userschema "honoka-chan/internal/schema/user"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+	"github.com/tidwall/gjson"
+)
+
+func changeNavi(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	req := gjson.Parse(ctx.MustGet("request_data").(string))
+	pref := user.UserPref{
+		UnitOwningUserID: int(req.Get("unit_owning_user_id").Int()),
+	}
+	_, err := ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Update(&pref)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	ss.Respond(userschema.ChangeNaviResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/user/changeNavi", middleware.Common, changeNavi)
+}
diff --git a/internal/handler/user/setnotificationtoken.go b/internal/handler/user/setnotificationtoken.go
new file mode 100644
index 0000000..d1e7c81
--- /dev/null
+++ b/internal/handler/user/setnotificationtoken.go
@@ -0,0 +1,25 @@
+package user
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/user"
+	"honoka-chan/internal/session"
+
+	"github.com/gin-gonic/gin"
+)
+
+func setNotificationToken(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	ss.Respond(user.SetNotificationTokenResp{
+		ResponseData: []any{},
+		ReleaseInfo:  []any{},
+		StatusCode:   200,
+	})
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/user/setNotificationToken", middleware.Common, setNotificationToken)
+}
diff --git a/internal/handler/user/userinfo.go b/internal/handler/user/userinfo.go
new file mode 100644
index 0000000..7673d64
--- /dev/null
+++ b/internal/handler/user/userinfo.go
@@ -0,0 +1,72 @@
+package user
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/model/user"
+	"honoka-chan/internal/router"
+	userapischema "honoka-chan/internal/schema/api/user"
+	userschema "honoka-chan/internal/schema/user"
+	"honoka-chan/internal/session"
+	"time"
+
+	"github.com/gin-gonic/gin"
+)
+
+func userInfo(ctx *gin.Context) {
+	ss := session.Get(ctx)
+	defer ss.Finalize()
+
+	pref := user.UserPref{}
+	_, err := ss.UserEng.Table("user_pref").Where("user_id = ?", ss.UserID).Get(&pref)
+	if ss.CheckErr(err) {
+		return
+	}
+
+	userResp := userschema.UserInfoResp{
+		ResponseData: userschema.UserInfoData{
+			User: userapischema.UserInfo{
+				UserID:                         ss.UserID,
+				Name:                           pref.UserName,
+				Level:                          pref.UserLevel,
+				Exp:                            1089696,
+				PreviousExp:                    0,
+				NextExp:                        1207185,
+				GameCoin:                       112124104,
+				SnsCoin:                        100000,
+				FreeSnsCoin:                    50000,
+				PaidSnsCoin:                    50000,
+				SocialPoint:                    999999999,
+				UnitMax:                        5000,
+				WaitingUnitMax:                 1000,
+				EnergyMax:                      417,
+				EnergyFullTime:                 "2023-03-20 03:58:55",
+				LicenseLiveEnergyRecoverlyTime: 60,
+				EnergyFullNeedTime:             0,
+				OverMaxEnergy:                  0,
+				TrainingEnergy:                 100,
+				TrainingEnergyMax:              100,
+				FriendMax:                      99,
+				InviteCode:                     pref.InviteCode,
+				InsertDate:                     "2015-08-10 18:58:30",
+				UpdateDate:                     "2018-08-09 18:13:12",
+				TutorialState:                  -1,
+				DiamondCoin:                    0,
+				CrystalCoin:                    0,
+				LpRecoveryItem:                 []userapischema.LpRecoveryItem{},
+			},
+			Birth: userschema.Birth{
+				BirthMonth: 10,
+				BirthDay:   18,
+			},
+			ServerTimestamp: time.Now().Unix(),
+		},
+		ReleaseInfo: []any{},
+		StatusCode:  200,
+	}
+
+	ss.Respond(userResp)
+}
+
+func init() {
+	router.AddHandler("main.php", "POST", "/user/userInfo", middleware.Common, userInfo)
+}
diff --git a/internal/handler/userinfo.go b/internal/handler/userinfo.go
deleted file mode 100644
index 245cc13..0000000
--- a/internal/handler/userinfo.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package handler
-
-import (
-	"honoka-chan/config"
-	"honoka-chan/internal/model"
-	"honoka-chan/internal/session"
-	"honoka-chan/internal/tools"
-	"net/http"
-	"strconv"
-	"time"
-
-	"github.com/gin-gonic/gin"
-)
-
-func UserInfo(ctx *gin.Context) {
-	ss := session.New(ctx)
-	defer ss.Finalize()
-
-	userId, err := strconv.Atoi(ctx.GetString("userid"))
-	if ss.CheckErr(err) {
-		return
-	}
-
-	pref := tools.UserPref{}
-	exists, err := ss.UserEng.Table("user_preference_m").Where("user_id = ?", userId).Get(&pref)
-	if ss.CheckErr(err) {
-		return
-	}
-	if !exists {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		return
-	}
-
-	userResp := model.UserInfoResp{
-		ResponseData: model.UserInfoRes{
-			User: model.UserInfo{
-				UserID:                         userId,
-				Name:                           pref.UserName,
-				Level:                          config.Conf.UserPrefs.Level,
-				Exp:                            config.Conf.UserPrefs.ExpNumerator,
-				PreviousExp:                    0,
-				NextExp:                        config.Conf.UserPrefs.ExpDenominator,
-				GameCoin:                       config.Conf.UserPrefs.GameCoin,
-				SnsCoin:                        config.Conf.UserPrefs.SnsCoin,
-				FreeSnsCoin:                    config.Conf.UserPrefs.SnsCoin,
-				PaidSnsCoin:                    0,
-				SocialPoint:                    1438395,
-				UnitMax:                        5000,
-				WaitingUnitMax:                 1000,
-				EnergyMax:                      config.Conf.UserPrefs.EnergyMax,
-				EnergyFullTime:                 "2023-03-20 03:58:55",
-				LicenseLiveEnergyRecoverlyTime: 60,
-				EnergyFullNeedTime:             0,
-				OverMaxEnergy:                  config.Conf.UserPrefs.OverMaxEnergy,
-				TrainingEnergy:                 100,
-				TrainingEnergyMax:              100,
-				FriendMax:                      99,
-				InviteCode:                     config.Conf.UserPrefs.InviteCode,
-				InsertDate:                     "2015-08-10 18:58:30",
-				UpdateDate:                     "2018-08-09 18:13:12",
-				TutorialState:                  -1,
-				DiamondCoin:                    0,
-				CrystalCoin:                    0,
-				LpRecoveryItem:                 []model.LpRecoveryItem{},
-			},
-			Birth: model.Birth{
-				BirthMonth: 10,
-				BirthDay:   18,
-			},
-			ServerTimestamp: time.Now().Unix(),
-		},
-		ReleaseInfo: []any{},
-		StatusCode:  200,
-	}
-
-	ss.Respond(userResp)
-}
diff --git a/internal/handler/webui/login.go b/internal/handler/webui/login.go
new file mode 100644
index 0000000..4622641
--- /dev/null
+++ b/internal/handler/webui/login.go
@@ -0,0 +1,61 @@
+package webui
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/webui"
+	"honoka-chan/internal/utils"
+	"honoka-chan/pkg/db"
+	"net/http"
+
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-gonic/gin"
+	"github.com/go-think/openssl"
+)
+
+func login(ctx *gin.Context) {
+	area := ctx.PostForm("area")
+	user := ctx.PostForm("user")
+	pass := ctx.PostForm("pass")
+	if area == "" || user == "" || pass == "" {
+		ctx.JSON(http.StatusOK, webui.Msg{
+			Code:     1,
+			Message:  "参数不完整！",
+			Redirect: "",
+		})
+		return
+	}
+
+	userName := " " + area + "-" + user
+	var userId int
+	exists, err := db.UserEng.Table("users").Where("phone = ? AND password = ?", userName, openssl.Md5ToString(pass)).Cols("user_id").Get(&userId)
+	utils.CheckErr(err)
+	if !exists {
+		ctx.JSON(http.StatusOK, webui.Msg{
+			Code:     1,
+			Message:  "账号不存在或者密码有误！",
+			Redirect: "",
+		})
+		return
+	}
+
+	session := sessions.Default(ctx)
+	session.Options(sessions.Options{
+		MaxAge: 3600 * 24,
+	})
+	session.Set("userid", userId)
+	session.Save()
+
+	ctx.JSON(http.StatusOK, webui.Msg{
+		Code:     0,
+		Message:  "登录成功！",
+		Redirect: "/admin/index",
+	})
+}
+
+func init() {
+	router.AddHandler("admin", "GET", "/login", middleware.WebAuth, func(ctx *gin.Context) {
+		ctx.HTML(http.StatusOK, "admin/login.html", gin.H{})
+	})
+	router.AddHandler("admin", "POST", "/login", middleware.WebAuth, login)
+}
diff --git a/internal/handler/webui/logout.go b/internal/handler/webui/logout.go
new file mode 100644
index 0000000..9b7ca37
--- /dev/null
+++ b/internal/handler/webui/logout.go
@@ -0,0 +1,26 @@
+package webui
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"net/http"
+
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-gonic/gin"
+)
+
+func logout(ctx *gin.Context) {
+	session := sessions.Default(ctx)
+	session.Clear()
+	session.Options(sessions.Options{
+		Path:   "/admin",
+		MaxAge: -1,
+	})
+	session.Save()
+
+	ctx.Redirect(http.StatusFound, "/admin/login")
+}
+
+func init() {
+	router.AddHandler("admin", "GET", "/logout", middleware.WebAuth, logout)
+}
diff --git a/internal/handler/webui.go b/internal/handler/webui/upload.go
similarity index 72%
rename from internal/handler/webui.go
rename to internal/handler/webui/upload.go
index 8d9b62e..27a3381 100644
--- a/internal/handler/webui.go
+++ b/internal/handler/webui/upload.go
@@ -1,19 +1,20 @@
-package handler
+package webui
 
 import (
 	"encoding/csv"
-	"honoka-chan/internal/model"
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"honoka-chan/internal/schema/api/profile"
 	"honoka-chan/internal/utils"
 	"honoka-chan/pkg/db"
 	"net/http"
 	"os"
 	"path"
 	"strconv"
+	"strings"
 	"time"
 
-	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-	"github.com/go-think/openssl"
 )
 
 type ErrMsg struct {
@@ -21,59 +22,7 @@ type ErrMsg struct {
 	Msg   string `json:"msg"`
 }
 
-func WebLogin(ctx *gin.Context) {
-	area := ctx.PostForm("area")
-	user := ctx.PostForm("user")
-	pass := ctx.PostForm("pass")
-	if area == "" || user == "" || pass == "" {
-		ctx.JSON(http.StatusOK, model.Msg{
-			Code:     1,
-			Message:  "参数不完整！",
-			Redirect: "",
-		})
-		return
-	}
-
-	userName := " " + area + "-" + user
-	var userId int
-	exists, err := db.UserEng.Table("users").Where("phone = ? AND password = ?", userName, openssl.Md5ToString(pass)).Cols("userid").Get(&userId)
-	utils.CheckErr(err)
-	if !exists {
-		ctx.JSON(http.StatusOK, model.Msg{
-			Code:     1,
-			Message:  "账号不存在或者密码有误！",
-			Redirect: "",
-		})
-		return
-	}
-
-	session := sessions.Default(ctx)
-	session.Options(sessions.Options{
-		MaxAge: 3600 * 24,
-	})
-	session.Set("userid", userId)
-	session.Save()
-
-	ctx.JSON(http.StatusOK, model.Msg{
-		Code:     0,
-		Message:  "登录成功！",
-		Redirect: "/admin/index",
-	})
-}
-
-func WebLogout(ctx *gin.Context) {
-	session := sessions.Default(ctx)
-	session.Clear()
-	session.Options(sessions.Options{
-		Path:   "/admin",
-		MaxAge: -1,
-	})
-	session.Save()
-
-	ctx.Redirect(http.StatusFound, "/admin/login")
-}
-
-func Upload(ctx *gin.Context) {
+func upload(ctx *gin.Context) {
 	file, err := ctx.FormFile("file")
 	utils.CheckErr(err)
 
@@ -155,7 +104,7 @@ func Upload(ctx *gin.Context) {
 			skillExp = 29900
 		}
 
-		unitData := model.UnitData{
+		unitData := profile.UnitData{
 			UserID:                      ctx.GetInt("userid"),
 			UnitID:                      unitId,
 			Exp:                         unitExp + diffExp,
@@ -182,7 +131,7 @@ func Upload(ctx *gin.Context) {
 			InsertDate:                  time.Now().Format("2006-01-02 03:04:05"),
 		}
 
-		_, err = session.Table("user_unit_m").Insert(&unitData)
+		_, err = session.Table("user_unit").Insert(&unitData)
 		if err != nil {
 			session.Rollback()
 			panic(err)
@@ -196,3 +145,13 @@ func Upload(ctx *gin.Context) {
 
 	ctx.JSON(http.StatusOK, ErrMsg{Error: 0, Msg: "上传成功！"})
 }
+
+func init() {
+	router.AddHandler("admin", "GET", "/upload", middleware.WebAuth, func(ctx *gin.Context) {
+		ctx.HTML(http.StatusOK, "admin/upload.html", gin.H{
+			"menu": 1,
+			"url":  strings.Split(ctx.Request.URL.String(), "?")[0],
+		})
+	})
+	router.AddHandler("admin", "POST", "/upload", middleware.WebAuth, upload)
+}
diff --git a/internal/handler/webui/webui.go b/internal/handler/webui/webui.go
new file mode 100644
index 0000000..289c329
--- /dev/null
+++ b/internal/handler/webui/webui.go
@@ -0,0 +1,28 @@
+package webui
+
+import (
+	"honoka-chan/internal/middleware"
+	"honoka-chan/internal/router"
+	"net/http"
+	"strings"
+
+	"github.com/gin-gonic/gin"
+)
+
+func card(ctx *gin.Context) {
+	ctx.HTML(http.StatusOK, "admin/card.html", gin.H{
+		"menu": 1,
+		"url":  strings.Split(ctx.Request.URL.String(), "?")[0],
+	})
+}
+
+func index(ctx *gin.Context) {
+	ctx.HTML(http.StatusOK, "admin/index.html", gin.H{
+		"url": strings.Split(ctx.Request.URL.String(), "?")[0],
+	})
+}
+
+func init() {
+	router.AddHandler("admin", "GET", "/card", middleware.WebAuth, card)
+	router.AddHandler("admin", "GET", "/index", middleware.WebAuth, index)
+}
diff --git a/internal/middleware/authkey.go b/internal/middleware/authkey.go
deleted file mode 100644
index 446e187..0000000
--- a/internal/middleware/authkey.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package middleware
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"honoka-chan/internal/utils"
-	"honoka-chan/pkg/db"
-	"honoka-chan/pkg/encrypt"
-	honokautils "honoka-chan/pkg/utils"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/tidwall/gjson"
-)
-
-func AuthKey(ctx *gin.Context) {
-	req := gjson.Parse(ctx.PostForm("request_data"))
-	tDummyToken, err := base64.StdEncoding.DecodeString(req.Get("dummy_token").String())
-	utils.CheckErr(err)
-	dummyToken := encrypt.RSADecrypt(tDummyToken)
-
-	// aesKey := dummyToken[0:16]
-	// tAuthData, err := base64.StdEncoding.DecodeString(req.Get("auth_data").String())
-	// utils.CheckErr(err)
-	// authData := utils.Sub16(encrypt.AES_CBC_Decrypt(tAuthData, aesKey))
-	// fmt.Println(string(authData))
-
-	clientToken := base64.StdEncoding.EncodeToString(dummyToken)
-	serverToken := base64.StdEncoding.EncodeToString([]byte(honokautils.RandomStr(32)))
-	authorizeToken := base64.StdEncoding.EncodeToString([]byte(honokautils.RandomStr(32)))
-
-	ctx.Set("dummy_token", serverToken)
-	ctx.Set("authorize_token", authorizeToken)
-
-	authJson, err := json.Marshal(map[string]any{
-		"client_token": clientToken,
-		"server_token": serverToken,
-	})
-	utils.CheckErr(err)
-	err = db.DB.Set([]byte(authorizeToken), authJson)
-	utils.CheckErr(err)
-
-	nonce := ctx.GetInt("nonce")
-	nonce++
-	ctx.Set("nonce", nonce)
-
-	authorize := fmt.Sprintf("consumerKey=lovelive_test&timeStamp=%d&version=1.1&nonce=%d&requestTimeStamp=%d", time.Now().Unix(), nonce, ctx.GetInt64("req_time"))
-
-	ctx.Header("user_id", "")
-	ctx.Header("authorize", authorize)
-
-	ctx.Next()
-}
diff --git a/internal/middleware/common.go b/internal/middleware/common.go
index d6c1247..d5ebec5 100644
--- a/internal/middleware/common.go
+++ b/internal/middleware/common.go
@@ -2,8 +2,7 @@ package middleware
 
 import (
 	"fmt"
-	"honoka-chan/internal/utils"
-	"honoka-chan/pkg/db"
+	"honoka-chan/internal/session"
 	"net/http"
 	"net/url"
 	"strconv"
@@ -12,64 +11,49 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
-var (
-	ErrorMsg = `{"code":20001,"message":""}`
-)
-
-func CheckErr(err error) {
+func CheckErr(ctx *gin.Context, err error) bool {
 	if err != nil {
-		panic(err)
+		ctx.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{
+			"code":    20001,
+			"message": err.Error(),
+		})
 	}
+	return err != nil
 }
 
 func Common(ctx *gin.Context) {
-	ctx.Set("req_time", time.Now().Unix())
-
-	authorize := ctx.Request.Header.Get("Authorize")
-	if authorize == "" {
-		ctx.String(http.StatusForbidden, ErrorMsg)
-		ctx.Abort()
+	reqData := ""
+	if form, err := ctx.MultipartForm(); err == nil {
+		if v, ok := form.Value["request_data"]; ok && len(v) > 0 {
+			reqData = v[0]
+		}
 	}
-	ctx.Set("authorize", authorize)
+	if reqData == "" {
+		reqData = ctx.PostForm("request_data")
+	}
+	ctx.Set("request_data", reqData)
 
+	uid := ctx.GetHeader("User-ID")
+	ctx.Set("userid", uid)
+
+	ss := session.New(ctx)
+	ctx.Set("session", ss)
+
+	authorize := ctx.GetHeader("Authorize")
 	params, err := url.ParseQuery(authorize)
-	utils.CheckErr(err)
+	if CheckErr(ctx, err) {
+		return
+	}
 
-	nonce, err := strconv.Atoi(params.Get("nonce"))
-	utils.CheckErr(err)
+	nonce, _ := strconv.Atoi(params.Get("nonce"))
 	nonce++
 	ctx.Set("nonce", nonce)
 
 	token := params.Get("token")
 	ctx.Set("token", token)
 
-	if ctx.Request.URL.String() == "/main.php/login/authkey" ||
-		ctx.Request.URL.String() == "/main.php/login/login" {
-		// 特殊请求
-		fmt.Println("========")
-	} else {
-		userId := ctx.Request.Header.Get("User-ID")
-		if userId == "" {
-			ctx.String(http.StatusForbidden, ErrorMsg)
-			ctx.Abort()
-		}
-		ctx.Set("userid", userId)
-
-		rToken, err := db.DB.Get([]byte(userId))
-		utils.CheckErr(err)
-		if token != string(rToken) {
-			ctx.String(http.StatusForbidden, ErrorMsg)
-			ctx.Abort()
-		}
-
-		if !db.MatchTokenUid(token, userId) {
-			ctx.String(http.StatusForbidden, ErrorMsg)
-			ctx.Abort()
-		}
-
-		ctx.Header("user_id", userId)
-		ctx.Header("authorize", fmt.Sprintf("consumerKey=lovelive_test&timeStamp=%d&version=1.1&token=%s&nonce=%d&user_id=%s&requestTimeStamp=%d", time.Now().Unix(), token, nonce, userId, time.Now().Unix()))
-	}
+	ctx.Header("user_id", uid)
+	ctx.Header("authorize", fmt.Sprintf("consumerKey=lovelive_test&timeStamp=%d&version=1.1&token=%s&nonce=%d&user_id=%s&requestTimeStamp=%d", time.Now().Unix(), token, nonce, uid, time.Now().Unix()))
 
 	ctx.Header("Content-Type", "application/json; charset=utf-8")
 	ctx.Header("X-Powered-By", "KLab Native APP Platform")
diff --git a/internal/middleware/login.go b/internal/middleware/login.go
deleted file mode 100644
index 92068e6..0000000
--- a/internal/middleware/login.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package middleware
-
-import (
-	"encoding/base64"
-	"honoka-chan/internal/utils"
-	"honoka-chan/pkg/db"
-	"honoka-chan/pkg/encrypt"
-	honokautils "honoka-chan/pkg/utils"
-
-	"github.com/gin-gonic/gin"
-	"github.com/tidwall/gjson"
-)
-
-func Login(ctx *gin.Context) {
-	authData, err := db.DB.Get([]byte(ctx.GetString("token")))
-	utils.CheckErr(err)
-
-	clientToken, err := base64.StdEncoding.DecodeString(gjson.Get(string(authData), "client_token").String())
-	utils.CheckErr(err)
-	serverToken, err := base64.StdEncoding.DecodeString(gjson.Get(string(authData), "server_token").String())
-	utils.CheckErr(err)
-
-	xmcKey := honokautils.SliceXor(clientToken, serverToken)
-	aesKey := xmcKey[0:16]
-
-	req := gjson.Parse(ctx.GetString("request_data"))
-	tKey, err := base64.StdEncoding.DecodeString(req.Get("login_key").String())
-	utils.CheckErr(err)
-	loginKey := honokautils.Sub16(encrypt.AESCBCDecrypt(tKey, aesKey))
-	ctx.Set("login_key", string(loginKey))
-
-	tPasswd, err := base64.StdEncoding.DecodeString(req.Get("login_passwd").String())
-	utils.CheckErr(err)
-	loginPasswd := honokautils.Sub16(encrypt.AESCBCDecrypt(tPasswd, aesKey))
-	ctx.Set("login_passwd", string(loginPasswd))
-
-	nonce := ctx.GetInt("nonce")
-	nonce++
-	ctx.Set("nonce", nonce)
-
-	authorizeToken := base64.StdEncoding.EncodeToString([]byte(honokautils.RandomStr(32)))
-	ctx.Set("authorize_token", authorizeToken)
-
-	ctx.Next()
-}
diff --git a/internal/middleware/multipart.go b/internal/middleware/multipart.go
deleted file mode 100644
index 7327b63..0000000
--- a/internal/middleware/multipart.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package middleware
-
-import (
-	"honoka-chan/internal/utils"
-	"io"
-	"mime/multipart"
-	"strings"
-
-	"github.com/gin-gonic/gin"
-)
-
-func ParseMultipartForm(ctx *gin.Context) {
-	// I don't know why mime.ParseMediaType() is failed
-	// mime.ParseMediaType(ctx.Request.Header.Get("Content-Type"))
-	boundary := strings.ReplaceAll(ctx.Request.Header.Get("Content-Type"), "multipart/form-data; boundary=", "")
-
-	var reqData []byte
-	mReader := multipart.NewReader(ctx.Request.Body, boundary)
-	for {
-		part, err := mReader.NextPart()
-		if err == io.EOF {
-			break
-		}
-		utils.CheckErr(err)
-
-		data, err := io.ReadAll(part)
-		utils.CheckErr(err)
-
-		reqData = data
-	}
-	ctx.Set("request_data", string(reqData))
-
-	ctx.Next()
-}
diff --git a/internal/model/album.go b/internal/model/album.go
deleted file mode 100644
index 64207f3..0000000
--- a/internal/model/album.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package model
-
-// AlbumResult ...
-type AlbumResult struct {
-	UnitID             int  `json:"unit_id"`
-	RankMaxFlag        bool `json:"rank_max_flag"`
-	LoveMaxFlag        bool `json:"love_max_flag"`
-	RankLevelMaxFlag   bool `json:"rank_level_max_flag"`
-	AllMaxFlag         bool `json:"all_max_flag"`
-	HighestLovePerUnit int  `json:"highest_love_per_unit"`
-	TotalLove          int  `json:"total_love"`
-	FavoritePoint      int  `json:"favorite_point"`
-	SignFlag           bool `json:"sign_flag"`
-}
-
-// AlbumResp ...
-type AlbumResp struct {
-	Result     []AlbumResult `json:"result"`
-	Status     int           `json:"status"`
-	CommandNum bool          `json:"commandNum"`
-	TimeStamp  int64         `json:"timeStamp"`
-}
-
-// AlbumSeriesRes ...
-type AlbumSeriesRes struct {
-	SeriesID int           `json:"series_id"`
-	UnitList []AlbumResult `json:"unit_list"`
-}
-
-// AlbumSeriesResp ...
-type AlbumSeriesResp struct {
-	ResponseData []AlbumSeriesRes `json:"response_data"`
-	ReleaseInfo  []any            `json:"release_info"`
-	StatusCode   int              `json:"status_code"`
-}
diff --git a/internal/model/announce.go b/internal/model/announce.go
deleted file mode 100644
index e164268..0000000
--- a/internal/model/announce.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package model
-
-// AnnounceResp ...
-type AnnounceResp struct {
-	ResponseData AnnounceRes `json:"response_data"`
-	ReleaseInfo  []any       `json:"release_info"`
-	StatusCode   int         `json:"status_code"`
-}
-
-// AnnounceRes ...
-type AnnounceRes struct {
-	HasUnreadAnnounce bool  `json:"has_unread_announce"`
-	ServerTimestamp   int64 `json:"server_timestamp"`
-}
diff --git a/internal/model/authkey.go b/internal/model/authkey.go
deleted file mode 100644
index da97f47..0000000
--- a/internal/model/authkey.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package model
-
-// AuthKeyRes ...
-type AuthKeyRes struct {
-	AuthorizeToken string `json:"authorize_token"`
-	DummyToken     string `json:"dummy_token"`
-}
-
-// AuthKeyResp ...
-type AuthKeyResp struct {
-	ResponseData AuthKeyRes `json:"response_data"`
-	ReleaseInfo  []any      `json:"release_info"`
-	StatusCode   int        `json:"status_code"`
-}
diff --git a/internal/model/award.go b/internal/model/award.go
deleted file mode 100644
index 8b988b9..0000000
--- a/internal/model/award.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package model
-
-// AwardSetResp ...
-type AwardSetResp struct {
-	ResponseData []any `json:"response_data"`
-	ReleaseInfo  []any `json:"release_info"`
-	StatusCode   int   `json:"status_code"`
-}
-
-// AwardInfo ...
-type AwardInfo struct {
-	AwardID    int    `json:"award_id"`
-	IsSet      bool   `json:"is_set"`
-	InsertDate string `json:"insert_date"`
-}
-
-// AwardInfoRes ...
-type AwardInfoRes struct {
-	AwardInfo []AwardInfo `json:"award_info"`
-}
-
-// AwardInfoResp ...
-type AwardInfoResp struct {
-	Result     AwardInfoRes `json:"result"`
-	Status     int          `json:"status"`
-	CommandNum bool         `json:"commandNum"`
-	TimeStamp  int64        `json:"timeStamp"`
-}
diff --git a/internal/model/background.go b/internal/model/background.go
deleted file mode 100644
index 29cb9d2..0000000
--- a/internal/model/background.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package model
-
-// BackgroundSetResp ...
-type BackgroundSetResp struct {
-	ResponseData []any `json:"response_data"`
-	ReleaseInfo  []any `json:"release_info"`
-	StatusCode   int   `json:"status_code"`
-}
-
-// BackgroundInfo ...
-type BackgroundInfo struct {
-	BackgroundID int    `json:"background_id"`
-	IsSet        bool   `json:"is_set"`
-	InsertDate   string `json:"insert_date"`
-}
-
-// BackgroundInfoRes ...
-type BackgroundInfoRes struct {
-	BackgroundInfo []BackgroundInfo `json:"background_info"`
-}
-
-// BackgroundInfoResp ...
-type BackgroundInfoResp struct {
-	Result     BackgroundInfoRes `json:"result"`
-	Status     int               `json:"status"`
-	CommandNum bool              `json:"commandNum"`
-	TimeStamp  int64             `json:"timeStamp"`
-}
diff --git a/internal/model/costume.go b/internal/model/costume.go
deleted file mode 100644
index 9ce14b7..0000000
--- a/internal/model/costume.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package model
-
-// CostumeList ...
-type CostumeList struct {
-	UnitID    int  `json:"unit_id"`
-	IsRankMax bool `json:"is_rank_max"`
-	IsSigned  bool `json:"is_signed"`
-}
-
-// CostumeListRes ...
-type CostumeListRes struct {
-	CostumeList []CostumeList `json:"costume_list"`
-}
-
-// CostumeListResp ...
-type CostumeListResp struct {
-	Result     CostumeListRes `json:"result"`
-	Status     int            `json:"status"`
-	CommandNum bool           `json:"commandNum"`
-	TimeStamp  int64          `json:"timeStamp"`
-}
diff --git a/internal/model/download.go b/internal/model/download.go
deleted file mode 100644
index a21984b..0000000
--- a/internal/model/download.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package model
-
-// AdditionalReq ...
-type AdditionalReq struct {
-	Module      string `json:"module"`
-	Mgd         int    `json:"mgd"`
-	Action      string `json:"action"`
-	TimeStamp   int    `json:"timeStamp"`
-	PackageID   int    `json:"package_id"`
-	TargetOs    string `json:"target_os"`
-	PackageType int    `json:"package_type"`
-	CommandNum  string `json:"commandNum"`
-}
-
-// AdditionalRes ...
-type AdditionalRes struct {
-	Size int    `json:"size"`
-	URL  string `json:"url"`
-}
-
-// AdditionalResp ...
-type AdditionalResp struct {
-	ResponseData []AdditionalRes `json:"response_data"`
-	ReleaseInfo  []any           `json:"release_info"`
-	StatusCode   int             `json:"status_code"`
-}
-
-// BatchReq ...
-type BatchReq struct {
-	ClientVersion      string `json:"client_version"`
-	Os                 string `json:"os"`
-	PackageType        int    `json:"package_type"`
-	ExcludedPackageIds []int  `json:"excluded_package_ids"`
-	CommandNum         string `json:"commandNum"`
-}
-
-// BatchRes ...
-type BatchRes struct {
-	Size int    `json:"size"`
-	URL  string `json:"url"`
-}
-
-// BatchResp ...
-type BatchResp struct {
-	ResponseData []BatchRes `json:"response_data"`
-	ReleaseInfo  []any      `json:"release_info"`
-	StatusCode   int        `json:"status_code"`
-}
-
-// UpdateReq ...
-type UpdateReq struct {
-	Module          string `json:"module"`
-	TargetOs        string `json:"target_os"`
-	InstallVersion  string `json:"install_version"`
-	TimeStamp       int    `json:"timeStamp"`
-	Action          string `json:"action"`
-	PackageList     []any  `json:"package_list"`
-	CommandNum      string `json:"commandNum"`
-	ExternalVersion string `json:"external_version"`
-}
-
-// UpdateRes ...
-type UpdateRes struct {
-	Size    int    `json:"size"`
-	URL     string `json:"url"`
-	Version string `json:"version"`
-}
-
-// UpdateResp ...
-type UpdateResp struct {
-	ResponseData []UpdateRes `json:"response_data"`
-	ReleaseInfo  []any       `json:"release_info"`
-	StatusCode   int         `json:"status_code"`
-}
-
-// UrlReq ...
-type UrlReq struct {
-	Module   string   `json:"module"`
-	Os       string   `json:"os"`
-	Mgd      int      `json:"mgd"`
-	PathList []string `json:"path_list"`
-	Action   string   `json:"action"`
-}
-
-// UrlRes ...
-type UrlRes struct {
-	UrlList []string `json:"url_list"`
-}
-
-// UrlResp ...
-type UrlResp struct {
-	ResponseData UrlRes `json:"response_data"`
-	ReleaseInfo  []any  `json:"release_info"`
-	StatusCode   int    `json:"status_code"`
-}
-
-// EventResp ...
-type EventResp struct {
-	ResponseData []any `json:"response_data"`
-	ReleaseInfo  []any `json:"release_info"`
-	StatusCode   int   `json:"status_code"`
-}
diff --git a/internal/model/event.go b/internal/model/event.go
deleted file mode 100644
index 49417ea..0000000
--- a/internal/model/event.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package model
-
-// EventsResp ...
-type EventsResp struct {
-	ResponseData EventsRes `json:"response_data"`
-	ReleaseInfo  []any     `json:"release_info"`
-	StatusCode   int       `json:"status_code"`
-}
-
-// EventsRes ...
-type EventsRes struct {
-	TargetList      []TargetList `json:"target_list"`
-	ServerTimestamp int64        `json:"server_timestamp"`
-}
-
-// TargetList ...
-type TargetList struct {
-	Position      int  `json:"position"`
-	IsDisplayable bool `json:"is_displayable"`
-}
diff --git a/internal/model/exchange.go b/internal/model/exchange.go
deleted file mode 100644
index 4861be1..0000000
--- a/internal/model/exchange.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package model
-
-// ExchangePointList ...
-type ExchangePointList struct {
-	Rarity        int `json:"rarity"`
-	ExchangePoint int `json:"exchange_point"`
-}
-
-// ExchangePointRes ...
-type ExchangePointRes struct {
-	ExchangePointList []ExchangePointList `json:"exchange_point_list"`
-}
-
-// ExchangePointResp ...
-type ExchangePointResp struct {
-	Result     ExchangePointRes `json:"result"`
-	Status     int              `json:"status"`
-	CommandNum bool             `json:"commandNum"`
-	TimeStamp  int64            `json:"timeStamp"`
-}
diff --git a/internal/model/lbonus.go b/internal/model/lbonus.go
deleted file mode 100644
index 3456a4c..0000000
--- a/internal/model/lbonus.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package model
-
-// LbDayItem ...
-type LbDayItem struct {
-	ItemID  int `json:"item_id"`
-	AddType int `json:"add_type"`
-	Amount  int `json:"amount"`
-}
-
-// LbDays ...
-type LbDays struct {
-	Day               int       `json:"day"`
-	DayOfTheWeek      int       `json:"day_of_the_week"`
-	SpecialDay        bool      `json:"special_day"`
-	SpecialImageAsset string    `json:"special_image_asset"`
-	Received          bool      `json:"received"`
-	AdReceived        bool      `json:"ad_received"`
-	Item              LbDayItem `json:"item"`
-}
-
-// LbMonth ...
-type LbMonth struct {
-	Year  int      `json:"year"`
-	Month int      `json:"month"`
-	Days  []LbDays `json:"days"`
-}
-
-// CalendarInfo ...
-type CalendarInfo struct {
-	CurrentDate  string  `json:"current_date"`
-	CurrentMonth LbMonth `json:"current_month"`
-	NextMonth    LbMonth `json:"next_month"`
-}
-
-// Reward ...
-type Reward struct {
-	ItemID  int `json:"item_id"`
-	AddType int `json:"add_type"`
-	Amount  int `json:"amount"`
-}
-
-// TotalLoginInfo ...
-type TotalLoginInfo struct {
-	LoginCount     int      `json:"login_count"`
-	RemainingCount int      `json:"remaining_count"`
-	Reward         []Reward `json:"reward"`
-}
-
-// LbRankInfo ...
-type LbRankInfo struct {
-	BeforeClassRankID int    `json:"before_class_rank_id"`
-	AfterClassRankID  int    `json:"after_class_rank_id"`
-	RankUpDate        string `json:"rank_up_date"`
-}
-
-// LbClassSystem ...
-type LbClassSystem struct {
-	RankInfo     LbRankInfo `json:"rank_info"`
-	CompleteFlag bool       `json:"complete_flag"`
-	IsOpened     bool       `json:"is_opened"`
-	IsVisible    bool       `json:"is_visible"`
-}
-
-// LbRes ...
-type LbRes struct {
-	Sheets            []any          `json:"sheets"`
-	CalendarInfo      CalendarInfo   `json:"calendar_info"`
-	TotalLoginInfo    TotalLoginInfo `json:"total_login_info"`
-	LicenseLbonusList []any          `json:"license_lbonus_list"`
-	ClassSystem       LbClassSystem  `json:"class_system"`
-	StartDashSheets   []any          `json:"start_dash_sheets"`
-	EffortPoint       []EffortPoint  `json:"effort_point"`
-	LimitedEffortBox  []any          `json:"limited_effort_box"`
-	MuseumInfo        Museum         `json:"museum_info"`
-	ServerTimestamp   int64          `json:"server_timestamp"`
-	PresentCnt        int            `json:"present_cnt"`
-}
-
-// LbResp ...
-type LbResp struct {
-	ResponseData LbRes `json:"response_data"`
-	ReleaseInfo  []any `json:"release_info"`
-	StatusCode   int   `json:"status_code"`
-}
diff --git a/internal/model/multiunit.go b/internal/model/multiunit.go
deleted file mode 100644
index f9d9bc0..0000000
--- a/internal/model/multiunit.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package model
-
-// MultiUnitScenarioChapterList ...
-type MultiUnitScenarioChapterList struct {
-	MultiUnitScenarioID int `json:"multi_unit_scenario_id"`
-	Chapter             int `json:"chapter"`
-	Status              int `json:"status"`
-}
-
-// MultiUnitScenarioStatusList ...
-type MultiUnitScenarioStatusList struct {
-	MultiUnitID               int                            `json:"multi_unit_id"`
-	Status                    int                            `json:"status"`
-	MultiUnitScenarioBtnAsset string                         `json:"multi_unit_scenario_btn_asset"`
-	OpenDate                  string                         `json:"open_date"`
-	ChapterList               []MultiUnitScenarioChapterList `json:"chapter_list"`
-}
-
-// MultiUnitScenarioStatusRes ...
-type MultiUnitScenarioStatusRes struct {
-	MultiUnitScenarioStatusList  []MultiUnitScenarioStatusList `json:"multi_unit_scenario_status_list"`
-	UnlockedMultiUnitScenarioIds []any                         `json:"unlocked_multi_unit_scenario_ids"`
-}
-
-// MultiUnitScenarioStatusResp ...
-type MultiUnitScenarioStatusResp struct {
-	Result     MultiUnitScenarioStatusRes `json:"result"`
-	Status     int                        `json:"status"`
-	CommandNum bool                       `json:"commandNum"`
-	TimeStamp  int64                      `json:"timeStamp"`
-}
-
-// MultiUnitStartUpResp ...
-type MultiUnitStartUpResp struct {
-	ResponseData MultiUnitStartUpRes `json:"response_data"`
-	ReleaseInfo  []any               `json:"release_info"`
-	StatusCode   int                 `json:"status_code"`
-}
-
-// MultiUnitStartUpRes ...
-type MultiUnitStartUpRes struct {
-	MultiUnitScenarioID int   `json:"multi_unit_scenario_id"`
-	ScenarioAdjustment  int   `json:"scenario_adjustment"`
-	ServerTimestamp     int64 `json:"server_timestamp"`
-}
-
-// MultiUnitStartUpReq ...
-type MultiUnitStartUpReq struct {
-	Module              string `json:"module"`
-	Action              string `json:"action"`
-	TimeStamp           int    `json:"timeStamp"`
-	Mgd                 int    `json:"mgd"`
-	MultiUnitScenarioID int    `json:"multi_unit_scenario_id"`
-	CommandNum          string `json:"commandNum"`
-}
diff --git a/internal/model/museum.go b/internal/model/museum.go
deleted file mode 100644
index 6db77cc..0000000
--- a/internal/model/museum.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package model
-
-// MuseumResp ...
-type MuseumResp struct {
-	ResponseData MuseumRes `json:"response_data"`
-	ReleaseInfo  []any     `json:"release_info"`
-	StatusCode   int       `json:"status_code"`
-}
-
-// MuseumParameter ...
-type MuseumParameter struct {
-	Smile int `json:"smile"`
-	Pure  int `json:"pure"`
-	Cool  int `json:"cool"`
-}
-
-// Museum ...
-type Museum struct {
-	Parameter      MuseumParameter `json:"parameter"`
-	ContentsIDList []int           `json:"contents_id_list"`
-}
-
-// MuseumRes ...
-type MuseumRes struct {
-	MuseumInfo      Museum `json:"museum_info"`
-	ServerTimestamp int64  `json:"server_timestamp"`
-}
-
-// MuseumInfoRes ...
-type MuseumInfoRes struct {
-	MuseumInfo Museum `json:"museum_info"`
-}
-
-// MuseumInfoResp ...
-type MuseumInfoResp struct {
-	Result     MuseumInfoRes `json:"result"`
-	Status     int           `json:"status"`
-	CommandNum bool          `json:"commandNum"`
-	TimeStamp  int64         `json:"timeStamp"`
-}
diff --git a/internal/model/navigation.go b/internal/model/navigation.go
deleted file mode 100644
index 366c099..0000000
--- a/internal/model/navigation.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package model
-
-// SpecialCutinRes ...
-type SpecialCutinRes struct {
-	SpecialCutinList []any `json:"special_cutin_list"`
-}
-
-// SpecialCutinResp ...
-type SpecialCutinResp struct {
-	Result     SpecialCutinRes `json:"result"`
-	Status     int             `json:"status"`
-	CommandNum bool            `json:"commandNum"`
-	TimeStamp  int64           `json:"timeStamp"`
-}
diff --git a/internal/model/notice.go b/internal/model/notice.go
deleted file mode 100644
index 7e56681..0000000
--- a/internal/model/notice.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package model
-
-// NoticeFriendVarietyResp ...
-type NoticeFriendVarietyResp struct {
-	ResponseData NoticeFriendVarietyRes `json:"response_data"`
-	ReleaseInfo  []any                  `json:"release_info"`
-	StatusCode   int                    `json:"status_code"`
-}
-
-// NoticeFriendVarietyRes ...
-type NoticeFriendVarietyRes struct {
-	ItemCount       int   `json:"item_count"`
-	NoticeList      []any `json:"notice_list"`
-	ServerTimestamp int64 `json:"server_timestamp"`
-}
-
-// NoticeFriendGreetingResp ...
-type NoticeFriendGreetingResp struct {
-	ResponseData NoticeFriendGreetingRes `json:"response_data"`
-	ReleaseInfo  []any                   `json:"release_info"`
-	StatusCode   int                     `json:"status_code"`
-}
-
-// NoticeFriendGreetingRes ...
-type NoticeFriendGreetingRes struct {
-	NextId          int   `json:"next_id"`
-	NoticeList      []any `json:"notice_list"`
-	ServerTimestamp int64 `json:"server_timestamp"`
-}
-
-// NoticeUserGreetingResp ...
-type NoticeUserGreetingResp struct {
-	ResponseData NoticeUserGreetingRes `json:"response_data"`
-	ReleaseInfo  []any                 `json:"release_info"`
-	StatusCode   int                   `json:"status_code"`
-}
-
-// NoticeUserGreetingRes ...
-type NoticeUserGreetingRes struct {
-	ItemCount       int   `json:"item_count"`
-	HasNext         bool  `json:"has_next"`
-	NoticeList      []any `json:"notice_list"`
-	ServerTimestamp int64 `json:"server_timestamp"`
-}
-
-// NoticeMarqueeRes ...
-type NoticeMarqueeRes struct {
-	ItemCount   int   `json:"item_count"`
-	MarqueeList []any `json:"marquee_list"`
-}
-
-// NoticeMarqueeResp ...
-type NoticeMarqueeResp struct {
-	Result     NoticeMarqueeRes `json:"result"`
-	Status     int              `json:"status"`
-	CommandNum bool             `json:"commandNum"`
-	TimeStamp  int64            `json:"timeStamp"`
-}
diff --git a/internal/model/payment.go b/internal/model/payment.go
deleted file mode 100644
index d7cd36c..0000000
--- a/internal/model/payment.go
+++ /dev/null
@@ -1,154 +0,0 @@
-package model
-
-// RestrictionInfo ...
-type RestrictionInfo struct {
-	Restricted bool `json:"restricted"`
-}
-
-// UnderAgeInfo ...
-type UnderAgeInfo struct {
-	BirthSet    bool `json:"birth_set"`
-	HasLimit    bool `json:"has_limit"`
-	LimitAmount any  `json:"limit_amount"`
-	MonthUsed   int  `json:"month_used"`
-}
-
-// SnsProductItemList ...
-type SnsProductItemList struct {
-	ItemID    int  `json:"item_id"`
-	AddType   int  `json:"add_type"`
-	Amount    int  `json:"amount"`
-	IsFreebie bool `json:"is_freebie"`
-}
-
-// SnsProductList ...
-type SnsProductList struct {
-	ProductID   string               `json:"product_id"`
-	Name        string               `json:"name"`
-	Price       int                  `json:"price"`
-	CanBuy      bool                 `json:"can_buy"`
-	ProductType int                  `json:"product_type"`
-	ItemList    []SnsProductItemList `json:"item_list"`
-}
-
-// ProductItemList ...
-type ProductItemList struct {
-	ItemID    int  `json:"item_id"`
-	AddType   int  `json:"add_type"`
-	Amount    int  `json:"amount"`
-	IsFreebie bool `json:"is_freebie"`
-	IsRankMax bool `json:"is_rank_max,omitempty"`
-}
-
-// LimitStatus ...
-type LimitStatus struct {
-	TermStartDate  string `json:"term_start_date"`
-	RemainingTime  string `json:"remaining_time"`
-	RemainingCount int    `json:"remaining_count"`
-}
-
-// ProductList ...
-type ProductList struct {
-	ProductID      string            `json:"product_id"`
-	Name           string            `json:"name"`
-	BannerImgAsset string            `json:"banner_img_asset"`
-	Price          int               `json:"price"`
-	CanBuy         bool              `json:"can_buy"`
-	ProductType    int               `json:"product_type"`
-	AnnounceURL    string            `json:"announce_url"`
-	ConfirmURL     string            `json:"confirm_url"`
-	ItemList       []ProductItemList `json:"item_list"`
-	LimitStatus    LimitStatus       `json:"limit_status"`
-}
-
-// SubscriptionItemList ...
-type SubscriptionItemList struct {
-	ItemID    int  `json:"item_id"`
-	AddType   int  `json:"add_type"`
-	Amount    int  `json:"amount"`
-	IsFreebie bool `json:"is_freebie"`
-}
-
-// RewardList ...
-type RewardList struct {
-	ItemID  int `json:"item_id"`
-	AddType int `json:"add_type"`
-	Amount  int `json:"amount"`
-}
-
-// Items ...
-type Items struct {
-	Seq        int          `json:"seq"`
-	RewardList []RewardList `json:"reward_list"`
-}
-
-// LicenseInfo ...
-type LicenseInfo struct {
-	Name  string  `json:"name"`
-	Items []Items `json:"items"`
-}
-
-// UserStatus ...
-type UserStatus struct {
-	IsLicensed bool `json:"is_licensed"`
-}
-
-// SubscriptionStatus ...
-type SubscriptionStatus struct {
-	LicenseID     int         `json:"license_id"`
-	LicenseType   int         `json:"license_type"`
-	LicenseInfo   LicenseInfo `json:"license_info,omitempty"`
-	UserStatus    UserStatus  `json:"user_status"`
-	PurchaseCount int         `json:"purchase_count"`
-	BadgeFlag     bool        `json:"badge_flag"`
-}
-
-// SubscriptionList ...
-type SubscriptionList struct {
-	ProductID          string                 `json:"product_id"`
-	Name               string                 `json:"name"`
-	BannerImgAsset     string                 `json:"banner_img_asset"`
-	Price              int                    `json:"price"`
-	CanBuy             bool                   `json:"can_buy"`
-	ProductType        int                    `json:"product_type"`
-	ProductURL         string                 `json:"product_url"`
-	ItemList           []SubscriptionItemList `json:"item_list"`
-	LimitStatus        LimitStatus            `json:"limit_status"`
-	SubscriptionStatus SubscriptionStatus     `json:"subscription_status"`
-}
-
-// ProductListRes ...
-type ProductListRes struct {
-	RestrictionInfo  RestrictionInfo    `json:"restriction_info"`
-	UnderAgeInfo     UnderAgeInfo       `json:"under_age_info"`
-	SnsProductList   []SnsProductList   `json:"sns_product_list"`
-	ProductList      []ProductList      `json:"product_list"`
-	SubscriptionList []SubscriptionList `json:"subscription_list"`
-	ShowPointShop    bool               `json:"show_point_shop"`
-}
-
-// ProductListResp ...
-type ProductListResp struct {
-	Result     ProductListRes `json:"result"`
-	Status     int            `json:"status"`
-	CommandNum bool           `json:"commandNum"`
-	TimeStamp  int64          `json:"timeStamp"`
-}
-
-// ProductResp ...
-type ProductResp struct {
-	ResponseData ProductRes `json:"response_data"`
-	ReleaseInfo  []any      `json:"release_info"`
-	StatusCode   int        `json:"status_code"`
-}
-
-// ProductRes ...
-type ProductRes struct {
-	RestrictionInfo  RestrictionInfo `json:"restriction_info"`
-	UnderAgeInfo     UnderAgeInfo    `json:"under_age_info"`
-	SnsProductList   []any           `json:"sns_product_list"`
-	ProductList      []any           `json:"product_list"`
-	SubscriptionList []any           `json:"subscription_list"`
-	ShowPointShop    bool            `json:"show_point_shop"`
-	ServerTimestamp  int64           `json:"server_timestamp"`
-}
diff --git a/internal/model/personalnotice.go b/internal/model/personalnotice.go
deleted file mode 100644
index 9c22c6d..0000000
--- a/internal/model/personalnotice.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package model
-
-// PersonalNoticeResp ...
-type PersonalNoticeResp struct {
-	ResponseData PersonalNoticeRes `json:"response_data"`
-	ReleaseInfo  []any             `json:"release_info"`
-	StatusCode   int               `json:"status_code"`
-}
-
-// PersonalNoticeRes ...
-type PersonalNoticeRes struct {
-	HasNotice       bool   `json:"has_notice"`
-	NoticeID        int    `json:"notice_id"`
-	Type            int    `json:"type"`
-	Title           string `json:"title"`
-	Contents        string `json:"contents"`
-	ServerTimestamp int64  `json:"server_timestamp"`
-}
diff --git a/internal/model/scenario.go b/internal/model/scenario.go
deleted file mode 100644
index 9e55a56..0000000
--- a/internal/model/scenario.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package model
-
-// ScenarioStatusList ...
-type ScenarioStatusList struct {
-	ScenarioID int `json:"scenario_id"`
-	Status     int `json:"status"`
-}
-
-// ScenarioStatusRes ...
-type ScenarioStatusRes struct {
-	ScenarioStatusList []ScenarioStatusList `json:"scenario_status_list"`
-}
-
-// ScenarioStatusResp ...
-type ScenarioStatusResp struct {
-	Result     ScenarioStatusRes `json:"result"`
-	Status     int               `json:"status"`
-	CommandNum bool              `json:"commandNum"`
-	TimeStamp  int64             `json:"timeStamp"`
-}
-
-// SubscenarioStatusList ...
-type SubscenarioStatusList struct {
-	SubscenarioID int `json:"subscenario_id"`
-	Status        int `json:"status"`
-}
-
-// SubscenarioStatusRes ...
-type SubscenarioStatusRes struct {
-	SubscenarioStatusList  []SubscenarioStatusList `json:"subscenario_status_list"`
-	UnlockedSubscenarioIds []any                   `json:"unlocked_subscenario_ids"`
-}
-
-// SubscenarioStatusResp ...
-type SubscenarioStatusResp struct {
-	Result     SubscenarioStatusRes `json:"result"`
-	Status     int                  `json:"status"`
-	CommandNum bool                 `json:"commandNum"`
-	TimeStamp  int64                `json:"timeStamp"`
-}
-
-// EventScenarioChapterList ...
-type EventScenarioChapterList struct {
-	EventScenarioID int    `json:"event_scenario_id"`
-	Chapter         int    `json:"chapter"`
-	ChapterAsset    string `json:"chapter_asset,omitempty"`
-	Status          int    `json:"status"`
-	OpenFlashFlag   int    `json:"open_flash_flag"`
-	IsReward        bool   `json:"is_reward"`
-	CostType        int    `json:"cost_type"`
-	ItemID          int    `json:"item_id"`
-	Amount          int    `json:"amount"`
-}
-
-// EventScenarioList ...
-type EventScenarioList struct {
-	EventID               int                        `json:"event_id"`
-	EventScenarioBtnAsset string                     `json:"event_scenario_btn_asset"`
-	OpenDate              string                     `json:"open_date"`
-	ChapterList           []EventScenarioChapterList `json:"chapter_list"`
-}
-
-// EventScenarioStatusRes ...
-type EventScenarioStatusRes struct {
-	EventScenarioList []EventScenarioList `json:"event_scenario_list"`
-}
-
-// EventScenarioStatusResp ...
-type EventScenarioStatusResp struct {
-	Result     EventScenarioStatusRes `json:"result"`
-	Status     int                    `json:"status"`
-	CommandNum bool                   `json:"commandNum"`
-	TimeStamp  int64                  `json:"timeStamp"`
-}
-
-// ScenarioResp ...
-type ScenarioResp struct {
-	ResponseData ScenarioRes `json:"response_data"`
-	ReleaseInfo  []any       `json:"release_info"`
-	StatusCode   int         `json:"status_code"`
-}
-
-// ScenarioRes ...
-type ScenarioRes struct {
-	ScenarioID         int   `json:"scenario_id"`
-	ScenarioAdjustment int   `json:"scenario_adjustment"`
-	ServerTimestamp    int64 `json:"server_timestamp"`
-}
-
-// ScenarioReq ...
-type ScenarioReq struct {
-	Module     string `json:"module"`
-	Action     string `json:"action"`
-	TimeStamp  int    `json:"timeStamp"`
-	Mgd        int    `json:"mgd"`
-	CommandNum string `json:"commandNum"`
-	ScenarioID int    `json:"scenario_id"`
-}
diff --git a/internal/model/topinfo.go b/internal/model/topinfo.go
deleted file mode 100644
index 0f4935b..0000000
--- a/internal/model/topinfo.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package model
-
-// TopInfoLicenseInfo ...
-type TopInfoLicenseInfo struct {
-	LicenseList  []any `json:"license_list"`
-	LicensedInfo []any `json:"licensed_info"`
-	ExpiredInfo  []any `json:"expired_info"`
-	BadgeFlag    bool  `json:"badge_flag"`
-}
-
-// TopInfoRes ...
-type TopInfoRes struct {
-	FriendActionCnt        int                `json:"friend_action_cnt"`
-	FriendGreetCnt         int                `json:"friend_greet_cnt"`
-	FriendVarietyCnt       int                `json:"friend_variety_cnt"`
-	FriendNewCnt           int                `json:"friend_new_cnt"`
-	PresentCnt             int                `json:"present_cnt"`
-	SecretBoxBadgeFlag     bool               `json:"secret_box_badge_flag"`
-	ServerDatetime         string             `json:"server_datetime"`
-	ServerTimestamp        int64              `json:"server_timestamp"`
-	NoticeFriendDatetime   string             `json:"notice_friend_datetime"`
-	NoticeMailDatetime     string             `json:"notice_mail_datetime"`
-	FriendsApprovalWaitCnt int                `json:"friends_approval_wait_cnt"`
-	FriendsRequestCnt      int                `json:"friends_request_cnt"`
-	IsTodayBirthday        bool               `json:"is_today_birthday"`
-	LicenseInfo            TopInfoLicenseInfo `json:"license_info"`
-	UsingBuffInfo          []any              `json:"using_buff_info"`
-	IsKlabIDTaskFlag       bool               `json:"is_klab_id_task_flag"`
-	KlabIDTaskCanSync      bool               `json:"klab_id_task_can_sync"`
-	HasUnreadAnnounce      bool               `json:"has_unread_announce"`
-	ExchangeBadgeCnt       []int              `json:"exchange_badge_cnt"`
-	AdFlag                 bool               `json:"ad_flag"`
-	HasAdReward            bool               `json:"has_ad_reward"`
-}
-
-// TopInfoResp ...
-type TopInfoResp struct {
-	Result     TopInfoRes `json:"result"`
-	Status     int        `json:"status"`
-	CommandNum bool       `json:"commandNum"`
-	TimeStamp  int64      `json:"timeStamp"`
-}
-
-// TopInfoOnceNotification ...
-type TopInfoOnceNotification struct {
-	Push       bool `json:"push"`
-	Lp         bool `json:"lp"`
-	UpdateInfo bool `json:"update_info"`
-	Campaign   bool `json:"campaign"`
-	Live       bool `json:"live"`
-	Lbonus     bool `json:"lbonus"`
-	Event      bool `json:"event"`
-	Secretbox  bool `json:"secretbox"`
-	Birthday   bool `json:"birthday"`
-}
-
-// TopInfoOnceRes ...
-type TopInfoOnceRes struct {
-	NewAchievementCnt            int                     `json:"new_achievement_cnt"`
-	UnaccomplishedAchievementCnt int                     `json:"unaccomplished_achievement_cnt"`
-	LiveDailyRewardExist         bool                    `json:"live_daily_reward_exist"`
-	TrainingEnergy               int                     `json:"training_energy"`
-	TrainingEnergyMax            int                     `json:"training_energy_max"`
-	Notification                 TopInfoOnceNotification `json:"notification"`
-	OpenArena                    bool                    `json:"open_arena"`
-	CostumeStatus                bool                    `json:"costume_status"`
-	OpenAccessory                bool                    `json:"open_accessory"`
-	ArenaSiSkillUniqueCheck      bool                    `json:"arena_si_skill_unique_check"`
-	OpenV98                      bool                    `json:"open_v98"`
-}
-
-// TopInfoOnceResp ...
-type TopInfoOnceResp struct {
-	Result     TopInfoOnceRes `json:"result"`
-	Status     int            `json:"status"`
-	CommandNum bool           `json:"commandNum"`
-	TimeStamp  int64          `json:"timeStamp"`
-}
diff --git a/internal/model/tos.go b/internal/model/tos.go
deleted file mode 100644
index d692f90..0000000
--- a/internal/model/tos.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package model
-
-// TosResp ...
-type TosResp struct {
-	ResponseData TosRes `json:"response_data"`
-	ReleaseInfo  []any  `json:"release_info"`
-	StatusCode   int    `json:"status_code"`
-}
-
-// TosResp ...
-type TosRes struct {
-	TosID           int   `json:"tos_id"`
-	TosType         int   `json:"tos_type"`
-	IsAgreed        bool  `json:"is_agreed"`
-	ServerTimestamp int64 `json:"server_timestamp"`
-}
diff --git a/internal/model/unit.go b/internal/model/unit.go
deleted file mode 100644
index a8754b1..0000000
--- a/internal/model/unit.go
+++ /dev/null
@@ -1,316 +0,0 @@
-package model
-
-// AccessoryList ...
-type AccessoryList struct {
-	AccessoryOwningUserID int  `json:"accessory_owning_user_id" xorm:"accessory_owning_user_id"`
-	AccessoryID           int  `json:"accessory_id" xorm:"accessory_id"`
-	Exp                   int  `json:"exp" xorm:"exp"`
-	NextExp               int  `json:"next_exp" xorm:"-"`
-	Level                 int  `json:"level" xorm:"-"`
-	MaxLevel              int  `json:"max_level" xorm:"-"`
-	RankUpCount           int  `json:"rank_up_count" xorm:"-"`
-	FavoriteFlag          bool `json:"favorite_flag" xorm:"-"`
-}
-
-// WearingInfo
-type WearingInfo struct {
-	UnitOwningUserID      int `json:"unit_owning_user_id" xorm:"unit_owning_user_id"`
-	AccessoryOwningUserID int `json:"accessory_owning_user_id" xorm:"accessory_owning_user_id"`
-}
-
-// UnitAccessoryAllResult ...
-type UnitAccessoryAllResult struct {
-	AccessoryList      []AccessoryList `json:"accessory_list"`
-	WearingInfo        []WearingInfo   `json:"wearing_info"`
-	EspecialCreateFlag bool            `json:"especial_create_flag"`
-}
-
-// UnitAccessoryAllResp ...
-type UnitAccessoryAllResp struct {
-	Result     UnitAccessoryAllResult `json:"result"`
-	Status     int                    `json:"status"`
-	CommandNum bool                   `json:"commandNum"`
-	TimeStamp  int64                  `json:"timeStamp"`
-}
-
-// WearAccessoryReq ...
-type WearAccessoryReq struct {
-	Module     string   `json:"module"`
-	Remove     []Remove `json:"remove"`
-	Action     string   `json:"action"`
-	TimeStamp  int      `json:"timeStamp"`
-	Wear       []Wear   `json:"wear"`
-	Mgd        int      `json:"mgd"`
-	CommandNum string   `json:"commandNum"`
-}
-
-// Remove ...
-type Remove struct {
-	AccessoryOwningUserID int `json:"accessory_owning_user_id"`
-	UnitOwningUserID      int `json:"unit_owning_user_id"`
-}
-
-// Wear ...
-type Wear struct {
-	AccessoryOwningUserID int `json:"accessory_owning_user_id"`
-	UnitOwningUserID      int `json:"unit_owning_user_id"`
-}
-
-// AccessoryWearData ...
-type AccessoryWearData struct {
-	Id                    int    `xorm:"id pk autoincr"`
-	AccessoryOwningUserID int    `xorm:"accessory_owning_user_id"`
-	UnitOwningUserID      int    `xorm:"unit_owning_user_id"`
-	UserId                string `xorm:"user_id"`
-}
-
-// AccessoryWearResp ...
-type AccessoryWearResp struct {
-	ResponseData []any `json:"response_data"`
-	ReleaseInfo  []any `json:"release_info"`
-	StatusCode   int   `json:"status_code"`
-}
-
-// SkillEquipReq ...
-type SkillEquipReq struct {
-	Module     string        `json:"module"`
-	Remove     []SkillRemove `json:"remove"`
-	Action     string        `json:"action"`
-	TimeStamp  int           `json:"timeStamp"`
-	Equip      []SkillEquip  `json:"equip"`
-	Mgd        int           `json:"mgd"`
-	CommandNum string        `json:"commandNum"`
-}
-
-// SkillRemove ...
-type SkillRemove struct {
-	UnitRemovableSkillID int `json:"unit_removable_skill_id"`
-	UnitOwningUserID     int `json:"unit_owning_user_id"`
-}
-
-// SkillEquip ...
-type SkillEquip struct {
-	UnitRemovableSkillID int `json:"unit_removable_skill_id"`
-	UnitOwningUserID     int `json:"unit_owning_user_id"`
-}
-
-// SkillEquipCount ...
-type SkillEquipCount struct {
-	UnitRemovableSkillId int `xorm:"unit_removable_skill_id"`
-	Count                int `xorm:"ct"`
-}
-
-// SkillEquipData ...
-type SkillEquipData struct {
-	Id                   int    `xorm:"id pk autoincr"`
-	UnitRemovableSkillId int    `xorm:"unit_removable_skill_id"`
-	UnitOwningUserID     int    `xorm:"unit_owning_user_id"`
-	UserId               string `xorm:"user_id"`
-}
-
-// SkillEquipDetail ...
-type SkillEquipDetail struct {
-	UnitRemovableSkillID int `json:"unit_removable_skill_id" xorm:"unit_removable_skill_id"`
-}
-
-// SkillEquipList ...
-type SkillEquipList struct {
-	UnitOwningUserID int                `json:"unit_owning_user_id"`
-	Detail           []SkillEquipDetail `json:"detail"`
-}
-
-// SkillEquipResp ...
-type SkillEquipResp struct {
-	ResponseData []any `json:"response_data"`
-	ReleaseInfo  []any `json:"release_info"`
-	StatusCode   int   `json:"status_code"`
-}
-
-// SetDisplayRankResp ...
-type SetDisplayRankResp struct {
-	ResponseData []any `json:"response_data"`
-	ReleaseInfo  []any `json:"release_info"`
-	StatusCode   int   `json:"status_code"`
-}
-
-// SetDeckResp ...
-type SetDeckResp struct {
-	ResponseData []any `json:"response_data"`
-	ReleaseInfo  []any `json:"release_info"`
-	StatusCode   int   `json:"status_code"`
-}
-
-// Costume ...
-type Costume struct {
-	UnitID    int  `json:"unit_id"`
-	IsRankMax bool `json:"is_rank_max"`
-	IsSigned  bool `json:"is_signed"`
-}
-
-// Active ...
-type Active struct {
-	UnitOwningUserID            int    `xorm:"unit_owning_user_id pk autoincr" json:"unit_owning_user_id"`
-	UserID                      int    `xorm:"user_id" json:"-"`
-	UnitID                      int    `xorm:"unit_id" json:"unit_id"`
-	Exp                         int    `xorm:"exp" json:"exp"`
-	NextExp                     int    `xorm:"next_exp" json:"next_exp"`
-	Level                       int    `xorm:"level" json:"level"`
-	MaxLevel                    int    `xorm:"max_level" json:"max_level"`
-	LevelLimitID                int    `xorm:"level_limit_id" json:"level_limit_id"`
-	Rank                        int    `xorm:"rank" json:"rank"`
-	MaxRank                     int    `xorm:"max_rank" json:"max_rank"`
-	Love                        int    `xorm:"love" json:"love"`
-	MaxLove                     int    `xorm:"max_love" json:"max_love"`
-	UnitSkillExp                int    `xorm:"unit_skill_exp" json:"unit_skill_exp"`
-	UnitSkillLevel              int    `xorm:"unit_skill_level" json:"unit_skill_level"`
-	MaxHp                       int    `xorm:"max_hp" json:"max_hp"`
-	UnitRemovableSkillCapacity  int    `xorm:"unit_removable_skill_capacity" json:"unit_removable_skill_capacity"`
-	FavoriteFlag                bool   `xorm:"favorite_flag" json:"favorite_flag"`
-	DisplayRank                 int    `xorm:"display_rank" json:"display_rank"`
-	IsRankMax                   bool   `xorm:"is_rank_max" json:"is_rank_max"`
-	IsLoveMax                   bool   `xorm:"is_love_max" json:"is_love_max"`
-	IsLevelMax                  bool   `xorm:"is_level_max" json:"is_level_max"`
-	IsSigned                    bool   `xorm:"is_signed" json:"is_signed"`
-	IsSkillLevelMax             bool   `xorm:"is_skill_level_max" json:"is_skill_level_max"`
-	IsRemovableSkillCapacityMax bool   `xorm:"is_removable_skill_capacity_max" json:"is_removable_skill_capacity_max"`
-	InsertDate                  string `xorm:"insert_date" json:"insert_date"`
-	// Costume                     Costume `json:"costume,omitempty"`
-}
-
-// Waiting ...
-type Waiting struct {
-	UnitOwningUserID            int64  `json:"unit_owning_user_id"`
-	UnitID                      int    `json:"unit_id"`
-	Exp                         int    `json:"exp"`
-	NextExp                     int    `json:"next_exp"`
-	Level                       int    `json:"level"`
-	MaxLevel                    int    `json:"max_level"`
-	LevelLimitID                int    `json:"level_limit_id"`
-	Rank                        int    `json:"rank"`
-	MaxRank                     int    `json:"max_rank"`
-	Love                        int    `json:"love"`
-	MaxLove                     int    `json:"max_love"`
-	UnitSkillExp                int    `json:"unit_skill_exp"`
-	UnitSkillLevel              int    `json:"unit_skill_level"`
-	MaxHp                       int    `json:"max_hp"`
-	UnitRemovableSkillCapacity  int    `json:"unit_removable_skill_capacity"`
-	FavoriteFlag                bool   `json:"favorite_flag"`
-	DisplayRank                 int    `json:"display_rank"`
-	IsRankMax                   bool   `json:"is_rank_max"`
-	IsLoveMax                   bool   `json:"is_love_max"`
-	IsLevelMax                  bool   `json:"is_level_max"`
-	IsSigned                    bool   `json:"is_signed"`
-	IsSkillLevelMax             bool   `json:"is_skill_level_max"`
-	IsRemovableSkillCapacityMax bool   `json:"is_removable_skill_capacity_max"`
-	InsertDate                  string `json:"insert_date"`
-}
-
-// UnitAllRes ...
-type UnitAllRes struct {
-	Active  []Active  `json:"active"`
-	Waiting []Waiting `json:"waiting"`
-}
-
-// UnitAllResp ...
-type UnitAllResp struct {
-	Result     UnitAllRes `json:"result"`
-	Status     int        `json:"status"`
-	CommandNum bool       `json:"commandNum"`
-	TimeStamp  int64      `json:"timeStamp"`
-}
-
-// UnitOwningUserIds ...
-type UnitOwningUserIds struct {
-	Position         int `json:"position"`
-	UnitOwningUserID int `json:"unit_owning_user_id"`
-}
-
-// UnitDeckInfoRes ...
-type UnitDeckInfoRes struct {
-	UnitDeckID        int                 `json:"unit_deck_id"`
-	MainFlag          bool                `json:"main_flag"`
-	DeckName          string              `json:"deck_name"`
-	UnitOwningUserIds []UnitOwningUserIds `json:"unit_owning_user_ids"`
-}
-
-// UnitDeckInfoResp ...
-type UnitDeckInfoResp struct {
-	Result     []UnitDeckInfoRes `json:"result"`
-	Status     int               `json:"status"`
-	CommandNum bool              `json:"commandNum"`
-	TimeStamp  int64             `json:"timeStamp"`
-}
-
-// UnitSupportList ...
-type UnitSupportList struct {
-	UnitID int `json:"unit_id"`
-	Amount int `json:"amount"`
-}
-
-// UnitSupportRes ...
-type UnitSupportRes struct {
-	UnitSupportList []UnitSupportList `json:"unit_support_list"`
-}
-
-// UnitSupportResp ...
-type UnitSupportResp struct {
-	Result     UnitSupportRes `json:"result"`
-	Status     int            `json:"status"`
-	CommandNum bool           `json:"commandNum"`
-	TimeStamp  int64          `json:"timeStamp"`
-}
-
-// OwningInfo ...
-type OwningInfo struct {
-	UnitRemovableSkillID int    `json:"unit_removable_skill_id"`
-	TotalAmount          int    `json:"total_amount"`
-	EquippedAmount       int    `json:"equipped_amount"`
-	InsertDate           string `json:"insert_date"`
-}
-
-// RemovableSkillRes ...
-type RemovableSkillRes struct {
-	OwningInfo    []OwningInfo `json:"owning_info"`
-	EquipmentInfo map[int]any  `json:"equipment_info"`
-}
-
-// RemovableSkillResp ...
-type RemovableSkillResp struct {
-	Result     RemovableSkillRes `json:"result"`
-	Status     int               `json:"status"`
-	CommandNum bool              `json:"commandNum"`
-	TimeStamp  int64             `json:"timeStamp"`
-}
-
-// UnitDeckReq ...
-type UnitDeckReq struct {
-	Module       string         `json:"module"`
-	UnitDeckList []UnitDeckList `json:"unit_deck_list"`
-	Action       string         `json:"action"`
-	Mgd          int            `json:"mgd"`
-}
-
-// UnitDeckDetail ...
-type UnitDeckDetail struct {
-	Position         int `json:"position"`
-	UnitOwningUserID int `json:"unit_owning_user_id"`
-}
-
-// UnitDeckList ...
-type UnitDeckList struct {
-	UnitDeckDetail []UnitDeckDetail `json:"unit_deck_detail"`
-	UnitDeckID     int              `json:"unit_deck_id"`
-	MainFlag       int              `json:"main_flag"`
-	DeckName       string           `json:"deck_name"`
-}
-
-// DeckNameReq ...
-type DeckNameReq struct {
-	Module     string `json:"module"`
-	UnitDeckID int    `json:"unit_deck_id"`
-	Action     string `json:"action"`
-	TimeStamp  int    `json:"timeStamp"`
-	Mgd        int    `json:"mgd"`
-	CommandNum string `json:"commandNum"`
-	DeckName   string `json:"deck_name"`
-}
diff --git a/internal/model/user.go b/internal/model/user.go
deleted file mode 100644
index d2b2db2..0000000
--- a/internal/model/user.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package model
-
-// UserNaviResp ...
-type UserNaviChangeResp struct {
-	ResponseData []any `json:"response_data"`
-	ReleaseInfo  []any `json:"release_info"`
-	StatusCode   int   `json:"status_code"`
-}
-
-// UserNameChangeResp ...
-type UserNameChangeResp struct {
-	ResponseData UserNameChangeRes `json:"response_data"`
-	ReleaseInfo  []any             `json:"release_info"`
-	StatusCode   int               `json:"status_code"`
-}
-
-// UserNameChangeRes ...
-type UserNameChangeRes struct {
-	BeforeName      string `json:"before_name"`
-	AfterName       string `json:"after_name"`
-	ServerTimestamp int64  `json:"server_timestamp"`
-}
-
-// User ...
-type User struct {
-	UserID           int `json:"user_id"`
-	UnitOwningUserID int `json:"unit_owning_user_id"`
-}
-
-// UserNaviRes ...
-type UserNaviRes struct {
-	User User `json:"user"`
-}
-
-// UserNaviResp ...
-type UserNaviResp struct {
-	Result     UserNaviRes `json:"result"`
-	Status     int         `json:"status"`
-	CommandNum bool        `json:"commandNum"`
-	TimeStamp  int64       `json:"timeStamp"`
-}
-
-// NotificationResp ...
-type NotificationResp struct {
-	ResponseData []any `json:"response_data"`
-	ReleaseInfo  []any `json:"release_info"`
-	StatusCode   int   `json:"status_code"`
-}
diff --git a/internal/model/user/useraccessorywear.go b/internal/model/user/useraccessorywear.go
new file mode 100644
index 0000000..507054c
--- /dev/null
+++ b/internal/model/user/useraccessorywear.go
@@ -0,0 +1,12 @@
+package user
+
+type UserAccessoryWear struct {
+	ID                    int `xorm:"id pk autoincr"`
+	AccessoryOwningUserID int `xorm:"accessory_owning_user_id"`
+	UnitOwningUserID      int `xorm:"unit_owning_user_id"`
+	UserID                int `xorm:"user_id"`
+}
+
+func (u *UserAccessoryWear) TableName() string {
+	return "user_accessory_wear"
+}
diff --git a/internal/model/user/userdeck.go b/internal/model/user/userdeck.go
new file mode 100644
index 0000000..f981652
--- /dev/null
+++ b/internal/model/user/userdeck.go
@@ -0,0 +1,14 @@
+package user
+
+type UserDeck struct {
+	ID         int    `xorm:"id pk autoincr"`
+	DeckID     int    `xorm:"deck_id"`
+	DeckName   string `xorm:"deck_name"`
+	MainFlag   int    `xorm:"main_flag"`
+	UserID     int    `xorm:"user_id"`
+	InsertDate int64  `xorm:"insert_date"`
+}
+
+func (u *UserDeck) TableName() string {
+	return "user_deck"
+}
diff --git a/internal/model/user/userdeckunit.go b/internal/model/user/userdeckunit.go
new file mode 100644
index 0000000..dc08a5d
--- /dev/null
+++ b/internal/model/user/userdeckunit.go
@@ -0,0 +1,25 @@
+package user
+
+type UserDeckUnit struct {
+	ID               int   `xorm:"id pk autoincr"`
+	UserDeckID       int   `xorm:"user_deck_id"`
+	UnitOwningUserID int   `xorm:"unit_owning_user_id"`
+	UnitID           int   `xorm:"unit_id"`
+	Position         int   `xorm:"position"`
+	Level            int   `xorm:"level"`
+	LevelLimitID     int   `xorm:"level_limit_id"`
+	DisplayRank      int   `xorm:"display_rank"`
+	Love             int   `xorm:"love"`
+	UnitSkillLevel   int   `xorm:"unit_skill_level"`
+	IsRankMax        int   `xorm:"is_rank_max"`
+	IsLoveMax        int   `xorm:"is_love_max"`
+	IsLevelMax       int   `xorm:"is_level_max"`
+	IsSigned         int   `xorm:"is_signed"`
+	BeforeLove       int   `xorm:"before_love"`
+	MaxLove          int   `xorm:"max_love"`
+	InsertDate       int64 `xorm:"insert_date"`
+}
+
+func (u *UserDeckUnit) TableName() string {
+	return "user_deck_unit"
+}
diff --git a/internal/model/user/userkey.go b/internal/model/user/userkey.go
new file mode 100644
index 0000000..c2d8a26
--- /dev/null
+++ b/internal/model/user/userkey.go
@@ -0,0 +1,11 @@
+package user
+
+type UserKey struct {
+	ID     int `xorm:"id pk autoincr"`
+	UserID int `xorm:"user_id"`
+	Key    int `xorm:"key"`
+}
+
+func (UserKey) TableName() string {
+	return "user_key"
+}
diff --git a/internal/model/user/userpref.go b/internal/model/user/userpref.go
new file mode 100644
index 0000000..289c0af
--- /dev/null
+++ b/internal/model/user/userpref.go
@@ -0,0 +1,18 @@
+package user
+
+type UserPref struct {
+	ID               int    `xorm:"id pk autoincr"`
+	UserID           int    `xorm:"user_id"`
+	AwardID          int    `xorm:"award_id"`
+	BackgroundID     int    `xorm:"background_id"`
+	UnitOwningUserID int    `xorm:"unit_owning_user_id"`
+	UserName         string `xorm:"user_name"`
+	UserLevel        int    `xorm:"user_level"`
+	UserDesc         string `xorm:"user_desc"`
+	InviteCode       string `xorm:"invite_code"`
+	UpdateTime       int64  `xorm:"update_time"`
+}
+
+func (UserPref) TableName() string {
+	return "user_pref"
+}
diff --git a/internal/model/user/users.go b/internal/model/user/users.go
new file mode 100644
index 0000000..8dd269a
--- /dev/null
+++ b/internal/model/user/users.go
@@ -0,0 +1,15 @@
+package user
+
+type Users struct {
+	ID            int    `xorm:"id pk autoincr"`
+	Phone         string `xorm:"phone"`
+	Password      string `xorm:"password"`
+	Autokey       string `xorm:"autokey"`
+	Ticket        string `xorm:"ticket"`
+	UserID        int    `xorm:"user_id"`
+	LastLoginTime int64  `xorm:"last_login_time"`
+}
+
+func (Users) TableName() string {
+	return "users"
+}
diff --git a/internal/model/user/userunit.go b/internal/model/user/userunit.go
new file mode 100644
index 0000000..6ce3a31
--- /dev/null
+++ b/internal/model/user/userunit.go
@@ -0,0 +1,34 @@
+package user
+
+type UserUnit struct {
+	ID                          int    `xorm:"id pk autoincr"`
+	UnitOwningUserID            int    `xorm:"unit_owning_user_id"`
+	UserID                      int    `xorm:"user_id"`
+	UnitID                      int    `xorm:"unit_id"`
+	Exp                         int    `xorm:"exp"`
+	NextExp                     int    `xorm:"next_exp"`
+	Level                       int    `xorm:"level"`
+	MaxLevel                    int    `xorm:"max_level"`
+	LevelLimitID                int    `xorm:"level_limit_id"`
+	Rank                        int    `xorm:"rank"`
+	MaxRank                     int    `xorm:"max_rank"`
+	Love                        int    `xorm:"love"`
+	MaxLove                     int    `xorm:"max_love"`
+	UnitSkillExp                int    `xorm:"unit_skill_exp"`
+	UnitSkillLevel              int    `xorm:"unit_skill_level"`
+	MaxHp                       int    `xorm:"max_hp"`
+	UnitRemovableSkillCapacity  int    `xorm:"unit_removable_skill_capacity"`
+	FavoriteFlag                int    `xorm:"favorite_flag"`
+	DisplayRank                 int    `xorm:"display_rank"`
+	IsRankMax                   int    `xorm:"is_rank_max"`
+	IsLoveMax                   int    `xorm:"is_love_max"`
+	IsLevelMax                  int    `xorm:"is_level_max"`
+	IsSigned                    int    `xorm:"is_signed"`
+	IsSkillLevelMax             int    `xorm:"is_skill_level_max"`
+	IsRemovableSkillCapacityMax int    `xorm:"is_removable_skill_capacity_max"`
+	InsertDate                  string `xorm:"insert_date"`
+}
+
+func (UserUnit) TableName() string {
+	return "user_unit"
+}
diff --git a/internal/model/user/userunitskillequip.go b/internal/model/user/userunitskillequip.go
new file mode 100644
index 0000000..dcfd59f
--- /dev/null
+++ b/internal/model/user/userunitskillequip.go
@@ -0,0 +1,12 @@
+package user
+
+type UserUnitSkillEquip struct {
+	ID                   int `xorm:"id pk autoincr"`
+	UnitOwningUserID     int `xorm:"unit_owning_user_id"`
+	UnitRemovableSkillID int `xorm:"unit_removable_skill_id"`
+	UserID               int `xorm:"user_id"`
+}
+
+func (UserUnitSkillEquip) TableName() string {
+	return "user_unit_skill_equip"
+}
diff --git a/internal/router/router.go b/internal/router/router.go
index c02ced5..7a4c37d 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -1,8 +1,7 @@
+// Modified from https://github.com/arina999999997/elichika/blob/463b37a0d69dbe68fff7112fe87105cfb2e260d6/router/router.go
 package router
 
 import (
-	"honoka-chan/internal/handler"
-	"honoka-chan/internal/middleware"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -13,12 +12,79 @@ import (
 	"github.com/gin-gonic/gin"
 )
 
+type HandlerInfo struct {
+	Method   string
+	Path     string
+	Handlers []gin.HandlerFunc
+}
+type SpecialGroupSetup = func(*gin.RouterGroup)
+type GroupInfo struct {
+	InitialHandlers []gin.HandlerFunc
+	Handlers        map[string]HandlerInfo
+	SpecialSetups   []SpecialGroupSetup
+}
+
+var (
+	groups    = map[string]*GroupInfo{}
+	templates []string
+)
+
+func initGroup(g string) {
+	_, exist := groups[g]
+	if exist {
+		return
+	}
+	groups[g] = &GroupInfo{
+		InitialHandlers: []gin.HandlerFunc{},
+		Handlers:        map[string]HandlerInfo{},
+		SpecialSetups:   []SpecialGroupSetup{},
+	}
+}
+
+func (g *GroupInfo) AddInitialHandler(handler gin.HandlerFunc) {
+	g.InitialHandlers = append(g.InitialHandlers, handler)
+}
+
+func (g *GroupInfo) AddHandler(method, path string, handlers ...gin.HandlerFunc) {
+	_, exist := g.Handlers[method+path]
+	if exist {
+		panic("Multiple handler for path and method: " + method + " " + path)
+	}
+	g.Handlers[method+path] = HandlerInfo{
+		Method:   method,
+		Path:     path,
+		Handlers: handlers,
+	}
+}
+
+func (g *GroupInfo) AddSpecialSetup(specialGroupSetup SpecialGroupSetup) {
+	g.SpecialSetups = append(g.SpecialSetups, specialGroupSetup)
+}
+
+func AddInitialHandler(group string, handler gin.HandlerFunc) {
+	initGroup(group)
+	groups[group].AddInitialHandler(handler)
+}
+func AddHandler(group, method, path string, handlers ...gin.HandlerFunc) {
+	initGroup(group)
+	groups[group].AddHandler(method, path, handlers...)
+}
+
+func AddSpecialSetup(group string, specialGroupSetup SpecialGroupSetup) {
+	initGroup(group)
+	groups[group].AddSpecialSetup(specialGroupSetup)
+}
+
+func AddTemplates(path string) {
+	templates = append(templates, path)
+}
+
 func SifRouter(r *gin.Engine) {
 	// Static
-	r.Static("/static", "assets/static")
+	r.Static("/static", "static")
 
 	var files []string
-	_ = filepath.Walk("assets/static/templates", func(path string, info os.FileInfo, err error) error {
+	_ = filepath.Walk("static/templates", func(path string, info os.FileInfo, err error) error {
 		if strings.HasSuffix(path, ".html") {
 			files = append(files, path)
 		}
@@ -26,116 +92,37 @@ func SifRouter(r *gin.Engine) {
 	})
 	r.LoadHTMLFiles(files...)
 
+	// favicon
+	r.StaticFile("/favicon.ico", "static/images/favicon.ico")
+
 	// session
 	store := cookie.NewStore([]byte("llsif"))
 	r.Use(sessions.Sessions("llsif", store))
 
-	// /
-	r.Any("/", func(ctx *gin.Context) {
-		ctx.String(http.StatusOK, "Hello, world!")
-	})
-
-	// Private APIs
-	v1 := r.Group("v1")
-	{
-		v1.GET("/basic/getcode", handler.GetCode)
-		v1.POST("/account/active", handler.Active)
-		v1.POST("/account/initialize", handler.Initialize)
-		v1.POST("/account/loginauto", handler.LoginAuto)
-		v1.POST("/account/login", handler.AccountLogin)
-		v1.POST("/account/reportRole", handler.ReportRole)
-		v1.POST("/basic/getcode", handler.GetCode)
-		v1.POST("/basic/getProductList", handler.GetProductList)
-		v1.POST("/basic/handshake", handler.Handshake)
-		v1.POST("/basic/loginarea", handler.LoginArea)
-		v1.POST("/basic/publickey", handler.PublicKey)
-		v1.POST("/guest/status", handler.GuestStatus)
-	}
-	r.GET("/agreement/all", handler.Agreement)
-	r.GET("/integration/appReport/initialize", handler.ReportApp)
-	r.POST("/report/ge/app", handler.ReportLog)
-	// Private APIs
-
-	// Server APIs
-	m := r.Group("main.php").Use(middleware.Common)
-	{
-		m.POST("/album/seriesAll", middleware.ParseMultipartForm, handler.AlbumSeriesAll)
-		m.POST("/announce/checkState", middleware.ParseMultipartForm, handler.AnnounceCheckState)
-		m.POST("/api", middleware.ParseMultipartForm, handler.Api)
-		m.POST("/award/set", handler.AwardSet)
-		m.POST("/background/set", handler.BackgroundSet)
-		m.POST("/download/additional", middleware.ParseMultipartForm, handler.DownloadAdditional)
-		m.POST("/download/batch", middleware.ParseMultipartForm, handler.DownloadBatch)
-		m.POST("/download/event", middleware.ParseMultipartForm, handler.DownloadEvent)
-		m.POST("/download/getUrl", middleware.ParseMultipartForm, handler.DownloadUrl)
-		m.POST("/download/update", middleware.ParseMultipartForm, handler.DownloadUpdate)
-		m.POST("/event/eventList", middleware.ParseMultipartForm, handler.EventList)
-		m.POST("/gdpr/get", middleware.ParseMultipartForm, handler.Gdpr)
-		m.POST("/lbonus/execute", handler.LBonusExecute)
-		m.POST("/live/gameover", handler.GameOver)
-		m.POST("/live/partyList", handler.PartyList)
-		m.POST("/live/play", middleware.ParseMultipartForm, handler.PlayLive)
-		m.POST("/live/preciseScore", middleware.ParseMultipartForm, handler.PlayScore)
-		m.POST("/live/reward", middleware.ParseMultipartForm, handler.PlayReward)
-		m.POST("/login/authkey", middleware.AuthKey, handler.AuthKey)
-		m.POST("/login/login", middleware.ParseMultipartForm, middleware.Login, handler.Login)
-		m.POST("/multiunit/scenarioStartup", handler.MultiUnitStartUp)
-		m.POST("/museum/info", middleware.ParseMultipartForm, handler.MuseumInfo)
-		m.POST("/notice/noticeFriendGreeting", middleware.ParseMultipartForm, handler.NoticeFriendGreeting)
-		m.POST("/notice/noticeFriendVariety", middleware.ParseMultipartForm, handler.NoticeFriendVariety)
-		m.POST("/notice/noticeUserGreetingHistory", handler.NoticeUserGreeting)
-		m.POST("/payment/productList", middleware.ParseMultipartForm, handler.ProductList)
-		m.POST("/personalnotice/get", middleware.ParseMultipartForm, handler.PersonalNotice)
-		m.POST("/profile/profileRegister", handler.ProfileRegister)
-		m.POST("/scenario/reward", handler.ScenarioReward)
-		m.POST("/scenario/startup", handler.ScenarioStartup)
-		m.POST("/subscenario/reward", handler.SubScenarioStartup)
-		m.POST("/subscenario/startup", handler.SubScenarioStartup)
-		m.POST("/tos/tosCheck", middleware.ParseMultipartForm, handler.TosCheck)
-		m.POST("/unit/deck", handler.SetDeck)
-		m.POST("/unit/deckName", handler.SetDeckName)
-		m.POST("/unit/favorite", handler.SetDisplayRank)
-		m.POST("/unit/removableSkillEquipment", handler.RemoveSkillEquip)
-		m.POST("/unit/setDisplayRank", handler.SetDisplayRank)
-		m.POST("/unit/wearAccessory", handler.WearAccessory)
-		m.POST("/user/changeName", handler.ChangeName)
-		m.POST("/user/changeNavi", handler.ChangeNavi)
-		m.POST("/user/setNotificationToken", handler.SetNotificationToken)
-		m.POST("/user/userInfo", middleware.ParseMultipartForm, handler.UserInfo)
-	}
-	r.GET("/webview.php/announce/index", handler.AnnounceIndex)
-	// Server APIs
-
-	// Manga
+	// manga
 	r.GET("/manga", func(ctx *gin.Context) {
 		ctx.HTML(http.StatusOK, "common/manga.html", gin.H{})
 	})
 
-	// WebUI
-	w := r.Group("admin").Use(middleware.WebAuth)
-	{
-		w.GET("/index", func(ctx *gin.Context) {
-			ctx.HTML(http.StatusOK, "admin/index.html", gin.H{
-				"url": strings.Split(ctx.Request.URL.String(), "?")[0],
-			})
-		})
-		w.GET("/login", func(ctx *gin.Context) {
-			ctx.HTML(http.StatusOK, "admin/login.html", gin.H{})
-		})
-		w.POST("/login", handler.WebLogin)
-		w.GET("/logout", handler.WebLogout)
-		w.GET("/card", func(ctx *gin.Context) {
-			ctx.HTML(http.StatusOK, "admin/card.html", gin.H{
-				"menu": 1,
-				"url":  strings.Split(ctx.Request.URL.String(), "?")[0],
-			})
-		})
-		w.GET("/upload", func(ctx *gin.Context) {
-			ctx.HTML(http.StatusOK, "admin/upload.html", gin.H{
-				"menu": 1,
-				"url":  strings.Split(ctx.Request.URL.String(), "?")[0],
-			})
-		})
-		w.POST("/upload", handler.Upload)
+	// router
+	for groupPath, groupInfo := range groups {
+		groupApi := r.Group(groupPath, groupInfo.InitialHandlers...)
+		for _, handlerInfo := range groupInfo.Handlers {
+			switch handlerInfo.Method {
+			case "POST":
+				groupApi.POST(handlerInfo.Path, handlerInfo.Handlers...)
+			case "GET":
+				groupApi.GET(handlerInfo.Path, handlerInfo.Handlers...)
+			case "PUT":
+				groupApi.PUT(handlerInfo.Path, handlerInfo.Handlers...)
+			case "DELETE":
+				groupApi.DELETE(handlerInfo.Path, handlerInfo.Handlers...)
+			default:
+				panic("Must be GET, POST, PUT or DELETE")
+			}
+		}
+		for _, specialSetup := range groupInfo.SpecialSetups {
+			specialSetup(groupApi)
+		}
 	}
 }
diff --git a/internal/schema/album/seriesall.go b/internal/schema/album/seriesall.go
new file mode 100644
index 0000000..ee7789a
--- /dev/null
+++ b/internal/schema/album/seriesall.go
@@ -0,0 +1,24 @@
+package album
+
+type UnitList struct {
+	UnitID             int  `json:"unit_id"`
+	RankMaxFlag        bool `json:"rank_max_flag"`
+	LoveMaxFlag        bool `json:"love_max_flag"`
+	RankLevelMaxFlag   bool `json:"rank_level_max_flag"`
+	AllMaxFlag         bool `json:"all_max_flag"`
+	HighestLovePerUnit int  `json:"highest_love_per_unit"`
+	TotalLove          int  `json:"total_love"`
+	FavoritePoint      int  `json:"favorite_point"`
+	SignFlag           bool `json:"sign_flag"`
+}
+
+type SeriesAllData struct {
+	SeriesID int        `json:"series_id"`
+	UnitList []UnitList `json:"unit_list"`
+}
+
+type SeriesAllResp struct {
+	ResponseData []SeriesAllData `json:"response_data"`
+	ReleaseInfo  []any           `json:"release_info"`
+	StatusCode   int             `json:"status_code"`
+}
diff --git a/internal/schema/announce/checkstate.go b/internal/schema/announce/checkstate.go
new file mode 100644
index 0000000..97bec02
--- /dev/null
+++ b/internal/schema/announce/checkstate.go
@@ -0,0 +1,12 @@
+package announce
+
+type CheckStateData struct {
+	HasUnreadAnnounce bool  `json:"has_unread_announce"`
+	ServerTimestamp   int64 `json:"server_timestamp"`
+}
+
+type CheckStateDataResp struct {
+	ResponseData CheckStateData `json:"response_data"`
+	ReleaseInfo  []any          `json:"release_info"`
+	StatusCode   int            `json:"status_code"`
+}
diff --git a/internal/schema/api/album/all.go b/internal/schema/api/album/all.go
new file mode 100644
index 0000000..a92ce37
--- /dev/null
+++ b/internal/schema/api/album/all.go
@@ -0,0 +1,20 @@
+package album
+
+type UnitList struct {
+	UnitID             int  `json:"unit_id"`
+	RankMaxFlag        bool `json:"rank_max_flag"`
+	LoveMaxFlag        bool `json:"love_max_flag"`
+	RankLevelMaxFlag   bool `json:"rank_level_max_flag"`
+	AllMaxFlag         bool `json:"all_max_flag"`
+	HighestLovePerUnit int  `json:"highest_love_per_unit"`
+	TotalLove          int  `json:"total_love"`
+	FavoritePoint      int  `json:"favorite_point"`
+	SignFlag           bool `json:"sign_flag"`
+}
+
+type AllResp struct {
+	Result     []UnitList `json:"result"`
+	Status     int        `json:"status"`
+	CommandNum bool       `json:"commandNum"`
+	TimeStamp  int64      `json:"timeStamp"`
+}
diff --git a/internal/model/api.go b/internal/schema/api/api.go
similarity index 51%
rename from internal/model/api.go
rename to internal/schema/api/api.go
index 5648bf2..3f89557 100644
--- a/internal/model/api.go
+++ b/internal/schema/api/api.go
@@ -1,23 +1,13 @@
-package model
+package api
 
-// ApiReq ...
 type ApiReq struct {
 	Module    string `json:"module"`
 	Action    string `json:"action"`
 	Timestamp int64  `json:"timeStamp"`
 }
 
-// ApiResp ...
 type ApiResp struct {
 	ResponseData any `json:"response_data"`
 	ReleaseInfo  any `json:"release_info"`
 	StatusCode   int `json:"status_code"`
 }
-
-// ApiUserInfoResp ...
-type ApiUserInfoResp struct {
-	Result     UserInfo `json:"result"`
-	Status     int      `json:"status"`
-	CommandNum bool     `json:"commandNum"`
-	TimeStamp  int64    `json:"timeStamp"`
-}
diff --git a/internal/schema/api/award/info.go b/internal/schema/api/award/info.go
new file mode 100644
index 0000000..47e3f2a
--- /dev/null
+++ b/internal/schema/api/award/info.go
@@ -0,0 +1,18 @@
+package award
+
+type Info struct {
+	AwardID    int    `json:"award_id"`
+	IsSet      bool   `json:"is_set"`
+	InsertDate string `json:"insert_date"`
+}
+
+type InfoData struct {
+	AwardInfo []Info `json:"award_info"`
+}
+
+type InfoResp struct {
+	Result     InfoData `json:"result"`
+	Status     int      `json:"status"`
+	CommandNum bool     `json:"commandNum"`
+	TimeStamp  int64    `json:"timeStamp"`
+}
diff --git a/internal/schema/api/background/info.go b/internal/schema/api/background/info.go
new file mode 100644
index 0000000..d974c1c
--- /dev/null
+++ b/internal/schema/api/background/info.go
@@ -0,0 +1,18 @@
+package background
+
+type Info struct {
+	BackgroundID int    `json:"background_id"`
+	IsSet        bool   `json:"is_set"`
+	InsertDate   string `json:"insert_date"`
+}
+
+type InfoData struct {
+	BackgroundInfo []Info `json:"background_info"`
+}
+
+type InfoResp struct {
+	Result     InfoData `json:"result"`
+	Status     int      `json:"status"`
+	CommandNum bool     `json:"commandNum"`
+	TimeStamp  int64    `json:"timeStamp"`
+}
diff --git a/internal/model/banner.go b/internal/schema/api/banner/list.go
similarity index 66%
rename from internal/model/banner.go
rename to internal/schema/api/banner/list.go
index fa3b703..99c48d8 100644
--- a/internal/model/banner.go
+++ b/internal/schema/api/banner/list.go
@@ -1,6 +1,5 @@
-package model
+package banner
 
-// BannerList ...
 type BannerList struct {
 	BannerType       int    `json:"banner_type"`
 	TargetID         int    `json:"target_id"`
@@ -14,16 +13,14 @@ type BannerList struct {
 	WebviewURL       string `json:"webview_url,omitempty"`
 }
 
-// BannerListRes ...
-type BannerListRes struct {
+type ListData struct {
 	TimeLimit  string       `json:"time_limit"`
 	BannerList []BannerList `json:"banner_list"`
 }
 
-// BannerListResp ...
-type BannerListResp struct {
-	Result     BannerListRes `json:"result"`
-	Status     int           `json:"status"`
-	CommandNum bool          `json:"commandNum"`
-	TimeStamp  int64         `json:"timeStamp"`
+type ListResp struct {
+	Result     ListData `json:"result"`
+	Status     int      `json:"status"`
+	CommandNum bool     `json:"commandNum"`
+	TimeStamp  int64    `json:"timeStamp"`
 }
diff --git a/internal/model/marathon.go b/internal/schema/api/challenge/info.go
similarity index 67%
rename from internal/model/marathon.go
rename to internal/schema/api/challenge/info.go
index 3d11058..871b584 100644
--- a/internal/model/marathon.go
+++ b/internal/schema/api/challenge/info.go
@@ -1,7 +1,6 @@
-package model
+package challenge
 
-// MarathonInfoResp ...
-type MarathonInfoResp struct {
+type InfoResp struct {
 	Result     []any `json:"result"`
 	Status     int   `json:"status"`
 	CommandNum bool  `json:"commandNum"`
diff --git a/internal/schema/api/costume/list.go b/internal/schema/api/costume/list.go
new file mode 100644
index 0000000..db6b372
--- /dev/null
+++ b/internal/schema/api/costume/list.go
@@ -0,0 +1,18 @@
+package costume
+
+type CostumeList struct {
+	UnitID    int  `json:"unit_id"`
+	IsRankMax bool `json:"is_rank_max"`
+	IsSigned  bool `json:"is_signed"`
+}
+
+type ListData struct {
+	CostumeList []CostumeList `json:"costume_list"`
+}
+
+type ListResp struct {
+	Result     ListData `json:"result"`
+	Status     int      `json:"status"`
+	CommandNum bool     `json:"commandNum"`
+	TimeStamp  int64    `json:"timeStamp"`
+}
diff --git a/internal/schema/api/eventscenario/status.go b/internal/schema/api/eventscenario/status.go
new file mode 100644
index 0000000..901c31b
--- /dev/null
+++ b/internal/schema/api/eventscenario/status.go
@@ -0,0 +1,31 @@
+package eventscenario
+
+type ChapterList struct {
+	EventScenarioID int    `json:"event_scenario_id"`
+	Chapter         int    `json:"chapter"`
+	ChapterAsset    string `json:"chapter_asset,omitempty"`
+	Status          int    `json:"status"`
+	OpenFlashFlag   int    `json:"open_flash_flag"`
+	IsReward        bool   `json:"is_reward"`
+	CostType        int    `json:"cost_type"`
+	ItemID          int    `json:"item_id"`
+	Amount          int    `json:"amount"`
+}
+
+type EventScenarioList struct {
+	EventID               int           `json:"event_id"`
+	EventScenarioBtnAsset string        `json:"event_scenario_btn_asset"`
+	OpenDate              string        `json:"open_date"`
+	ChapterList           []ChapterList `json:"chapter_list"`
+}
+
+type StatusData struct {
+	EventScenarioList []EventScenarioList `json:"event_scenario_list"`
+}
+
+type StatusResp struct {
+	Result     StatusData `json:"result"`
+	Status     int        `json:"status"`
+	CommandNum bool       `json:"commandNum"`
+	TimeStamp  int64      `json:"timeStamp"`
+}
diff --git a/internal/schema/api/exchange/owningpoint.go b/internal/schema/api/exchange/owningpoint.go
new file mode 100644
index 0000000..33526a6
--- /dev/null
+++ b/internal/schema/api/exchange/owningpoint.go
@@ -0,0 +1,17 @@
+package exchange
+
+type ExchangePointList struct {
+	Rarity        int `json:"rarity"`
+	ExchangePoint int `json:"exchange_point"`
+}
+
+type OwningPointData struct {
+	ExchangePointList []ExchangePointList `json:"exchange_point_list"`
+}
+
+type OwningPointResp struct {
+	Result     OwningPointData `json:"result"`
+	Status     int             `json:"status"`
+	CommandNum bool            `json:"commandNum"`
+	TimeStamp  int64           `json:"timeStamp"`
+}
diff --git a/internal/schema/api/live/schedule.go b/internal/schema/api/live/schedule.go
new file mode 100644
index 0000000..96f02c1
--- /dev/null
+++ b/internal/schema/api/live/schedule.go
@@ -0,0 +1,45 @@
+package live
+
+type LiveList struct {
+	LiveDifficultyID int    `json:"live_difficulty_id"`
+	StartDate        string `json:"start_date"`
+	EndDate          string `json:"end_date"`
+	IsRandom         bool   `json:"is_random"`
+}
+
+type LimitedBonusCommonList struct {
+	LiveType          int    `json:"live_type"`
+	LimitedBonusType  int    `json:"limited_bonus_type"`
+	LimitedBonusValue int    `json:"limited_bonus_value"`
+	StartDate         string `json:"start_date"`
+	EndDate           string `json:"end_date"`
+}
+
+type RandomLiveList struct {
+	AttributeID int    `json:"attribute_id"`
+	StartDate   string `json:"start_date"`
+	EndDate     string `json:"end_date"`
+}
+
+type TrainingLiveList struct {
+	LiveDifficultyID int    `json:"live_difficulty_id"`
+	StartDate        string `json:"start_date"`
+	IsRandom         bool   `json:"is_random"`
+}
+
+type ScheduleData struct {
+	EventList              []any                    `json:"event_list"`
+	LiveList               []LiveList               `json:"live_list"`
+	LimitedBonusList       []any                    `json:"limited_bonus_list"`
+	LimitedBonusCommonList []LimitedBonusCommonList `json:"limited_bonus_common_list"`
+	RandomLiveList         []RandomLiveList         `json:"random_live_list"`
+	FreeLiveList           []any                    `json:"free_live_list"`
+	TrainingLiveList       []TrainingLiveList       `json:"training_live_list"`
+}
+
+type ScheduleResp struct {
+	Result     ScheduleData `json:"result"`
+	Status     int          `json:"status"`
+	CommandNum bool         `json:"commandNum"`
+	TimeStamp  int64        `json:"timeStamp"`
+}
diff --git a/internal/schema/api/live/status.go b/internal/schema/api/live/status.go
new file mode 100644
index 0000000..a98dae4
--- /dev/null
+++ b/internal/schema/api/live/status.go
@@ -0,0 +1,44 @@
+package live
+
+type NormalLiveStatusList struct {
+	LiveDifficultyID   int   `json:"live_difficulty_id"`
+	Status             int   `json:"status"`
+	HiScore            int   `json:"hi_score"`
+	HiComboCount       int   `json:"hi_combo_count"`
+	ClearCnt           int   `json:"clear_cnt"`
+	AchievedGoalIDList []int `json:"achieved_goal_id_list"`
+}
+
+type SpecialLiveStatusList struct {
+	LiveDifficultyID   int   `json:"live_difficulty_id"`
+	Status             int   `json:"status"`
+	HiScore            int   `json:"hi_score"`
+	HiComboCount       int   `json:"hi_combo_count"`
+	ClearCnt           int   `json:"clear_cnt"`
+	AchievedGoalIDList []int `json:"achieved_goal_id_list"`
+}
+
+type TrainingLiveStatusList struct {
+	LiveDifficultyID   int   `json:"live_difficulty_id"`
+	Status             int   `json:"status"`
+	HiScore            int   `json:"hi_score"`
+	HiComboCount       int   `json:"hi_combo_count"`
+	ClearCnt           int   `json:"clear_cnt"`
+	AchievedGoalIDList []int `json:"achieved_goal_id_list"`
+}
+
+type StatusData struct {
+	NormalLiveStatusList   []NormalLiveStatusList   `json:"normal_live_status_list"`
+	SpecialLiveStatusList  []SpecialLiveStatusList  `json:"special_live_status_list"`
+	TrainingLiveStatusList []TrainingLiveStatusList `json:"training_live_status_list"`
+	MarathonLiveStatusList []any                    `json:"marathon_live_status_list"`
+	FreeLiveStatusList     []any                    `json:"free_live_status_list"`
+	CanResumeLive          bool                     `json:"can_resume_live"`
+}
+
+type StatusResp struct {
+	Result     StatusData `json:"result"`
+	Status     int        `json:"status"`
+	CommandNum bool       `json:"commandNum"`
+	TimeStamp  int64      `json:"timeStamp"`
+}
diff --git a/internal/schema/api/liveicon/info.go b/internal/schema/api/liveicon/info.go
new file mode 100644
index 0000000..288b736
--- /dev/null
+++ b/internal/schema/api/liveicon/info.go
@@ -0,0 +1,12 @@
+package liveicon
+
+type InfoData struct {
+	LiveNotesIconList []int `json:"live_notes_icon_list"`
+}
+
+type InfoResp struct {
+	Result     InfoData `json:"result"`
+	Status     int      `json:"status"`
+	CommandNum bool     `json:"commandNum"`
+	TimeStamp  int64    `json:"timeStamp"`
+}
diff --git a/internal/schema/api/livese/info.go b/internal/schema/api/livese/info.go
new file mode 100644
index 0000000..f89c785
--- /dev/null
+++ b/internal/schema/api/livese/info.go
@@ -0,0 +1,12 @@
+package livese
+
+type InfoData struct {
+	LiveSeList []int `json:"live_se_list"`
+}
+
+type InfoResp struct {
+	Result     InfoData `json:"result"`
+	Status     int      `json:"status"`
+	CommandNum bool     `json:"commandNum"`
+	TimeStamp  int64    `json:"timeStamp"`
+}
diff --git a/internal/schema/api/login/topinfo.go b/internal/schema/api/login/topinfo.go
new file mode 100644
index 0000000..49ab7f9
--- /dev/null
+++ b/internal/schema/api/login/topinfo.go
@@ -0,0 +1,39 @@
+package login
+
+type LicenseInfo struct {
+	LicenseList  []any `json:"license_list"`
+	LicensedInfo []any `json:"licensed_info"`
+	ExpiredInfo  []any `json:"expired_info"`
+	BadgeFlag    bool  `json:"badge_flag"`
+}
+
+type TopInfoData struct {
+	FriendActionCnt        int         `json:"friend_action_cnt"`
+	FriendGreetCnt         int         `json:"friend_greet_cnt"`
+	FriendVarietyCnt       int         `json:"friend_variety_cnt"`
+	FriendNewCnt           int         `json:"friend_new_cnt"`
+	PresentCnt             int         `json:"present_cnt"`
+	SecretBoxBadgeFlag     bool        `json:"secret_box_badge_flag"`
+	ServerDatetime         string      `json:"server_datetime"`
+	ServerTimestamp        int64       `json:"server_timestamp"`
+	NoticeFriendDatetime   string      `json:"notice_friend_datetime"`
+	NoticeMailDatetime     string      `json:"notice_mail_datetime"`
+	FriendsApprovalWaitCnt int         `json:"friends_approval_wait_cnt"`
+	FriendsRequestCnt      int         `json:"friends_request_cnt"`
+	IsTodayBirthday        bool        `json:"is_today_birthday"`
+	LicenseInfo            LicenseInfo `json:"license_info"`
+	UsingBuffInfo          []any       `json:"using_buff_info"`
+	IsKlabIDTaskFlag       bool        `json:"is_klab_id_task_flag"`
+	KlabIDTaskCanSync      bool        `json:"klab_id_task_can_sync"`
+	HasUnreadAnnounce      bool        `json:"has_unread_announce"`
+	ExchangeBadgeCnt       []int       `json:"exchange_badge_cnt"`
+	AdFlag                 bool        `json:"ad_flag"`
+	HasAdReward            bool        `json:"has_ad_reward"`
+}
+
+type TopInfoResp struct {
+	Result     TopInfoData `json:"result"`
+	Status     int         `json:"status"`
+	CommandNum bool        `json:"commandNum"`
+	TimeStamp  int64       `json:"timeStamp"`
+}
diff --git a/internal/schema/api/login/topinfoonce.go b/internal/schema/api/login/topinfoonce.go
new file mode 100644
index 0000000..45dc9d9
--- /dev/null
+++ b/internal/schema/api/login/topinfoonce.go
@@ -0,0 +1,34 @@
+package login
+
+type Notification struct {
+	Push       bool `json:"push"`
+	Lp         bool `json:"lp"`
+	UpdateInfo bool `json:"update_info"`
+	Campaign   bool `json:"campaign"`
+	Live       bool `json:"live"`
+	Lbonus     bool `json:"lbonus"`
+	Event      bool `json:"event"`
+	Secretbox  bool `json:"secretbox"`
+	Birthday   bool `json:"birthday"`
+}
+
+type TopInfoOnceData struct {
+	NewAchievementCnt            int          `json:"new_achievement_cnt"`
+	UnaccomplishedAchievementCnt int          `json:"unaccomplished_achievement_cnt"`
+	LiveDailyRewardExist         bool         `json:"live_daily_reward_exist"`
+	TrainingEnergy               int          `json:"training_energy"`
+	TrainingEnergyMax            int          `json:"training_energy_max"`
+	Notification                 Notification `json:"notification"`
+	OpenArena                    bool         `json:"open_arena"`
+	CostumeStatus                bool         `json:"costume_status"`
+	OpenAccessory                bool         `json:"open_accessory"`
+	ArenaSiSkillUniqueCheck      bool         `json:"arena_si_skill_unique_check"`
+	OpenV98                      bool         `json:"open_v98"`
+}
+
+type TopInfoOnceResp struct {
+	Result     TopInfoOnceData `json:"result"`
+	Status     int             `json:"status"`
+	CommandNum bool            `json:"commandNum"`
+	TimeStamp  int64           `json:"timeStamp"`
+}
diff --git a/internal/model/challenge.go b/internal/schema/api/marathon/info.go
similarity index 67%
rename from internal/model/challenge.go
rename to internal/schema/api/marathon/info.go
index 5e561f9..83d03df 100644
--- a/internal/model/challenge.go
+++ b/internal/schema/api/marathon/info.go
@@ -1,7 +1,6 @@
-package model
+package marathon
 
-// ChallengeInfoResp ...
-type ChallengeInfoResp struct {
+type InfoResp struct {
 	Result     []any `json:"result"`
 	Status     int   `json:"status"`
 	CommandNum bool  `json:"commandNum"`
diff --git a/internal/schema/api/multiunit/scenariostatus.go b/internal/schema/api/multiunit/scenariostatus.go
new file mode 100644
index 0000000..2889f01
--- /dev/null
+++ b/internal/schema/api/multiunit/scenariostatus.go
@@ -0,0 +1,27 @@
+package multiunit
+
+type ChapterList struct {
+	MultiUnitScenarioID int `json:"multi_unit_scenario_id"`
+	Chapter             int `json:"chapter"`
+	Status              int `json:"status"`
+}
+
+type StatusList struct {
+	MultiUnitID               int           `json:"multi_unit_id"`
+	Status                    int           `json:"status"`
+	MultiUnitScenarioBtnAsset string        `json:"multi_unit_scenario_btn_asset"`
+	OpenDate                  string        `json:"open_date"`
+	ChapterList               []ChapterList `json:"chapter_list"`
+}
+
+type StatusData struct {
+	MultiUnitScenarioStatusList  []StatusList `json:"multi_unit_scenario_status_list"`
+	UnlockedMultiUnitScenarioIds []any        `json:"unlocked_multi_unit_scenario_ids"`
+}
+
+type StatusResp struct {
+	Result     StatusData `json:"result"`
+	Status     int        `json:"status"`
+	CommandNum bool       `json:"commandNum"`
+	TimeStamp  int64      `json:"timeStamp"`
+}
diff --git a/internal/schema/api/museum/info.go b/internal/schema/api/museum/info.go
new file mode 100644
index 0000000..f19e2fb
--- /dev/null
+++ b/internal/schema/api/museum/info.go
@@ -0,0 +1,23 @@
+package museum
+
+type Parameter struct {
+	Smile int `json:"smile"`
+	Pure  int `json:"pure"`
+	Cool  int `json:"cool"`
+}
+
+type Info struct {
+	Parameter      Parameter `json:"parameter"`
+	ContentsIDList []int     `json:"contents_id_list"`
+}
+
+type InfoData struct {
+	MuseumInfo Info `json:"museum_info"`
+}
+
+type InfoResp struct {
+	Result     InfoData `json:"result"`
+	Status     int      `json:"status"`
+	CommandNum bool     `json:"commandNum"`
+	TimeStamp  int64    `json:"timeStamp"`
+}
diff --git a/internal/schema/api/navigation/specialcutin.go b/internal/schema/api/navigation/specialcutin.go
new file mode 100644
index 0000000..54b4528
--- /dev/null
+++ b/internal/schema/api/navigation/specialcutin.go
@@ -0,0 +1,12 @@
+package navigation
+
+type SpecialCutinData struct {
+	SpecialCutinList []any `json:"special_cutin_list"`
+}
+
+type SpecialCutinResp struct {
+	Result     SpecialCutinData `json:"result"`
+	Status     int              `json:"status"`
+	CommandNum bool             `json:"commandNum"`
+	TimeStamp  int64            `json:"timeStamp"`
+}
diff --git a/internal/schema/api/notice/marquee.go b/internal/schema/api/notice/marquee.go
new file mode 100644
index 0000000..d597faf
--- /dev/null
+++ b/internal/schema/api/notice/marquee.go
@@ -0,0 +1,13 @@
+package notice
+
+type MarqueeData struct {
+	ItemCount   int   `json:"item_count"`
+	MarqueeList []any `json:"marquee_list"`
+}
+
+type MarqueeResp struct {
+	Result     MarqueeData `json:"result"`
+	Status     int         `json:"status"`
+	CommandNum bool        `json:"commandNum"`
+	TimeStamp  int64       `json:"timeStamp"`
+}
diff --git a/internal/schema/api/payment/productlist.go b/internal/schema/api/payment/productlist.go
new file mode 100644
index 0000000..9f7cf49
--- /dev/null
+++ b/internal/schema/api/payment/productlist.go
@@ -0,0 +1,120 @@
+package payment
+
+type RestrictionInfo struct {
+	Restricted bool `json:"restricted"`
+}
+
+type UnderAgeInfo struct {
+	BirthSet    bool `json:"birth_set"`
+	HasLimit    bool `json:"has_limit"`
+	LimitAmount any  `json:"limit_amount"`
+	MonthUsed   int  `json:"month_used"`
+}
+
+type SnsProductItem struct {
+	ItemID    int  `json:"item_id"`
+	AddType   int  `json:"add_type"`
+	Amount    int  `json:"amount"`
+	IsFreebie bool `json:"is_freebie"`
+}
+
+type SnsProduct struct {
+	ProductID   string           `json:"product_id"`
+	Name        string           `json:"name"`
+	Price       int              `json:"price"`
+	CanBuy      bool             `json:"can_buy"`
+	ProductType int              `json:"product_type"`
+	ItemList    []SnsProductItem `json:"item_list"`
+}
+
+type ProductItem struct {
+	ItemID    int  `json:"item_id"`
+	AddType   int  `json:"add_type"`
+	Amount    int  `json:"amount"`
+	IsFreebie bool `json:"is_freebie"`
+	IsRankMax bool `json:"is_rank_max,omitempty"`
+}
+
+type LimitStatus struct {
+	TermStartDate  string `json:"term_start_date"`
+	RemainingTime  string `json:"remaining_time"`
+	RemainingCount int    `json:"remaining_count"`
+}
+
+type Product struct {
+	ProductID      string        `json:"product_id"`
+	Name           string        `json:"name"`
+	BannerImgAsset string        `json:"banner_img_asset"`
+	Price          int           `json:"price"`
+	CanBuy         bool          `json:"can_buy"`
+	ProductType    int           `json:"product_type"`
+	AnnounceURL    string        `json:"announce_url"`
+	ConfirmURL     string        `json:"confirm_url"`
+	ItemList       []ProductItem `json:"item_list"`
+	LimitStatus    LimitStatus   `json:"limit_status"`
+}
+
+type SubscriptionItem struct {
+	ItemID    int  `json:"item_id"`
+	AddType   int  `json:"add_type"`
+	Amount    int  `json:"amount"`
+	IsFreebie bool `json:"is_freebie"`
+}
+
+type LicenseReward struct {
+	ItemID  int `json:"item_id"`
+	AddType int `json:"add_type"`
+	Amount  int `json:"amount"`
+}
+
+type LicenseItem struct {
+	Seq        int             `json:"seq"`
+	RewardList []LicenseReward `json:"reward_list"`
+}
+
+type LicenseInfo struct {
+	Name  string        `json:"name"`
+	Items []LicenseItem `json:"items"`
+}
+
+type UserStatus struct {
+	IsLicensed bool `json:"is_licensed"`
+}
+
+type SubscriptionStatus struct {
+	LicenseID     int         `json:"license_id"`
+	LicenseType   int         `json:"license_type"`
+	LicenseInfo   LicenseInfo `json:"license_info,omitempty"`
+	UserStatus    UserStatus  `json:"user_status"`
+	PurchaseCount int         `json:"purchase_count"`
+	BadgeFlag     bool        `json:"badge_flag"`
+}
+
+type Subscription struct {
+	ProductID          string             `json:"product_id"`
+	Name               string             `json:"name"`
+	BannerImgAsset     string             `json:"banner_img_asset"`
+	Price              int                `json:"price"`
+	CanBuy             bool               `json:"can_buy"`
+	ProductType        int                `json:"product_type"`
+	ProductURL         string             `json:"product_url"`
+	ItemList           []SubscriptionItem `json:"item_list"`
+	LimitStatus        LimitStatus        `json:"limit_status"`
+	SubscriptionStatus SubscriptionStatus `json:"subscription_status"`
+}
+
+type ProductListData struct {
+	RestrictionInfo  RestrictionInfo `json:"restriction_info"`
+	UnderAgeInfo     UnderAgeInfo    `json:"under_age_info"`
+	SnsProductList   []SnsProduct    `json:"sns_product_list"`
+	ProductList      []Product       `json:"product_list"`
+	SubscriptionList []Subscription  `json:"subscription_list"`
+	ShowPointShop    bool            `json:"show_point_shop"`
+}
+
+type ProductListResp struct {
+	Result     ProductListData `json:"result"`
+	Status     int             `json:"status"`
+	CommandNum bool            `json:"commandNum"`
+	TimeStamp  int64           `json:"timeStamp"`
+}
diff --git a/internal/schema/api/profile/cardranking.go b/internal/schema/api/profile/cardranking.go
new file mode 100644
index 0000000..a06965d
--- /dev/null
+++ b/internal/schema/api/profile/cardranking.go
@@ -0,0 +1,8 @@
+package profile
+
+type CardRankingResp struct {
+	Result     []any `json:"result"`
+	Status     int   `json:"status"`
+	CommandNum bool  `json:"commandNum"`
+	TimeStamp  int64 `json:"timeStamp"`
+}
diff --git a/internal/model/tools.go b/internal/schema/api/profile/info.go
similarity index 71%
rename from internal/model/tools.go
rename to internal/schema/api/profile/info.go
index 089720d..a53faab 100644
--- a/internal/model/tools.go
+++ b/internal/schema/api/profile/info.go
@@ -1,6 +1,5 @@
-package model
+package profile
 
-// UnitData ...
 type UnitData struct {
 	UnitOwningUserID            int    `xorm:"unit_owning_user_id pk autoincr" json:"unit_owning_user_id"`
 	UserID                      int    `xorm:"user_id" json:"-"`
@@ -29,60 +28,6 @@ type UnitData struct {
 	InsertDate                  string `xorm:"insert_date" json:"insert_date"`
 }
 
-// UserDeckData ...
-type UserDeckData struct {
-	ID         int    `xorm:"id pk autoincr"`
-	DeckID     int    `xorm:"deck_id"`
-	MainFlag   int    `xorm:"main_flag"`
-	DeckName   string `xorm:"deck_name"`
-	UserID     int    `xorm:"user_id"`
-	InsertDate int64  `xorm:"insert_date"`
-}
-
-// UnitDeckData ...
-type UnitDeckData struct {
-	ID               int   `xorm:"id pk autoincr" json:"-"`
-	UserDeckID       int   `xorm:"user_deck_id" json:"-"`
-	UnitOwningUserID int   `xorm:"unit_owning_user_id" json:"unit_owning_user_id"`
-	UnitID           int   `xorm:"unit_id" json:"unit_id"`
-	Position         int   `xorm:"position" json:"position"`
-	Level            int   `xorm:"level" json:"level"`
-	LevelLimitID     int   `xorm:"level_limit_id" json:"level_limit_id"`
-	DisplayRank      int   `xorm:"display_rank" json:"display_rank"`
-	Love             int   `xorm:"love" json:"love"`
-	UnitSkillLevel   int   `xorm:"unit_skill_level" json:"unit_skill_level"`
-	IsRankMax        bool  `xorm:"is_rank_max" json:"is_rank_max"`
-	IsLoveMax        bool  `xorm:"is_love_max" json:"is_love_max"`
-	IsLevelMax       bool  `xorm:"is_level_max" json:"is_level_max"`
-	IsSigned         bool  `xorm:"is_signed" json:"is_signed"`
-	BeforeLove       int   `xorm:"before_love" json:"before_love"`
-	MaxLove          int   `xorm:"max_love" json:"max_love"`
-	InsertData       int64 `xorm:"insert_date" json:"-"`
-}
-
-// DifficultyRes ...
-type DifficultyRes struct {
-	Difficulty int `json:"difficulty"`
-	ClearCnt   int `json:"clear_cnt"`
-}
-
-// DifficultyResp ...
-type DifficultyResp struct {
-	Result     []DifficultyRes `json:"result"`
-	Status     int             `json:"status"`
-	CommandNum bool            `json:"commandNum"`
-	TimeStamp  int64           `json:"timeStamp"`
-}
-
-// LoveResp ...
-type LoveResp struct {
-	Result     []any `json:"result"`
-	Status     int   `json:"status"`
-	CommandNum bool  `json:"commandNum"`
-	TimeStamp  int64 `json:"timeStamp"`
-}
-
-// AccessoryInfo ...
 type AccessoryInfo struct {
 	AccessoryOwningUserID int  `json:"accessory_owning_user_id"`
 	AccessoryID           int  `json:"accessory_id"`
@@ -94,8 +39,13 @@ type AccessoryInfo struct {
 	FavoriteFlag          bool `json:"favorite_flag"`
 }
 
-// ProfileUserInfo ...
-type ProfileUserInfo struct {
+type Costume struct {
+	UnitID    int  `json:"unit_id"`
+	IsRankMax bool `json:"is_rank_max"`
+	IsSigned  bool `json:"is_signed"`
+}
+
+type UserInfo struct {
 	UserID               int    `json:"user_id"`
 	Name                 string `json:"name"`
 	Level                int    `json:"level"`
@@ -109,7 +59,6 @@ type ProfileUserInfo struct {
 	Introduction         string `json:"introduction"`
 }
 
-// CenterUnitInfo ...
 type CenterUnitInfo struct {
 	UnitOwningUserID           int           `json:"unit_owning_user_id"`
 	UnitID                     int           `json:"unit_id"`
@@ -147,7 +96,6 @@ type CenterUnitInfo struct {
 	TotalHp                    int           `json:"total_hp"`
 }
 
-// NaviUnitInfo ...
 type NaviUnitInfo struct {
 	UnitOwningUserID            int    `json:"unit_owning_user_id"`
 	UnitID                      int    `json:"unit_id"`
@@ -180,21 +128,19 @@ type NaviUnitInfo struct {
 	RemovableSkillIds           []int  `json:"removable_skill_ids"`
 }
 
-// ProfileRes ...
-type ProfileRes struct {
-	UserInfo            ProfileUserInfo `json:"user_info"`
-	CenterUnitInfo      CenterUnitInfo  `json:"center_unit_info"`
-	NaviUnitInfo        NaviUnitInfo    `json:"navi_unit_info"`
-	IsAlliance          bool            `json:"is_alliance"`
-	FriendStatus        int             `json:"friend_status"`
-	SettingAwardID      int             `json:"setting_award_id"`
-	SettingBackgroundID int             `json:"setting_background_id"`
+type InfoData struct {
+	UserInfo            UserInfo       `json:"user_info"`
+	CenterUnitInfo      CenterUnitInfo `json:"center_unit_info"`
+	NaviUnitInfo        NaviUnitInfo   `json:"navi_unit_info"`
+	IsAlliance          bool           `json:"is_alliance"`
+	FriendStatus        int            `json:"friend_status"`
+	SettingAwardID      int            `json:"setting_award_id"`
+	SettingBackgroundID int            `json:"setting_background_id"`
 }
 
-// ProfileResp ...
-type ProfileResp struct {
-	Result     ProfileRes `json:"result"`
-	Status     int        `json:"status"`
-	CommandNum bool       `json:"commandNum"`
-	TimeStamp  int64      `json:"timeStamp"`
+type InfoResp struct {
+	Result     InfoData `json:"result"`
+	Status     int      `json:"status"`
+	CommandNum bool     `json:"commandNum"`
+	TimeStamp  int64    `json:"timeStamp"`
 }
diff --git a/internal/schema/api/profile/livecnt.go b/internal/schema/api/profile/livecnt.go
new file mode 100644
index 0000000..8c35e0b
--- /dev/null
+++ b/internal/schema/api/profile/livecnt.go
@@ -0,0 +1,13 @@
+package profile
+
+type LiveCntData struct {
+	Difficulty int `json:"difficulty"`
+	ClearCnt   int `json:"clear_cnt"`
+}
+
+type LiveCntResp struct {
+	Result     []LiveCntData `json:"result"`
+	Status     int           `json:"status"`
+	CommandNum bool          `json:"commandNum"`
+	TimeStamp  int64         `json:"timeStamp"`
+}
diff --git a/internal/schema/api/scenario/status.go b/internal/schema/api/scenario/status.go
new file mode 100644
index 0000000..ffff05e
--- /dev/null
+++ b/internal/schema/api/scenario/status.go
@@ -0,0 +1,17 @@
+package scenario
+
+type StatusList struct {
+	ScenarioID int `json:"scenario_id"`
+	Status     int `json:"status"`
+}
+
+type StatusData struct {
+	ScenarioStatusList []StatusList `json:"scenario_status_list"`
+}
+
+type StatusResp struct {
+	Result     StatusData `json:"result"`
+	Status     int        `json:"status"`
+	CommandNum bool       `json:"commandNum"`
+	TimeStamp  int64      `json:"timeStamp"`
+}
diff --git a/internal/schema/api/subscenario/status.go b/internal/schema/api/subscenario/status.go
new file mode 100644
index 0000000..1a5486b
--- /dev/null
+++ b/internal/schema/api/subscenario/status.go
@@ -0,0 +1,18 @@
+package subscenario
+
+type StatusList struct {
+	SubscenarioID int `json:"subscenario_id"`
+	Status        int `json:"status"`
+}
+
+type StatusData struct {
+	SubscenarioStatusList  []StatusList `json:"subscenario_status_list"`
+	UnlockedSubscenarioIds []any        `json:"unlocked_subscenario_ids"`
+}
+
+type StatusResp struct {
+	Result     StatusData `json:"result"`
+	Status     int        `json:"status"`
+	CommandNum bool       `json:"commandNum"`
+	TimeStamp  int64      `json:"timeStamp"`
+}
diff --git a/internal/schema/api/unit/accessoryall.go b/internal/schema/api/unit/accessoryall.go
new file mode 100644
index 0000000..1773f94
--- /dev/null
+++ b/internal/schema/api/unit/accessoryall.go
@@ -0,0 +1,30 @@
+package unit
+
+type AccessoryList struct {
+	AccessoryOwningUserID int  `json:"accessory_owning_user_id" xorm:"accessory_owning_user_id"`
+	AccessoryID           int  `json:"accessory_id" xorm:"accessory_id"`
+	Exp                   int  `json:"exp" xorm:"exp"`
+	NextExp               int  `json:"next_exp" xorm:"-"`
+	Level                 int  `json:"level" xorm:"-"`
+	MaxLevel              int  `json:"max_level" xorm:"-"`
+	RankUpCount           int  `json:"rank_up_count" xorm:"-"`
+	FavoriteFlag          bool `json:"favorite_flag" xorm:"-"`
+}
+
+type WearingInfo struct {
+	UnitOwningUserID      int `json:"unit_owning_user_id" xorm:"unit_owning_user_id"`
+	AccessoryOwningUserID int `json:"accessory_owning_user_id" xorm:"accessory_owning_user_id"`
+}
+
+type AccessoryAllData struct {
+	AccessoryList      []AccessoryList `json:"accessory_list"`
+	WearingInfo        []WearingInfo   `json:"wearing_info"`
+	EspecialCreateFlag bool            `json:"especial_create_flag"`
+}
+
+type AccessoryAllResp struct {
+	Result     AccessoryAllData `json:"result"`
+	Status     int              `json:"status"`
+	CommandNum bool             `json:"commandNum"`
+	TimeStamp  int64            `json:"timeStamp"`
+}
diff --git a/internal/schema/api/unit/all.go b/internal/schema/api/unit/all.go
new file mode 100644
index 0000000..2d58003
--- /dev/null
+++ b/internal/schema/api/unit/all.go
@@ -0,0 +1,75 @@
+package unit
+
+type Costume struct {
+	UnitID    int  `json:"unit_id"`
+	IsRankMax bool `json:"is_rank_max"`
+	IsSigned  bool `json:"is_signed"`
+}
+
+type Active struct {
+	UnitOwningUserID            int    `xorm:"unit_owning_user_id pk autoincr" json:"unit_owning_user_id"`
+	UserID                      int    `xorm:"user_id" json:"-"`
+	UnitID                      int    `xorm:"unit_id" json:"unit_id"`
+	Exp                         int    `xorm:"exp" json:"exp"`
+	NextExp                     int    `xorm:"next_exp" json:"next_exp"`
+	Level                       int    `xorm:"level" json:"level"`
+	MaxLevel                    int    `xorm:"max_level" json:"max_level"`
+	LevelLimitID                int    `xorm:"level_limit_id" json:"level_limit_id"`
+	Rank                        int    `xorm:"rank" json:"rank"`
+	MaxRank                     int    `xorm:"max_rank" json:"max_rank"`
+	Love                        int    `xorm:"love" json:"love"`
+	MaxLove                     int    `xorm:"max_love" json:"max_love"`
+	UnitSkillExp                int    `xorm:"unit_skill_exp" json:"unit_skill_exp"`
+	UnitSkillLevel              int    `xorm:"unit_skill_level" json:"unit_skill_level"`
+	MaxHp                       int    `xorm:"max_hp" json:"max_hp"`
+	UnitRemovableSkillCapacity  int    `xorm:"unit_removable_skill_capacity" json:"unit_removable_skill_capacity"`
+	FavoriteFlag                bool   `xorm:"favorite_flag" json:"favorite_flag"`
+	DisplayRank                 int    `xorm:"display_rank" json:"display_rank"`
+	IsRankMax                   bool   `xorm:"is_rank_max" json:"is_rank_max"`
+	IsLoveMax                   bool   `xorm:"is_love_max" json:"is_love_max"`
+	IsLevelMax                  bool   `xorm:"is_level_max" json:"is_level_max"`
+	IsSigned                    bool   `xorm:"is_signed" json:"is_signed"`
+	IsSkillLevelMax             bool   `xorm:"is_skill_level_max" json:"is_skill_level_max"`
+	IsRemovableSkillCapacityMax bool   `xorm:"is_removable_skill_capacity_max" json:"is_removable_skill_capacity_max"`
+	InsertDate                  string `xorm:"insert_date" json:"insert_date"`
+	// Costume                     Costume `json:"costume"`
+}
+
+type Waiting struct {
+	UnitOwningUserID            int64  `json:"unit_owning_user_id"`
+	UnitID                      int    `json:"unit_id"`
+	Exp                         int    `json:"exp"`
+	NextExp                     int    `json:"next_exp"`
+	Level                       int    `json:"level"`
+	MaxLevel                    int    `json:"max_level"`
+	LevelLimitID                int    `json:"level_limit_id"`
+	Rank                        int    `json:"rank"`
+	MaxRank                     int    `json:"max_rank"`
+	Love                        int    `json:"love"`
+	MaxLove                     int    `json:"max_love"`
+	UnitSkillExp                int    `json:"unit_skill_exp"`
+	UnitSkillLevel              int    `json:"unit_skill_level"`
+	MaxHp                       int    `json:"max_hp"`
+	UnitRemovableSkillCapacity  int    `json:"unit_removable_skill_capacity"`
+	FavoriteFlag                bool   `json:"favorite_flag"`
+	DisplayRank                 int    `json:"display_rank"`
+	IsRankMax                   bool   `json:"is_rank_max"`
+	IsLoveMax                   bool   `json:"is_love_max"`
+	IsLevelMax                  bool   `json:"is_level_max"`
+	IsSigned                    bool   `json:"is_signed"`
+	IsSkillLevelMax             bool   `json:"is_skill_level_max"`
+	IsRemovableSkillCapacityMax bool   `json:"is_removable_skill_capacity_max"`
+	InsertDate                  string `json:"insert_date"`
+}
+
+type AllData struct {
+	Active  []Active  `json:"active"`
+	Waiting []Waiting `json:"waiting"`
+}
+
+type AllResp struct {
+	Result     AllData `json:"result"`
+	Status     int     `json:"status"`
+	CommandNum bool    `json:"commandNum"`
+	TimeStamp  int64   `json:"timeStamp"`
+}
diff --git a/internal/schema/api/unit/deckinfo.go b/internal/schema/api/unit/deckinfo.go
new file mode 100644
index 0000000..a434b0a
--- /dev/null
+++ b/internal/schema/api/unit/deckinfo.go
@@ -0,0 +1,49 @@
+package unit
+
+type UserDeckData struct {
+	ID         int    `xorm:"id pk autoincr"`
+	DeckID     int    `xorm:"deck_id"`
+	MainFlag   int    `xorm:"main_flag"`
+	DeckName   string `xorm:"deck_name"`
+	UserID     int    `xorm:"user_id"`
+	InsertDate int64  `xorm:"insert_date"`
+}
+
+type UnitDeckData struct {
+	ID               int   `xorm:"id pk autoincr" json:"-"`
+	UserDeckID       int   `xorm:"user_deck_id" json:"-"`
+	UnitOwningUserID int   `xorm:"unit_owning_user_id" json:"unit_owning_user_id"`
+	UnitID           int   `xorm:"unit_id" json:"unit_id"`
+	Position         int   `xorm:"position" json:"position"`
+	Level            int   `xorm:"level" json:"level"`
+	LevelLimitID     int   `xorm:"level_limit_id" json:"level_limit_id"`
+	DisplayRank      int   `xorm:"display_rank" json:"display_rank"`
+	Love             int   `xorm:"love" json:"love"`
+	UnitSkillLevel   int   `xorm:"unit_skill_level" json:"unit_skill_level"`
+	IsRankMax        bool  `xorm:"is_rank_max" json:"is_rank_max"`
+	IsLoveMax        bool  `xorm:"is_love_max" json:"is_love_max"`
+	IsLevelMax       bool  `xorm:"is_level_max" json:"is_level_max"`
+	IsSigned         bool  `xorm:"is_signed" json:"is_signed"`
+	BeforeLove       int   `xorm:"before_love" json:"before_love"`
+	MaxLove          int   `xorm:"max_love" json:"max_love"`
+	InsertData       int64 `xorm:"insert_date" json:"-"`
+}
+
+type UnitOwningUserIds struct {
+	Position         int `json:"position"`
+	UnitOwningUserID int `json:"unit_owning_user_id"`
+}
+
+type DeckInfoData struct {
+	UnitDeckID        int                 `json:"unit_deck_id"`
+	MainFlag          bool                `json:"main_flag"`
+	DeckName          string              `json:"deck_name"`
+	UnitOwningUserIds []UnitOwningUserIds `json:"unit_owning_user_ids"`
+}
+
+type DeckInfoResp struct {
+	Result     []DeckInfoData `json:"result"`
+	Status     int            `json:"status"`
+	CommandNum bool           `json:"commandNum"`
+	TimeStamp  int64          `json:"timeStamp"`
+}
diff --git a/internal/schema/api/unit/removableskillinfo.go b/internal/schema/api/unit/removableskillinfo.go
new file mode 100644
index 0000000..8ed7891
--- /dev/null
+++ b/internal/schema/api/unit/removableskillinfo.go
@@ -0,0 +1,41 @@
+package unit
+
+type SkillEquipCount struct {
+	UnitRemovableSkillId int `xorm:"unit_removable_skill_id"`
+	Count                int `xorm:"ct"`
+}
+
+type SkillEquipData struct {
+	Id                   int    `xorm:"id pk autoincr"`
+	UnitRemovableSkillId int    `xorm:"unit_removable_skill_id"`
+	UnitOwningUserID     int    `xorm:"unit_owning_user_id"`
+	UserId               string `xorm:"user_id"`
+}
+
+type SkillEquipDetail struct {
+	UnitRemovableSkillID int `json:"unit_removable_skill_id" xorm:"unit_removable_skill_id"`
+}
+
+type SkillEquipList struct {
+	UnitOwningUserID int                `json:"unit_owning_user_id"`
+	Detail           []SkillEquipDetail `json:"detail"`
+}
+
+type OwningInfo struct {
+	UnitRemovableSkillID int    `json:"unit_removable_skill_id"`
+	TotalAmount          int    `json:"total_amount"`
+	EquippedAmount       int    `json:"equipped_amount"`
+	InsertDate           string `json:"insert_date"`
+}
+
+type RemovableSkillInfoData struct {
+	OwningInfo    []OwningInfo `json:"owning_info"`
+	EquipmentInfo map[int]any  `json:"equipment_info"`
+}
+
+type RemovableSkillInfoResp struct {
+	Result     RemovableSkillInfoData `json:"result"`
+	Status     int                    `json:"status"`
+	CommandNum bool                   `json:"commandNum"`
+	TimeStamp  int64                  `json:"timeStamp"`
+}
diff --git a/internal/schema/api/unit/supporterall.go b/internal/schema/api/unit/supporterall.go
new file mode 100644
index 0000000..40947a5
--- /dev/null
+++ b/internal/schema/api/unit/supporterall.go
@@ -0,0 +1,17 @@
+package unit
+
+type SupporterList struct {
+	UnitID int `json:"unit_id"`
+	Amount int `json:"amount"`
+}
+
+type SupporterAllData struct {
+	UnitSupportList []SupporterList `json:"unit_support_list"`
+}
+
+type SupporterAllResp struct {
+	Result     SupporterAllData `json:"result"`
+	Status     int              `json:"status"`
+	CommandNum bool             `json:"commandNum"`
+	TimeStamp  int64            `json:"timeStamp"`
+}
diff --git a/internal/schema/api/user/getnavi.go b/internal/schema/api/user/getnavi.go
new file mode 100644
index 0000000..73f3b06
--- /dev/null
+++ b/internal/schema/api/user/getnavi.go
@@ -0,0 +1,17 @@
+package user
+
+type User struct {
+	UserID           int `json:"user_id"`
+	UnitOwningUserID int `json:"unit_owning_user_id"`
+}
+
+type GetNaviData struct {
+	User User `json:"user"`
+}
+
+type GetNaviResp struct {
+	Result     GetNaviData `json:"result"`
+	Status     int         `json:"status"`
+	CommandNum bool        `json:"commandNum"`
+	TimeStamp  int64       `json:"timeStamp"`
+}
diff --git a/internal/model/userinfo.go b/internal/schema/api/user/info.go
similarity index 79%
rename from internal/model/userinfo.go
rename to internal/schema/api/user/info.go
index 1600e1a..ee85867 100644
--- a/internal/model/userinfo.go
+++ b/internal/schema/api/user/info.go
@@ -1,26 +1,10 @@
-package model
+package user
 
-// UserInfoResp ...
-type UserInfoResp struct {
-	ResponseData UserInfoRes `json:"response_data"`
-	ReleaseInfo  []any       `json:"release_info"`
-	StatusCode   int         `json:"status_code"`
-}
-
-// UserInfoRes ...
-type UserInfoRes struct {
-	User            UserInfo `json:"user"`
-	Birth           Birth    `json:"birth"`
-	ServerTimestamp int64    `json:"server_timestamp"`
-}
-
-// LpRecoveryItem ...
 type LpRecoveryItem struct {
 	ItemID int `json:"item_id"`
 	Amount int `json:"amount"`
 }
 
-// UserInfo ...
 type UserInfo struct {
 	UserID                         int              `json:"user_id"`
 	Name                           string           `json:"name"`
@@ -52,8 +36,9 @@ type UserInfo struct {
 	LpRecoveryItem                 []LpRecoveryItem `json:"lp_recovery_item"`
 }
 
-// Birth ...
-type Birth struct {
-	BirthMonth int `json:"birth_month"`
-	BirthDay   int `json:"birth_day"`
+type InfoResp struct {
+	Result     UserInfo `json:"result"`
+	Status     int      `json:"status"`
+	CommandNum bool     `json:"commandNum"`
+	TimeStamp  int64    `json:"timeStamp"`
 }
diff --git a/internal/model/profile.go b/internal/schema/award/set.go
similarity index 65%
rename from internal/model/profile.go
rename to internal/schema/award/set.go
index 648ca81..f70b6e8 100644
--- a/internal/model/profile.go
+++ b/internal/schema/award/set.go
@@ -1,7 +1,6 @@
-package model
+package award
 
-// AwardSetResp ...
-type ProfileRegisterResp struct {
+type SetResp struct {
 	ResponseData []any `json:"response_data"`
 	ReleaseInfo  []any `json:"release_info"`
 	StatusCode   int   `json:"status_code"`
diff --git a/internal/schema/background/set.go b/internal/schema/background/set.go
new file mode 100644
index 0000000..9b4be09
--- /dev/null
+++ b/internal/schema/background/set.go
@@ -0,0 +1,7 @@
+package background
+
+type SetResp struct {
+	ResponseData []any `json:"response_data"`
+	ReleaseInfo  []any `json:"release_info"`
+	StatusCode   int   `json:"status_code"`
+}
diff --git a/internal/schema/download/additional.go b/internal/schema/download/additional.go
new file mode 100644
index 0000000..4fe32f9
--- /dev/null
+++ b/internal/schema/download/additional.go
@@ -0,0 +1,23 @@
+package download
+
+type AdditionalReq struct {
+	Module      string `json:"module"`
+	Mgd         int    `json:"mgd"`
+	Action      string `json:"action"`
+	TimeStamp   int    `json:"timeStamp"`
+	PackageID   int    `json:"package_id"`
+	TargetOs    string `json:"target_os"`
+	PackageType int    `json:"package_type"`
+	CommandNum  string `json:"commandNum"`
+}
+
+type AdditionalData struct {
+	Size int    `json:"size"`
+	URL  string `json:"url"`
+}
+
+type AdditionalResp struct {
+	ResponseData []AdditionalData `json:"response_data"`
+	ReleaseInfo  []any            `json:"release_info"`
+	StatusCode   int              `json:"status_code"`
+}
diff --git a/internal/schema/download/batch.go b/internal/schema/download/batch.go
new file mode 100644
index 0000000..ea440cf
--- /dev/null
+++ b/internal/schema/download/batch.go
@@ -0,0 +1,20 @@
+package download
+
+type BatchReq struct {
+	ClientVersion      string `json:"client_version"`
+	Os                 string `json:"os"`
+	PackageType        int    `json:"package_type"`
+	ExcludedPackageIds []int  `json:"excluded_package_ids"`
+	CommandNum         string `json:"commandNum"`
+}
+
+type BatchData struct {
+	Size int    `json:"size"`
+	URL  string `json:"url"`
+}
+
+type BatchResp struct {
+	ResponseData []BatchData `json:"response_data"`
+	ReleaseInfo  []any       `json:"release_info"`
+	StatusCode   int         `json:"status_code"`
+}
diff --git a/internal/schema/download/event.go b/internal/schema/download/event.go
new file mode 100644
index 0000000..e8fb6c7
--- /dev/null
+++ b/internal/schema/download/event.go
@@ -0,0 +1,7 @@
+package download
+
+type EventResp struct {
+	ResponseData []any `json:"response_data"`
+	ReleaseInfo  []any `json:"release_info"`
+	StatusCode   int   `json:"status_code"`
+}
diff --git a/internal/schema/download/update.go b/internal/schema/download/update.go
new file mode 100644
index 0000000..8e9b61c
--- /dev/null
+++ b/internal/schema/download/update.go
@@ -0,0 +1,24 @@
+package download
+
+type UpdateReq struct {
+	Module          string `json:"module"`
+	TargetOs        string `json:"target_os"`
+	InstallVersion  string `json:"install_version"`
+	TimeStamp       int    `json:"timeStamp"`
+	Action          string `json:"action"`
+	PackageList     []any  `json:"package_list"`
+	CommandNum      string `json:"commandNum"`
+	ExternalVersion string `json:"external_version"`
+}
+
+type UpdateData struct {
+	Size    int    `json:"size"`
+	URL     string `json:"url"`
+	Version string `json:"version"`
+}
+
+type UpdateResp struct {
+	ResponseData []UpdateData `json:"response_data"`
+	ReleaseInfo  []any        `json:"release_info"`
+	StatusCode   int          `json:"status_code"`
+}
diff --git a/internal/schema/download/url.go b/internal/schema/download/url.go
new file mode 100644
index 0000000..120515c
--- /dev/null
+++ b/internal/schema/download/url.go
@@ -0,0 +1,19 @@
+package download
+
+type UrlReq struct {
+	Module   string   `json:"module"`
+	Os       string   `json:"os"`
+	Mgd      int      `json:"mgd"`
+	PathList []string `json:"path_list"`
+	Action   string   `json:"action"`
+}
+
+type UrlData struct {
+	UrlList []string `json:"url_list"`
+}
+
+type UrlResp struct {
+	ResponseData UrlData `json:"response_data"`
+	ReleaseInfo  []any   `json:"release_info"`
+	StatusCode   int     `json:"status_code"`
+}
diff --git a/internal/schema/event/list.go b/internal/schema/event/list.go
new file mode 100644
index 0000000..634bc58
--- /dev/null
+++ b/internal/schema/event/list.go
@@ -0,0 +1,17 @@
+package event
+
+type TargetList struct {
+	Position      int  `json:"position"`
+	IsDisplayable bool `json:"is_displayable"`
+}
+
+type ListData struct {
+	TargetList      []TargetList `json:"target_list"`
+	ServerTimestamp int64        `json:"server_timestamp"`
+}
+
+type ListResp struct {
+	ResponseData any   `json:"response_data"`
+	ReleaseInfo  []any `json:"release_info"`
+	StatusCode   int   `json:"status_code"`
+}
diff --git a/internal/model/gdpr.go b/internal/schema/gdpr/get.go
similarity index 62%
rename from internal/model/gdpr.go
rename to internal/schema/gdpr/get.go
index aba4095..08096a4 100644
--- a/internal/model/gdpr.go
+++ b/internal/schema/gdpr/get.go
@@ -1,15 +1,13 @@
-package model
+package gdpr
 
-// GdprResp ...
-type GdprResp struct {
-	ResponseData GdprRes `json:"response_data"`
-	ReleaseInfo  []any   `json:"release_info"`
-	StatusCode   int     `json:"status_code"`
-}
-
-// GdprRes ...
-type GdprRes struct {
+type GetData struct {
 	EnableGdpr      bool  `json:"enable_gdpr"`
 	IsEea           bool  `json:"is_eea"`
 	ServerTimestamp int64 `json:"server_timestamp"`
 }
+
+type GetResp struct {
+	ResponseData GetData `json:"response_data"`
+	ReleaseInfo  []any   `json:"release_info"`
+	StatusCode   int     `json:"status_code"`
+}
diff --git a/internal/schema/ghome/account.go b/internal/schema/ghome/account.go
new file mode 100644
index 0000000..994b1b2
--- /dev/null
+++ b/internal/schema/ghome/account.go
@@ -0,0 +1,104 @@
+package ghome
+
+type ActiveData struct {
+	Message string `json:"message"`
+	Result  int    `json:"result"`
+}
+
+type ActiveResp struct {
+	Code int        `json:"code"`
+	Msg  string     `json:"msg"`
+	Data ActiveData `json:"data"`
+}
+
+type InitializeData struct {
+	BrandLogo                 string   `json:"brand_logo"`
+	BrandName                 string   `json:"brand_name"`
+	DaoyuClientid             string   `json:"daoyu_clientid"`
+	DaoyuDownloadURL          string   `json:"daoyu_download_url"`
+	DeviceFeature             string   `json:"device_feature"`
+	DisplayThirdaccout        int      `json:"display_thirdaccout"`
+	ForceShowAgreement        int      `json:"force_show_agreement"`
+	GreportLogLevel           string   `json:"greport_log_level"`
+	GuestEnable               int      `json:"guest_enable"`
+	IsMatch                   int      `json:"is_match"`
+	LogLevel                  string   `json:"log_level"`
+	LoginButton               []string `json:"login_button"`
+	LoginIcon                 []any    `json:"login_icon"`
+	LoginLimitEnable          int      `json:"login_limit_enable"`
+	NeedFloatWindowPermission int      `json:"need_float_window_permission"`
+	NewDeviceIDServer         string   `json:"new_device_id_server"`
+	QqAppID                   string   `json:"qq_appId"`
+	QqKey                     string   `json:"qq_key"`
+	ShowGuestConfirm          int      `json:"show_guest_confirm"`
+	VoicetipButton            int      `json:"voicetip_button"`
+	VoicetipOne               string   `json:"voicetip_one"`
+	VoicetipTwo               string   `json:"voicetip_two"`
+	WegameAppid               string   `json:"wegame_appid"`
+	WegameAppkey              string   `json:"wegame_appkey"`
+	WegameClientid            string   `json:"wegame_clientid"`
+	WegameCompanyID           string   `json:"wegame_companyId"`
+	WegameLoginURL            string   `json:"wegame_loginUrl"`
+	WeiboAppKey               string   `json:"weibo_appKey"`
+	WeiboRedirectURL          string   `json:"weibo_redirectUrl"`
+	WeixinAppID               string   `json:"weixin_appId"`
+	WeixinKey                 string   `json:"weixin_key"`
+}
+
+type InitializeResp struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+	Data string `json:"data"`
+}
+
+type LoginData struct {
+	Activation           int    `json:"activation"`
+	Autokey              string `json:"autokey"`
+	CaptchaParams        string `json:"captchaParams"`
+	CheckCodeGUID        string `json:"checkCodeGuid"`
+	CheckCodeURL         string `json:"checkCodeUrl"`
+	HasExtendAccs        int    `json:"hasExtendAccs"`
+	HasRealInfo          int    `json:"has_realInfo"`
+	ImagecodeType        int    `json:"imagecodeType"`
+	IsNewUser            int    `json:"isNewUser"`
+	Message              string `json:"message"`
+	NextAction           int    `json:"nextAction"`
+	PromptMsg            string `json:"prompt_msg"`
+	RealInfoNotification string `json:"realInfoNotification"`
+	RealInfoForce        int    `json:"realInfo_force"`
+	RealInfoForcePay     int    `json:"realInfo_force_pay"`
+	RealInfoStatus       int    `json:"realInfo_status"`
+	RealInfoStatusPay    int    `json:"realInfo_status_pay"`
+	Result               int    `json:"result"`
+	SdgHeight            int    `json:"sdg_height"`
+	SdgWidth             int    `json:"sdg_width"`
+	Ticket               string `json:"ticket"`
+	UserAttribute        string `json:"userAttribute"`
+	UserID               int    `json:"userid"`
+}
+
+type LoginResp struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+	Data string `json:"data"`
+}
+
+type LoginAutoData struct {
+	Result  int    `json:"result"`
+	Message string `json:"message"`
+	Autokey string `json:"autokey,omitempty"`
+	UserId  string `json:"userid,omitempty"`
+	Ticket  string `json:"ticket,omitempty"`
+}
+
+type LoginAutoResp struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+	Data string `json:"data"`
+}
+
+type ReportRoleResp struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+	Data string `json:"data"`
+}
diff --git a/internal/schema/ghome/basic.go b/internal/schema/ghome/basic.go
new file mode 100644
index 0000000..5a63354
--- /dev/null
+++ b/internal/schema/ghome/basic.go
@@ -0,0 +1,47 @@
+package ghome
+
+type GetCodeResp struct {
+	Code int            `json:"code"`
+	Msg  string         `json:"msg"`
+	Data map[string]any `json:"data"`
+}
+
+type GetProductListResp struct {
+	Code int                `json:"code"`
+	Msg  string             `json:"msg"`
+	Data GetProductListData `json:"data"`
+}
+
+type GetProductListData struct {
+	Message []string `json:"message"`
+	Result  int      `json:"result"`
+}
+
+type HandshakeResp struct {
+	Code int    `json:"code"`
+	Msg  string `json:"msg"`
+	Data string `json:"data"`
+}
+
+type LoginAreaData struct {
+	UserID string `json:"userid"`
+}
+
+type LoginAreaResp struct {
+	Code int           `json:"code"`
+	Msg  string        `json:"msg"`
+	Data LoginAreaData `json:"data"`
+}
+
+type PublicKeyData struct {
+	Result  int    `json:"result"`
+	Message string `json:"message"`
+	Key     string `json:"key,omitempty"`
+	Method  string `json:"method,omitempty"`
+}
+
+type PublicKeyResp struct {
+	Code int           `json:"code"`
+	Msg  string        `json:"msg"`
+	Data PublicKeyData `json:"data"`
+}
diff --git a/internal/schema/ghome/guest.go b/internal/schema/ghome/guest.go
new file mode 100644
index 0000000..718d3ec
--- /dev/null
+++ b/internal/schema/ghome/guest.go
@@ -0,0 +1,14 @@
+package ghome
+
+type GuestStatusData struct {
+	Disablead   int    `json:"disablead"`
+	Loginswitch int    `json:"loginswitch"`
+	Message     string `json:"message"`
+	Result      int    `json:"result"`
+}
+
+type GuestStatusResp struct {
+	Code int             `json:"code"`
+	Msg  string          `json:"msg"`
+	Data GuestStatusData `json:"data"`
+}
diff --git a/internal/schema/ghome/misc.go b/internal/schema/ghome/misc.go
new file mode 100644
index 0000000..bfd6093
--- /dev/null
+++ b/internal/schema/ghome/misc.go
@@ -0,0 +1,21 @@
+package ghome
+
+type AgreementData struct {
+}
+
+type AgreementResp struct {
+	ReturnCode    int           `json:"return_code"`
+	ErrorType     int           `json:"error_type"`
+	ReturnMessage string        `json:"return_message"`
+	Data          AgreementData `json:"data"`
+}
+
+type AppReportData struct {
+	NeedReport int `json:"needReport"`
+}
+
+type AppReportResp struct {
+	Code int           `json:"code"`
+	Msg  string        `json:"msg"`
+	Data AppReportData `json:"data"`
+}
diff --git a/internal/schema/lbonus/execute.go b/internal/schema/lbonus/execute.go
new file mode 100644
index 0000000..2a54da3
--- /dev/null
+++ b/internal/schema/lbonus/execute.go
@@ -0,0 +1,103 @@
+package lbonus
+
+type Item struct {
+	ItemID  int `json:"item_id"`
+	AddType int `json:"add_type"`
+	Amount  int `json:"amount"`
+}
+
+type Day struct {
+	Day               int    `json:"day"`
+	DayOfTheWeek      int    `json:"day_of_the_week"`
+	SpecialDay        bool   `json:"special_day"`
+	SpecialImageAsset string `json:"special_image_asset"`
+	Received          bool   `json:"received"`
+	AdReceived        bool   `json:"ad_received"`
+	Item              Item   `json:"item"`
+}
+
+type Month struct {
+	Year  int   `json:"year"`
+	Month int   `json:"month"`
+	Days  []Day `json:"days"`
+}
+
+type CalendarInfo struct {
+	CurrentDate  string `json:"current_date"`
+	CurrentMonth Month  `json:"current_month"`
+	NextMonth    Month  `json:"next_month"`
+}
+
+type Reward struct {
+	ItemID  int `json:"item_id"`
+	AddType int `json:"add_type"`
+	Amount  int `json:"amount"`
+}
+
+type TotalLoginInfo struct {
+	LoginCount     int      `json:"login_count"`
+	RemainingCount int      `json:"remaining_count"`
+	Reward         []Reward `json:"reward"`
+}
+
+type RankInfo struct {
+	BeforeClassRankID int    `json:"before_class_rank_id"`
+	AfterClassRankID  int    `json:"after_class_rank_id"`
+	RankUpDate        string `json:"rank_up_date"`
+}
+
+type ClassSystem struct {
+	RankInfo     RankInfo `json:"rank_info"`
+	CompleteFlag bool     `json:"complete_flag"`
+	IsOpened     bool     `json:"is_opened"`
+	IsVisible    bool     `json:"is_visible"`
+}
+
+type Rewards struct {
+	Rarity         int    `json:"rarity"`
+	ItemID         int    `json:"item_id"`
+	AddType        int    `json:"add_type"`
+	Amount         int    `json:"amount"`
+	ItemCategoryID int    `json:"item_category_id"`
+	RewardBoxFlag  bool   `json:"reward_box_flag"`
+	InsertDate     string `json:"insert_date"`
+}
+
+type EffortPoint struct {
+	LiveEffortPointBoxSpecID int       `json:"live_effort_point_box_spec_id"`
+	Capacity                 int       `json:"capacity"`
+	Before                   int       `json:"before"`
+	After                    int       `json:"after"`
+	Rewards                  []Rewards `json:"rewards"`
+}
+
+type Parameter struct {
+	Smile int `json:"smile"`
+	Pure  int `json:"pure"`
+	Cool  int `json:"cool"`
+}
+
+type Museum struct {
+	Parameter      Parameter `json:"parameter"`
+	ContentsIDList []int     `json:"contents_id_list"`
+}
+
+type ExecuteData struct {
+	Sheets            []any          `json:"sheets"`
+	CalendarInfo      CalendarInfo   `json:"calendar_info"`
+	TotalLoginInfo    TotalLoginInfo `json:"total_login_info"`
+	LicenseLbonusList []any          `json:"license_lbonus_list"`
+	ClassSystem       ClassSystem    `json:"class_system"`
+	StartDashSheets   []any          `json:"start_dash_sheets"`
+	EffortPoint       []EffortPoint  `json:"effort_point"`
+	LimitedEffortBox  []any          `json:"limited_effort_box"`
+	MuseumInfo        Museum         `json:"museum_info"`
+	ServerTimestamp   int64          `json:"server_timestamp"`
+	PresentCnt        int            `json:"present_cnt"`
+}
+
+type ExecuteResp struct {
+	ResponseData ExecuteData `json:"response_data"`
+	ReleaseInfo  []any       `json:"release_info"`
+	StatusCode   int         `json:"status_code"`
+}
diff --git a/internal/schema/live/gameover.go b/internal/schema/live/gameover.go
new file mode 100644
index 0000000..b5efd81
--- /dev/null
+++ b/internal/schema/live/gameover.go
@@ -0,0 +1,7 @@
+package live
+
+type GameOverResp struct {
+	ResponseData []any `json:"response_data"`
+	ReleaseInfo  []any `json:"release_info"`
+	StatusCode   int   `json:"status_code"`
+}
diff --git a/internal/schema/live/play.go b/internal/schema/live/play.go
new file mode 100644
index 0000000..dac4b14
--- /dev/null
+++ b/internal/schema/live/play.go
@@ -0,0 +1,84 @@
+package live
+
+type PlayReq struct {
+	Module           string `json:"module"`
+	PartyUserID      int64  `json:"party_user_id"`
+	Action           string `json:"action"`
+	Mgd              int    `json:"mgd"`
+	IsTraining       bool   `json:"is_training"`
+	UnitDeckID       int    `json:"unit_deck_id"`
+	LiveDifficultyID string `json:"live_difficulty_id"`
+	TimeStamp        int    `json:"timeStamp"`
+	LpFactor         int    `json:"lp_factor"`
+	CommandNum       string `json:"commandNum"`
+}
+
+type RankInfo struct {
+	Rank    int `json:"rank"`
+	RankMin int `json:"rank_min"`
+	RankMax int `json:"rank_max"`
+}
+
+type NotesList struct {
+	TimingSec      float64 `json:"timing_sec"`
+	NotesAttribute int     `json:"notes_attribute"`
+	NotesLevel     int     `json:"notes_level"`
+	Effect         int     `json:"effect"`
+	EffectValue    float64 `json:"effect_value"`
+	Position       int     `json:"position"`
+}
+
+type LiveInfo struct {
+	LiveDifficultyID int         `json:"live_difficulty_id"`
+	IsRandom         bool        `json:"is_random"`
+	AcFlag           int         `json:"ac_flag"`
+	SwingFlag        int         `json:"swing_flag"`
+	NotesList        []NotesList `json:"notes_list"`
+}
+
+type Costume struct {
+	UnitID    int  `json:"unit_id"`
+	IsRankMax bool `json:"is_rank_max"`
+	IsSigned  bool `json:"is_signed"`
+}
+
+type UnitList struct {
+	Smile int `json:"smile"`
+	Cute  int `json:"cute"`
+	Cool  int `json:"cool"`
+	// Costume Costume `json:"costume"`
+}
+
+type DeckInfo struct {
+	UnitDeckID       int        `json:"unit_deck_id"`
+	TotalSmile       int        `json:"total_smile"`
+	TotalCute        int        `json:"total_cute"`
+	TotalCool        int        `json:"total_cool"`
+	TotalHp          int        `json:"total_hp"`
+	PreparedHpDamage int        `json:"prepared_hp_damage"`
+	UnitList         []UnitList `json:"unit_list"`
+}
+
+type PlayLiveList struct {
+	LiveInfo LiveInfo `json:"live_info"`
+	DeckInfo DeckInfo `json:"deck_info"`
+}
+
+type PlayData struct {
+	RankInfo            []RankInfo     `json:"rank_info"`
+	EnergyFullTime      string         `json:"energy_full_time"`
+	OverMaxEnergy       int            `json:"over_max_energy"`
+	AvailableLiveResume bool           `json:"available_live_resume"`
+	LiveList            []PlayLiveList `json:"live_list"`
+	IsMarathonEvent     bool           `json:"is_marathon_event"`
+	MarathonEventID     any            `json:"marathon_event_id"`
+	NoSkill             bool           `json:"no_skill"`
+	CanActivateEffect   bool           `json:"can_activate_effect"`
+	ServerTimestamp     int64          `json:"server_timestamp"`
+}
+
+type PlayResp struct {
+	ResponseData PlayData `json:"response_data"`
+	ReleaseInfo  []any    `json:"release_info"`
+	StatusCode   int      `json:"status_code"`
+}
diff --git a/internal/schema/live/precisescore.go b/internal/schema/live/precisescore.go
new file mode 100644
index 0000000..b24e70b
--- /dev/null
+++ b/internal/schema/live/precisescore.go
@@ -0,0 +1,48 @@
+package live
+
+type PlayScoreReq struct {
+	Module           string `json:"module"`
+	Action           string `json:"action"`
+	TimeStamp        int64  `json:"timeStamp"`
+	Mgd              int    `json:"mgd"`
+	LiveDifficultyID string `json:"live_difficulty_id"`
+	CommandNum       string `json:"commandNum"`
+}
+
+type On struct {
+	HasRecord   bool     `json:"has_record"`
+	LiveInfo    LiveInfo `json:"live_info"`
+	RandomSeed  any      `json:"random_seed"`
+	MaxCombo    any      `json:"max_combo"`
+	UpdateDate  any      `json:"update_date"`
+	PreciseList any      `json:"precise_list"`
+	DeckInfo    any      `json:"deck_info"`
+	TapAdjust   any      `json:"tap_adjust"`
+	CanReplay   bool     `json:"can_replay"`
+}
+
+type Off struct {
+	HasRecord   bool     `json:"has_record"`
+	LiveInfo    LiveInfo `json:"live_info"`
+	RandomSeed  any      `json:"random_seed"`
+	MaxCombo    any      `json:"max_combo"`
+	UpdateDate  any      `json:"update_date"`
+	PreciseList any      `json:"precise_list"`
+	DeckInfo    any      `json:"deck_info"`
+	TapAdjust   any      `json:"tap_adjust"`
+	CanReplay   bool     `json:"can_replay"`
+}
+
+type PreciseScoreData struct {
+	On                On         `json:"on"`
+	Off               Off        `json:"off"`
+	RankInfo          []RankInfo `json:"rank_info"`
+	CanActivateEffect bool       `json:"can_activate_effect"`
+	ServerTimestamp   int64      `json:"server_timestamp"`
+}
+
+type PreciseScoreResp struct {
+	ResponseData PreciseScoreData `json:"response_data"`
+	ReleaseInfo  []any            `json:"release_info"`
+	StatusCode   int              `json:"status_code"`
+}
diff --git a/internal/model/live.go b/internal/schema/live/reward.go
similarity index 61%
rename from internal/model/live.go
rename to internal/schema/live/reward.go
index 1f06270..bece48f 100644
--- a/internal/model/live.go
+++ b/internal/schema/live/reward.go
@@ -1,257 +1,6 @@
-package model
+package live
 
-// GameOverResp ...
-type GameOverResp struct {
-	ResponseData []any `json:"response_data"`
-	ReleaseInfo  []any `json:"release_info"`
-	StatusCode   int   `json:"status_code"`
-}
-
-// NormalLiveStatusList ...
-type NormalLiveStatusList struct {
-	LiveDifficultyID   int   `json:"live_difficulty_id"`
-	Status             int   `json:"status"`
-	HiScore            int   `json:"hi_score"`
-	HiComboCount       int   `json:"hi_combo_count"`
-	ClearCnt           int   `json:"clear_cnt"`
-	AchievedGoalIDList []int `json:"achieved_goal_id_list"`
-}
-
-// SpecialLiveStatusList ...
-type SpecialLiveStatusList struct {
-	LiveDifficultyID   int   `json:"live_difficulty_id"`
-	Status             int   `json:"status"`
-	HiScore            int   `json:"hi_score"`
-	HiComboCount       int   `json:"hi_combo_count"`
-	ClearCnt           int   `json:"clear_cnt"`
-	AchievedGoalIDList []int `json:"achieved_goal_id_list"`
-}
-
-// TrainingLiveStatusList ...
-type TrainingLiveStatusList struct {
-	LiveDifficultyID   int   `json:"live_difficulty_id"`
-	Status             int   `json:"status"`
-	HiScore            int   `json:"hi_score"`
-	HiComboCount       int   `json:"hi_combo_count"`
-	ClearCnt           int   `json:"clear_cnt"`
-	AchievedGoalIDList []int `json:"achieved_goal_id_list"`
-}
-
-// LiveStatusRes ...
-type LiveStatusRes struct {
-	NormalLiveStatusList   []NormalLiveStatusList   `json:"normal_live_status_list"`
-	SpecialLiveStatusList  []SpecialLiveStatusList  `json:"special_live_status_list"`
-	TrainingLiveStatusList []TrainingLiveStatusList `json:"training_live_status_list"`
-	MarathonLiveStatusList []any                    `json:"marathon_live_status_list"`
-	FreeLiveStatusList     []any                    `json:"free_live_status_list"`
-	CanResumeLive          bool                     `json:"can_resume_live"`
-}
-
-// LiveStatusResp ...
-type LiveStatusResp struct {
-	Result     LiveStatusRes `json:"result"`
-	Status     int           `json:"status"`
-	CommandNum bool          `json:"commandNum"`
-	TimeStamp  int64         `json:"timeStamp"`
-}
-
-// LiveList ...
-type LiveList struct {
-	LiveDifficultyID int    `json:"live_difficulty_id"`
-	StartDate        string `json:"start_date"`
-	EndDate          string `json:"end_date"`
-	IsRandom         bool   `json:"is_random"`
-}
-
-// LimitedBonusCommonList ...
-type LimitedBonusCommonList struct {
-	LiveType          int    `json:"live_type"`
-	LimitedBonusType  int    `json:"limited_bonus_type"`
-	LimitedBonusValue int    `json:"limited_bonus_value"`
-	StartDate         string `json:"start_date"`
-	EndDate           string `json:"end_date"`
-}
-
-// RandomLiveList ...
-type RandomLiveList struct {
-	AttributeID int    `json:"attribute_id"`
-	StartDate   string `json:"start_date"`
-	EndDate     string `json:"end_date"`
-}
-
-// TrainingLiveList ...
-type TrainingLiveList struct {
-	LiveDifficultyID int    `json:"live_difficulty_id"`
-	StartDate        string `json:"start_date"`
-	IsRandom         bool   `json:"is_random"`
-}
-
-// LiveScheduleRes ...
-type LiveScheduleRes struct {
-	EventList              []any                    `json:"event_list"`
-	LiveList               []LiveList               `json:"live_list"`
-	LimitedBonusList       []any                    `json:"limited_bonus_list"`
-	LimitedBonusCommonList []LimitedBonusCommonList `json:"limited_bonus_common_list"`
-	RandomLiveList         []RandomLiveList         `json:"random_live_list"`
-	FreeLiveList           []any                    `json:"free_live_list"`
-	TrainingLiveList       []TrainingLiveList       `json:"training_live_list"`
-}
-
-// LiveScheduleResp ...
-type LiveScheduleResp struct {
-	Result     LiveScheduleRes `json:"result"`
-	Status     int             `json:"status"`
-	CommandNum bool            `json:"commandNum"`
-	TimeStamp  int64           `json:"timeStamp"`
-}
-
-// PlayReq ...
-type PlayReq struct {
-	Module           string `json:"module"`
-	PartyUserID      int64  `json:"party_user_id"`
-	Action           string `json:"action"`
-	Mgd              int    `json:"mgd"`
-	IsTraining       bool   `json:"is_training"`
-	UnitDeckID       int    `json:"unit_deck_id"`
-	LiveDifficultyID string `json:"live_difficulty_id"`
-	TimeStamp        int    `json:"timeStamp"`
-	LpFactor         int    `json:"lp_factor"`
-	CommandNum       string `json:"commandNum"`
-}
-
-// RankInfo ...
-type RankInfo struct {
-	Rank    int `json:"rank"`
-	RankMin int `json:"rank_min"`
-	RankMax int `json:"rank_max"`
-}
-
-// NotesList ...
-type NotesList struct {
-	TimingSec      float64 `json:"timing_sec"`
-	NotesAttribute int     `json:"notes_attribute"`
-	NotesLevel     int     `json:"notes_level"`
-	Effect         int     `json:"effect"`
-	EffectValue    float64 `json:"effect_value"`
-	Position       int     `json:"position"`
-}
-
-// LiveInfo ...
-type LiveInfo struct {
-	LiveDifficultyID int         `json:"live_difficulty_id"`
-	IsRandom         bool        `json:"is_random"`
-	AcFlag           int         `json:"ac_flag"`
-	SwingFlag        int         `json:"swing_flag"`
-	NotesList        []NotesList `json:"notes_list"`
-}
-
-// PlayCostume ...
-type PlayCostume struct {
-	UnitID    int  `json:"unit_id"`
-	IsRankMax bool `json:"is_rank_max"`
-	IsSigned  bool `json:"is_signed"`
-}
-
-// UnitList ...
-type UnitList struct {
-	Smile   int         `json:"smile"`
-	Cute    int         `json:"cute"`
-	Cool    int         `json:"cool"`
-	Costume PlayCostume `json:"costume,omitempty"`
-}
-
-// DeckInfo ...
-type DeckInfo struct {
-	UnitDeckID       int        `json:"unit_deck_id"`
-	TotalSmile       int        `json:"total_smile"`
-	TotalCute        int        `json:"total_cute"`
-	TotalCool        int        `json:"total_cool"`
-	TotalHp          int        `json:"total_hp"`
-	PreparedHpDamage int        `json:"prepared_hp_damage"`
-	UnitList         []UnitList `json:"unit_list"`
-}
-
-// PlayLiveList ...
-type PlayLiveList struct {
-	LiveInfo LiveInfo `json:"live_info"`
-	DeckInfo DeckInfo `json:"deck_info"`
-}
-
-// PlayRes ...
-type PlayRes struct {
-	RankInfo            []RankInfo     `json:"rank_info"`
-	EnergyFullTime      string         `json:"energy_full_time"`
-	OverMaxEnergy       int            `json:"over_max_energy"`
-	AvailableLiveResume bool           `json:"available_live_resume"`
-	LiveList            []PlayLiveList `json:"live_list"`
-	IsMarathonEvent     bool           `json:"is_marathon_event"`
-	MarathonEventID     any            `json:"marathon_event_id"`
-	NoSkill             bool           `json:"no_skill"`
-	CanActivateEffect   bool           `json:"can_activate_effect"`
-	ServerTimestamp     int64          `json:"server_timestamp"`
-}
-
-// PlayResp ...
-type PlayResp struct {
-	ResponseData PlayRes `json:"response_data"`
-	ReleaseInfo  []any   `json:"release_info"`
-	StatusCode   int     `json:"status_code"`
-}
-
-// PlayScoreReq ...
-type PlayScoreReq struct {
-	Module           string `json:"module"`
-	Action           string `json:"action"`
-	TimeStamp        int64  `json:"timeStamp"`
-	Mgd              int    `json:"mgd"`
-	LiveDifficultyID string `json:"live_difficulty_id"`
-	CommandNum       string `json:"commandNum"`
-}
-
-// On ...
-type On struct {
-	HasRecord   bool     `json:"has_record"`
-	LiveInfo    LiveInfo `json:"live_info"`
-	RandomSeed  any      `json:"random_seed"`
-	MaxCombo    any      `json:"max_combo"`
-	UpdateDate  any      `json:"update_date"`
-	PreciseList any      `json:"precise_list"`
-	DeckInfo    any      `json:"deck_info"`
-	TapAdjust   any      `json:"tap_adjust"`
-	CanReplay   bool     `json:"can_replay"`
-}
-
-// Off ...
-type Off struct {
-	HasRecord   bool     `json:"has_record"`
-	LiveInfo    LiveInfo `json:"live_info"`
-	RandomSeed  any      `json:"random_seed"`
-	MaxCombo    any      `json:"max_combo"`
-	UpdateDate  any      `json:"update_date"`
-	PreciseList any      `json:"precise_list"`
-	DeckInfo    any      `json:"deck_info"`
-	TapAdjust   any      `json:"tap_adjust"`
-	CanReplay   bool     `json:"can_replay"`
-}
-
-// PlayScoreRes ...
-type PlayScoreRes struct {
-	On                On         `json:"on"`
-	Off               Off        `json:"off"`
-	RankInfo          []RankInfo `json:"rank_info"`
-	CanActivateEffect bool       `json:"can_activate_effect"`
-	ServerTimestamp   int64      `json:"server_timestamp"`
-}
-
-// PlayScoreResp ...
-type PlayScoreResp struct {
-	ResponseData PlayScoreRes `json:"response_data"`
-	ReleaseInfo  []any        `json:"release_info"`
-	StatusCode   int          `json:"status_code"`
-}
-
-// PlayRewardReq ...
-type PlayRewardReq struct {
+type RewardReq struct {
 	Module           string          `json:"module"`
 	Action           string          `json:"action"`
 	GoodCnt          int             `json:"good_cnt"`
@@ -275,14 +24,12 @@ type PlayRewardReq struct {
 	ScoreCool        int             `json:"score_cool"`
 }
 
-// Icon ...
 type Icon struct {
 	SlideID  int `json:"slide_id"`
 	JustID   int `json:"just_id"`
 	NormalID int `json:"normal_id"`
 }
 
-// LiveSetting ...
 type LiveSetting struct {
 	StringSize                 int     `json:"string_size"`
 	PreciseScoreAutoUpdateFlag bool    `json:"precise_score_auto_update_flag"`
@@ -296,7 +43,6 @@ type LiveSetting struct {
 	CutinType                  int     `json:"cutin_type"`
 }
 
-// PreciseList ...
 type PreciseList struct {
 	Effect     int     `json:"effect"`
 	Count      int     `json:"count"`
@@ -307,20 +53,17 @@ type PreciseList struct {
 	IsSame     bool    `json:"is_same"`
 }
 
-// BackgroundScore ...
 type BackgroundScore struct {
 	Smile int `json:"smile"`
 	Cute  int `json:"cute"`
 	Cool  int `json:"cool"`
 }
 
-// TriggerLog ...
 type TriggerLog struct {
 	ActivationRate int `json:"activation_rate"`
 	Position       int `json:"position"`
 }
 
-// PreciseScoreLog ...
 type PreciseScoreLog struct {
 	LiveSetting     LiveSetting     `json:"live_setting"`
 	TapAdjust       int             `json:"tap_adjust"`
@@ -333,7 +76,6 @@ type PreciseScoreLog struct {
 	RandomSeed      int             `json:"random_seed"`
 }
 
-// RewardLiveInfo ...
 type RewardLiveInfo struct {
 	LiveDifficultyID int  `json:"live_difficulty_id"`
 	IsRandom         bool `json:"is_random"`
@@ -341,25 +83,21 @@ type RewardLiveInfo struct {
 	SwingFlag        int  `json:"swing_flag"`
 }
 
-// PlayerExpUnitMax ...
 type PlayerExpUnitMax struct {
 	Before int `json:"before"`
 	After  int `json:"after"`
 }
 
-// PlayerExpFriendMax ...
 type PlayerExpFriendMax struct {
 	Before int `json:"before"`
 	After  int `json:"after"`
 }
 
-// PlayerExpLpMax ...
 type PlayerExpLpMax struct {
 	Before int `json:"before"`
 	After  int `json:"after"`
 }
 
-// BaseRewardInfo ...
 type BaseRewardInfo struct {
 	PlayerExp             int                `json:"player_exp"`
 	PlayerExpUnitMax      PlayerExpUnitMax   `json:"player_exp_unit_max"`
@@ -370,7 +108,6 @@ type BaseRewardInfo struct {
 	SocialPoint           int                `json:"social_point"`
 }
 
-// LiveClear ...
 type LiveClear struct {
 	AddType                    int   `json:"add_type"`
 	Amount                     int   `json:"amount"`
@@ -399,7 +136,6 @@ type LiveClear struct {
 	RemovableSkillIds          []any `json:"removable_skill_ids"`
 }
 
-// LiveRank ...
 type LiveRank struct {
 	AddType                    int   `json:"add_type"`
 	Amount                     int   `json:"amount"`
@@ -428,14 +164,12 @@ type LiveRank struct {
 	RemovableSkillIds          []any `json:"removable_skill_ids"`
 }
 
-// RewardUnitList ...
 type RewardUnitList struct {
 	LiveClear []LiveClear `json:"live_clear"`
 	LiveRank  []LiveRank  `json:"live_rank"`
 	LiveCombo []any       `json:"live_combo"`
 }
 
-// Rewards ...
 type Rewards struct {
 	Rarity         int    `json:"rarity"`
 	ItemID         int    `json:"item_id"`
@@ -446,7 +180,6 @@ type Rewards struct {
 	InsertDate     string `json:"insert_date"`
 }
 
-// EffortPoint ...
 type EffortPoint struct {
 	LiveEffortPointBoxSpecID int       `json:"live_effort_point_box_spec_id"`
 	Capacity                 int       `json:"capacity"`
@@ -455,7 +188,6 @@ type EffortPoint struct {
 	Rewards                  []Rewards `json:"rewards"`
 }
 
-// PlayRewardUnitList ...
 type PlayRewardUnitList struct {
 	ID               int   `xorm:"id pk autoincr" json:"-"`
 	UserDeckID       int   `xorm:"user_deck_id" json:"-"`
@@ -476,7 +208,6 @@ type PlayRewardUnitList struct {
 	InsertData       int64 `xorm:"insert_date" json:"-"`
 }
 
-// BeforeUserInfo ...
 type BeforeUserInfo struct {
 	Level                          int    `json:"level"`
 	Exp                            int    `json:"exp"`
@@ -502,7 +233,6 @@ type BeforeUserInfo struct {
 	UnlockRandomLiveAqours         int    `json:"unlock_random_live_aqours"`
 }
 
-// AfterUserInfo ...
 type AfterUserInfo struct {
 	Level                          int    `json:"level"`
 	Exp                            int    `json:"exp"`
@@ -528,26 +258,22 @@ type AfterUserInfo struct {
 	UnlockRandomLiveAqours         int    `json:"unlock_random_live_aqours"`
 }
 
-// NextLevelInfo ...
 type NextLevelInfo struct {
 	Level   int `json:"level"`
 	FromExp int `json:"from_exp"`
 }
 
-// GoalAccompInfo ...
 type GoalAccompInfo struct {
 	AchievedIds []any `json:"achieved_ids"`
 	Rewards     []any `json:"rewards"`
 }
 
-// RewardRankInfo ...
 type RewardRankInfo struct {
 	BeforeClassRankID int    `json:"before_class_rank_id"`
 	AfterClassRankID  int    `json:"after_class_rank_id"`
 	RankUpDate        string `json:"rank_up_date"`
 }
 
-// ClassSystem ...
 type ClassSystem struct {
 	RankInfo     RewardRankInfo `json:"rank_info"`
 	CompleteFlag bool           `json:"complete_flag"`
@@ -555,7 +281,6 @@ type ClassSystem struct {
 	IsVisible    bool           `json:"is_visible"`
 }
 
-// PlayRewardList ...
 type PlayRewardList struct {
 	ItemID         int  `json:"item_id"`
 	AddType        int  `json:"add_type"`
@@ -564,7 +289,6 @@ type PlayRewardList struct {
 	RewardBoxFlag  bool `json:"reward_box_flag"`
 }
 
-// AccomplishedAchievementList ...
 type AccomplishedAchievementList struct {
 	AchievementID       int              `json:"achievement_id"`
 	Count               int              `json:"count"`
@@ -580,14 +304,23 @@ type AccomplishedAchievementList struct {
 	RewardList          []PlayRewardList `json:"reward_list"`
 }
 
-// RewardUnitSupportList ...
+type Parameter struct {
+	Smile int `json:"smile"`
+	Pure  int `json:"pure"`
+	Cool  int `json:"cool"`
+}
+
+type Museum struct {
+	Parameter      Parameter `json:"parameter"`
+	ContentsIDList []int     `json:"contents_id_list"`
+}
+
 type RewardUnitSupportList struct {
 	UnitID int `json:"unit_id"`
 	Amount int `json:"amount"`
 }
 
-// RewardRes ...
-type RewardRes struct {
+type RewardData struct {
 	LiveInfo                     []RewardLiveInfo              `json:"live_info"`
 	Rank                         int                           `json:"rank"`
 	ComboRank                    int                           `json:"combo_rank"`
@@ -621,35 +354,8 @@ type RewardRes struct {
 	PresentCnt                   int                           `json:"present_cnt"`
 }
 
-// RewardResp ...
 type RewardResp struct {
-	ResponseData RewardRes `json:"response_data"`
-	ReleaseInfo  []any     `json:"release_info"`
-	StatusCode   int       `json:"status_code"`
-}
-
-// LiveSeInfoRes ...
-type LiveSeInfoRes struct {
-	LiveSeList []int `json:"live_se_list"`
-}
-
-// LiveSeInfoResp ...
-type LiveSeInfoResp struct {
-	Result     LiveSeInfoRes `json:"result"`
-	Status     int           `json:"status"`
-	CommandNum bool          `json:"commandNum"`
-	TimeStamp  int64         `json:"timeStamp"`
-}
-
-// LiveIconInfoRes ...
-type LiveIconInfoRes struct {
-	LiveNotesIconList []int `json:"live_notes_icon_list"`
-}
-
-// LiveIconInfoResp ...
-type LiveIconInfoResp struct {
-	Result     LiveIconInfoRes `json:"result"`
-	Status     int             `json:"status"`
-	CommandNum bool            `json:"commandNum"`
-	TimeStamp  int64           `json:"timeStamp"`
+	ResponseData RewardData `json:"response_data"`
+	ReleaseInfo  []any      `json:"release_info"`
+	StatusCode   int        `json:"status_code"`
 }
diff --git a/internal/schema/login/authkey.go b/internal/schema/login/authkey.go
new file mode 100644
index 0000000..1fb9264
--- /dev/null
+++ b/internal/schema/login/authkey.go
@@ -0,0 +1,12 @@
+package login
+
+type AuthKeyData struct {
+	AuthorizeToken string `json:"authorize_token"`
+	DummyToken     string `json:"dummy_token"`
+}
+
+type AuthKeyResp struct {
+	ResponseData AuthKeyData `json:"response_data"`
+	ReleaseInfo  []any       `json:"release_info"`
+	StatusCode   int         `json:"status_code"`
+}
diff --git a/internal/model/login.go b/internal/schema/login/login.go
similarity index 63%
rename from internal/model/login.go
rename to internal/schema/login/login.go
index 074c406..caf39f4 100644
--- a/internal/model/login.go
+++ b/internal/schema/login/login.go
@@ -1,7 +1,6 @@
-package model
+package login
 
-// LoginRes ...
-type LoginRes struct {
+type LoginData struct {
 	AuthorizeToken  string `json:"authorize_token"`
 	UserId          int    `json:"user_id"`
 	ReviewVersion   string `json:"review_version"`
@@ -11,9 +10,8 @@ type LoginRes struct {
 	AdultFlag       int    `json:"adult_flag"`
 }
 
-// LoginResp ...
 type LoginResp struct {
-	ResponseData LoginRes `json:"response_data"`
-	ReleaseInfo  []any    `json:"release_info"`
-	StatusCode   int      `json:"status_code"`
+	ResponseData LoginData `json:"response_data"`
+	ReleaseInfo  []any     `json:"release_info"`
+	StatusCode   int       `json:"status_code"`
 }
diff --git a/internal/schema/multiunit/scenariostartup.go b/internal/schema/multiunit/scenariostartup.go
new file mode 100644
index 0000000..ec30c4a
--- /dev/null
+++ b/internal/schema/multiunit/scenariostartup.go
@@ -0,0 +1,22 @@
+package multiunit
+
+type ScenarioStartUpReq struct {
+	Module              string `json:"module"`
+	Action              string `json:"action"`
+	TimeStamp           int    `json:"timeStamp"`
+	Mgd                 int    `json:"mgd"`
+	MultiUnitScenarioID int    `json:"multi_unit_scenario_id"`
+	CommandNum          string `json:"commandNum"`
+}
+
+type ScenarioStartUpData struct {
+	MultiUnitScenarioID int   `json:"multi_unit_scenario_id"`
+	ScenarioAdjustment  int   `json:"scenario_adjustment"`
+	ServerTimestamp     int64 `json:"server_timestamp"`
+}
+
+type ScenarioStartUpResp struct {
+	ResponseData ScenarioStartUpData `json:"response_data"`
+	ReleaseInfo  []any               `json:"release_info"`
+	StatusCode   int                 `json:"status_code"`
+}
diff --git a/internal/schema/museum/info.go b/internal/schema/museum/info.go
new file mode 100644
index 0000000..e170521
--- /dev/null
+++ b/internal/schema/museum/info.go
@@ -0,0 +1,23 @@
+package museum
+
+type Parameter struct {
+	Smile int `json:"smile"`
+	Pure  int `json:"pure"`
+	Cool  int `json:"cool"`
+}
+
+type Museum struct {
+	Parameter      Parameter `json:"parameter"`
+	ContentsIDList []int     `json:"contents_id_list"`
+}
+
+type InfoData struct {
+	MuseumInfo      Museum `json:"museum_info"`
+	ServerTimestamp int64  `json:"server_timestamp"`
+}
+
+type InfoResp struct {
+	ResponseData InfoData `json:"response_data"`
+	ReleaseInfo  []any    `json:"release_info"`
+	StatusCode   int      `json:"status_code"`
+}
diff --git a/internal/schema/notice/friendgreeting.go b/internal/schema/notice/friendgreeting.go
new file mode 100644
index 0000000..2bb1972
--- /dev/null
+++ b/internal/schema/notice/friendgreeting.go
@@ -0,0 +1,13 @@
+package notice
+
+type FriendGreetingData struct {
+	NextId          int   `json:"next_id"`
+	NoticeList      []any `json:"notice_list"`
+	ServerTimestamp int64 `json:"server_timestamp"`
+}
+
+type FriendGreetingResp struct {
+	ResponseData FriendGreetingData `json:"response_data"`
+	ReleaseInfo  []any              `json:"release_info"`
+	StatusCode   int                `json:"status_code"`
+}
diff --git a/internal/schema/notice/friendvariety.go b/internal/schema/notice/friendvariety.go
new file mode 100644
index 0000000..ab08a93
--- /dev/null
+++ b/internal/schema/notice/friendvariety.go
@@ -0,0 +1,13 @@
+package notice
+
+type FriendVarietyData struct {
+	ItemCount       int   `json:"item_count"`
+	NoticeList      []any `json:"notice_list"`
+	ServerTimestamp int64 `json:"server_timestamp"`
+}
+
+type FriendVarietyResp struct {
+	ResponseData FriendVarietyData `json:"response_data"`
+	ReleaseInfo  []any             `json:"release_info"`
+	StatusCode   int               `json:"status_code"`
+}
diff --git a/internal/schema/notice/usergreetinghistory.go b/internal/schema/notice/usergreetinghistory.go
new file mode 100644
index 0000000..76620e4
--- /dev/null
+++ b/internal/schema/notice/usergreetinghistory.go
@@ -0,0 +1,14 @@
+package notice
+
+type UserGreetingData struct {
+	ItemCount       int   `json:"item_count"`
+	HasNext         bool  `json:"has_next"`
+	NoticeList      []any `json:"notice_list"`
+	ServerTimestamp int64 `json:"server_timestamp"`
+}
+
+type UserGreetingResp struct {
+	ResponseData UserGreetingData `json:"response_data"`
+	ReleaseInfo  []any            `json:"release_info"`
+	StatusCode   int              `json:"status_code"`
+}
diff --git a/internal/schema/payment/productlist.go b/internal/schema/payment/productlist.go
new file mode 100644
index 0000000..97edcce
--- /dev/null
+++ b/internal/schema/payment/productlist.go
@@ -0,0 +1,19 @@
+package payment
+
+import "honoka-chan/internal/schema/api/payment"
+
+type ProductListData struct {
+	RestrictionInfo  payment.RestrictionInfo `json:"restriction_info"`
+	UnderAgeInfo     payment.UnderAgeInfo    `json:"under_age_info"`
+	SnsProductList   []any                   `json:"sns_product_list"`
+	ProductList      []any                   `json:"product_list"`
+	SubscriptionList []any                   `json:"subscription_list"`
+	ShowPointShop    bool                    `json:"show_point_shop"`
+	ServerTimestamp  int64                   `json:"server_timestamp"`
+}
+
+type ProductListResp struct {
+	ResponseData ProductListData `json:"response_data"`
+	ReleaseInfo  []any           `json:"release_info"`
+	StatusCode   int             `json:"status_code"`
+}
diff --git a/internal/schema/personalnotice/get.go b/internal/schema/personalnotice/get.go
new file mode 100644
index 0000000..37c43cd
--- /dev/null
+++ b/internal/schema/personalnotice/get.go
@@ -0,0 +1,16 @@
+package personalnotice
+
+type GetData struct {
+	HasNotice       bool   `json:"has_notice"`
+	NoticeID        int    `json:"notice_id"`
+	Type            int    `json:"type"`
+	Title           string `json:"title"`
+	Contents        string `json:"contents"`
+	ServerTimestamp int64  `json:"server_timestamp"`
+}
+
+type GetResp struct {
+	ResponseData GetData `json:"response_data"`
+	ReleaseInfo  []any   `json:"release_info"`
+	StatusCode   int     `json:"status_code"`
+}
diff --git a/internal/schema/profile/register.go b/internal/schema/profile/register.go
new file mode 100644
index 0000000..8f339f0
--- /dev/null
+++ b/internal/schema/profile/register.go
@@ -0,0 +1,7 @@
+package profile
+
+type RegisterResp struct {
+	ResponseData []any `json:"response_data"`
+	ReleaseInfo  []any `json:"release_info"`
+	StatusCode   int   `json:"status_code"`
+}
diff --git a/internal/schema/scenario/startup.go b/internal/schema/scenario/startup.go
new file mode 100644
index 0000000..c99925f
--- /dev/null
+++ b/internal/schema/scenario/startup.go
@@ -0,0 +1,22 @@
+package scenario
+
+type StartUpReq struct {
+	Module     string `json:"module"`
+	Action     string `json:"action"`
+	TimeStamp  int    `json:"timeStamp"`
+	Mgd        int    `json:"mgd"`
+	CommandNum string `json:"commandNum"`
+	ScenarioID int    `json:"scenario_id"`
+}
+
+type StartUpData struct {
+	ScenarioID         int   `json:"scenario_id"`
+	ScenarioAdjustment int   `json:"scenario_adjustment"`
+	ServerTimestamp    int64 `json:"server_timestamp"`
+}
+
+type StartUpResp struct {
+	ResponseData StartUpData `json:"response_data"`
+	ReleaseInfo  []any       `json:"release_info"`
+	StatusCode   int         `json:"status_code"`
+}
diff --git a/internal/model/subscenario.go b/internal/schema/subscenario/startup.go
similarity index 55%
rename from internal/model/subscenario.go
rename to internal/schema/subscenario/startup.go
index da7488d..01eeb8c 100644
--- a/internal/model/subscenario.go
+++ b/internal/schema/subscenario/startup.go
@@ -1,21 +1,6 @@
-package model
+package subscenario
 
-// SubScenarioResp ...
-type SubScenarioResp struct {
-	ResponseData SubScenarioRes `json:"response_data"`
-	ReleaseInfo  []any          `json:"release_info"`
-	StatusCode   int            `json:"status_code"`
-}
-
-// SubScenarioRes ...
-type SubScenarioRes struct {
-	SubscenarioID      int   `json:"subscenario_id"`
-	ScenarioAdjustment int   `json:"scenario_adjustment"`
-	ServerTimestamp    int64 `json:"server_timestamp"`
-}
-
-// SubScenarioReq ...
-type SubScenarioReq struct {
+type StartUpReq struct {
 	Module        string `json:"module"`
 	Action        string `json:"action"`
 	TimeStamp     int    `json:"timeStamp"`
@@ -23,3 +8,15 @@ type SubScenarioReq struct {
 	Mgd           int    `json:"mgd"`
 	CommandNum    string `json:"commandNum"`
 }
+
+type StartUpData struct {
+	SubscenarioID      int   `json:"subscenario_id"`
+	ScenarioAdjustment int   `json:"scenario_adjustment"`
+	ServerTimestamp    int64 `json:"server_timestamp"`
+}
+
+type StartUpResp struct {
+	ResponseData StartUpData `json:"response_data"`
+	ReleaseInfo  []any       `json:"release_info"`
+	StatusCode   int         `json:"status_code"`
+}
diff --git a/internal/schema/tos/check.go b/internal/schema/tos/check.go
new file mode 100644
index 0000000..01bcadf
--- /dev/null
+++ b/internal/schema/tos/check.go
@@ -0,0 +1,14 @@
+package tos
+
+type CheckData struct {
+	TosID           int   `json:"tos_id"`
+	TosType         int   `json:"tos_type"`
+	IsAgreed        bool  `json:"is_agreed"`
+	ServerTimestamp int64 `json:"server_timestamp"`
+}
+
+type CheckResp struct {
+	ResponseData CheckData `json:"response_data"`
+	ReleaseInfo  []any     `json:"release_info"`
+	StatusCode   int       `json:"status_code"`
+}
diff --git a/internal/schema/unit/deck.go b/internal/schema/unit/deck.go
new file mode 100644
index 0000000..3a0e422
--- /dev/null
+++ b/internal/schema/unit/deck.go
@@ -0,0 +1,26 @@
+package unit
+
+type UnitDeckDetail struct {
+	Position         int `json:"position"`
+	UnitOwningUserID int `json:"unit_owning_user_id"`
+}
+
+type UnitDeckList struct {
+	UnitDeckDetail []UnitDeckDetail `json:"unit_deck_detail"`
+	UnitDeckID     int              `json:"unit_deck_id"`
+	MainFlag       int              `json:"main_flag"`
+	DeckName       string           `json:"deck_name"`
+}
+
+type DeckReq struct {
+	Module       string         `json:"module"`
+	UnitDeckList []UnitDeckList `json:"unit_deck_list"`
+	Action       string         `json:"action"`
+	Mgd          int            `json:"mgd"`
+}
+
+type DeckResp struct {
+	ResponseData []any `json:"response_data"`
+	ReleaseInfo  []any `json:"release_info"`
+	StatusCode   int   `json:"status_code"`
+}
diff --git a/internal/schema/unit/deckname.go b/internal/schema/unit/deckname.go
new file mode 100644
index 0000000..9e78c53
--- /dev/null
+++ b/internal/schema/unit/deckname.go
@@ -0,0 +1,11 @@
+package unit
+
+type DeckNameReq struct {
+	Module     string `json:"module"`
+	UnitDeckID int    `json:"unit_deck_id"`
+	Action     string `json:"action"`
+	TimeStamp  int    `json:"timeStamp"`
+	Mgd        int    `json:"mgd"`
+	CommandNum string `json:"commandNum"`
+	DeckName   string `json:"deck_name"`
+}
diff --git a/internal/schema/unit/favorite.go b/internal/schema/unit/favorite.go
new file mode 100644
index 0000000..8af1193
--- /dev/null
+++ b/internal/schema/unit/favorite.go
@@ -0,0 +1,7 @@
+package unit
+
+type FavoriteResp struct {
+	ResponseData []any `json:"response_data"`
+	ReleaseInfo  []any `json:"release_info"`
+	StatusCode   int   `json:"status_code"`
+}
diff --git a/internal/schema/unit/removableskillequipment.go b/internal/schema/unit/removableskillequipment.go
new file mode 100644
index 0000000..761319a
--- /dev/null
+++ b/internal/schema/unit/removableskillequipment.go
@@ -0,0 +1,34 @@
+package unit
+
+type SkillRemove struct {
+	UnitRemovableSkillID int `json:"unit_removable_skill_id"`
+	UnitOwningUserID     int `json:"unit_owning_user_id"`
+}
+
+type SkillEquip struct {
+	UnitRemovableSkillID int `json:"unit_removable_skill_id"`
+	UnitOwningUserID     int `json:"unit_owning_user_id"`
+}
+
+type RemovableSkillEquipmentReq struct {
+	Module     string        `json:"module"`
+	Remove     []SkillRemove `json:"remove"`
+	Action     string        `json:"action"`
+	TimeStamp  int           `json:"timeStamp"`
+	Equip      []SkillEquip  `json:"equip"`
+	Mgd        int           `json:"mgd"`
+	CommandNum string        `json:"commandNum"`
+}
+
+type RemovableSkillEquipmentData struct {
+	Id                   int `xorm:"id pk autoincr"`
+	UnitRemovableSkillId int `xorm:"unit_removable_skill_id"`
+	UnitOwningUserID     int `xorm:"unit_owning_user_id"`
+	UserID               int `xorm:"user_id"`
+}
+
+type RemovableSkillEquipmentResp struct {
+	ResponseData []any `json:"response_data"`
+	ReleaseInfo  []any `json:"release_info"`
+	StatusCode   int   `json:"status_code"`
+}
diff --git a/internal/schema/unit/setdisplayrank.go b/internal/schema/unit/setdisplayrank.go
new file mode 100644
index 0000000..2c9c542
--- /dev/null
+++ b/internal/schema/unit/setdisplayrank.go
@@ -0,0 +1,7 @@
+package unit
+
+type SetDisplayRankResp struct {
+	ResponseData []any `json:"response_data"`
+	ReleaseInfo  []any `json:"release_info"`
+	StatusCode   int   `json:"status_code"`
+}
diff --git a/internal/schema/unit/wearaccessory.go b/internal/schema/unit/wearaccessory.go
new file mode 100644
index 0000000..e12debd
--- /dev/null
+++ b/internal/schema/unit/wearaccessory.go
@@ -0,0 +1,34 @@
+package unit
+
+type AccessoryRemove struct {
+	AccessoryOwningUserID int `json:"accessory_owning_user_id"`
+	UnitOwningUserID      int `json:"unit_owning_user_id"`
+}
+
+type AccessoryWear struct {
+	AccessoryOwningUserID int `json:"accessory_owning_user_id"`
+	UnitOwningUserID      int `json:"unit_owning_user_id"`
+}
+
+type WearAccessoryReq struct {
+	Module     string            `json:"module"`
+	Remove     []AccessoryRemove `json:"remove"`
+	Action     string            `json:"action"`
+	TimeStamp  int               `json:"timeStamp"`
+	Wear       []AccessoryWear   `json:"wear"`
+	Mgd        int               `json:"mgd"`
+	CommandNum string            `json:"commandNum"`
+}
+
+type WearAccessoryData struct {
+	Id                    int `xorm:"id pk autoincr"`
+	AccessoryOwningUserID int `xorm:"accessory_owning_user_id"`
+	UnitOwningUserID      int `xorm:"unit_owning_user_id"`
+	UserID                int `xorm:"user_id"`
+}
+
+type WearAccessoryResp struct {
+	ResponseData []any `json:"response_data"`
+	ReleaseInfo  []any `json:"release_info"`
+	StatusCode   int   `json:"status_code"`
+}
diff --git a/internal/schema/user/changename.go b/internal/schema/user/changename.go
new file mode 100644
index 0000000..0c3f5e5
--- /dev/null
+++ b/internal/schema/user/changename.go
@@ -0,0 +1,13 @@
+package user
+
+type ChangeNameData struct {
+	BeforeName      string `json:"before_name"`
+	AfterName       string `json:"after_name"`
+	ServerTimestamp int64  `json:"server_timestamp"`
+}
+
+type ChangeNameResp struct {
+	ResponseData ChangeNameData `json:"response_data"`
+	ReleaseInfo  []any          `json:"release_info"`
+	StatusCode   int            `json:"status_code"`
+}
diff --git a/internal/schema/user/changenavi.go b/internal/schema/user/changenavi.go
new file mode 100644
index 0000000..58259da
--- /dev/null
+++ b/internal/schema/user/changenavi.go
@@ -0,0 +1,7 @@
+package user
+
+type ChangeNaviResp struct {
+	ResponseData []any `json:"response_data"`
+	ReleaseInfo  []any `json:"release_info"`
+	StatusCode   int   `json:"status_code"`
+}
diff --git a/internal/schema/user/setnotificationtoken.go b/internal/schema/user/setnotificationtoken.go
new file mode 100644
index 0000000..c390276
--- /dev/null
+++ b/internal/schema/user/setnotificationtoken.go
@@ -0,0 +1,7 @@
+package user
+
+type SetNotificationTokenResp struct {
+	ResponseData []any `json:"response_data"`
+	ReleaseInfo  []any `json:"release_info"`
+	StatusCode   int   `json:"status_code"`
+}
diff --git a/internal/schema/user/userinfo.go b/internal/schema/user/userinfo.go
new file mode 100644
index 0000000..fb1fa10
--- /dev/null
+++ b/internal/schema/user/userinfo.go
@@ -0,0 +1,20 @@
+package user
+
+import "honoka-chan/internal/schema/api/user"
+
+type Birth struct {
+	BirthMonth int `json:"birth_month"`
+	BirthDay   int `json:"birth_day"`
+}
+
+type UserInfoData struct {
+	User            user.UserInfo `json:"user"`
+	Birth           Birth         `json:"birth"`
+	ServerTimestamp int64         `json:"server_timestamp"`
+}
+
+type UserInfoResp struct {
+	ResponseData UserInfoData `json:"response_data"`
+	ReleaseInfo  []any        `json:"release_info"`
+	StatusCode   int          `json:"status_code"`
+}
diff --git a/internal/model/webui.go b/internal/schema/webui/webui.go
similarity index 82%
rename from internal/model/webui.go
rename to internal/schema/webui/webui.go
index fd2bc09..cea8d63 100644
--- a/internal/model/webui.go
+++ b/internal/schema/webui/webui.go
@@ -1,6 +1,5 @@
-package model
+package webui
 
-// Msg ...
 type Msg struct {
 	Code     int    `json:"code"`
 	Message  string `json:"message"`
diff --git a/internal/session/session.go b/internal/session/session.go
index 57de59f..e69a39e 100644
--- a/internal/session/session.go
+++ b/internal/session/session.go
@@ -2,17 +2,24 @@ package session
 
 import (
 	"encoding/json"
+	"errors"
+	"honoka-chan/internal/model/user"
 	"honoka-chan/internal/utils"
 	"honoka-chan/pkg/db"
+	"log"
 
 	"github.com/gin-gonic/gin"
 	"xorm.io/xorm"
 )
 
 type Session struct {
-	Ctx     *gin.Context
+	Ctx *gin.Context
+
 	MainEng *xorm.Session
 	UserEng *xorm.Session
+
+	UserID   int
+	UserPref user.UserPref
 }
 
 func New(ctx *gin.Context) *Session {
@@ -21,23 +28,39 @@ func New(ctx *gin.Context) *Session {
 	}
 
 	ss.MainEng = db.MainEng.NewSession()
-
 	ss.UserEng = db.UserEng.NewSession()
 	ss.UserEng.Begin()
 
+	userID := ctx.GetString("userid")
+	if userID != "" {
+		exist, err := ss.UserEng.Table("user_pref").Where("user_id = ?", userID).Get(&ss.UserPref)
+		if ss.CheckErr(err) {
+			return nil
+		}
+		if !exist {
+			ss.Abort(errors.New("user not exist!"))
+			return nil
+		}
+		ss.UserID = ss.UserPref.UserID
+	}
+
 	return ss
 }
 
+func Get(ctx *gin.Context) *Session {
+	return ctx.MustGet("session").(*Session)
+}
+
 func (ss *Session) Finalize() {
 	ss.MainEng.Close()
-
-	ss.UserEng.Commit()
+	if ss.CheckErr(ss.UserEng.Commit()) {
+		return
+	}
 	ss.UserEng.Close()
 }
 
 func (ss *Session) Abort(err error) {
 	ss.MainEng.Close()
-
 	ss.UserEng.Rollback()
 	ss.UserEng.Close()
 
@@ -47,16 +70,28 @@ func (ss *Session) Abort(err error) {
 
 func (ss *Session) CheckErr(err error) bool {
 	if err != nil {
+		log.Println(err.Error())
 		ss.Abort(err)
 		return true
 	}
 	return false
 }
 
+func (ss *Session) GetDeviceID() string {
+	return ss.Ctx.Request.Header.Get("X-DEVICEID")
+}
+
+func (ss *Session) GetRandKey() []byte {
+	key, err := db.Ldb.Get([]byte(ss.GetDeviceID()))
+	if ss.CheckErr(err) {
+		return nil
+	}
+	return key
+}
+
 func (ss *Session) Respond(resp any) {
 	data, err := json.Marshal(resp)
-	if err != nil {
-		ss.Abort(err)
+	if ss.CheckErr(err) {
 		return
 	}
 
diff --git a/internal/startup/database.go b/internal/startup/database.go
new file mode 100644
index 0000000..22ffb27
--- /dev/null
+++ b/internal/startup/database.go
@@ -0,0 +1,18 @@
+package startup
+
+import (
+	"honoka-chan/internal/model/user"
+	"honoka-chan/pkg/db"
+)
+
+func CreateTable() {
+	// db.UserEng.ShowSQL(true)
+	db.UserEng.Sync2(new(user.Users))
+	db.UserEng.Sync2(new(user.UserKey))
+	db.UserEng.Sync2(new(user.UserPref))
+	db.UserEng.Sync2(new(user.UserAccessoryWear))
+	db.UserEng.Sync2(new(user.UserDeck))
+	db.UserEng.Sync2(new(user.UserUnit))
+	db.UserEng.Sync2(new(user.UserDeckUnit))
+	db.UserEng.Sync2(new(user.UserUnitSkillEquip))
+}
diff --git a/internal/startup/startup.go b/internal/startup/startup.go
new file mode 100644
index 0000000..d5e98b5
--- /dev/null
+++ b/internal/startup/startup.go
@@ -0,0 +1,6 @@
+package startup
+
+func StartUp() {
+	CreateTable()
+	InitUserData(0)
+}
diff --git a/internal/tools/init.go b/internal/startup/userdata.go
similarity index 55%
rename from internal/tools/init.go
rename to internal/startup/userdata.go
index 1d24fe7..63442c4 100644
--- a/internal/tools/init.go
+++ b/internal/startup/userdata.go
@@ -1,45 +1,32 @@
-package tools
+package startup
 
 import (
 	"fmt"
-	"honoka-chan/internal/model"
+	"honoka-chan/internal/model/user"
+	"honoka-chan/internal/schema/api/profile"
+	"honoka-chan/internal/schema/api/unit"
 	"honoka-chan/internal/utils"
 	"honoka-chan/pkg/db"
+	"strconv"
 	"time"
 )
 
-type UserData struct {
-	ID            int    `xorm:"id pk autoincr"`
-	Phone         string `xorm:"phone"`
-	Password      string `xorm:"password"`
-	Autokey       string `xorm:"autokey"`
-	Ticket        string `xorm:"ticket"`
-	UserID        int    `xorm:"userid"`
-	LastLoginTime int64  `xorm:"last_login_time"`
-}
-
-type UserPref struct {
-	ID               int    `xorm:"id pk autoincr"`
-	UserID           int    `xorm:"user_id"`
-	AwardID          int    `xorm:"award_id"`
-	BackgroundID     int    `xorm:"background_id"`
-	UnitOwningUserID int    `xorm:"unit_owning_user_id"`
-	UserName         string `xorm:"user_name"`
-	UserLevel        int    `xorm:"user_level"`
-	UserDesc         string `xorm:"user_desc"`
-	UpdateTime       int64  `xorm:"update_time"`
-}
-
 func InitUserData(userId int) {
-	userList := []UserData{}
+	userList := []user.Users{}
 	if userId != 0 {
-		err := db.UserEng.Table("users").Where("userid = ?", userId).Find(&userList)
+		err := db.UserEng.Table("users").Where("user_id = ?", userId).Find(&userList)
 		utils.CheckErr(err)
 	} else {
 		err := db.UserEng.Table("users").Asc("id").Find(&userList)
 		utils.CheckErr(err)
 	}
 
+	// 同步用户表
+	// db.UserEng.ShowSQL(true)
+	// db.UserEng.Table("user_info_m").Sync2(new(user.UserInfo))
+	// db.UserEng.Table("user_pref").Sync2(new(UserPref))
+
+	// 开始会话
 	session := db.UserEng.NewSession()
 	defer session.Close()
 
@@ -47,9 +34,9 @@ func InitUserData(userId int) {
 		panic(err)
 	}
 
-	for _, user := range userList {
+	for _, u := range userList {
 		// 检查用户配置
-		exists, err := db.UserEng.Table("user_preference_m").Where("user_id = ?", user.UserID).Exist()
+		exists, err := db.UserEng.Table("user_pref").Where("user_id = ?", u.UserID).Exist()
 		utils.CheckErr(err)
 
 		if !exists {
@@ -57,38 +44,42 @@ func InitUserData(userId int) {
 			var oId int
 			_, err = db.MainEng.Table("common_unit_m").Cols("unit_owning_user_id").Where("unit_id = ?", 31).Get(&oId)
 			utils.CheckErr(err)
-			fmt.Println("Center UnitOwningUserID:", oId)
-			userPref := UserPref{
-				UserID:           user.UserID,
+			fmt.Println("Center UnitOwningUserId:", oId)
+			userPref := user.UserPref{
+				UserID:           u.UserID,
 				AwardID:          1, // 音乃木坂学生
 				BackgroundID:     1, // 初始背景
 				UnitOwningUserID: oId,
 				UserName:         "音乃木坂学生",
 				UserLevel:        1,
 				UserDesc:         "你好。",
+				InviteCode:       strconv.Itoa(u.UserID),
 				UpdateTime:       time.Now().Unix(),
 			}
-			_, err = session.Table("user_preference_m").Insert(&userPref)
+			_, err = session.Table("user_pref").Insert(&userPref)
 			utils.CheckErr(err)
-			// fmt.Println("UserPref ID", userPref.ID)
+			// fmt.Println("UserPref Id", userPref.Id)
 		}
 
+		// 检查用户信息
+		exists, err = db.UserEng.Table("user_info_m").Where("user_id = ?", u.UserID).Exist()
+
 		// 检查用户卡组配置
-		exists, err = db.UserEng.Table("user_deck_m").Where("user_id = ?", user.UserID).Asc("deck_id").Exist()
+		exists, err = db.UserEng.Table("user_deck").Where("user_id = ?", u.UserID).Asc("deck_id").Exist()
 		utils.CheckErr(err)
 		// fmt.Println("UserDeck exists:", exists)
 
 		if !exists {
-			userDeck := model.UserDeckData{
+			userDeck := unit.UserDeckData{
 				DeckID:     1,
 				MainFlag:   1,
 				DeckName:   "队伍A",
-				UserID:     user.UserID,
+				UserID:     u.UserID,
 				InsertDate: time.Now().Unix(),
 			}
 
 			// 默认队伍
-			_, err = session.Table("user_deck_m").Insert(&userDeck)
+			_, err = session.Table("user_deck").Insert(&userDeck)
 			if err != nil {
 				session.Rollback()
 				panic(err)
@@ -104,7 +95,7 @@ func InitUserData(userId int) {
 				panic(err)
 			}
 
-			unitData := []model.UnitData{}
+			unitData := []profile.UnitData{}
 			err = db.MainEng.Table("common_unit_m").In("unit_id", unitIds).Find(&unitData)
 			if err != nil {
 				session.Rollback()
@@ -113,11 +104,11 @@ func InitUserData(userId int) {
 			// fmt.Println(unitData)
 
 			position := 1
-			for _, unit := range unitData {
-				unitDeckData := model.UnitDeckData{
+			for _, u := range unitData {
+				unitDeckData := unit.UnitDeckData{
 					UserDeckID:       userDeckId,
-					UnitOwningUserID: unit.UnitOwningUserID,
-					UnitID:           unit.UnitID,
+					UnitOwningUserID: u.UnitOwningUserID,
+					UnitID:           u.UnitID,
 					Position:         position,
 					Level:            100,
 					LevelLimitID:     1,
@@ -127,21 +118,22 @@ func InitUserData(userId int) {
 					IsRankMax:        true,
 					IsLoveMax:        true,
 					IsLevelMax:       true,
-					IsSigned:         unit.IsSigned,
+					IsSigned:         u.IsSigned,
 					BeforeLove:       1000,
 					MaxLove:          1000,
 					InsertData:       time.Now().Unix(),
 				}
-				_, err = session.Table("deck_unit_m").Insert(&unitDeckData)
+				_, err = session.Table("user_deck_unit").Insert(&unitDeckData)
 				if err != nil {
 					session.Rollback()
 					panic(err)
 				}
-				// fmt.Println("New DeckUnit:", unitDeckData.ID)
+				// fmt.Println("New DeckUnit:", unitDeckData.Id)
 
 				position++
 			}
 
+			// 结束会话
 			if err = session.Commit(); err != nil {
 				panic(err)
 			}
diff --git a/internal/utils/utils.go b/internal/utils/utils.go
index b3a89b3..ae42f9c 100644
--- a/internal/utils/utils.go
+++ b/internal/utils/utils.go
@@ -2,7 +2,6 @@ package utils
 
 import (
 	"encoding/base64"
-	"honoka-chan/pkg/db"
 	"honoka-chan/pkg/encrypt"
 )
 
@@ -12,13 +11,6 @@ func CheckErr(err error) {
 	}
 }
 
-func IsSigned(unitId int) bool {
-	exists, err := db.MainEng.Table("unit_sign_asset_m").Where("unit_id = ?", unitId).Exist()
-	CheckErr(err)
-
-	return exists
-}
-
 func GenXMS(resp []byte) string {
 	return base64.StdEncoding.EncodeToString(encrypt.RSASignSHA1(resp))
 }
diff --git a/main.go b/main.go
index 665ef8b..0df3c91 100644
--- a/main.go
+++ b/main.go
@@ -2,8 +2,9 @@ package main
 
 import (
 	"honoka-chan/config"
+	_ "honoka-chan/internal/handler"
 	"honoka-chan/internal/router"
-	_ "honoka-chan/internal/tools"
+	"honoka-chan/internal/startup"
 	"honoka-chan/pkg/db"
 	"log"
 	"os"
@@ -14,6 +15,12 @@ import (
 )
 
 func main() {
+	// 初始化配置
+	config.InitConfig()
+
+	// 初始化数据库表和用户数据
+	startup.StartUp()
+
 	// 处理系统信号，确保程序退出时关闭数据库
 	signalChan := make(chan os.Signal, 1)
 	signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM)
@@ -21,7 +28,7 @@ func main() {
 	go func() {
 		<-signalChan
 		log.Println("Shutting down...")
-		db.DB.Close()
+		db.Ldb.Close()
 		os.Exit(0)
 	}()
 
diff --git a/pkg/db/db.go b/pkg/db/db.go
index c25a9e7..5a4bd22 100644
--- a/pkg/db/db.go
+++ b/pkg/db/db.go
@@ -2,30 +2,22 @@ package db
 
 import (
 	"fmt"
-	"honoka-chan/pkg/utils"
-	"os"
 
 	_ "modernc.org/sqlite"
 	"xorm.io/xorm"
 )
 
 var (
-	DB *Instance
+	Ldb *LdbInstance
 
-	ExampleDb = "assets/data.example.db"
-	MainDb    = "assets/main.db"
-	UserDb    = "assets/data.db"
-	MainEng   *xorm.Engine
-	UserEng   *xorm.Engine
+	MainDb  = "assets/main.db"
+	UserDb  = "assets/data.db"
+	MainEng *xorm.Engine
+	UserEng *xorm.Engine
 )
 
 func init() {
-	DB = GetInstance()
-
-	_, err := os.Stat(UserDb)
-	if err != nil {
-		utils.WriteAllText(UserDb, utils.ReadAllText(ExampleDb))
-	}
+	Ldb = GetLdbInstance()
 
 	eng, err := xorm.NewEngine("sqlite", MainDb)
 	if err != nil {
@@ -53,7 +45,7 @@ func init() {
 }
 
 func MatchTokenUid(token, uid string) bool {
-	res, err := DB.Get([]byte(uid))
+	res, err := Ldb.Get([]byte(uid))
 	if err != nil {
 		fmt.Println(err)
 		return false
diff --git a/pkg/db/leveldb.go b/pkg/db/leveldb.go
index b2d8e51..6d8ac69 100644
--- a/pkg/db/leveldb.go
+++ b/pkg/db/leveldb.go
@@ -11,13 +11,13 @@ var (
 	once sync.Once
 )
 
-type Instance struct {
+type LdbInstance struct {
 	db *leveldb.DB
 	mu sync.Mutex
 }
 
-func GetInstance() *Instance {
-	in := Instance{}
+func GetLdbInstance() *LdbInstance {
+	in := LdbInstance{}
 	once.Do(func() {
 		var err error
 		in.db, err = leveldb.OpenFile("./data/honoka-chan.db", nil)
@@ -28,7 +28,7 @@ func GetInstance() *Instance {
 	return &in
 }
 
-func (in *Instance) Close() error {
+func (in *LdbInstance) Close() error {
 	in.mu.Lock()
 	defer in.mu.Unlock()
 	if in.db != nil {
@@ -37,7 +37,7 @@ func (in *Instance) Close() error {
 	return nil
 }
 
-func (in *Instance) Get(key []byte) ([]byte, error) {
+func (in *LdbInstance) Get(key []byte) ([]byte, error) {
 	if len(key) == 0 {
 		return nil, errors.New("empty key")
 	}
@@ -50,7 +50,7 @@ func (in *Instance) Get(key []byte) ([]byte, error) {
 	return res, nil
 }
 
-func (in *Instance) Set(key, value []byte) error {
+func (in *LdbInstance) Set(key, value []byte) error {
 	if len(key) == 0 {
 		return errors.New("empty key")
 	}
diff --git a/internal/tools/tools.go b/pkg/tools/tools.go
similarity index 99%
rename from internal/tools/tools.go
rename to pkg/tools/tools.go
index a0960ee..ab288a7 100644
--- a/internal/tools/tools.go
+++ b/pkg/tools/tools.go
@@ -1,7 +1,6 @@
 package tools
 
 func init() {
-	InitUserData(0)
 
 	// eng, err := xorm.NewEngine("sqlite", "assets/masterdata.db")
 	// utils.CheckErr(err)
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
index e7eb4de..8af2a4d 100644
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -38,13 +38,14 @@ func WriteAllText(path, text string) {
 	_ = os.WriteFile(path, []byte(text), 0644)
 }
 
-func SliceXor(s1, s2 []byte) (res []byte) {
-	for k, b := range s1 {
-		newBt := b ^ s2[k]
-		res = append(res, newBt)
-	}
+func XOR(s1, s2 []byte) []byte {
+	n := min(len(s1), len(s2))
 
-	return
+	res := make([]byte, n)
+	for i, b := range s1[:n] {
+		res[i] = b ^ s2[i]
+	}
+	return res
 }
 
 func Sub16(str []byte) []byte {
diff --git a/assets/static/.gitignore b/static/.gitignore
similarity index 100%
rename from assets/static/.gitignore
rename to static/.gitignore
diff --git a/assets/static/css/base.css b/static/css/base.css
similarity index 100%
rename from assets/static/css/base.css
rename to static/css/base.css
diff --git a/assets/static/css/layui.css b/static/css/layui.css
similarity index 100%
rename from assets/static/css/layui.css
rename to static/css/layui.css
diff --git a/assets/static/css/ll-perfect-scrollbar.css b/static/css/ll-perfect-scrollbar.css
similarity index 100%
rename from assets/static/css/ll-perfect-scrollbar.css
rename to static/css/ll-perfect-scrollbar.css
diff --git a/assets/static/css/perfect-scrollbar.css b/static/css/perfect-scrollbar.css
similarity index 100%
rename from assets/static/css/perfect-scrollbar.css
rename to static/css/perfect-scrollbar.css
diff --git a/assets/static/css/style.css b/static/css/style.css
similarity index 100%
rename from assets/static/css/style.css
rename to static/css/style.css
diff --git a/assets/static/css/window.css b/static/css/window.css
similarity index 100%
rename from assets/static/css/window.css
rename to static/css/window.css
diff --git a/assets/static/font/iconfont.eot b/static/font/iconfont.eot
similarity index 100%
rename from assets/static/font/iconfont.eot
rename to static/font/iconfont.eot
diff --git a/assets/static/font/iconfont.svg b/static/font/iconfont.svg
similarity index 100%
rename from assets/static/font/iconfont.svg
rename to static/font/iconfont.svg
diff --git a/assets/static/font/iconfont.ttf b/static/font/iconfont.ttf
similarity index 100%
rename from assets/static/font/iconfont.ttf
rename to static/font/iconfont.ttf
diff --git a/assets/static/font/iconfont.woff b/static/font/iconfont.woff
similarity index 100%
rename from assets/static/font/iconfont.woff
rename to static/font/iconfont.woff
diff --git a/assets/static/font/iconfont.woff2 b/static/font/iconfont.woff2
similarity index 100%
rename from assets/static/font/iconfont.woff2
rename to static/font/iconfont.woff2
diff --git a/assets/static/images/15047550942873.jpg b/static/images/15047550942873.jpg
similarity index 100%
rename from assets/static/images/15047550942873.jpg
rename to static/images/15047550942873.jpg
diff --git a/assets/static/images/15047551059201.jpg b/static/images/15047551059201.jpg
similarity index 100%
rename from assets/static/images/15047551059201.jpg
rename to static/images/15047551059201.jpg
diff --git a/assets/static/images/15047551145790.jpg b/static/images/15047551145790.jpg
similarity index 100%
rename from assets/static/images/15047551145790.jpg
rename to static/images/15047551145790.jpg
diff --git a/assets/static/images/15047551242040.jpg b/static/images/15047551242040.jpg
similarity index 100%
rename from assets/static/images/15047551242040.jpg
rename to static/images/15047551242040.jpg
diff --git a/assets/static/images/15047553374283.jpg b/static/images/15047553374283.jpg
similarity index 100%
rename from assets/static/images/15047553374283.jpg
rename to static/images/15047553374283.jpg
diff --git a/assets/static/images/15047553496606.jpg b/static/images/15047553496606.jpg
similarity index 100%
rename from assets/static/images/15047553496606.jpg
rename to static/images/15047553496606.jpg
diff --git a/assets/static/images/15047553611357.jpg b/static/images/15047553611357.jpg
similarity index 100%
rename from assets/static/images/15047553611357.jpg
rename to static/images/15047553611357.jpg
diff --git a/assets/static/images/15047553728636.jpg b/static/images/15047553728636.jpg
similarity index 100%
rename from assets/static/images/15047553728636.jpg
rename to static/images/15047553728636.jpg
diff --git a/assets/static/images/15047553849518.jpg b/static/images/15047553849518.jpg
similarity index 100%
rename from assets/static/images/15047553849518.jpg
rename to static/images/15047553849518.jpg
diff --git a/assets/static/images/15047553982300.jpg b/static/images/15047553982300.jpg
similarity index 100%
rename from assets/static/images/15047553982300.jpg
rename to static/images/15047553982300.jpg
diff --git a/assets/static/images/15047554108052.jpg b/static/images/15047554108052.jpg
similarity index 100%
rename from assets/static/images/15047554108052.jpg
rename to static/images/15047554108052.jpg
diff --git a/assets/static/images/15047554203428.jpg b/static/images/15047554203428.jpg
similarity index 100%
rename from assets/static/images/15047554203428.jpg
rename to static/images/15047554203428.jpg
diff --git a/assets/static/images/15047554315307.jpg b/static/images/15047554315307.jpg
similarity index 100%
rename from assets/static/images/15047554315307.jpg
rename to static/images/15047554315307.jpg
diff --git a/assets/static/images/15047554481319.jpg b/static/images/15047554481319.jpg
similarity index 100%
rename from assets/static/images/15047554481319.jpg
rename to static/images/15047554481319.jpg
diff --git a/assets/static/images/15047554596230.jpg b/static/images/15047554596230.jpg
similarity index 100%
rename from assets/static/images/15047554596230.jpg
rename to static/images/15047554596230.jpg
diff --git a/assets/static/images/15047554774569.jpg b/static/images/15047554774569.jpg
similarity index 100%
rename from assets/static/images/15047554774569.jpg
rename to static/images/15047554774569.jpg
diff --git a/assets/static/images/15047554922924.jpg b/static/images/15047554922924.jpg
similarity index 100%
rename from assets/static/images/15047554922924.jpg
rename to static/images/15047554922924.jpg
diff --git a/assets/static/images/15047555087747.jpg b/static/images/15047555087747.jpg
similarity index 100%
rename from assets/static/images/15047555087747.jpg
rename to static/images/15047555087747.jpg
diff --git a/assets/static/images/15047555219572.jpg b/static/images/15047555219572.jpg
similarity index 100%
rename from assets/static/images/15047555219572.jpg
rename to static/images/15047555219572.jpg
diff --git a/assets/static/images/15047555411780.jpg b/static/images/15047555411780.jpg
similarity index 100%
rename from assets/static/images/15047555411780.jpg
rename to static/images/15047555411780.jpg
diff --git a/assets/static/images/15047555499746.jpg b/static/images/15047555499746.jpg
similarity index 100%
rename from assets/static/images/15047555499746.jpg
rename to static/images/15047555499746.jpg
diff --git a/assets/static/images/15047555585712.jpg b/static/images/15047555585712.jpg
similarity index 100%
rename from assets/static/images/15047555585712.jpg
rename to static/images/15047555585712.jpg
diff --git a/assets/static/images/15047555704112.jpg b/static/images/15047555704112.jpg
similarity index 100%
rename from assets/static/images/15047555704112.jpg
rename to static/images/15047555704112.jpg
diff --git a/assets/static/images/15047555798773.jpg b/static/images/15047555798773.jpg
similarity index 100%
rename from assets/static/images/15047555798773.jpg
rename to static/images/15047555798773.jpg
diff --git a/assets/static/images/15047555888980.jpg b/static/images/15047555888980.jpg
similarity index 100%
rename from assets/static/images/15047555888980.jpg
rename to static/images/15047555888980.jpg
diff --git a/assets/static/images/15088959186072.jpg b/static/images/15088959186072.jpg
similarity index 100%
rename from assets/static/images/15088959186072.jpg
rename to static/images/15088959186072.jpg
diff --git a/assets/static/images/15107324142966.png b/static/images/15107324142966.png
similarity index 100%
rename from assets/static/images/15107324142966.png
rename to static/images/15107324142966.png
diff --git a/assets/static/images/15141856059568.jpg b/static/images/15141856059568.jpg
similarity index 100%
rename from assets/static/images/15141856059568.jpg
rename to static/images/15141856059568.jpg
diff --git a/assets/static/images/15141862776588.jpg b/static/images/15141862776588.jpg
similarity index 100%
rename from assets/static/images/15141862776588.jpg
rename to static/images/15141862776588.jpg
diff --git a/assets/static/images/15141862946556.jpg b/static/images/15141862946556.jpg
similarity index 100%
rename from assets/static/images/15141862946556.jpg
rename to static/images/15141862946556.jpg
diff --git a/assets/static/images/15141863126912.jpg b/static/images/15141863126912.jpg
similarity index 100%
rename from assets/static/images/15141863126912.jpg
rename to static/images/15141863126912.jpg
diff --git a/assets/static/images/15141863229129.jpg b/static/images/15141863229129.jpg
similarity index 100%
rename from assets/static/images/15141863229129.jpg
rename to static/images/15141863229129.jpg
diff --git a/assets/static/images/15141863365919.jpg b/static/images/15141863365919.jpg
similarity index 100%
rename from assets/static/images/15141863365919.jpg
rename to static/images/15141863365919.jpg
diff --git a/assets/static/images/15141863483422.jpg b/static/images/15141863483422.jpg
similarity index 100%
rename from assets/static/images/15141863483422.jpg
rename to static/images/15141863483422.jpg
diff --git a/assets/static/images/15141863639911.jpg b/static/images/15141863639911.jpg
similarity index 100%
rename from assets/static/images/15141863639911.jpg
rename to static/images/15141863639911.jpg
diff --git a/assets/static/images/15141863772178.jpg b/static/images/15141863772178.jpg
similarity index 100%
rename from assets/static/images/15141863772178.jpg
rename to static/images/15141863772178.jpg
diff --git a/assets/static/images/15141864261972.jpg b/static/images/15141864261972.jpg
similarity index 100%
rename from assets/static/images/15141864261972.jpg
rename to static/images/15141864261972.jpg
diff --git a/assets/static/images/15141864584520.jpg b/static/images/15141864584520.jpg
similarity index 100%
rename from assets/static/images/15141864584520.jpg
rename to static/images/15141864584520.jpg
diff --git a/assets/static/images/15141864695842.jpg b/static/images/15141864695842.jpg
similarity index 100%
rename from assets/static/images/15141864695842.jpg
rename to static/images/15141864695842.jpg
diff --git a/assets/static/images/15141864804128.jpg b/static/images/15141864804128.jpg
similarity index 100%
rename from assets/static/images/15141864804128.jpg
rename to static/images/15141864804128.jpg
diff --git a/assets/static/images/15141864889884.jpg b/static/images/15141864889884.jpg
similarity index 100%
rename from assets/static/images/15141864889884.jpg
rename to static/images/15141864889884.jpg
diff --git a/assets/static/images/15141865055652.jpg b/static/images/15141865055652.jpg
similarity index 100%
rename from assets/static/images/15141865055652.jpg
rename to static/images/15141865055652.jpg
diff --git a/assets/static/images/15141865133555.jpg b/static/images/15141865133555.jpg
similarity index 100%
rename from assets/static/images/15141865133555.jpg
rename to static/images/15141865133555.jpg
diff --git a/assets/static/images/15141865196092.jpg b/static/images/15141865196092.jpg
similarity index 100%
rename from assets/static/images/15141865196092.jpg
rename to static/images/15141865196092.jpg
diff --git a/assets/static/images/15238681581968.png b/static/images/15238681581968.png
similarity index 100%
rename from assets/static/images/15238681581968.png
rename to static/images/15238681581968.png
diff --git a/assets/static/images/15238694807202.png b/static/images/15238694807202.png
similarity index 100%
rename from assets/static/images/15238694807202.png
rename to static/images/15238694807202.png
diff --git a/assets/static/images/15238694919055.png b/static/images/15238694919055.png
similarity index 100%
rename from assets/static/images/15238694919055.png
rename to static/images/15238694919055.png
diff --git a/assets/static/images/15238695116848.png b/static/images/15238695116848.png
similarity index 100%
rename from assets/static/images/15238695116848.png
rename to static/images/15238695116848.png
diff --git a/assets/static/images/15238695303404.png b/static/images/15238695303404.png
similarity index 100%
rename from assets/static/images/15238695303404.png
rename to static/images/15238695303404.png
diff --git a/assets/static/images/15238695455400.png b/static/images/15238695455400.png
similarity index 100%
rename from assets/static/images/15238695455400.png
rename to static/images/15238695455400.png
diff --git a/assets/static/images/15238695587056.png b/static/images/15238695587056.png
similarity index 100%
rename from assets/static/images/15238695587056.png
rename to static/images/15238695587056.png
diff --git a/assets/static/images/15238695641197.png b/static/images/15238695641197.png
similarity index 100%
rename from assets/static/images/15238695641197.png
rename to static/images/15238695641197.png
diff --git a/assets/static/images/15238701747409.png b/static/images/15238701747409.png
similarity index 100%
rename from assets/static/images/15238701747409.png
rename to static/images/15238701747409.png
diff --git a/assets/static/images/15238702168776.png b/static/images/15238702168776.png
similarity index 100%
rename from assets/static/images/15238702168776.png
rename to static/images/15238702168776.png
diff --git a/assets/static/images/admin/ic_launcher.png b/static/images/admin/ic_launcher.png
similarity index 100%
rename from assets/static/images/admin/ic_launcher.png
rename to static/images/admin/ic_launcher.png
diff --git a/assets/static/images/admin/top-bg.jpg b/static/images/admin/top-bg.jpg
similarity index 100%
rename from assets/static/images/admin/top-bg.jpg
rename to static/images/admin/top-bg.jpg
diff --git a/assets/static/images/admin/top-bg_2.jpg b/static/images/admin/top-bg_2.jpg
similarity index 100%
rename from assets/static/images/admin/top-bg_2.jpg
rename to static/images/admin/top-bg_2.jpg
diff --git a/assets/static/images/bg-left.png b/static/images/bg-left.png
similarity index 100%
rename from assets/static/images/bg-left.png
rename to static/images/bg-left.png
diff --git a/assets/static/images/bg-right.png b/static/images/bg-right.png
similarity index 100%
rename from assets/static/images/bg-right.png
rename to static/images/bg-right.png
diff --git a/static/images/favicon.ico b/static/images/favicon.ico
new file mode 100644
index 0000000..dd176a9
Binary files /dev/null and b/static/images/favicon.ico differ
diff --git a/assets/static/images/list-content-bg-on.png b/static/images/list-content-bg-on.png
similarity index 100%
rename from assets/static/images/list-content-bg-on.png
rename to static/images/list-content-bg-on.png
diff --git a/assets/static/images/list-content-bg.png b/static/images/list-content-bg.png
similarity index 100%
rename from assets/static/images/list-content-bg.png
rename to static/images/list-content-bg.png
diff --git a/assets/static/images/title-banner.png b/static/images/title-banner.png
similarity index 100%
rename from assets/static/images/title-banner.png
rename to static/images/title-banner.png
diff --git a/assets/static/js/button.js b/static/js/button.js
similarity index 100%
rename from assets/static/js/button.js
rename to static/js/button.js
diff --git a/assets/static/js/layui.js b/static/js/layui.js
similarity index 100%
rename from assets/static/js/layui.js
rename to static/js/layui.js
diff --git a/assets/static/js/perfect-scrollbar.min.js b/static/js/perfect-scrollbar.min.js
similarity index 100%
rename from assets/static/js/perfect-scrollbar.min.js
rename to static/js/perfect-scrollbar.min.js
diff --git a/assets/static/templates/admin/card.html b/static/templates/admin/card.html
similarity index 98%
rename from assets/static/templates/admin/card.html
rename to static/templates/admin/card.html
index f072485..7780ac6 100644
--- a/assets/static/templates/admin/card.html
+++ b/static/templates/admin/card.html
@@ -24,4 +24,4 @@
 </body>
 
 </html>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/assets/static/templates/admin/index.html b/static/templates/admin/index.html
similarity index 98%
rename from assets/static/templates/admin/index.html
rename to static/templates/admin/index.html
index c9b7d91..8605b5e 100644
--- a/assets/static/templates/admin/index.html
+++ b/static/templates/admin/index.html
@@ -24,4 +24,4 @@
 </body>
 
 </html>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/assets/static/templates/admin/login.html b/static/templates/admin/login.html
similarity index 99%
rename from assets/static/templates/admin/login.html
rename to static/templates/admin/login.html
index c63a72d..64070d3 100644
--- a/assets/static/templates/admin/login.html
+++ b/static/templates/admin/login.html
@@ -110,4 +110,4 @@
 </div>
 
 </html>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/assets/static/templates/admin/nav/css.html b/static/templates/admin/nav/css.html
similarity index 90%
rename from assets/static/templates/admin/nav/css.html
rename to static/templates/admin/nav/css.html
index 872a4fe..8c7c1ba 100644
--- a/assets/static/templates/admin/nav/css.html
+++ b/static/templates/admin/nav/css.html
@@ -1,4 +1,5 @@
 {{ define "admin/nav/css.html" }}
+<link rel="shortcut icon" href="/static/images/favicon.ico">
 <link rel="stylesheet" href="/static/css/layui.css">
 
 <style>
@@ -31,4 +32,4 @@
         background-color: #ff6699 !important;
     }
 </style>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/assets/static/templates/admin/nav/footer.html b/static/templates/admin/nav/footer.html
similarity index 91%
rename from assets/static/templates/admin/nav/footer.html
rename to static/templates/admin/nav/footer.html
index e235608..e6eb0c1 100644
--- a/assets/static/templates/admin/nav/footer.html
+++ b/static/templates/admin/nav/footer.html
@@ -2,4 +2,4 @@
 <div class="layui-footer">
     Copyright © 2023 YumeMichi
 </div>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/assets/static/templates/admin/nav/header.html b/static/templates/admin/nav/header.html
similarity index 98%
rename from assets/static/templates/admin/nav/header.html
rename to static/templates/admin/nav/header.html
index b047469..4157f3d 100644
--- a/assets/static/templates/admin/nav/header.html
+++ b/static/templates/admin/nav/header.html
@@ -20,4 +20,4 @@
         </li>
     </ul>
 </div>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/assets/static/templates/admin/nav/side.html b/static/templates/admin/nav/side.html
similarity index 100%
rename from assets/static/templates/admin/nav/side.html
rename to static/templates/admin/nav/side.html
diff --git a/assets/static/templates/admin/upload.html b/static/templates/admin/upload.html
similarity index 99%
rename from assets/static/templates/admin/upload.html
rename to static/templates/admin/upload.html
index 90092d8..0c60c9c 100644
--- a/assets/static/templates/admin/upload.html
+++ b/static/templates/admin/upload.html
@@ -84,4 +84,4 @@
 </body>
 
 </html>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/assets/static/templates/common/announce.html b/static/templates/common/announce.html
similarity index 100%
rename from assets/static/templates/common/announce.html
rename to static/templates/common/announce.html
diff --git a/assets/static/templates/common/manga.html b/static/templates/common/manga.html
similarity index 100%
rename from assets/static/templates/common/manga.html
rename to static/templates/common/manga.html