diff --git a/server/src/internal-api/import/import.ts b/server/src/internal-api/import/import.ts
index ef41a1128..90763122b 100644
--- a/server/src/internal-api/import/import.ts
+++ b/server/src/internal-api/import/import.ts
@@ -8,7 +8,7 @@ import { GetUserWithID } from "../../core/user-core";
 import CreateLogCtx from "../../logger";
 import prValidate from "../../middleware/prudence-validate";
 import { RequireLoggedIn } from "../../middleware/require-logged-in";
-import ScoreImportFatalError from "../../score-import/framework/importing/score-import-error";
+import ScoreImportFatalError from "../../score-import/framework/score-importing/score-import-error";
 import ScoreImportMain from "../../score-import/framework/score-import-main";
 import ParseEamusementCSV from "../../score-import/import-types/file/csv-eamusement-iidx/parser";
 
diff --git a/server/src/score-import/framework/common/string-asserts.test.ts b/server/src/score-import/framework/common/string-asserts.test.ts
index e4e0d600e..ddf33eb6a 100644
--- a/server/src/score-import/framework/common/string-asserts.test.ts
+++ b/server/src/score-import/framework/common/string-asserts.test.ts
@@ -1,5 +1,5 @@
 import t from "tap";
-import { InvalidScoreFailure } from "../importing/converter-failures";
+import { InvalidScoreFailure } from "../score-importing/converter-failures";
 import { AssertStrAsPositiveInt, AssertStrAsPositiveNonZeroInt } from "./string-asserts";
 
 function astr(v: string) {
diff --git a/server/src/score-import/framework/common/string-asserts.ts b/server/src/score-import/framework/common/string-asserts.ts
index 984973815..2670a4eda 100644
--- a/server/src/score-import/framework/common/string-asserts.ts
+++ b/server/src/score-import/framework/common/string-asserts.ts
@@ -1,4 +1,4 @@
-import { InvalidScoreFailure } from "../importing/converter-failures";
+import { InvalidScoreFailure } from "../score-importing/converter-failures";
 
 const isIntegerRegex = /^-?\d+$/;
 
diff --git a/server/src/score-import/framework/score-import-main.ts b/server/src/score-import/framework/score-import-main.ts
index f6ecf6720..6e27e7f8e 100644
--- a/server/src/score-import/framework/score-import-main.ts
+++ b/server/src/score-import/framework/score-import-main.ts
@@ -5,8 +5,8 @@ import {
     PublicUserDocument,
 } from "kamaitachi-common";
 import { ImportInputParser, ScorePlaytypeMap } from "../../types";
-import { InsertQueue } from "./importing/insert-score";
-import { ImportAllIterableData } from "./importing/score-importing";
+import { InsertQueue } from "./score-importing/insert-score";
+import { ImportAllIterableData } from "./score-importing/score-importing";
 import { CreateImportLoggerAndID } from "./common/import-logger";
 import { CreateSessions } from "./sessions/sessions";
 import { GetMilisecondsSince } from "../../core/hrtime-core";
diff --git a/server/src/score-import/framework/importing/converter-failures.ts b/server/src/score-import/framework/score-importing/converter-failures.ts
similarity index 100%
rename from server/src/score-import/framework/importing/converter-failures.ts
rename to server/src/score-import/framework/score-importing/converter-failures.ts
diff --git a/server/src/score-import/framework/importing/hydrate-score.ts b/server/src/score-import/framework/score-importing/hydrate-score.ts
similarity index 100%
rename from server/src/score-import/framework/importing/hydrate-score.ts
rename to server/src/score-import/framework/score-importing/hydrate-score.ts
diff --git a/server/src/score-import/framework/importing/insert-score.test.ts b/server/src/score-import/framework/score-importing/insert-score.test.ts
similarity index 100%
rename from server/src/score-import/framework/importing/insert-score.test.ts
rename to server/src/score-import/framework/score-importing/insert-score.test.ts
diff --git a/server/src/score-import/framework/importing/insert-score.ts b/server/src/score-import/framework/score-importing/insert-score.ts
similarity index 100%
rename from server/src/score-import/framework/importing/insert-score.ts
rename to server/src/score-import/framework/score-importing/insert-score.ts
diff --git a/server/src/score-import/framework/importing/score-id.test.ts b/server/src/score-import/framework/score-importing/score-id.test.ts
similarity index 100%
rename from server/src/score-import/framework/importing/score-id.test.ts
rename to server/src/score-import/framework/score-importing/score-id.test.ts
diff --git a/server/src/score-import/framework/importing/score-id.ts b/server/src/score-import/framework/score-importing/score-id.ts
similarity index 100%
rename from server/src/score-import/framework/importing/score-id.ts
rename to server/src/score-import/framework/score-importing/score-id.ts
diff --git a/server/src/score-import/framework/importing/score-import-error.test.ts b/server/src/score-import/framework/score-importing/score-import-error.test.ts
similarity index 100%
rename from server/src/score-import/framework/importing/score-import-error.test.ts
rename to server/src/score-import/framework/score-importing/score-import-error.test.ts
diff --git a/server/src/score-import/framework/importing/score-import-error.ts b/server/src/score-import/framework/score-importing/score-import-error.ts
similarity index 100%
rename from server/src/score-import/framework/importing/score-import-error.ts
rename to server/src/score-import/framework/score-importing/score-import-error.ts
diff --git a/server/src/score-import/framework/importing/score-importing.ts b/server/src/score-import/framework/score-importing/score-importing.ts
similarity index 100%
rename from server/src/score-import/framework/importing/score-importing.ts
rename to server/src/score-import/framework/score-importing/score-importing.ts
diff --git a/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.test.ts b/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.test.ts
index ce555d952..bb4520f0e 100644
--- a/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.test.ts
+++ b/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.test.ts
@@ -11,7 +11,7 @@ import {
     ConverterFailure,
     InvalidScoreFailure,
     KTDataNotFoundFailure,
-} from "../../../framework/importing/converter-failures";
+} from "../../../framework/score-importing/converter-failures";
 
 const logger = CreateLogCtx("converter.test.ts");
 
