diff --git a/frontends/nextjs/src/lib/db/workflows/add-workflow.ts b/frontends/nextjs/src/lib/db/workflows/crud/add-workflow.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/workflows/add-workflow.ts
rename to frontends/nextjs/src/lib/db/workflows/crud/add-workflow.ts
diff --git a/frontends/nextjs/src/lib/db/workflows/delete-workflow.ts b/frontends/nextjs/src/lib/db/workflows/crud/delete-workflow.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/workflows/delete-workflow.ts
rename to frontends/nextjs/src/lib/db/workflows/crud/delete-workflow.ts
diff --git a/frontends/nextjs/src/lib/db/workflows/get-workflows.ts b/frontends/nextjs/src/lib/db/workflows/crud/get-workflows.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/workflows/get-workflows.ts
rename to frontends/nextjs/src/lib/db/workflows/crud/get-workflows.ts
diff --git a/frontends/nextjs/src/lib/db/workflows/set-workflows.ts b/frontends/nextjs/src/lib/db/workflows/crud/set-workflows.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/workflows/set-workflows.ts
rename to frontends/nextjs/src/lib/db/workflows/crud/set-workflows.ts
diff --git a/frontends/nextjs/src/lib/db/workflows/update-workflow.ts b/frontends/nextjs/src/lib/db/workflows/crud/update-workflow.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/workflows/update-workflow.ts
rename to frontends/nextjs/src/lib/db/workflows/crud/update-workflow.ts
diff --git a/frontends/nextjs/src/lib/db/workflows/add-workflow.test.ts b/frontends/nextjs/src/lib/db/workflows/tests/add-workflow.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/workflows/add-workflow.test.ts
rename to frontends/nextjs/src/lib/db/workflows/tests/add-workflow.test.ts
diff --git a/frontends/nextjs/src/lib/db/workflows/delete-workflow.test.ts b/frontends/nextjs/src/lib/db/workflows/tests/delete-workflow.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/workflows/delete-workflow.test.ts
rename to frontends/nextjs/src/lib/db/workflows/tests/delete-workflow.test.ts
diff --git a/frontends/nextjs/src/lib/db/workflows/get-workflows.test.ts b/frontends/nextjs/src/lib/db/workflows/tests/get-workflows.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/workflows/get-workflows.test.ts
rename to frontends/nextjs/src/lib/db/workflows/tests/get-workflows.test.ts
diff --git a/frontends/nextjs/src/lib/db/workflows/set-workflows.test.ts b/frontends/nextjs/src/lib/db/workflows/tests/set-workflows.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/workflows/set-workflows.test.ts
rename to frontends/nextjs/src/lib/db/workflows/tests/set-workflows.test.ts
diff --git a/frontends/nextjs/src/lib/db/workflows/update-workflow.test.ts b/frontends/nextjs/src/lib/db/workflows/tests/update-workflow.test.ts
similarity index 100%
rename from frontends/nextjs/src/lib/db/workflows/update-workflow.test.ts
rename to frontends/nextjs/src/lib/db/workflows/tests/update-workflow.test.ts
diff --git a/frontends/nextjs/src/theme/colors.ts b/frontends/nextjs/src/theme/base/colors.ts
similarity index 100%
rename from frontends/nextjs/src/theme/colors.ts
rename to frontends/nextjs/src/theme/base/colors.ts
diff --git a/frontends/nextjs/src/theme/fonts.ts b/frontends/nextjs/src/theme/base/fonts.ts
similarity index 100%
rename from frontends/nextjs/src/theme/fonts.ts
rename to frontends/nextjs/src/theme/base/fonts.ts
diff --git a/frontends/nextjs/src/theme/layout.ts b/frontends/nextjs/src/theme/base/layout.ts
similarity index 100%
rename from frontends/nextjs/src/theme/layout.ts
rename to frontends/nextjs/src/theme/base/layout.ts
diff --git a/frontends/nextjs/src/theme/tokens.ts b/frontends/nextjs/src/theme/base/tokens.ts
similarity index 100%
rename from frontends/nextjs/src/theme/tokens.ts
rename to frontends/nextjs/src/theme/base/tokens.ts
diff --git a/frontends/nextjs/src/theme/typography.ts b/frontends/nextjs/src/theme/base/typography.ts
similarity index 100%
rename from frontends/nextjs/src/theme/typography.ts
rename to frontends/nextjs/src/theme/base/typography.ts
diff --git a/frontends/nextjs/src/theme/dark-theme.ts b/frontends/nextjs/src/theme/modes/dark-theme.ts
similarity index 100%
rename from frontends/nextjs/src/theme/dark-theme.ts
rename to frontends/nextjs/src/theme/modes/dark-theme.ts
diff --git a/frontends/nextjs/src/theme/light-theme.ts b/frontends/nextjs/src/theme/modes/light-theme.ts
similarity index 100%
rename from frontends/nextjs/src/theme/light-theme.ts
rename to frontends/nextjs/src/theme/modes/light-theme.ts
diff --git a/frontends/nextjs/src/theme/theme.d.ts b/frontends/nextjs/src/theme/types/theme.d.ts
similarity index 100%
rename from frontends/nextjs/src/theme/theme.d.ts
rename to frontends/nextjs/src/theme/types/theme.d.ts