diff --git a/src/templates/components/Background/Background.sass b/fwt/components/Background/Background.sass
similarity index 100%
rename from src/templates/components/Background/Background.sass
rename to fwt/components/Background/Background.sass
diff --git a/src/templates/components/Background/Background.tsx b/fwt/components/Background/Background.tsx
similarity index 87%
rename from src/templates/components/Background/Background.tsx
rename to fwt/components/Background/Background.tsx
index e33e37d..12e21b2 100644
--- a/src/templates/components/Background/Background.tsx
+++ b/fwt/components/Background/Background.tsx
@@ -1,9 +1,9 @@
 import './Background.sass'
 import { Show, createSignal } from 'solid-js'
 import fs from 'fs'
-import webpPath from '../../../templates/images/background.webp'
-import avifPath from '../../../templates/images/background.avif'
-import noBackground from '../../../templates/images/no-background.webp'
+import webpPath from '../../images/background.webp'
+import avifPath from '../../images/background.avif'
+import noBackground from '../../images/no-background.webp'
 
 interface Props {
   image?: boolean
diff --git a/src/templates/components/Button/Button.sass b/fwt/components/Button/Button.sass
similarity index 100%
rename from src/templates/components/Button/Button.sass
rename to fwt/components/Button/Button.sass
diff --git a/src/templates/components/Button/Button.tsx b/fwt/components/Button/Button.tsx
similarity index 100%
rename from src/templates/components/Button/Button.tsx
rename to fwt/components/Button/Button.tsx
diff --git a/src/templates/components/Image/Image.tsx b/fwt/components/Image/Image.tsx
similarity index 100%
rename from src/templates/components/Image/Image.tsx
rename to fwt/components/Image/Image.tsx
diff --git a/src/templates/components/Link/Link.tsx b/fwt/components/Link/Link.tsx
similarity index 100%
rename from src/templates/components/Link/Link.tsx
rename to fwt/components/Link/Link.tsx
diff --git a/src/templates/components/Logo/Logo.tsx b/fwt/components/Logo/Logo.tsx
similarity index 75%
rename from src/templates/components/Logo/Logo.tsx
rename to fwt/components/Logo/Logo.tsx
index d293b1a..5d1af4c 100644
--- a/src/templates/components/Logo/Logo.tsx
+++ b/fwt/components/Logo/Logo.tsx
@@ -1,5 +1,5 @@
-import webpPath from '../../../templates/images/logo.webp'
-import avifPath from '../../../templates/images/logo.avif'
+import webpPath from '../../images/logo.webp'
+import avifPath from '../../images/logo.avif'
 
 interface Props {
   size?: number
diff --git a/src/templates/components/Optimizer/OptimizeBackground.tsx b/fwt/components/Optimizer/OptimizeBackground.tsx
similarity index 78%
rename from src/templates/components/Optimizer/OptimizeBackground.tsx
rename to fwt/components/Optimizer/OptimizeBackground.tsx
index 2c004f5..1c27caf 100644
--- a/src/templates/components/Optimizer/OptimizeBackground.tsx
+++ b/fwt/components/Optimizer/OptimizeBackground.tsx
@@ -2,8 +2,8 @@ import sharp from 'sharp'
 
 const convertBackground = async () => {
   const inputSrc = 'src/assets/images/background.png'
-  const webpOutput = 'src/templates/images/background.webp'
-  const avifOutput = 'src/templates/images/background.avif'
+  const webpOutput = 'fwt/images/background.webp'
+  const avifOutput = 'fwt/images/background.avif'
 
   const avifBuffer = await sharp(inputSrc).avif({ quality: 60 }).resize(1920).toBuffer()
   await sharp(avifBuffer).toFile(avifOutput)
diff --git a/src/templates/components/Optimizer/OptimizeImage.tsx b/fwt/components/Optimizer/OptimizeImage.tsx
similarity index 72%
rename from src/templates/components/Optimizer/OptimizeImage.tsx
rename to fwt/components/Optimizer/OptimizeImage.tsx
index 4edf349..00afd77 100644
--- a/src/templates/components/Optimizer/OptimizeImage.tsx
+++ b/fwt/components/Optimizer/OptimizeImage.tsx
@@ -6,8 +6,8 @@ interface Props {
 }
 
 const convertImage = async (props: Props) => {
-  const avifOutputPath = `src/templates/images/${props.src.split('.').slice(0, -1).join('.')}.avif`
-  const webpOutputPath = `src/templates/images/${props.src.split('.').slice(0, -1).join('.')}.webp`
+  const avifOutputPath = `fwt/images/${props.src.split('.').slice(0, -1).join('.')}.avif`
+  const webpOutputPath = `fwt/images/${props.src.split('.').slice(0, -1).join('.')}.webp`
 
   const avifBuffer = await sharp(`src/assets/images/${props.src}`).avif({ quality: 60 }).resize(props.size).toBuffer()
   await sharp(avifBuffer).toFile(avifOutputPath)
diff --git a/src/templates/components/Optimizer/OptimizeLogo.tsx b/fwt/components/Optimizer/OptimizeLogo.tsx
similarity index 82%
rename from src/templates/components/Optimizer/OptimizeLogo.tsx
rename to fwt/components/Optimizer/OptimizeLogo.tsx
index 83172d8..e3e8014 100644
--- a/src/templates/components/Optimizer/OptimizeLogo.tsx
+++ b/fwt/components/Optimizer/OptimizeLogo.tsx
@@ -6,8 +6,8 @@ interface Props {
 
 const convertLogo = async (props: Props) => {
   const inputSrc = 'src/assets/images/logo.png'
-  const webpImage = 'src/templates/images/logo.webp'
-  const avifImage = 'src/templates/images/logo.avif'
+  const webpImage = 'fwt/images/logo.webp'
+  const avifImage = 'fwt/images/logo.avif'
 
   const avifBuffer = await sharp(inputSrc).avif({ quality: 60 }).resize(props.size).toBuffer()
   await sharp(avifBuffer).toFile(avifImage)
diff --git a/src/templates/components/Page/Page.sass b/fwt/components/Page/Page.sass
similarity index 100%
rename from src/templates/components/Page/Page.sass
rename to fwt/components/Page/Page.sass
diff --git a/src/templates/components/Page/Page.tsx b/fwt/components/Page/Page.tsx
similarity index 100%
rename from src/templates/components/Page/Page.tsx
rename to fwt/components/Page/Page.tsx
diff --git a/src/templates/images/background.avif b/fwt/images/background.avif
similarity index 100%
rename from src/templates/images/background.avif
rename to fwt/images/background.avif
diff --git a/src/templates/images/background.webp b/fwt/images/background.webp
similarity index 100%
rename from src/templates/images/background.webp
rename to fwt/images/background.webp
diff --git a/src/templates/images/logo.avif b/fwt/images/logo.avif
similarity index 100%
rename from src/templates/images/logo.avif
rename to fwt/images/logo.avif
diff --git a/src/templates/images/logo.webp b/fwt/images/logo.webp
similarity index 100%
rename from src/templates/images/logo.webp
rename to fwt/images/logo.webp
diff --git a/src/templates/images/no-background.webp b/fwt/images/no-background.webp
similarity index 100%
rename from src/templates/images/no-background.webp
rename to fwt/images/no-background.webp
diff --git a/src/templates/images/sample.avif b/fwt/images/sample.avif
similarity index 100%
rename from src/templates/images/sample.avif
rename to fwt/images/sample.avif
diff --git a/src/templates/images/sample.webp b/fwt/images/sample.webp
similarity index 100%
rename from src/templates/images/sample.webp
rename to fwt/images/sample.webp
diff --git a/quadlet.container b/podman.container
similarity index 100%
rename from quadlet.container
rename to podman.container
diff --git a/public/favicon.svg b/public/favicon.svg
deleted file mode 100644
index f157bd1..0000000
--- a/public/favicon.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 128 128">
-    <path d="M50.4 78.5a75.1 75.1 0 0 0-28.5 6.9l24.2-65.7c.7-2 1.9-3.2 3.4-3.2h29c1.5 0 2.7 1.2 3.4 3.2l24.2 65.7s-11.6-7-28.5-7L67 45.5c-.4-1.7-1.6-2.8-2.9-2.8-1.3 0-2.5 1.1-2.9 2.7L50.4 78.5Zm-1.1 28.2Zm-4.2-20.2c-2 6.6-.6 15.8 4.2 20.2a17.5 17.5 0 0 1 .2-.7 5.5 5.5 0 0 1 5.7-4.5c2.8.1 4.3 1.5 4.7 4.7.2 1.1.2 2.3.2 3.5v.4c0 2.7.7 5.2 2.2 7.4a13 13 0 0 0 5.7 4.9v-.3l-.2-.3c-1.8-5.6-.5-9.5 4.4-12.8l1.5-1a73 73 0 0 0 3.2-2.2 16 16 0 0 0 6.8-11.4c.3-2 .1-4-.6-6l-.8.6-1.6 1a37 37 0 0 1-22.4 2.7c-5-.7-9.7-2-13.2-6.2Z" />
-    <style>
-        path { fill: #000; }
-        @media (prefers-color-scheme: dark) {
-            path { fill: #FFF; }
-        }
-    </style>
-</svg>
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 966c07b..18af47b 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -4,8 +4,8 @@ const { title } = Astro.props
 const websiteName = 'Template'
 const websiteDescription = 'This is just a template.'
 
-import Background from '../templates/components/Background/Background'
-import OptimizeBackground from '../templates/components/Optimizer/OptimizeBackground'
+import Background from '../../fwt/components/Background/Background'
+import OptimizeBackground from '../../fwt/components/Optimizer/OptimizeBackground'
 ---
 
 <html lang="en">
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 7a2a55b..5b00d64 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,11 +1,11 @@
 ---
 import Layout from '../layouts/Layout.astro'
-import Button from '../templates/components/Button/Button'
-import Logo from '../templates/components/Logo/Logo'
-import OptimizeLogo from '../templates/components/Optimizer/OptimizeLogo'
-import Link from '../templates/components/Link/Link'
+import Button from '../../fwt/components/Button/Button'
+import Logo from '../../fwt/components/Logo/Logo'
+import OptimizeLogo from '../../fwt/components/Optimizer/OptimizeLogo'
+import Link from '../../fwt/components/Link/Link'
 import Counter from '../components/Counter/Counter'
-import Page from '../templates/components/Page/Page'
+import Page from '../../fwt/components/Page/Page'
 ---
 
 <Layout title="FWT">
diff --git a/src/pages/next.astro b/src/pages/next.astro
index 73233e2..c3b3cf4 100644
--- a/src/pages/next.astro
+++ b/src/pages/next.astro
@@ -1,11 +1,11 @@
 ---
 import Layout from '../layouts/Layout.astro'
-import Button from '../templates/components/Button/Button.tsx'
-import Image from '../templates/components/Image/Image'
-import Page from '../templates/components/Page/Page'
-import sampleA from '../templates/images/sample.avif'
-import sampleW from '../templates/images/sample.webp'
-import OptimizeImage from '../templates/components/Optimizer/OptimizeImage'
+import Button from '../../fwt/components/Button/Button'
+import Image from '../../fwt/components/Image/Image'
+import Page from '../../fwt/components/Page/Page'
+import sample1 from '../../fwt/images/sample.avif'
+import sample2 from '../../fwt/images/sample.webp'
+import OptimizeImage from '../../fwt/components/Optimizer/OptimizeImage.tsx'
 ---
 
 <Layout title="Home">
@@ -15,10 +15,10 @@ import OptimizeImage from '../templates/components/Optimizer/OptimizeImage'
 
     <section class="image">
       <!-- <OptimizeImage src="sample.png" size={400} /> -->
-      <Image avif={sampleA.src} webp={sampleW.src} alt="Example Image" size={400} />
-      <Image avif={sampleA.src} webp={sampleW.src} alt="Example Image" size={400} />
-      <Image avif={sampleA.src} webp={sampleW.src} alt="Example Image" size={400} />
-      <Image avif={sampleA.src} webp={sampleW.src} alt="Example Image" size={400} />
+      <Image avif={sample1.src} webp={sample2.src} alt="Example Image" size={400} />
+      <Image avif={sample1.src} webp={sample2.src} alt="Example Image" size={400} />
+      <Image avif={sample1.src} webp={sample2.src} alt="Example Image" size={400} />
+      <Image avif={sample1.src} webp={sample2.src} alt="Example Image" size={400} />
     </section>
   </Page>
 </Layout>
diff --git a/tests/pages/index.spec.ts b/tests/index.spec.ts
similarity index 100%
rename from tests/pages/index.spec.ts
rename to tests/index.spec.ts
diff --git a/tests/pages/next.spec.ts b/tests/next.spec.ts
similarity index 100%
rename from tests/pages/next.spec.ts
rename to tests/next.spec.ts