diff --git a/server/api/ProcDecorator/ReqGameLogin.ts b/server/ProcDecorator/ReqGameLogin.ts
similarity index 100%
rename from server/api/ProcDecorator/ReqGameLogin.ts
rename to server/ProcDecorator/ReqGameLogin.ts
diff --git a/server/api/ProcDecorator/ReqLogin.ts b/server/ProcDecorator/ReqLogin.ts
similarity index 100%
rename from server/api/ProcDecorator/ReqLogin.ts
rename to server/ProcDecorator/ReqLogin.ts
diff --git a/server/api/ProcDecorator/StartSession.ts b/server/ProcDecorator/StartSession.ts
similarity index 100%
rename from server/api/ProcDecorator/StartSession.ts
rename to server/ProcDecorator/StartSession.ts
diff --git a/server/api/ProcDecorator/base.ts b/server/ProcDecorator/base.ts
similarity index 100%
rename from server/api/ProcDecorator/base.ts
rename to server/ProcDecorator/base.ts
diff --git a/server/api/Login/ChangePassword.ts b/server/api/RootAPI/Login/ChangePassword.ts
similarity index 57%
rename from server/api/Login/ChangePassword.ts
rename to server/api/RootAPI/Login/ChangePassword.ts
index d8286b7..597b333 100644
--- a/server/api/Login/ChangePassword.ts
+++ b/server/api/RootAPI/Login/ChangePassword.ts
@@ -1,9 +1,9 @@
-import { GET } from "../defs.js";
-import type { structure } from "../../apiStructure/sammoRootAPI.js";
-import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs.js";
-import { declProcDecorators } from "../ProcDecorator/base.js";
-import { ReqLogin } from "../ProcDecorator/ReqLogin.js";
-import { StartSession } from "../ProcDecorator/StartSession.js";
+import { GET } from "../../defs.js";
+import type { structure } from "../../../apiStructure/sammoRootAPI.js";
+import type { ExtractError, ExtractQuery, ExtractResponse } from "../../../apiStructure/defs.js";
+import { declProcDecorators } from "../../../ProcDecorator/base.js";
+import { ReqLogin } from "../../../ProcDecorator/ReqLogin.js";
+import { StartSession } from "../../../ProcDecorator/StartSession.js";
 
 type BaseAPI = typeof structure.Login.ReqNonce;
 type RType = ExtractResponse<BaseAPI>;
diff --git a/server/api/Login/LoginByID.ts b/server/api/RootAPI/Login/LoginByID.ts
similarity index 78%
rename from server/api/Login/LoginByID.ts
rename to server/api/RootAPI/Login/LoginByID.ts
index e43fc30..3962935 100644
--- a/server/api/Login/LoginByID.ts
+++ b/server/api/RootAPI/Login/LoginByID.ts
@@ -1,11 +1,11 @@
-import { POST } from "../defs.js";
-import type { structure } from "../../apiStructure/sammoRootAPI.js";
-import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs.js";
-import { StartSession } from "../ProcDecorator/StartSession.js";
-import { delay } from "../../util/delay.js";
-import { declProcDecorators } from "../ProcDecorator/base.js";
+import { POST } from "../../defs.js";
+import type { structure } from "../../../apiStructure/sammoRootAPI.js";
+import type { ExtractError, ExtractQuery, ExtractResponse } from "../../../apiStructure/defs.js";
+import { StartSession } from "../../../ProcDecorator/StartSession.js";
+import { delay } from "../../../util/delay.js";
+import { declProcDecorators } from "../../../ProcDecorator/base.js";
 import { z } from "zod";
-import { type LoginCtx, loginCtxSessionKey } from "../ProcDecorator/ReqLogin.js";
+import { type LoginCtx, loginCtxSessionKey } from "../../../ProcDecorator/ReqLogin.js";
 
 type BaseAPI = typeof structure.Login.LoginByID;
 type RType = ExtractResponse<BaseAPI>;
diff --git a/server/api/Login/LoginByToken.ts b/server/api/RootAPI/Login/LoginByToken.ts
similarity index 74%
rename from server/api/Login/LoginByToken.ts
rename to server/api/RootAPI/Login/LoginByToken.ts
index ea5443a..1e77732 100644
--- a/server/api/Login/LoginByToken.ts
+++ b/server/api/RootAPI/Login/LoginByToken.ts
@@ -1,10 +1,10 @@
-import { POST } from "../defs.js";
-import type { structure } from "../../apiStructure/sammoRootAPI.js";
-import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs.js";
-import { StartSession } from "../ProcDecorator/StartSession.js";
-import { delay } from "../../util/delay.js";
-import { declProcDecorators } from "../ProcDecorator/base.js";
-import { type LoginCtx, loginCtxSessionKey } from "../ProcDecorator/ReqLogin.js";
+import { POST } from "../../defs.js";
+import type { structure } from "../../../apiStructure/sammoRootAPI.js";
+import type { ExtractError, ExtractQuery, ExtractResponse } from "../../../apiStructure/defs.js";
+import { StartSession } from "../../../ProcDecorator/StartSession.js";
+import { delay } from "../../../util/delay.js";
+import { declProcDecorators } from "../../../ProcDecorator/base.js";
+import { type LoginCtx, loginCtxSessionKey } from "../../../ProcDecorator/ReqLogin.js";
 import { z } from "zod";
 type BaseAPI = typeof structure.Login.LoginByToken;
 type RType = ExtractResponse<BaseAPI>;
