diff --git a/src/web/src/app/template.js b/src/web/src/app/template.js
index 8b1ba29..c64cdc3 100644
--- a/src/web/src/app/template.js
+++ b/src/web/src/app/template.js
@@ -1,4 +1,4 @@
-import PageTransition from "@/components/transitions";
+import PageTransition from "@/components/ui/transitions";
 
 export default function rootTemplate({ children }) {
   return <PageTransition>{children}</PageTransition>;
diff --git a/src/web/src/components/footer.jsx b/src/web/src/components/footer.jsx
deleted file mode 100644
index ca679cd..0000000
--- a/src/web/src/components/footer.jsx
+++ /dev/null
@@ -1,7 +0,0 @@
-const Footer = () => {
-  return (
-    <div></div>
-  );
-}
-
-export default Footer;
diff --git a/src/web/src/components/footer/content.jsx b/src/web/src/components/footer/content.jsx
new file mode 100644
index 0000000..347a0d6
--- /dev/null
+++ b/src/web/src/components/footer/content.jsx
@@ -0,0 +1,7 @@
+function Content() {
+  return (
+    <div></div>
+  );
+}
+
+export default Content;
diff --git a/src/web/src/components/footer/index.jsx b/src/web/src/components/footer/index.jsx
new file mode 100644
index 0000000..3268f99
--- /dev/null
+++ b/src/web/src/components/footer/index.jsx
@@ -0,0 +1,12 @@
+import Container from "@/components/ui/container";
+import Content from "@/components/footer/content";
+
+function Footer() {
+  return (
+    <Container>
+      <Content />
+    </Container>
+  );
+}
+
+export default Footer;
diff --git a/src/web/src/components/hero/sections.jsx b/src/web/src/components/hero/content.jsx
similarity index 97%
rename from src/web/src/components/hero/sections.jsx
rename to src/web/src/components/hero/content.jsx
index cc09dfc..d230fed 100644
--- a/src/web/src/components/hero/sections.jsx
+++ b/src/web/src/components/hero/content.jsx
@@ -1,6 +1,5 @@
 "use client"
 
-import { motion } from 'framer-motion';
 import Typewriter from 'typewriter-effect';
 import React from 'react';
 
diff --git a/src/web/src/components/hero/index.jsx b/src/web/src/components/hero/index.jsx
index 25b8603..11d1910 100644
--- a/src/web/src/components/hero/index.jsx
+++ b/src/web/src/components/hero/index.jsx
@@ -1,7 +1,7 @@
 "use client"
 
-import React, { useRef } from 'react';
-import Content from '@/components/hero/sections';
+import React from 'react';
+import Content from '@/components/hero/content';
 
 function Hero() {
   return (
@@ -12,4 +12,3 @@ function Hero() {
 }
 
 export default Hero;
-
diff --git a/src/web/src/components/theme-toggle.jsx b/src/web/src/components/ui/theme-toggle.jsx
similarity index 100%
rename from src/web/src/components/theme-toggle.jsx
rename to src/web/src/components/ui/theme-toggle.jsx
diff --git a/src/web/src/components/transitions.jsx b/src/web/src/components/ui/transitions.jsx
similarity index 100%
rename from src/web/src/components/transitions.jsx
rename to src/web/src/components/ui/transitions.jsx