diff --git a/src/app/[userName]/NewProjectForm.tsx b/src/app/(main)/[userName]/NewProjectForm.tsx
similarity index 100%
rename from src/app/[userName]/NewProjectForm.tsx
rename to src/app/(main)/[userName]/NewProjectForm.tsx
diff --git a/src/app/[userName]/ProjectRow.tsx b/src/app/(main)/[userName]/ProjectRow.tsx
similarity index 100%
rename from src/app/[userName]/ProjectRow.tsx
rename to src/app/(main)/[userName]/ProjectRow.tsx
diff --git a/src/app/[userName]/[projectName]/[kind]/page.tsx b/src/app/(main)/[userName]/[projectName]/[kind]/page.tsx
similarity index 100%
rename from src/app/[userName]/[projectName]/[kind]/page.tsx
rename to src/app/(main)/[userName]/[projectName]/[kind]/page.tsx
diff --git a/src/app/[userName]/[projectName]/download/route.ts b/src/app/(main)/[userName]/[projectName]/download/route.ts
similarity index 100%
rename from src/app/[userName]/[projectName]/download/route.ts
rename to src/app/(main)/[userName]/[projectName]/download/route.ts
diff --git a/src/app/[userName]/[projectName]/loading.tsx b/src/app/(main)/[userName]/[projectName]/loading.tsx
similarity index 100%
rename from src/app/[userName]/[projectName]/loading.tsx
rename to src/app/(main)/[userName]/[projectName]/loading.tsx
diff --git a/src/app/[userName]/[projectName]/page.tsx b/src/app/(main)/[userName]/[projectName]/page.tsx
similarity index 100%
rename from src/app/[userName]/[projectName]/page.tsx
rename to src/app/(main)/[userName]/[projectName]/page.tsx
diff --git a/src/app/[userName]/[projectName]/preview/[...relPath]/route.ts b/src/app/(main)/[userName]/[projectName]/preview/[...relPath]/route.ts
similarity index 100%
rename from src/app/[userName]/[projectName]/preview/[...relPath]/route.ts
rename to src/app/(main)/[userName]/[projectName]/preview/[...relPath]/route.ts
diff --git a/src/app/[userName]/[projectName]/publish/PublishCard.tsx b/src/app/(main)/[userName]/[projectName]/publish/PublishCard.tsx
similarity index 100%
rename from src/app/[userName]/[projectName]/publish/PublishCard.tsx
rename to src/app/(main)/[userName]/[projectName]/publish/PublishCard.tsx
diff --git a/src/app/[userName]/[projectName]/publish/actions.ts b/src/app/(main)/[userName]/[projectName]/publish/actions.ts
similarity index 100%
rename from src/app/[userName]/[projectName]/publish/actions.ts
rename to src/app/(main)/[userName]/[projectName]/publish/actions.ts
diff --git a/src/app/[userName]/[projectName]/publish/page.tsx b/src/app/(main)/[userName]/[projectName]/publish/page.tsx
similarity index 100%
rename from src/app/[userName]/[projectName]/publish/page.tsx
rename to src/app/(main)/[userName]/[projectName]/publish/page.tsx
diff --git a/src/app/[userName]/actions.ts b/src/app/(main)/[userName]/actions.ts
similarity index 100%
rename from src/app/[userName]/actions.ts
rename to src/app/(main)/[userName]/actions.ts
diff --git a/src/app/[userName]/page.tsx b/src/app/(main)/[userName]/page.tsx
similarity index 100%
rename from src/app/[userName]/page.tsx
rename to src/app/(main)/[userName]/page.tsx
diff --git a/src/app/[userName]/unauthorized.tsx b/src/app/(main)/[userName]/unauthorized.tsx
similarity index 100%
rename from src/app/[userName]/unauthorized.tsx
rename to src/app/(main)/[userName]/unauthorized.tsx
diff --git a/src/app/page.tsx b/src/app/(main)/page.tsx
similarity index 100%
rename from src/app/page.tsx
rename to src/app/(main)/page.tsx
diff --git a/src/app/setup/SetupAdmin.tsx b/src/app/(main)/setup/SetupAdmin.tsx
similarity index 100%
rename from src/app/setup/SetupAdmin.tsx
rename to src/app/(main)/setup/SetupAdmin.tsx
diff --git a/src/app/setup/SetupFlow.tsx b/src/app/(main)/setup/SetupFlow.tsx
similarity index 100%
rename from src/app/setup/SetupFlow.tsx
rename to src/app/(main)/setup/SetupFlow.tsx
diff --git a/src/app/setup/actions.ts b/src/app/(main)/setup/actions.ts
similarity index 100%
rename from src/app/setup/actions.ts
rename to src/app/(main)/setup/actions.ts
diff --git a/src/app/setup/page.tsx b/src/app/(main)/setup/page.tsx
similarity index 100%
rename from src/app/setup/page.tsx
rename to src/app/(main)/setup/page.tsx
diff --git a/src/app/setup/unauthorized.tsx b/src/app/(main)/setup/unauthorized.tsx
similarity index 100%
rename from src/app/setup/unauthorized.tsx
rename to src/app/(main)/setup/unauthorized.tsx
diff --git a/src/app/admin/components/AccessControl.tsx b/src/app/(settings)/admin/components/AccessControl.tsx
similarity index 100%
rename from src/app/admin/components/AccessControl.tsx
rename to src/app/(settings)/admin/components/AccessControl.tsx
diff --git a/src/app/admin/components/AllowlistEditor.tsx b/src/app/(settings)/admin/components/AllowlistEditor.tsx
similarity index 100%
rename from src/app/admin/components/AllowlistEditor.tsx
rename to src/app/(settings)/admin/components/AllowlistEditor.tsx
diff --git a/src/app/admin/components/HealthMonitor.tsx b/src/app/(settings)/admin/components/HealthMonitor.tsx
similarity index 100%
rename from src/app/admin/components/HealthMonitor.tsx
rename to src/app/(settings)/admin/components/HealthMonitor.tsx
diff --git a/src/app/admin/components/OAuthConfig.tsx b/src/app/(settings)/admin/components/OAuthConfig.tsx
similarity index 100%
rename from src/app/admin/components/OAuthConfig.tsx
rename to src/app/(settings)/admin/components/OAuthConfig.tsx
diff --git a/src/app/admin/components/RegistrationModeControl.tsx b/src/app/(settings)/admin/components/RegistrationModeControl.tsx
similarity index 100%
rename from src/app/admin/components/RegistrationModeControl.tsx
rename to src/app/(settings)/admin/components/RegistrationModeControl.tsx
diff --git a/src/app/admin/components/SessionRow.tsx b/src/app/(settings)/admin/components/SessionRow.tsx
similarity index 100%
rename from src/app/admin/components/SessionRow.tsx
rename to src/app/(settings)/admin/components/SessionRow.tsx
diff --git a/src/app/admin/components/SessionViewer.tsx b/src/app/(settings)/admin/components/SessionViewer.tsx
similarity index 100%
rename from src/app/admin/components/SessionViewer.tsx
rename to src/app/(settings)/admin/components/SessionViewer.tsx
diff --git a/src/app/admin/components/TemplateManagement.tsx b/src/app/(settings)/admin/components/TemplateManagement.tsx
similarity index 100%
rename from src/app/admin/components/TemplateManagement.tsx
rename to src/app/(settings)/admin/components/TemplateManagement.tsx
diff --git a/src/app/admin/components/ToolchainManagement.tsx b/src/app/(settings)/admin/components/ToolchainManagement.tsx
similarity index 100%
rename from src/app/admin/components/ToolchainManagement.tsx
rename to src/app/(settings)/admin/components/ToolchainManagement.tsx
diff --git a/src/app/admin/components/UserList.tsx b/src/app/(settings)/admin/components/UserList.tsx
similarity index 100%
rename from src/app/admin/components/UserList.tsx
rename to src/app/(settings)/admin/components/UserList.tsx
diff --git a/src/app/admin/components/UserManagement.tsx b/src/app/(settings)/admin/components/UserManagement.tsx
similarity index 100%
rename from src/app/admin/components/UserManagement.tsx
rename to src/app/(settings)/admin/components/UserManagement.tsx
diff --git a/src/app/admin/components/UserRow.tsx b/src/app/(settings)/admin/components/UserRow.tsx
similarity index 100%
rename from src/app/admin/components/UserRow.tsx
rename to src/app/(settings)/admin/components/UserRow.tsx
diff --git a/src/app/admin/components/utils.ts b/src/app/(settings)/admin/components/utils.ts
similarity index 100%
rename from src/app/admin/components/utils.ts
rename to src/app/(settings)/admin/components/utils.ts
diff --git a/src/app/admin/forbidden.tsx b/src/app/(settings)/admin/forbidden.tsx
similarity index 100%
rename from src/app/admin/forbidden.tsx
rename to src/app/(settings)/admin/forbidden.tsx
diff --git a/src/app/admin/page.tsx b/src/app/(settings)/admin/page.tsx
similarity index 100%
rename from src/app/admin/page.tsx
rename to src/app/(settings)/admin/page.tsx
diff --git a/src/app/admin/unauthorized.tsx b/src/app/(settings)/admin/unauthorized.tsx
similarity index 100%
rename from src/app/admin/unauthorized.tsx
rename to src/app/(settings)/admin/unauthorized.tsx