diff --git a/src/routes/+error.svelte b/src/routes/(main)/+error.svelte
similarity index 100%
rename from src/routes/+error.svelte
rename to src/routes/(main)/+error.svelte
diff --git a/src/routes/+layout.server.ts b/src/routes/(main)/+layout.server.ts
similarity index 100%
rename from src/routes/+layout.server.ts
rename to src/routes/(main)/+layout.server.ts
diff --git a/src/routes/(main)/+layout.svelte b/src/routes/(main)/+layout.svelte
new file mode 100644
index 0000000..b61e9d7
--- /dev/null
+++ b/src/routes/(main)/+layout.svelte
@@ -0,0 +1,9 @@
+<script lang="ts">
+  import MainLayout from '$lib/components/mainLayout.svelte';
+  import type { LayoutProps } from './$types';
+  let { data, children }: LayoutProps = $props();
+</script>
+
+<MainLayout {data}>
+  {@render children()}
+</MainLayout>
diff --git a/src/routes/+page.server.ts b/src/routes/(main)/+page.server.ts
similarity index 100%
rename from src/routes/+page.server.ts
rename to src/routes/(main)/+page.server.ts
diff --git a/src/routes/+page.svelte b/src/routes/(main)/+page.svelte
similarity index 100%
rename from src/routes/+page.svelte
rename to src/routes/(main)/+page.svelte
diff --git a/src/routes/channel/[channel]/+page.server.ts b/src/routes/(main)/channel/[channel]/+page.server.ts
similarity index 100%
rename from src/routes/channel/[channel]/+page.server.ts
rename to src/routes/(main)/channel/[channel]/+page.server.ts
diff --git a/src/routes/channel/[channel]/+page.svelte b/src/routes/(main)/channel/[channel]/+page.svelte
similarity index 98%
rename from src/routes/channel/[channel]/+page.svelte
rename to src/routes/(main)/channel/[channel]/+page.svelte
index 907278a..6dc7c75 100644
--- a/src/routes/channel/[channel]/+page.svelte
+++ b/src/routes/(main)/channel/[channel]/+page.svelte
@@ -84,7 +84,8 @@
       use:autoResize
       class="flex h-10 min-h-10 w-full resize-none rounded-md border border-input bg-transparent px-3 py-2 text-sm
       shadow-sm placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1
-      focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50"></textarea>
+      focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50"
+    ></textarea>
     <Button class="h-full min-h-10 w-14" type="submit"><Send class="size-full" /></Button>
   </form>
 </div>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 4ff4309..304d27d 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,12 +1,8 @@
 <script lang="ts">
-  import MainLayout from '$lib/components/mainLayout.svelte';
   import { ModeWatcher } from 'mode-watcher';
   import '../app.css';
-  import type { LayoutProps } from './$types';
-  let { data, children }: LayoutProps = $props();
+  let { children } = $props();
 </script>
 
 <ModeWatcher />
-<MainLayout {data}>
-  {@render children()}
-</MainLayout>
+{@render children()}