diff --git a/frontends/nextjs/src/lib/db/users/add-user.test.ts b/frontends/nextjs/src/lib/db/users/crud/add-user.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/add-user.test.ts
rename to frontends/nextjs/src/lib/db/users/crud/add-user.test.ts
diff --git a/frontends/nextjs/src/lib/db/users/add-user.ts b/frontends/nextjs/src/lib/db/users/crud/add-user.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/add-user.ts
rename to frontends/nextjs/src/lib/db/users/crud/add-user.ts
diff --git a/frontends/nextjs/src/lib/db/users/delete-user.test.ts b/frontends/nextjs/src/lib/db/users/crud/delete-user.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/delete-user.test.ts
rename to frontends/nextjs/src/lib/db/users/crud/delete-user.test.ts
diff --git a/frontends/nextjs/src/lib/db/users/delete-user.ts b/frontends/nextjs/src/lib/db/users/crud/delete-user.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/delete-user.ts
rename to frontends/nextjs/src/lib/db/users/crud/delete-user.ts
diff --git a/frontends/nextjs/src/lib/db/users/update-user.test.ts b/frontends/nextjs/src/lib/db/users/crud/update-user.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/update-user.test.ts
rename to frontends/nextjs/src/lib/db/users/crud/update-user.test.ts
diff --git a/frontends/nextjs/src/lib/db/users/update-user.ts b/frontends/nextjs/src/lib/db/users/crud/update-user.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/update-user.ts
rename to frontends/nextjs/src/lib/db/users/crud/update-user.ts
diff --git a/frontends/nextjs/src/lib/db/users/get-user-by-id.test.ts b/frontends/nextjs/src/lib/db/users/getters/get-user-by-id.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/get-user-by-id.test.ts
rename to frontends/nextjs/src/lib/db/users/getters/get-user-by-id.test.ts
diff --git a/frontends/nextjs/src/lib/db/users/get-user-by-id.ts b/frontends/nextjs/src/lib/db/users/getters/get-user-by-id.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/get-user-by-id.ts
rename to frontends/nextjs/src/lib/db/users/getters/get-user-by-id.ts
diff --git a/frontends/nextjs/src/lib/db/users/get-user-first-login-flag.ts b/frontends/nextjs/src/lib/db/users/getters/get-user-first-login-flag.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/get-user-first-login-flag.ts
rename to frontends/nextjs/src/lib/db/users/getters/get-user-first-login-flag.ts
diff --git a/frontends/nextjs/src/lib/db/users/get-users.test.ts b/frontends/nextjs/src/lib/db/users/getters/get-users.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/get-users.test.ts
rename to frontends/nextjs/src/lib/db/users/getters/get-users.test.ts
diff --git a/frontends/nextjs/src/lib/db/users/get-users.ts b/frontends/nextjs/src/lib/db/users/getters/get-users.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/get-users.ts
rename to frontends/nextjs/src/lib/db/users/getters/get-users.ts
diff --git a/frontends/nextjs/src/lib/db/users/get-super-god.test.ts b/frontends/nextjs/src/lib/db/users/super-god/get-super-god.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/get-super-god.test.ts
rename to frontends/nextjs/src/lib/db/users/super-god/get-super-god.test.ts
diff --git a/frontends/nextjs/src/lib/db/users/get-super-god.ts b/frontends/nextjs/src/lib/db/users/super-god/get-super-god.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/get-super-god.ts
rename to frontends/nextjs/src/lib/db/users/super-god/get-super-god.ts
diff --git a/frontends/nextjs/src/lib/db/users/transfer-super-god-power.test.ts b/frontends/nextjs/src/lib/db/users/super-god/transfer-super-god-power.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/transfer-super-god-power.test.ts
rename to frontends/nextjs/src/lib/db/users/super-god/transfer-super-god-power.test.ts
diff --git a/frontends/nextjs/src/lib/db/users/transfer-super-god-power.ts b/frontends/nextjs/src/lib/db/users/super-god/transfer-super-god-power.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/users/transfer-super-god-power.ts
rename to frontends/nextjs/src/lib/db/users/super-god/transfer-super-god-power.ts