diff --git a/frontends/nextjs/src/components/ui/organisms/Form.tsx b/frontends/nextjs/src/components/ui/organisms/data/Form.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/organisms/Form.tsx
rename to frontends/nextjs/src/components/ui/organisms/data/Form.tsx
diff --git a/frontends/nextjs/src/components/ui/organisms/Table.tsx b/frontends/nextjs/src/components/ui/organisms/data/Table.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/organisms/Table.tsx
rename to frontends/nextjs/src/components/ui/organisms/data/Table.tsx
diff --git a/frontends/nextjs/src/components/ui/organisms/AlertDialog.tsx b/frontends/nextjs/src/components/ui/organisms/dialogs/AlertDialog.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/organisms/AlertDialog.tsx
rename to frontends/nextjs/src/components/ui/organisms/dialogs/AlertDialog.tsx
diff --git a/frontends/nextjs/src/components/ui/organisms/Command.tsx b/frontends/nextjs/src/components/ui/organisms/dialogs/Command.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/organisms/Command.tsx
rename to frontends/nextjs/src/components/ui/organisms/dialogs/Command.tsx
diff --git a/frontends/nextjs/src/components/ui/organisms/Sheet.tsx b/frontends/nextjs/src/components/ui/organisms/dialogs/Sheet.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/organisms/Sheet.tsx
rename to frontends/nextjs/src/components/ui/organisms/dialogs/Sheet.tsx
diff --git a/frontends/nextjs/src/components/ui/organisms/Navigation.tsx b/frontends/nextjs/src/components/ui/organisms/navigation/Navigation.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/organisms/Navigation.tsx
rename to frontends/nextjs/src/components/ui/organisms/navigation/Navigation.tsx
diff --git a/frontends/nextjs/src/components/ui/organisms/Pagination.tsx b/frontends/nextjs/src/components/ui/organisms/navigation/Pagination.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/organisms/Pagination.tsx
rename to frontends/nextjs/src/components/ui/organisms/navigation/Pagination.tsx
diff --git a/frontends/nextjs/src/components/ui/organisms/Sidebar.tsx b/frontends/nextjs/src/components/ui/organisms/navigation/Sidebar.tsx
similarity index 100%
rename from frontends/nextjs/src/components/ui/organisms/Sidebar.tsx
rename to frontends/nextjs/src/components/ui/organisms/navigation/Sidebar.tsx
diff --git a/frontends/nextjs/src/lib/db/god-credentials/get-first-login-flags.ts b/frontends/nextjs/src/lib/db/god-credentials/getters/get-first-login-flags.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/god-credentials/get-first-login-flags.ts
rename to frontends/nextjs/src/lib/db/god-credentials/getters/get-first-login-flags.ts
diff --git a/frontends/nextjs/src/lib/db/god-credentials/get-god-credentials-expiry-duration.ts b/frontends/nextjs/src/lib/db/god-credentials/getters/get-god-credentials-expiry-duration.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/god-credentials/get-god-credentials-expiry-duration.ts
rename to frontends/nextjs/src/lib/db/god-credentials/getters/get-god-credentials-expiry-duration.ts
diff --git a/frontends/nextjs/src/lib/db/god-credentials/get-god-credentials-expiry.ts b/frontends/nextjs/src/lib/db/god-credentials/getters/get-god-credentials-expiry.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/god-credentials/get-god-credentials-expiry.ts
rename to frontends/nextjs/src/lib/db/god-credentials/getters/get-god-credentials-expiry.ts
diff --git a/frontends/nextjs/src/lib/db/god-credentials/should-show-god-credentials.ts b/frontends/nextjs/src/lib/db/god-credentials/getters/should-show-god-credentials.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/god-credentials/should-show-god-credentials.ts
rename to frontends/nextjs/src/lib/db/god-credentials/getters/should-show-god-credentials.ts
diff --git a/frontends/nextjs/src/lib/db/god-credentials/reset-god-credentials-expiry.ts b/frontends/nextjs/src/lib/db/god-credentials/setters/reset-god-credentials-expiry.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/god-credentials/reset-god-credentials-expiry.ts
rename to frontends/nextjs/src/lib/db/god-credentials/setters/reset-god-credentials-expiry.ts
diff --git a/frontends/nextjs/src/lib/db/god-credentials/set-first-login-flag.ts b/frontends/nextjs/src/lib/db/god-credentials/setters/set-first-login-flag.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/god-credentials/set-first-login-flag.ts
rename to frontends/nextjs/src/lib/db/god-credentials/setters/set-first-login-flag.ts
diff --git a/frontends/nextjs/src/lib/db/god-credentials/set-god-credentials-expiry-duration.ts b/frontends/nextjs/src/lib/db/god-credentials/setters/set-god-credentials-expiry-duration.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/god-credentials/set-god-credentials-expiry-duration.ts
rename to frontends/nextjs/src/lib/db/god-credentials/setters/set-god-credentials-expiry-duration.ts
diff --git a/frontends/nextjs/src/lib/db/god-credentials/set-god-credentials-expiry.ts b/frontends/nextjs/src/lib/db/god-credentials/setters/set-god-credentials-expiry.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/god-credentials/set-god-credentials-expiry.ts
rename to frontends/nextjs/src/lib/db/god-credentials/setters/set-god-credentials-expiry.ts