diff --git a/.gitignore b/.gitignore
index d298c4b..d7d27b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,6 @@ pnpm-debug.log*
 
 # environment variables
 .env
-.env.local
 .env.production
 
 # macOS-specific files
diff --git a/fwt/components/Background.tsx b/fwt/Background.tsx
similarity index 87%
rename from fwt/components/Background.tsx
rename to fwt/Background.tsx
index e10af59..77648b2 100644
--- a/fwt/components/Background.tsx
+++ b/fwt/Background.tsx
@@ -1,9 +1,9 @@
-import '../styles/Background.sass'
+import './styles/Background.sass'
 import { Show, createSignal } from 'solid-js'
 import fs from 'fs'
-import webpPath from '../images/background.webp'
-import avifPath from '../images/background.avif'
-import noBackground from '../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/fwt/components/Box.tsx b/fwt/Box.tsx
similarity index 93%
rename from fwt/components/Box.tsx
rename to fwt/Box.tsx
index d27815f..b897376 100644
--- a/fwt/components/Box.tsx
+++ b/fwt/Box.tsx
@@ -1,4 +1,4 @@
-import '../styles/Box.sass'
+import './styles/Box.sass'
 import { type JSXElement, createMemo } from 'solid-js'
 
 interface Props {
diff --git a/fwt/components/Button.tsx b/fwt/Button.tsx
similarity index 98%
rename from fwt/components/Button.tsx
rename to fwt/Button.tsx
index 19fcb26..b8367ff 100644
--- a/fwt/components/Button.tsx
+++ b/fwt/Button.tsx
@@ -1,4 +1,4 @@
-import '../styles/Button.sass'
+import './styles/Button.sass'
 import { Show, Switch, Match } from 'solid-js'
 
 interface Props {
diff --git a/fwt/components/Column.tsx b/fwt/Column.tsx
similarity index 92%
rename from fwt/components/Column.tsx
rename to fwt/Column.tsx
index e683a7c..d59ac96 100644
--- a/fwt/components/Column.tsx
+++ b/fwt/Column.tsx
@@ -1,4 +1,4 @@
-import '../styles/Column.sass'
+import './styles/Column.sass'
 import type { JSXElement } from 'solid-js'
 
 interface Props {
diff --git a/fwt/components/Copyright.tsx b/fwt/Copyright.tsx
similarity index 100%
rename from fwt/components/Copyright.tsx
rename to fwt/Copyright.tsx
diff --git a/fwt/components/Footer.tsx b/fwt/Footer.tsx
similarity index 88%
rename from fwt/components/Footer.tsx
rename to fwt/Footer.tsx
index 0f00944..00593b6 100644
--- a/fwt/components/Footer.tsx
+++ b/fwt/Footer.tsx
@@ -1,4 +1,4 @@
-import '../styles/Footer.sass'
+import './styles/Footer.sass'
 import type { JSXElement } from 'solid-js'
 
 interface Props {
diff --git a/fwt/components/Form.tsx b/fwt/Form.tsx
similarity index 90%
rename from fwt/components/Form.tsx
rename to fwt/Form.tsx
index 28c00a9..d0e63a9 100644
--- a/fwt/components/Form.tsx
+++ b/fwt/Form.tsx
@@ -1,4 +1,4 @@
-import '../styles/Form.sass'
+import './styles/Form.sass'
 import type { JSXElement } from 'solid-js'
 
 interface Props {
diff --git a/fwt/components/HTML.tsx b/fwt/HTML.tsx
similarity index 91%
rename from fwt/components/HTML.tsx
rename to fwt/HTML.tsx
index bdd446a..01878fe 100644
--- a/fwt/components/HTML.tsx
+++ b/fwt/HTML.tsx
@@ -1,7 +1,7 @@
-import '../styles/HTML.sass'
+import './styles/HTML.sass'
 import { type JSXElement, Show } from 'solid-js'
-import background1 from '../images/background.avif'
-import background2 from '../images/background.webp'
+import background1 from './images/background.avif'
+import background2 from './images/background.webp'
 
 interface Props {
   title: string
diff --git a/fwt/components/Image.tsx b/fwt/Image.tsx
similarity index 100%
rename from fwt/components/Image.tsx
rename to fwt/Image.tsx
diff --git a/fwt/components/Input.tsx b/fwt/Input.tsx
similarity index 95%
rename from fwt/components/Input.tsx
rename to fwt/Input.tsx
index 2ff9a6f..aa40f02 100644
--- a/fwt/components/Input.tsx
+++ b/fwt/Input.tsx
@@ -1,4 +1,4 @@
-import '../styles/Input.sass'
+import './styles/Input.sass'
 import { createSignal } from 'solid-js'
 
 interface Props {
diff --git a/fwt/components/Link.tsx b/fwt/Link.tsx
similarity index 88%
rename from fwt/components/Link.tsx
rename to fwt/Link.tsx
index cdd5ffc..c5b1441 100644
--- a/fwt/components/Link.tsx
+++ b/fwt/Link.tsx
@@ -1,4 +1,4 @@
-import '../styles/Link.sass'
+import './styles/Link.sass'
 
 interface Props {
   to: string
diff --git a/fwt/components/Logo.tsx b/fwt/Logo.tsx
similarity index 80%
rename from fwt/components/Logo.tsx
rename to fwt/Logo.tsx
index ba1c8d6..46d053e 100644
--- a/fwt/components/Logo.tsx
+++ b/fwt/Logo.tsx
@@ -1,5 +1,5 @@
-import webpPath from '../images/logo.webp'
-import avifPath from '../images/logo.avif'
+import webpPath from './images/logo.webp'
+import avifPath from './images/logo.avif'
 
 interface Props {
   size?: number
diff --git a/fwt/components/Navbar.tsx b/fwt/Navbar.tsx
similarity index 90%
rename from fwt/components/Navbar.tsx
rename to fwt/Navbar.tsx
index f87864b..b207ef8 100644
--- a/fwt/components/Navbar.tsx
+++ b/fwt/Navbar.tsx
@@ -1,4 +1,4 @@
-import '../styles/Navbar.sass'
+import './styles/Navbar.sass'
 import Row from './Row'
 
 interface Props {
diff --git a/fwt/components/Page.tsx b/fwt/Page.tsx
similarity index 92%
rename from fwt/components/Page.tsx
rename to fwt/Page.tsx
index de14c7d..da9a2d8 100644
--- a/fwt/components/Page.tsx
+++ b/fwt/Page.tsx
@@ -1,4 +1,4 @@
-import '../styles/Page.sass'
+import './styles/Page.sass'
 import { Show } from 'solid-js'
 
 interface Props {
diff --git a/fwt/components/Row.tsx b/fwt/Row.tsx
similarity index 95%
rename from fwt/components/Row.tsx
rename to fwt/Row.tsx
index d560e8b..8eaf852 100644
--- a/fwt/components/Row.tsx
+++ b/fwt/Row.tsx
@@ -1,4 +1,4 @@
-import '../styles/Row.sass'
+import './styles/Row.sass'
 import { Show, type JSXElement } from 'solid-js'
 
 interface Props {
diff --git a/fwt/index.ts b/fwt/index.ts
deleted file mode 100644
index 3ef241e..0000000
--- a/fwt/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-export { default as Background } from './components/Background'
-export { default as Box } from './components/Box'
-export { default as Button } from './components/Button'
-export { default as Column } from './components/Column'
-export { default as Copyright } from './components/Copyright'
-export { default as Footer } from './components/Footer'
-export { default as Form } from './components/Form'
-export { default as HTML } from './components/HTML'
-export { default as Image } from './components/Image'
-export { default as Link } from './components/Link'
-export { default as Logo } from './components/Logo'
-export { default as Navbar } from './components/Navbar'
-export { default as Page } from './components/Page'
-export { default as Row } from './components/Row'
-
-export { default as OptimizeBackground } from './Optimizers/OptimizeBackground'
-export { default as OptimizeImage } from './Optimizers/OptimizeImage'
-export { default as OptimizeLogo } from './Optimizers/OptimizeLogo'
diff --git a/src/components/Input/Input.tsx b/src/components/Input/Input.tsx
index aa0d701..e35b5e6 100644
--- a/src/components/Input/Input.tsx
+++ b/src/components/Input/Input.tsx
@@ -1,4 +1,4 @@
-import Input from '../../../fwt/components/Input'
+import Input from '../../../fwt/Input'
 import { createSignal } from 'solid-js'
 
 const [sample, setSample] = createSignal('')
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 4430d0b..32f595f 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -4,7 +4,9 @@ const { title } = Astro.props
 const websiteName = 'Template'
 const websiteDescription = 'This is just a template.'
 
-import { Background, HTML } from '../../fwt'
+import Background from '../../fwt/Background'
+// import OptimizeBackground from '../../fwt/components/Optimizer/OptimizeBackground'
+import HTML from '../../fwt/HTML'
 ---
 
 <HTML title={title} name={websiteName} description={websiteDescription} font="inter">
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 581d760..39a888d 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -1,9 +1,18 @@
 ---
 import Layout from '../layouts/Layout.astro'
-import { Button, Logo, Link, Page, Footer, Row, Image, Copyright } from '../../fwt/'
+import Button from '../../fwt/Button'
+import Logo from '../../fwt/Logo'
+// import OptimizeLogo from '../../fwt/components/Optimizer/OptimizeLogo'
+// import OptimizeImage from '../../fwt/components/Optimizer/OptimizeImage'
+import Link from '../../fwt/Link'
 import Counter from '../components/Counter/Counter'
+import Page from '../../fwt/Page'
+import Footer from '../../fwt/Footer'
+import Row from '../../fwt/Row'
+import Image from '../../fwt/Image'
 import PA1 from '../../fwt/images/pat-alcala.avif'
 import PA2 from '../../fwt/images/pat-alcala.webp'
+import Copyright from '../../fwt/Copyright'
 
 // const sample = import.meta.env.SAMPLE
 ---
diff --git a/src/pages/next.astro b/src/pages/next.astro
index 310064b..e331521 100644
--- a/src/pages/next.astro
+++ b/src/pages/next.astro
@@ -1,8 +1,13 @@
 ---
 import Layout from '../layouts/Layout.astro'
-import { Button, Page, Row, Image } from '../../fwt'
+import Button from '../../fwt/Button'
+import Image from '../../fwt/Image'
+import Page from '../../fwt/Page'
 import sample1 from '../../fwt/images/sample.avif'
 import sample2 from '../../fwt/images/sample.webp'
+// import OptimizeImage from '../../fwt/components/Optimizer/OptimizeImage'
+import Row from '../../fwt/Row'
+// import Column from '../../fwt/components/Column/Column'
 ---
 
 <Layout title="Home">