diff --git a/apps/dashboard/app/favicon.ico b/apps/dashboard/src/app/favicon.ico
similarity index 100%
rename from apps/dashboard/app/favicon.ico
rename to apps/dashboard/src/app/favicon.ico
diff --git a/apps/dashboard/app/globals.css b/apps/dashboard/src/app/globals.css
similarity index 100%
rename from apps/dashboard/app/globals.css
rename to apps/dashboard/src/app/globals.css
diff --git a/apps/dashboard/app/layout.tsx b/apps/dashboard/src/app/layout.tsx
similarity index 100%
rename from apps/dashboard/app/layout.tsx
rename to apps/dashboard/src/app/layout.tsx
diff --git a/apps/dashboard/app/page.tsx b/apps/dashboard/src/app/page.tsx
similarity index 78%
rename from apps/dashboard/app/page.tsx
rename to apps/dashboard/src/app/page.tsx
index bcb15de..ad27c22 100644
--- a/apps/dashboard/app/page.tsx
+++ b/apps/dashboard/src/app/page.tsx
@@ -1,6 +1,6 @@
 'use client'
-import { OgPlayground } from "./_components/OgPlayground";
-import type { OGElement } from "./_lib/types";
+import { OgPlayground } from "../components/OgPlayground";
+import type { OGElement } from "../lib/types";
 
 const initialElements: OGElement[] = [
   {
diff --git a/apps/dashboard/app/_components/Button.tsx b/apps/dashboard/src/components/Button.tsx
similarity index 100%
rename from apps/dashboard/app/_components/Button.tsx
rename to apps/dashboard/src/components/Button.tsx
diff --git a/apps/dashboard/app/_components/Element.tsx b/apps/dashboard/src/components/Element.tsx
similarity index 99%
rename from apps/dashboard/app/_components/Element.tsx
rename to apps/dashboard/src/components/Element.tsx
index 63e3a91..b110c4e 100644
--- a/apps/dashboard/app/_components/Element.tsx
+++ b/apps/dashboard/src/components/Element.tsx
@@ -1,6 +1,6 @@
 import type { CSSProperties } from "react";
 import { useEffect, useMemo, useRef, useState } from "react"
-import type { OGElement } from "../_lib/types"
+import type { OGElement } from "../lib/types";
 import { useOg } from "./OgPlayground"
 
 function hexToRgba(hex: string, alpha: number) {
diff --git a/apps/dashboard/app/_components/ElementTab.tsx b/apps/dashboard/src/components/ElementTab.tsx
similarity index 92%
rename from apps/dashboard/app/_components/ElementTab.tsx
rename to apps/dashboard/src/components/ElementTab.tsx
index bbccc8e..6e1814d 100644
--- a/apps/dashboard/app/_components/ElementTab.tsx
+++ b/apps/dashboard/src/components/ElementTab.tsx
@@ -1,6 +1,6 @@
 import { useSortable } from "@dnd-kit/sortable"
 import { CSS } from '@dnd-kit/utilities';
-import type { OGElement } from "../_lib/types"
+import type { OGElement } from "../lib/types";
 import { useOg } from "./OgPlayground"
 import { BoxIcon } from "./icons/BoxIcon"
 import { CircleIcon } from "./icons/CircleIcon"
@@ -69,10 +69,12 @@ export function ElementTab({ element }: ElementTabProps) {
       </button>
       <button
         className="text-gray-600 hover:text-gray-900"
-        onClick={() => { updateElement({
-          ...element,
-          visible: !element.visible,
-        }); }}
+        onClick={() => {
+          updateElement({
+            ...element,
+            visible: !element.visible,
+          });
+        }}
         type="button"
       >
         {element.visible ? <VisibleIcon /> : <NotVisibleIcon />}
diff --git a/apps/dashboard/app/_components/Labels.tsx b/apps/dashboard/src/components/Labels.tsx
similarity index 100%
rename from apps/dashboard/app/_components/Labels.tsx
rename to apps/dashboard/src/components/Labels.tsx
diff --git a/apps/dashboard/app/_components/LeftPanel.tsx b/apps/dashboard/src/components/LeftPanel.tsx
similarity index 96%
rename from apps/dashboard/app/_components/LeftPanel.tsx
rename to apps/dashboard/src/components/LeftPanel.tsx
index 8a5f5e1..e1873c0 100644
--- a/apps/dashboard/app/_components/LeftPanel.tsx
+++ b/apps/dashboard/src/components/LeftPanel.tsx
@@ -4,7 +4,7 @@ import type { DragEndEvent } from "@dnd-kit/core";
 import { DndContext, KeyboardSensor, PointerSensor, closestCenter, useSensor, useSensors } from "@dnd-kit/core";
 import { SortableContext, arrayMove, sortableKeyboardCoordinates, verticalListSortingStrategy } from "@dnd-kit/sortable";
 import { restrictToVerticalAxis } from "@dnd-kit/modifiers";
-import { exportToPng, exportToSvg } from "../_lib/export";
+import { exportToPng, exportToSvg } from "../lib/export";
 import { ElementTab } from "./ElementTab";
 import { useOg } from "./OgPlayground";
 import { Button } from "./Button";
@@ -88,18 +88,18 @@ export function LeftPanel() {
 
   async function getFonts() {
     return Promise.all(elements.filter(element => element.tag === 'p' || element.tag === 'span').map(async element => {
-      // @ts-expect-error wrong inference
+      // @ts-expect-error -- wrong inference
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access -- wrong inference
       const fontName = element.fontFamily.toLowerCase().replace(' ', '-')
-      // @ts-expect-error wrong inference
+      // @ts-expect-error -- wrong inference
       const data = await fetch(`https://fonts.bunny.net/${fontName}/files/${fontName}-latin-${element.fontWeight}-normal.woff`).then(response => response.arrayBuffer())
 
       return {
-        // @ts-expect-error wrong inference
+        // @ts-expect-error -- wrong inference
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- wrong inference
         name: element.fontFamily,
         data,
-        // @ts-expect-error wrong inference
+        // @ts-expect-error -- wrong inference
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment -- wrong inference
         weight: element.fontWeight,
       }
diff --git a/apps/dashboard/app/_components/OgPlayground.tsx b/apps/dashboard/src/components/OgPlayground.tsx
similarity index 99%
rename from apps/dashboard/app/_components/OgPlayground.tsx
rename to apps/dashboard/src/components/OgPlayground.tsx
index e01640e..cd69cc9 100644
--- a/apps/dashboard/app/_components/OgPlayground.tsx
+++ b/apps/dashboard/src/components/OgPlayground.tsx
@@ -1,6 +1,6 @@
 import type { RefObject } from "react";
 import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
-import type { OGElement } from "../_lib/types";
+import type { OGElement } from "../lib/types";
 import { Element } from './Element'
 import { RightPanel } from "./RightPanel";
 import { LeftPanel } from "./LeftPanel";
diff --git a/apps/dashboard/app/_components/PlaygroundToolbar.tsx b/apps/dashboard/src/components/PlaygroundToolbar.tsx
similarity index 98%
rename from apps/dashboard/app/_components/PlaygroundToolbar.tsx
rename to apps/dashboard/src/components/PlaygroundToolbar.tsx
index 089464a..eadb231 100644
--- a/apps/dashboard/app/_components/PlaygroundToolbar.tsx
+++ b/apps/dashboard/src/components/PlaygroundToolbar.tsx
@@ -1,5 +1,5 @@
 import type { ReactElement } from "react"
-import type { OGElement } from "../_lib/types"
+import type { OGElement } from "../lib/types"
 import { TextIcon } from "./icons/TextIcon"
 import { CircleIcon } from "./icons/CircleIcon"
 import { ImageIcon } from "./icons/ImageIcon"
diff --git a/apps/dashboard/app/_components/RightPanel.tsx b/apps/dashboard/src/components/RightPanel.tsx
similarity index 99%
rename from apps/dashboard/app/_components/RightPanel.tsx
rename to apps/dashboard/src/components/RightPanel.tsx
index 74809d6..b517623 100644
--- a/apps/dashboard/app/_components/RightPanel.tsx
+++ b/apps/dashboard/src/components/RightPanel.tsx
@@ -1,4 +1,4 @@
-import { FONTS, WEIGHTS } from "../_lib/fonts";
+import { FONTS, WEIGHTS } from "../lib/fonts";
 import { Button } from "./Button";
 import { Input, Select } from "./Labels";
 import { useOg } from "./OgPlayground";
diff --git a/apps/dashboard/app/_components/icons/AddIcon.tsx b/apps/dashboard/src/components/icons/AddIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/AddIcon.tsx
rename to apps/dashboard/src/components/icons/AddIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/AlignCenterIcon.tsx b/apps/dashboard/src/components/icons/AlignCenterIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/AlignCenterIcon.tsx
rename to apps/dashboard/src/components/icons/AlignCenterIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/AlignLeftIcon.tsx b/apps/dashboard/src/components/icons/AlignLeftIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/AlignLeftIcon.tsx
rename to apps/dashboard/src/components/icons/AlignLeftIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/AlignRightIcon.tsx b/apps/dashboard/src/components/icons/AlignRightIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/AlignRightIcon.tsx
rename to apps/dashboard/src/components/icons/AlignRightIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/BoldIcon.tsx b/apps/dashboard/src/components/icons/BoldIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/BoldIcon.tsx
rename to apps/dashboard/src/components/icons/BoldIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/BorderStyleIcon.tsx b/apps/dashboard/src/components/icons/BorderStyleIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/BorderStyleIcon.tsx
rename to apps/dashboard/src/components/icons/BorderStyleIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/BoxIcon.tsx b/apps/dashboard/src/components/icons/BoxIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/BoxIcon.tsx
rename to apps/dashboard/src/components/icons/BoxIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/CircleIcon.tsx b/apps/dashboard/src/components/icons/CircleIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/CircleIcon.tsx
rename to apps/dashboard/src/components/icons/CircleIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/ColorIcon.tsx b/apps/dashboard/src/components/icons/ColorIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/ColorIcon.tsx
rename to apps/dashboard/src/components/icons/ColorIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/CornerIcon.tsx b/apps/dashboard/src/components/icons/CornerIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/CornerIcon.tsx
rename to apps/dashboard/src/components/icons/CornerIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/DeleteIcon.tsx b/apps/dashboard/src/components/icons/DeleteIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/DeleteIcon.tsx
rename to apps/dashboard/src/components/icons/DeleteIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/EndIcon.tsx b/apps/dashboard/src/components/icons/EndIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/EndIcon.tsx
rename to apps/dashboard/src/components/icons/EndIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/FontSizeIcon.tsx b/apps/dashboard/src/components/icons/FontSizeIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/FontSizeIcon.tsx
rename to apps/dashboard/src/components/icons/FontSizeIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/GradientIcon.tsx b/apps/dashboard/src/components/icons/GradientIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/GradientIcon.tsx
rename to apps/dashboard/src/components/icons/GradientIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/ImageIcon.tsx b/apps/dashboard/src/components/icons/ImageIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/ImageIcon.tsx
rename to apps/dashboard/src/components/icons/ImageIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/ImagePositionIcon.tsx b/apps/dashboard/src/components/icons/ImagePositionIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/ImagePositionIcon.tsx
rename to apps/dashboard/src/components/icons/ImagePositionIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/ImageSizeIcon.tsx b/apps/dashboard/src/components/icons/ImageSizeIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/ImageSizeIcon.tsx
rename to apps/dashboard/src/components/icons/ImageSizeIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/LetterSpacingIcon.tsx b/apps/dashboard/src/components/icons/LetterSpacingIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/LetterSpacingIcon.tsx
rename to apps/dashboard/src/components/icons/LetterSpacingIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/LineHeightIcon.tsx b/apps/dashboard/src/components/icons/LineHeightIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/LineHeightIcon.tsx
rename to apps/dashboard/src/components/icons/LineHeightIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/LinkIcon.tsx b/apps/dashboard/src/components/icons/LinkIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/LinkIcon.tsx
rename to apps/dashboard/src/components/icons/LinkIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/MagicWandIcon.tsx b/apps/dashboard/src/components/icons/MagicWandIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/MagicWandIcon.tsx
rename to apps/dashboard/src/components/icons/MagicWandIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/NotVisibleIcon.tsx b/apps/dashboard/src/components/icons/NotVisibleIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/NotVisibleIcon.tsx
rename to apps/dashboard/src/components/icons/NotVisibleIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/OpacityIcon.tsx b/apps/dashboard/src/components/icons/OpacityIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/OpacityIcon.tsx
rename to apps/dashboard/src/components/icons/OpacityIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/PngIcon.tsx b/apps/dashboard/src/components/icons/PngIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/PngIcon.tsx
rename to apps/dashboard/src/components/icons/PngIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/RedoIcon.tsx b/apps/dashboard/src/components/icons/RedoIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/RedoIcon.tsx
rename to apps/dashboard/src/components/icons/RedoIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/RotateIcon.tsx b/apps/dashboard/src/components/icons/RotateIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/RotateIcon.tsx
rename to apps/dashboard/src/components/icons/RotateIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/SquareIcon.tsx b/apps/dashboard/src/components/icons/SquareIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/SquareIcon.tsx
rename to apps/dashboard/src/components/icons/SquareIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/StartIcon.tsx b/apps/dashboard/src/components/icons/StartIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/StartIcon.tsx
rename to apps/dashboard/src/components/icons/StartIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/SvgIcon.tsx b/apps/dashboard/src/components/icons/SvgIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/SvgIcon.tsx
rename to apps/dashboard/src/components/icons/SvgIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/TextIcon.tsx b/apps/dashboard/src/components/icons/TextIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/TextIcon.tsx
rename to apps/dashboard/src/components/icons/TextIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/UndoIcon.tsx b/apps/dashboard/src/components/icons/UndoIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/UndoIcon.tsx
rename to apps/dashboard/src/components/icons/UndoIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/VisibleIcon.tsx b/apps/dashboard/src/components/icons/VisibleIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/VisibleIcon.tsx
rename to apps/dashboard/src/components/icons/VisibleIcon.tsx
diff --git a/apps/dashboard/app/_components/icons/WidthIcon.tsx b/apps/dashboard/src/components/icons/WidthIcon.tsx
similarity index 100%
rename from apps/dashboard/app/_components/icons/WidthIcon.tsx
rename to apps/dashboard/src/components/icons/WidthIcon.tsx
diff --git a/apps/dashboard/app/_lib/export.ts b/apps/dashboard/src/lib/export.ts
similarity index 100%
rename from apps/dashboard/app/_lib/export.ts
rename to apps/dashboard/src/lib/export.ts
diff --git a/apps/dashboard/app/_lib/fonts.ts b/apps/dashboard/src/lib/fonts.ts
similarity index 100%
rename from apps/dashboard/app/_lib/fonts.ts
rename to apps/dashboard/src/lib/fonts.ts
diff --git a/apps/dashboard/app/_lib/types.ts b/apps/dashboard/src/lib/types.ts
similarity index 100%
rename from apps/dashboard/app/_lib/types.ts
rename to apps/dashboard/src/lib/types.ts
diff --git a/apps/dashboard/tailwind.config.ts b/apps/dashboard/tailwind.config.ts
index 87a09fe..94f2c35 100644
--- a/apps/dashboard/tailwind.config.ts
+++ b/apps/dashboard/tailwind.config.ts
@@ -2,9 +2,7 @@ import type { Config } from 'tailwindcss'
 
 const config: Config = {
   content: [
-    './pages/**/*.{js,ts,jsx,tsx,mdx}',
-    './components/**/*.{js,ts,jsx,tsx,mdx}',
-    './app/**/*.{js,ts,jsx,tsx,mdx}',
+    './src/**/*.{js,ts,jsx,tsx,mdx}',
   ],
   theme: {
     extend: {},
diff --git a/apps/dashboard/tsconfig.json b/apps/dashboard/tsconfig.json
index 5df2164..221a6a9 100644
--- a/apps/dashboard/tsconfig.json
+++ b/apps/dashboard/tsconfig.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/tsconfig",
   "extends": "@ogstudio/typescript/nextjs.json",
   "compilerOptions": {
     "plugins": [
diff --git a/apps/dashboard/turbo.json b/apps/dashboard/turbo.json
index e10f737..5742b3e 100644
--- a/apps/dashboard/turbo.json
+++ b/apps/dashboard/turbo.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://turbo.build/schema.json",
   "extends": [
     "//"
   ],