diff --git a/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.ts b/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.ts
index f1e0cf694..932e2eb74 100644
--- a/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.ts
+++ b/server/src/score-import/import-types/file/csv-eamusement-iidx/converter.ts
@@ -7,8 +7,8 @@ import {
     KTDataNotFoundFailure,
     InternalFailure,
     InvalidScoreFailure,
-} from "../../../framework/importing/converter-failures";
-import ScoreImportFatalError from "../../../framework/importing/score-import-error";
+} from "../../../framework/score-importing/converter-failures";
+import ScoreImportFatalError from "../../../framework/score-importing/score-import-error";
 import { GetGradeFromPercent } from "../../../framework/common/score-utils";
 import { AssertStrAsPositiveInt } from "../../../framework/common/string-asserts";
 import { EamusementScoreData, IIDXEamusementCSVContext, IIDXEamusementCSVData } from "./types";
diff --git a/server/src/score-import/import-types/file/csv-eamusement-iidx/parser.test.ts b/server/src/score-import/import-types/file/csv-eamusement-iidx/parser.test.ts
index 21dced06b..72c290304 100644
--- a/server/src/score-import/import-types/file/csv-eamusement-iidx/parser.test.ts
+++ b/server/src/score-import/import-types/file/csv-eamusement-iidx/parser.test.ts
@@ -1,6 +1,6 @@
 import t from "tap";
 import CreateLogCtx from "../../../../logger";
-import ScoreImportFatalError from "../../../framework/importing/score-import-error";
+import ScoreImportFatalError from "../../../framework/score-importing/score-import-error";
 import ParseEamusementCSV, { NaiveCSVParse, ResolveHeaders } from "./parser";
 import { CloseMongoConnection } from "../../../../db/db";
 import {
diff --git a/server/src/score-import/import-types/file/csv-eamusement-iidx/parser.ts b/server/src/score-import/import-types/file/csv-eamusement-iidx/parser.ts
index c00d51290..f45e86305 100644
--- a/server/src/score-import/import-types/file/csv-eamusement-iidx/parser.ts
+++ b/server/src/score-import/import-types/file/csv-eamusement-iidx/parser.ts
@@ -1,7 +1,7 @@
 import { Difficulties } from "kamaitachi-common";
 import { Logger } from "winston";
 import { ParserFunctionReturnsSync } from "../../../../types";
-import ScoreImportFatalError from "../../../framework/importing/score-import-error";
+import ScoreImportFatalError from "../../../framework/score-importing/score-import-error";
 import ConverterFn from "./converter";
 import { EamusementScoreData, IIDXEamusementCSVContext, IIDXEamusementCSVData } from "./types";
 
diff --git a/server/src/types.ts b/server/src/types.ts
index 559b148bf..144d779ef 100644
--- a/server/src/types.ts
+++ b/server/src/types.ts
@@ -10,7 +10,7 @@ import {
     Playtypes,
 } from "kamaitachi-common";
 import { Logger, LeveledLogMethod } from "winston";
-import { ConverterFailure } from "./score-import/framework/importing/converter-failures";
+import { ConverterFailure } from "./score-import/framework/score-importing/converter-failures";
 import { Converters } from "./score-import/import-types/import-types";
 
 declare module "express-session" {