diff --git a/server/README.md b/server/README.md
index 8cd69ce79..54a17917f 100644
--- a/server/README.md
+++ b/server/README.md
@@ -1,5 +1 @@
-![](https://raw.githubusercontent.com/zkldi/kamaitachi-api/master/Kamaitachi-TX.png)
-
-(Black)
-
 Any colour you like...
diff --git a/server/scripts/save-testdata-from-ktblack.ts b/server/scripts/save-testdata-from-ktblack.ts
index 87c7ddc32..b6cd69e68 100644
--- a/server/scripts/save-testdata-from-ktblack.ts
+++ b/server/scripts/save-testdata-from-ktblack.ts
@@ -24,7 +24,7 @@ const ktBlackDB = monk(`${process.env.MONGO_BASE_URL}/ktblackdb`);
     logger.info(`Fetched ${data.length} documents, Writing...`);
 
     fs.writeFileSync(
-        path.join(__dirname, `../src/test-utils/test-data/kamaitachi/ktblack-${collection}.json`),
+        path.join(__dirname, `../src/test-utils/test-data/tachi/ktblack-${collection}.json`),
         JSON.stringify(data)
     );
 
diff --git a/server/src/test-utils/test-data/kamaitachi/bms-gazer-chart.json b/server/src/test-utils/test-data/tachi/bms-gazer-chart.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/bms-gazer-chart.json
rename to server/src/test-utils/test-data/tachi/bms-gazer-chart.json
diff --git a/server/src/test-utils/test-data/kamaitachi/bms-gazer-song.json b/server/src/test-utils/test-data/tachi/bms-gazer-song.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/bms-gazer-song.json
rename to server/src/test-utils/test-data/tachi/bms-gazer-song.json
diff --git a/server/src/test-utils/test-data/kamaitachi/chunithm-bbkk-chart.json b/server/src/test-utils/test-data/tachi/chunithm-bbkk-chart.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/chunithm-bbkk-chart.json
rename to server/src/test-utils/test-data/tachi/chunithm-bbkk-chart.json
diff --git a/server/src/test-utils/test-data/kamaitachi/chunithm-bbkk-song.json b/server/src/test-utils/test-data/tachi/chunithm-bbkk-song.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/chunithm-bbkk-song.json
rename to server/src/test-utils/test-data/tachi/chunithm-bbkk-song.json
diff --git a/server/src/test-utils/test-data/kamaitachi/ddr-puty-chart.json b/server/src/test-utils/test-data/tachi/ddr-puty-chart.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/ddr-puty-chart.json
rename to server/src/test-utils/test-data/tachi/ddr-puty-chart.json
diff --git a/server/src/test-utils/test-data/kamaitachi/ddr-puty-song.json b/server/src/test-utils/test-data/tachi/ddr-puty-song.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/ddr-puty-song.json
rename to server/src/test-utils/test-data/tachi/ddr-puty-song.json
diff --git a/server/src/test-utils/test-data/kamaitachi/gitadora-dryscore.json b/server/src/test-utils/test-data/tachi/gitadora-dryscore.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/gitadora-dryscore.json
rename to server/src/test-utils/test-data/tachi/gitadora-dryscore.json
diff --git a/server/src/test-utils/test-data/kamaitachi/gitadora-ithinkabtyou.json b/server/src/test-utils/test-data/tachi/gitadora-ithinkabtyou.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/gitadora-ithinkabtyou.json
rename to server/src/test-utils/test-data/tachi/gitadora-ithinkabtyou.json
diff --git a/server/src/test-utils/test-data/kamaitachi/iidx-511-song.json b/server/src/test-utils/test-data/tachi/iidx-511-song.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/iidx-511-song.json
rename to server/src/test-utils/test-data/tachi/iidx-511-song.json
diff --git a/server/src/test-utils/test-data/kamaitachi/iidx-511spa.json b/server/src/test-utils/test-data/tachi/iidx-511spa.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/iidx-511spa.json
rename to server/src/test-utils/test-data/tachi/iidx-511spa.json
diff --git a/server/src/test-utils/test-data/kamaitachi/iidx-dryscore.json b/server/src/test-utils/test-data/tachi/iidx-dryscore.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/iidx-dryscore.json
rename to server/src/test-utils/test-data/tachi/iidx-dryscore.json
diff --git a/server/src/test-utils/test-data/kamaitachi/iidx-score.json b/server/src/test-utils/test-data/tachi/iidx-score.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/iidx-score.json
rename to server/src/test-utils/test-data/tachi/iidx-score.json
diff --git a/server/src/test-utils/test-data/kamaitachi/iidx-scorepb.json b/server/src/test-utils/test-data/tachi/iidx-scorepb.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/iidx-scorepb.json
rename to server/src/test-utils/test-data/tachi/iidx-scorepb.json
diff --git a/server/src/test-utils/test-data/kamaitachi/ktblack-charts-iidx.json b/server/src/test-utils/test-data/tachi/ktblack-charts-iidx.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/ktblack-charts-iidx.json
rename to server/src/test-utils/test-data/tachi/ktblack-charts-iidx.json
diff --git a/server/src/test-utils/test-data/kamaitachi/ktblack-songs-iidx.json b/server/src/test-utils/test-data/tachi/ktblack-songs-iidx.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/ktblack-songs-iidx.json
rename to server/src/test-utils/test-data/tachi/ktblack-songs-iidx.json
diff --git a/server/src/test-utils/test-data/kamaitachi/sdvx-albida-chart.json b/server/src/test-utils/test-data/tachi/sdvx-albida-chart.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/sdvx-albida-chart.json
rename to server/src/test-utils/test-data/tachi/sdvx-albida-chart.json
diff --git a/server/src/test-utils/test-data/kamaitachi/sdvx-albida-song.json b/server/src/test-utils/test-data/tachi/sdvx-albida-song.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/sdvx-albida-song.json
rename to server/src/test-utils/test-data/tachi/sdvx-albida-song.json
diff --git a/server/src/test-utils/test-data/kamaitachi/sdvx-dryscore.json b/server/src/test-utils/test-data/tachi/sdvx-dryscore.json
similarity index 100%
rename from server/src/test-utils/test-data/kamaitachi/sdvx-dryscore.json
rename to server/src/test-utils/test-data/tachi/sdvx-dryscore.json