diff --git a/server/api/Login/ReqNonce.ts b/server/api/RootAPI/Login/ReqNonce.ts
similarity index 74%
rename from server/api/Login/ReqNonce.ts
rename to server/api/RootAPI/Login/ReqNonce.ts
index a9a8d51..5cbbdbf 100644
--- a/server/api/Login/ReqNonce.ts
+++ b/server/api/RootAPI/Login/ReqNonce.ts
@@ -1,8 +1,8 @@
-import { GET } from "../defs.js";
-import type { structure } from "../../apiStructure/sammoRootAPI.js";
-import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs.js";
-import { StartSession } from "../ProcDecorator/StartSession.js";
-import { declProcDecorators } from "../ProcDecorator/base.js";
+import { GET } from "../../defs.js";
+import type { structure } from "../../../apiStructure/sammoRootAPI.js";
+import type { ExtractError, ExtractQuery, ExtractResponse } from "../../../apiStructure/defs.js";
+import { StartSession } from "../../../ProcDecorator/StartSession.js";
+import { declProcDecorators } from "../../../ProcDecorator/base.js";
 
 type BaseAPI = typeof structure.Login.ReqNonce;
 type RType = ExtractResponse<BaseAPI>;
diff --git a/server/api/Login/index.ts b/server/api/RootAPI/Login/index.ts
similarity index 70%
rename from server/api/Login/index.ts
rename to server/api/RootAPI/Login/index.ts
index 01b76bc..48e5bae 100644
--- a/server/api/Login/index.ts
+++ b/server/api/RootAPI/Login/index.ts
@@ -1,5 +1,5 @@
-import type { structure } from "../../apiStructure/sammoRootAPI.js";
-import type { APINamespaceType } from "../defs.js";
+import type { structure } from "../../../apiStructure/sammoRootAPI.js";
+import type { APINamespaceType } from "../../defs.js";
 import { LoginByID } from "./LoginByID.js";
 import { LoginByToken } from "./LoginByToken.js";
 import { ReqNonce } from "./ReqNonce.js";
diff --git a/server/api/Login/test.ts b/server/api/RootAPI/Login/test.ts
similarity index 64%
rename from server/api/Login/test.ts
rename to server/api/RootAPI/Login/test.ts
index 943fe42..0a886c4 100644
--- a/server/api/Login/test.ts
+++ b/server/api/RootAPI/Login/test.ts
@@ -1,7 +1,7 @@
-import { GET } from "../defs.js";
-import type { structure } from "../../apiStructure/sammoRootAPI.js";
-import type { ExtractError, ExtractQuery, ExtractResponse } from "../../apiStructure/defs.js";
-import { EmptyProcDecorator } from "../ProcDecorator/base.js";
+import { GET } from "../../defs.js";
+import type { structure } from "../../../apiStructure/sammoRootAPI.js";
+import type { ExtractError, ExtractQuery, ExtractResponse } from "../../../apiStructure/defs.js";
+import { EmptyProcDecorator } from "../../../ProcDecorator/base.js";
 
 type BaseAPI = typeof structure.Login.test;
 type RType = ExtractResponse<BaseAPI>;
diff --git a/server/api/defs.ts b/server/api/defs.ts
index 9d6bb01..e048840 100644
--- a/server/api/defs.ts
+++ b/server/api/defs.ts
@@ -1,7 +1,7 @@
 
 import type { Request, Response } from 'express';
 import type { Callable, DefAPINamespace, DeleteAPICallT, GetAPICallT, HeadAPICallT, HttpMethod, InvalidResponse, PatchAPICallT, PostAPICallT, PutAPICallT, RawArgType, ValidResponse, recoveryMethod } from '../apiStructure/defs.js';
-import type { Empty, PostProcDecoratorRunner, ProcDecoratorRunner } from './ProcDecorator/base.js';
+import type { Empty, PostProcDecoratorRunner, ProcDecoratorRunner } from '../ProcDecorator/base.js';
 import type { ZodType } from 'zod';
 
 export type APINamespace = {
diff --git a/server/api/root.ts b/server/api/root.ts
index c9263f6..26e6333 100644
--- a/server/api/root.ts
+++ b/server/api/root.ts
@@ -1,6 +1,6 @@
 import type { structure } from "../apiStructure/sammoRootAPI.js";
 import type { APINamespaceType } from "./defs.js";
-import { Login } from "./Login/index.js";
+import { Login } from "./RootAPI/Login/index.js";
 
 export const sammoRootAPI = {
     Login,