diff --git a/.vscode/extensions.json b/.vscode/extensions.json
deleted file mode 100644
index 22a1505..0000000
--- a/.vscode/extensions.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "recommendations": ["astro-build.astro-vscode"],
-  "unwantedRecommendations": []
-}
diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index d642209..0000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "version": "0.2.0",
-  "configurations": [
-    {
-      "command": "./node_modules/.bin/astro dev",
-      "name": "Development server",
-      "request": "launch",
-      "type": "node-terminal"
-    }
-  ]
-}
diff --git a/SECURITY.md b/SECURITY.md
index 3fd4c3e..8aa967e 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,7 +1,7 @@
 ## Navegadores compatibles
 
 > [!IMPORTANT]
-> En el proyecto se ocupan componenetes nativos, haciendo ya facil su lectura en la mayotia de navegadores
+> En el proyecto se ocupan componentes nativos, haciendo ya facil su lectura en la mayoria de navegadores
 
 | Navegador             | Supported          |
 | --------------------- | ------------------ |
diff --git a/robots.txt b/robots.txt
deleted file mode 100644
index 6556c40..0000000
--- a/robots.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-User-agent: *
-Allow: /
-
-Sitemap: https://khelde.vercel.app/sitemap-index.xml
\ No newline at end of file
diff --git a/src/components/features/projects/index.ts b/src/components/features/projects/index.ts
deleted file mode 100644
index 275b005..0000000
--- a/src/components/features/projects/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from "./Backend";
-export * from "./Companies";
-export * from "./DataAnalyst";
-export * from "./Frontend";
diff --git a/src/components/templates/enviarOpinion.astro b/src/components/templates/enviarOpinion.astro
deleted file mode 100644
index 9529420..0000000
--- a/src/components/templates/enviarOpinion.astro
+++ /dev/null
@@ -1,9 +0,0 @@
----
-import { SendOpinions } from "@/components/features/opinions/sendOpinions";
-
-const { currentLocale } = Astro;
----
-
-<div class="card not-first:isolate flex justify-center items-center w-full h-screen overflow-y-auto">
-    <SendOpinions client:load currentLocale={currentLocale}/>
-</div>
\ No newline at end of file
diff --git a/src/components/templates/Acerca.astro b/src/components/ui/About/About.astro
similarity index 75%
rename from src/components/templates/Acerca.astro
rename to src/components/ui/About/About.astro
index 8c15626..ab7e37e 100644
--- a/src/components/templates/Acerca.astro
+++ b/src/components/ui/About/About.astro
@@ -1,5 +1,5 @@
 ---
-import { TabsAcerca } from "@/components/organisms/TabsAcerca";
+import { TabsAcerca } from "@/components/ui/About/TabsAbout.tsx";
 
 const { currentLocale } = Astro;
 ---
diff --git a/src/components/features/aboutMe/Items/ItemDataExperiencia.tsx b/src/components/ui/About/Items/ItemExperience.tsx
similarity index 95%
rename from src/components/features/aboutMe/Items/ItemDataExperiencia.tsx
rename to src/components/ui/About/Items/ItemExperience.tsx
index 0d7c4c8..92b40d5 100644
--- a/src/components/features/aboutMe/Items/ItemDataExperiencia.tsx
+++ b/src/components/ui/About/Items/ItemExperience.tsx
@@ -5,9 +5,9 @@ import { motion } from "framer-motion";
 import type {
 	Experiences,
 	PropsLang,
-} from "@/interfaces/currentLang.interface";
+} from "@/interfaces/currentLang.interface.ts";
 
-export const ItemDataExperiencia = ({ currentLocale }: PropsLang) => {
+export const ItemExperience = ({ currentLocale }: PropsLang) => {
 	const [data, setData] = useState<Experiences[]>([]); // tipa tu array según tu DTO
 	const [loading, setLoading] = useState<boolean>(true);
 
diff --git a/src/components/features/aboutMe/Items/ItemDataHabilidades.tsx b/src/components/ui/About/Items/ItemSkills.tsx
similarity index 89%
rename from src/components/features/aboutMe/Items/ItemDataHabilidades.tsx
rename to src/components/ui/About/Items/ItemSkills.tsx
index be2ccf1..d5d4c85 100644
--- a/src/components/features/aboutMe/Items/ItemDataHabilidades.tsx
+++ b/src/components/ui/About/Items/ItemSkills.tsx
@@ -1,8 +1,8 @@
 import { useCallback, useMemo, useState } from "react";
-import type { PropsLang } from "@/interfaces/currentLang.interface";
-import { dataTabsAcercaDeEN } from "@/utils/en/dataTabsAcercaDeEN";
-import { dataTabsAcercaDe } from "@/utils/es/dataTabsAcercaDe";
-import { dataTabsAcercaDeFR } from "@/utils/fr/dataTabsAcercaDeFR";
+import type { PropsLang } from "@/interfaces/currentLang.interface.ts";
+import { dataTabsAcercaDeEN } from "@/utils/en/dataTabsAboutmeEN";
+import { dataTabsAcercaDe } from "@/utils/es/dataTabsAboutme";
+import { dataTabsAcercaDeFR } from "@/utils/fr/dataTabsAboutmeFR";
 import { motion } from "framer-motion";
 
 const langTraduceData: Record<string, typeof dataTabsAcercaDe> = {
@@ -11,7 +11,7 @@ const langTraduceData: Record<string, typeof dataTabsAcercaDe> = {
 	fr: dataTabsAcercaDeFR,
 };
 
-export const ItemDataHabilidades = ({ currentLocale }: PropsLang) => {
+export const ItemSkills = ({ currentLocale }: PropsLang) => {
 	const [loadedImages, setLoadedImages] = useState<Record<string, boolean>>({});
 
 	const memorization = useMemo(
diff --git a/src/components/features/aboutMe/SobreMi.tsx b/src/components/ui/About/Tabs/Aboutme.tsx
similarity index 95%
rename from src/components/features/aboutMe/SobreMi.tsx
rename to src/components/ui/About/Tabs/Aboutme.tsx
index ecd039a..c56a429 100644
--- a/src/components/features/aboutMe/SobreMi.tsx
+++ b/src/components/ui/About/Tabs/Aboutme.tsx
@@ -1,8 +1,8 @@
 import { getI18N } from "@/i18n";
-import type { PropsLang } from "@/interfaces/currentLang.interface";
+import type { PropsLang } from "@/interfaces/currentLang.interface.ts";
 import { motion } from "framer-motion";
 
-export const SobreMi = ({ currentLocale }: PropsLang) => {
+export const Aboutme = ({ currentLocale }: PropsLang) => {
 	const i18n = getI18N({ currentLocale });
 
 	return (
diff --git a/src/components/features/aboutMe/Educacion.tsx b/src/components/ui/About/Tabs/Education.tsx
similarity index 95%
rename from src/components/features/aboutMe/Educacion.tsx
rename to src/components/ui/About/Tabs/Education.tsx
index 5afc8ef..27ffc13 100644
--- a/src/components/features/aboutMe/Educacion.tsx
+++ b/src/components/ui/About/Tabs/Education.tsx
@@ -1,8 +1,8 @@
 import { getI18N } from "@/i18n";
-import type { PropsLang } from "@/interfaces/currentLang.interface";
+import type { PropsLang } from "@/interfaces/currentLang.interface.ts";
 import { motion } from "framer-motion";
 
-export const Educacion = ({ currentLocale }: PropsLang) => {
+export const Education = ({ currentLocale }: PropsLang) => {
 	const i18n = getI18N({ currentLocale });
 	return (
 		<div className="flex flex-col p-4">
diff --git a/src/components/features/aboutMe/Experiencia.tsx b/src/components/ui/About/Tabs/Experience.tsx
similarity index 67%
rename from src/components/features/aboutMe/Experiencia.tsx
rename to src/components/ui/About/Tabs/Experience.tsx
index 7ea9a7e..6059f4a 100644
--- a/src/components/features/aboutMe/Experiencia.tsx
+++ b/src/components/ui/About/Tabs/Experience.tsx
@@ -1,8 +1,8 @@
-import { ItemDataExperiencia } from "@/components/features/aboutMe/Items/ItemDataExperiencia";
+import { ItemExperience } from "@/components/ui/About/Items/ItemExperience.tsx";
 import { getI18N } from "@/i18n";
 import type { PropsLang } from "@/interfaces/currentLang.interface";
 
-export const Experiencia = ({ currentLocale }: PropsLang) => {
+export const Experience = ({ currentLocale }: PropsLang) => {
 	const i18n = getI18N({ currentLocale });
 	return (
 		<div className="w-full flex flex-col">
@@ -13,7 +13,7 @@ export const Experiencia = ({ currentLocale }: PropsLang) => {
 
 			<div className="animate__animated animate__zoomIn">
 				<div className="flex flex-col hero-content gap-4 pt-4">
-					<ItemDataExperiencia currentLocale={currentLocale} />
+					<ItemExperience currentLocale={currentLocale} />
 				</div>
 			</div>
 		</div>
diff --git a/src/components/features/aboutMe/Habilidades.tsx b/src/components/ui/About/Tabs/Skills.tsx
similarity index 68%
rename from src/components/features/aboutMe/Habilidades.tsx
rename to src/components/ui/About/Tabs/Skills.tsx
index 035a86b..7a5083b 100644
--- a/src/components/features/aboutMe/Habilidades.tsx
+++ b/src/components/ui/About/Tabs/Skills.tsx
@@ -1,8 +1,8 @@
-import { ItemDataHabilidades } from "@/components/features/aboutMe/Items/ItemDataHabilidades";
+import { ItemSkills } from "@/components/ui/About/Items/ItemSkills.tsx";
 import { getI18N } from "@/i18n";
 import type { PropsLang } from "@/interfaces/currentLang.interface";
 
-export const Habilidades = ({ currentLocale }: PropsLang) => {
+export const Skills = ({ currentLocale }: PropsLang) => {
 	const i18n = getI18N({ currentLocale });
 	return (
 		<div className="w-full flex flex-col">
@@ -13,7 +13,7 @@ export const Habilidades = ({ currentLocale }: PropsLang) => {
 
 			<div className="animate__animated animate__zoomIn">
 				<div className="grid md:grid-cols-2 lg:grid-cols-3 grid-cols-1 p-4 gap-4">
-					<ItemDataHabilidades currentLocale={currentLocale} />
+					<ItemSkills currentLocale={currentLocale} />
 				</div>
 			</div>
 		</div>
diff --git a/src/components/organisms/TabsAcerca.tsx b/src/components/ui/About/TabsAbout.tsx
similarity index 89%
rename from src/components/organisms/TabsAcerca.tsx
rename to src/components/ui/About/TabsAbout.tsx
index 49b73cf..e7c4dc2 100644
--- a/src/components/organisms/TabsAcerca.tsx
+++ b/src/components/ui/About/TabsAbout.tsx
@@ -1,11 +1,11 @@
 import { Briefcase, GraduationCap, PencilRuler, UserRound } from "lucide-react";
 import { useEffect, useState } from "react";
-import { Educacion } from "@/components/features/aboutMe/Educacion";
-import { Experiencia } from "@/components/features/aboutMe/Experiencia";
-import { Habilidades } from "@/components/features/aboutMe/Habilidades";
-import { SobreMi } from "@/components/features/aboutMe/SobreMi";
+import { Education } from "@/components/ui/About/Tabs/Education.tsx";
+import { Experience } from "@/components/ui/About/Tabs/Experience.tsx";
+import { Skills } from "@/components/ui/About/Tabs/Skills.tsx";
+import { Aboutme } from "@/components/ui/About/Tabs/Aboutme.tsx";
 import { getI18N } from "@/i18n";
-import type { PropsLang } from "@/interfaces/currentLang.interface";
+import type { PropsLang } from "@/interfaces/currentLang.interface.ts";
 
 export const TabsAcerca = ({ currentLocale }: PropsLang) => {
 	const [activeTab, setActiveTab] = useState<string>("experiencia");
@@ -119,15 +119,15 @@ export const TabsAcerca = ({ currentLocale }: PropsLang) => {
 			{/* Contenedor del contenido del tab con un ancho flexible */}
 			<div className="flex-1 w-full hero-content animate__animated animate__zoomIn">
 				{activeTab === "experiencia" && (
-					<Experiencia currentLocale={currentLocale} />
+					<Experience currentLocale={currentLocale} />
 				)}
 				{activeTab === "educacion" && (
-					<Educacion currentLocale={currentLocale} />
+					<Education currentLocale={currentLocale} />
 				)}
 				{activeTab === "habilidades" && (
-					<Habilidades currentLocale={currentLocale} />
+					<Skills currentLocale={currentLocale} />
 				)}
-				{activeTab === "sobreMi" && <SobreMi currentLocale={currentLocale} />}
+				{activeTab === "sobreMi" && <Aboutme currentLocale={currentLocale} />}
 			</div>
 		</div>
 	);
diff --git a/src/components/atoms/Bubble.tsx b/src/components/ui/Bubble/Bubble.tsx
similarity index 100%
rename from src/components/atoms/Bubble.tsx
rename to src/components/ui/Bubble/Bubble.tsx
diff --git a/src/components/templates/Contacto.astro b/src/components/ui/Contact/Contact.astro
similarity index 73%
rename from src/components/templates/Contacto.astro
rename to src/components/ui/Contact/Contact.astro
index ba3f5a3..a079206 100644
--- a/src/components/templates/Contacto.astro
+++ b/src/components/ui/Contact/Contact.astro
@@ -1,5 +1,5 @@
 ---
-import { Form } from "@/components/features/contact/Form";
+import { Form } from "@/components/ui/Contact/Form";
 
 const { currentLocale } = Astro;
 ---
diff --git a/src/components/features/contact/Form.tsx b/src/components/ui/Contact/Form.tsx
similarity index 98%
rename from src/components/features/contact/Form.tsx
rename to src/components/ui/Contact/Form.tsx
index 377e0c6..d8b3528 100644
--- a/src/components/features/contact/Form.tsx
+++ b/src/components/ui/Contact/Form.tsx
@@ -3,9 +3,12 @@ import { motion } from "framer-motion";
 import { Mail, Send, Github, Linkedin, MessageCircle } from "lucide-react";
 import { type FieldError, useForm } from "react-hook-form";
 import toast, { Toaster } from "react-hot-toast";
-import { useTheme } from "@/hooks/useTheme";
+import { useTheme } from "@/hooks/useTheme.ts";
 import { getI18N } from "@/i18n";
-import type { FormData, PropsLang } from "@/interfaces/currentLang.interface";
+import type {
+	FormData,
+	PropsLang,
+} from "@/interfaces/currentLang.interface.ts";
 import { contactSchema } from "@/schemas/contactSchema";
 
 export const Form = ({ currentLocale }: PropsLang) => {
diff --git a/src/components/templates/Header.astro b/src/components/ui/Home/Home.astro
similarity index 98%
rename from src/components/templates/Header.astro
rename to src/components/ui/Home/Home.astro
index a64b9ed..81117a5 100644
--- a/src/components/templates/Header.astro
+++ b/src/components/ui/Home/Home.astro
@@ -7,7 +7,7 @@ import {
 	MoveRight,
 	SquareArrowOutUpRight,
 } from "lucide-react";
-import { Bubble } from "@/components/atoms/Bubble";
+import { Bubble } from "@/components/ui/Bubble/Bubble";
 import { getI18N } from "@/i18n";
 import { Image } from "astro:assets";
 
diff --git a/src/components/features/navbar/ItemsNav.tsx b/src/components/ui/Navbar/Items/ItemsNav.tsx
similarity index 100%
rename from src/components/features/navbar/ItemsNav.tsx
rename to src/components/ui/Navbar/Items/ItemsNav.tsx
diff --git a/src/components/features/navbar/LangDrop.tsx b/src/components/ui/Navbar/Items/LangDrop.tsx
similarity index 100%
rename from src/components/features/navbar/LangDrop.tsx
rename to src/components/ui/Navbar/Items/LangDrop.tsx
diff --git a/src/components/features/navbar/ThemeSwitch.tsx b/src/components/ui/Navbar/Items/ThemeSwitch.tsx
similarity index 100%
rename from src/components/features/navbar/ThemeSwitch.tsx
rename to src/components/ui/Navbar/Items/ThemeSwitch.tsx
diff --git a/src/components/organisms/Nav.tsx b/src/components/ui/Navbar/Nav.tsx
similarity index 95%
rename from src/components/organisms/Nav.tsx
rename to src/components/ui/Navbar/Nav.tsx
index 2ad8b16..622848a 100644
--- a/src/components/organisms/Nav.tsx
+++ b/src/components/ui/Navbar/Nav.tsx
@@ -1,10 +1,10 @@
 import { AnimatePresence, motion } from "framer-motion";
 import { Menu, X } from "lucide-react";
 import { useEffect, useRef, useState } from "react";
-import { ItemsNav } from "@/components/features/navbar/ItemsNav";
-import { LangDrop } from "@/components/features/navbar/LangDrop";
-import { ThemeDrop } from "@/components/features/navbar/ThemeSwitch";
-import type { PropsLang } from "@/interfaces/currentLang.interface";
+import { ItemsNav } from "@/components/ui/Navbar/Items/ItemsNav.tsx";
+import { LangDrop } from "@/components/ui/Navbar/Items/LangDrop.tsx";
+import { ThemeDrop } from "@/components/ui/Navbar/Items/ThemeSwitch.tsx";
+import type { PropsLang } from "@/interfaces/currentLang.interface.ts";
 
 export const Nav = ({ currentLocale }: PropsLang) => {
 	const [isOpen, setIsOpen] = useState(false);
diff --git a/src/components/features/opinions/Items/CountryFlag.tsx b/src/components/ui/Opinions/Items/CountryFlag.tsx
similarity index 96%
rename from src/components/features/opinions/Items/CountryFlag.tsx
rename to src/components/ui/Opinions/Items/CountryFlag.tsx
index 5dc9053..f080355 100644
--- a/src/components/features/opinions/Items/CountryFlag.tsx
+++ b/src/components/ui/Opinions/Items/CountryFlag.tsx
@@ -1,5 +1,5 @@
 import ReactCountryFlag from "react-country-flag";
-import type { CountryFlagProps } from "@/interfaces/currentLang.interface";
+import type { CountryFlagProps } from "@/interfaces/currentLang.interface.ts";
 
 export const CountryFlag = ({
 	countryCode,
diff --git a/src/components/templates/Opiniones.astro b/src/components/ui/Opinions/Opiniones.astro
similarity index 74%
rename from src/components/templates/Opiniones.astro
rename to src/components/ui/Opinions/Opiniones.astro
index 435ca5b..3709646 100644
--- a/src/components/templates/Opiniones.astro
+++ b/src/components/ui/Opinions/Opiniones.astro
@@ -1,5 +1,5 @@
 ---
-import { Opinions } from "@/components/features/opinions/Opinions";
+import { Opinions } from "@/components/ui/Opinions/Opinions";
 
 const { currentLocale } = Astro;
 ---
diff --git a/src/components/features/opinions/Opinions.tsx b/src/components/ui/Opinions/Opinions.tsx
similarity index 98%
rename from src/components/features/opinions/Opinions.tsx
rename to src/components/ui/Opinions/Opinions.tsx
index 0015767..f42cbfe 100644
--- a/src/components/features/opinions/Opinions.tsx
+++ b/src/components/ui/Opinions/Opinions.tsx
@@ -6,8 +6,8 @@ import { getI18N } from "@/i18n";
 import type {
 	PropsLang,
 	Testimonial,
-} from "@/interfaces/currentLang.interface";
-import { CountryFlag } from "@/components/features/opinions/Items/CountryFlag";
+} from "@/interfaces/currentLang.interface.ts";
+import { CountryFlag } from "@/components/ui/Opinions/Items/CountryFlag.tsx";
 
 const containerVariants = {
 	hidden: { opacity: 0 },
diff --git a/src/components/features/opinions/sendOpinions.tsx b/src/components/ui/Opinions/SendOpinions.tsx
similarity index 97%
rename from src/components/features/opinions/sendOpinions.tsx
rename to src/components/ui/Opinions/SendOpinions.tsx
index b5547bb..5c72d56 100644
--- a/src/components/features/opinions/sendOpinions.tsx
+++ b/src/components/ui/Opinions/SendOpinions.tsx
@@ -3,14 +3,14 @@ import { AnimatePresence, motion } from "framer-motion";
 import { Briefcase, Globe, MessageSquare, Send, User } from "lucide-react";
 import { useId, useMemo, useState } from "react";
 import { type FieldError, useForm } from "react-hook-form";
-import { SubmittedOpinion } from "@/components/features/opinions/SubmittedOpinion";
+import { SubmittedOpinion } from "@/components/ui/Opinions/SubmittedOpinion.tsx";
 import { getI18N } from "@/i18n";
 import type {
 	FormOpinions,
 	PropsLang,
-} from "@/interfaces/currentLang.interface";
-import { opinionsSchema } from "@/schemas/opinionsSchema";
-import { countries } from "@/utils/countries";
+} from "@/interfaces/currentLang.interface.ts";
+import { opinionsSchema } from "@/schemas/opinionsSchema.ts";
+import { countries } from "@/utils/countries.ts";
 import ReactCountryFlag from "react-country-flag";
 
 export const SendOpinions = ({ currentLocale }: PropsLang) => {
diff --git a/src/components/features/opinions/SubmittedOpinion.tsx b/src/components/ui/Opinions/SubmittedOpinion.tsx
similarity index 99%
rename from src/components/features/opinions/SubmittedOpinion.tsx
rename to src/components/ui/Opinions/SubmittedOpinion.tsx
index 598c7a6..659cbcb 100644
--- a/src/components/features/opinions/SubmittedOpinion.tsx
+++ b/src/components/ui/Opinions/SubmittedOpinion.tsx
@@ -1,7 +1,7 @@
 import { motion, type Variants } from "framer-motion";
 import { Check } from "lucide-react";
 import { getI18N } from "@/i18n";
-import type { PropsLang } from "@/interfaces/currentLang.interface";
+import type { PropsLang } from "@/interfaces/currentLang.interface.ts";
 
 const successVariants: Variants = {
 	hidden: { opacity: 0, scale: 0.8 },
diff --git a/src/components/ui/Opinions/send/SendOpinions.astro b/src/components/ui/Opinions/send/SendOpinions.astro
new file mode 100644
index 0000000..8d89cfd
--- /dev/null
+++ b/src/components/ui/Opinions/send/SendOpinions.astro
@@ -0,0 +1,10 @@
+---
+import { SendOpinions } from "@/components/ui/Opinions/SendOpinions.tsx";
+
+const { currentLocale } = Astro;
+---
+
+<div
+    class="card not-first:isolate flex justify-center items-center w-full h-screen overflow-y-auto">
+    <SendOpinions client:load currentLocale={currentLocale} />
+</div>
diff --git a/src/components/features/projects/items/ItemDataProjects.tsx b/src/components/ui/Projects/Items/ItemProjects.tsx
similarity index 97%
rename from src/components/features/projects/items/ItemDataProjects.tsx
rename to src/components/ui/Projects/Items/ItemProjects.tsx
index f7ff613..b2680b1 100644
--- a/src/components/features/projects/items/ItemDataProjects.tsx
+++ b/src/components/ui/Projects/Items/ItemProjects.tsx
@@ -4,10 +4,7 @@ import { getI18N } from "@/i18n";
 import type { PropsLangWithData } from "@/interfaces/currentLang.interface";
 import { motion } from "framer-motion";
 
-export const ItemDataProjects = ({
-	currentLocale,
-	data,
-}: PropsLangWithData) => {
+export const ItemProjects = ({ currentLocale, data }: PropsLangWithData) => {
 	const [loadedImages, setLoadedImages] = useState<Record<string, boolean>>({});
 	const i18n = getI18N({ currentLocale });
 
diff --git a/src/components/features/projects/items/SkeletonProjectsCard.tsx b/src/components/ui/Projects/Items/SkeletonProjectsCard.tsx
similarity index 100%
rename from src/components/features/projects/items/SkeletonProjectsCard.tsx
rename to src/components/ui/Projects/Items/SkeletonProjectsCard.tsx
diff --git a/src/components/templates/Proyectos.astro b/src/components/ui/Projects/Projects.astro
similarity index 74%
rename from src/components/templates/Proyectos.astro
rename to src/components/ui/Projects/Projects.astro
index 51e4bfa..1521a1b 100644
--- a/src/components/templates/Proyectos.astro
+++ b/src/components/ui/Projects/Projects.astro
@@ -1,5 +1,5 @@
 ---
-import { TabsProyectos } from "@/components/organisms/TabsProyectos";
+import { TabsProyectos } from "@/components/ui/Projects/TabsProjects";
 
 const { currentLocale } = Astro;
 ---
diff --git a/src/components/features/projects/Backend.tsx b/src/components/ui/Projects/Tabs/Backend.tsx
similarity index 59%
rename from src/components/features/projects/Backend.tsx
rename to src/components/ui/Projects/Tabs/Backend.tsx
index 115d182..644086f 100644
--- a/src/components/features/projects/Backend.tsx
+++ b/src/components/ui/Projects/Tabs/Backend.tsx
@@ -1,12 +1,8 @@
-import { ItemDataProjects } from "@/components/features/projects/items/ItemDataProjects";
+import { ItemProjects } from "@/components/ui/Projects/Items/ItemProjects.tsx";
 import { getI18N } from "@/i18n";
-import type { PropsLangWithData } from "@/interfaces/currentLang.interface";
+import type { PropsLangWithData } from "@/interfaces/currentLang.interface.ts";
 
-export const Backend = ({
-	currentLocale,
-	data,
-	loading,
-}: PropsLangWithData) => {
+export const Backend = ({ currentLocale, data }: PropsLangWithData) => {
 	const i18n = getI18N({ currentLocale });
 	return (
 		<div className="w-full flex flex-col ">
@@ -16,11 +12,7 @@ export const Backend = ({
 
 			<div>
 				<div className="flex flex-col hero-content gap-4 pt-4 animate__animated animate__zoomIn">
-					<ItemDataProjects
-						currentLocale={currentLocale}
-						data={data}
-						loading={loading}
-					/>
+					<ItemProjects currentLocale={currentLocale} data={data} />
 				</div>
 			</div>
 		</div>
diff --git a/src/components/features/projects/Companies.tsx b/src/components/ui/Projects/Tabs/Companies.tsx
similarity index 58%
rename from src/components/features/projects/Companies.tsx
rename to src/components/ui/Projects/Tabs/Companies.tsx
index e426535..d56ffc5 100644
--- a/src/components/features/projects/Companies.tsx
+++ b/src/components/ui/Projects/Tabs/Companies.tsx
@@ -1,12 +1,8 @@
-import { ItemDataProjects } from "@/components/features/projects/items/ItemDataProjects";
+import { ItemProjects } from "@/components/ui/Projects/Items/ItemProjects.tsx";
 import { getI18N } from "@/i18n";
-import type { PropsLangWithData } from "@/interfaces/currentLang.interface";
+import type { PropsLangWithData } from "@/interfaces/currentLang.interface.ts";
 
-export const Companies = ({
-	currentLocale,
-	data,
-	loading,
-}: PropsLangWithData) => {
+export const Companies = ({ currentLocale, data }: PropsLangWithData) => {
 	const i18n = getI18N({ currentLocale });
 	return (
 		<div className="w-full flex flex-col ">
@@ -16,11 +12,7 @@ export const Companies = ({
 
 			<div>
 				<div className="flex flex-col hero-content gap-4 pt-4 animate__animated animate__zoomIn">
-					<ItemDataProjects
-						currentLocale={currentLocale}
-						data={data}
-						loading={loading}
-					/>
+					<ItemProjects currentLocale={currentLocale} data={data} />
 				</div>
 			</div>
 		</div>
diff --git a/src/components/features/projects/DataAnalyst.tsx b/src/components/ui/Projects/Tabs/DataAnalyst.tsx
similarity index 58%
rename from src/components/features/projects/DataAnalyst.tsx
rename to src/components/ui/Projects/Tabs/DataAnalyst.tsx
index 2d7fdc9..9a64505 100644
--- a/src/components/features/projects/DataAnalyst.tsx
+++ b/src/components/ui/Projects/Tabs/DataAnalyst.tsx
@@ -1,12 +1,8 @@
-import { ItemDataProjects } from "@/components/features/projects/items/ItemDataProjects";
+import { ItemProjects } from "@/components/ui/Projects/Items/ItemProjects.tsx";
 import { getI18N } from "@/i18n";
-import type { PropsLangWithData } from "@/interfaces/currentLang.interface";
+import type { PropsLangWithData } from "@/interfaces/currentLang.interface.ts";
 
-export const DataAnalyst = ({
-	currentLocale,
-	data,
-	loading,
-}: PropsLangWithData) => {
+export const DataAnalyst = ({ currentLocale, data }: PropsLangWithData) => {
 	const i18n = getI18N({ currentLocale });
 	return (
 		<div className="w-full flex flex-col ">
@@ -16,11 +12,7 @@ export const DataAnalyst = ({
 
 			<div>
 				<div className="flex flex-col hero-content gap-4 pt-4 animate__animated animate__zoomIn">
-					<ItemDataProjects
-						currentLocale={currentLocale}
-						data={data}
-						loading={loading}
-					/>
+					<ItemProjects currentLocale={currentLocale} data={data} />
 				</div>
 			</div>
 		</div>
diff --git a/src/components/features/projects/Frontend.tsx b/src/components/ui/Projects/Tabs/Frontend.tsx
similarity index 74%
rename from src/components/features/projects/Frontend.tsx
rename to src/components/ui/Projects/Tabs/Frontend.tsx
index 5835281..6eda86b 100644
--- a/src/components/features/projects/Frontend.tsx
+++ b/src/components/ui/Projects/Tabs/Frontend.tsx
@@ -1,6 +1,6 @@
-import { ItemDataProjects } from "@/components/features/projects/items/ItemDataProjects";
+import { ItemProjects } from "@/components/ui/Projects/Items/ItemProjects.tsx";
 import { getI18N } from "@/i18n";
-import type { PropsLangWithData } from "@/interfaces/currentLang.interface";
+import type { PropsLangWithData } from "@/interfaces/currentLang.interface.ts";
 
 export const Frontend = ({ currentLocale, data }: PropsLangWithData) => {
 	const i18n = getI18N({ currentLocale });
@@ -11,7 +11,7 @@ export const Frontend = ({ currentLocale, data }: PropsLangWithData) => {
 			</span>
 			<div>
 				<div className="flex flex-col hero-content gap-4 pt-4 animate__animated animate__zoomIn">
-					<ItemDataProjects currentLocale={currentLocale} data={data} />
+					<ItemProjects currentLocale={currentLocale} data={data} />
 				</div>
 			</div>
 		</div>
diff --git a/src/components/organisms/TabsProyectos.tsx b/src/components/ui/Projects/TabsProjects.tsx
similarity index 94%
rename from src/components/organisms/TabsProyectos.tsx
rename to src/components/ui/Projects/TabsProjects.tsx
index c41a927..fea4a67 100644
--- a/src/components/organisms/TabsProyectos.tsx
+++ b/src/components/ui/Projects/TabsProjects.tsx
@@ -1,12 +1,10 @@
 import { Building, ChartArea, HardDrive, Layout } from "lucide-react";
 import { useEffect, useMemo, useState } from "react";
-import {
-	Backend,
-	Companies,
-	DataAnalyst,
-	Frontend,
-} from "@/components/features/projects/index";
-import { SkeletonProjectsCard } from "@/components/features/projects/items/SkeletonProjectsCard";
+import { Backend } from "@/components/ui/Projects/Tabs/Backend.tsx";
+import { Frontend } from "@/components/ui/Projects/Tabs/Frontend.tsx";
+import { Companies } from "@/components/ui/Projects/Tabs/Companies.tsx";
+import { DataAnalyst } from "@/components/ui/Projects/Tabs/DataAnalyst.tsx";
+import { SkeletonProjectsCard } from "@/components/ui/Projects/Items/SkeletonProjectsCard.tsx";
 import { getI18N } from "@/i18n";
 import type { Projects, PropsLang } from "@/interfaces/currentLang.interface";
 
diff --git a/src/pages/404.astro b/src/pages/404.astro
index 078353d..130c3be 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -1,5 +1,5 @@
 ---
-import { Nav } from "@/components/organisms/Nav";
+import { Nav } from "@/components/ui/Navbar/Nav";
 import { getI18N } from "@/i18n";
 import Layout from "@/layouts/Layout.astro";
 
diff --git a/src/pages/[lang]/comments.astro b/src/pages/[lang]/comments.astro
index 305d5e6..2fd93f3 100644
--- a/src/pages/[lang]/comments.astro
+++ b/src/pages/[lang]/comments.astro
@@ -1,5 +1,5 @@
 ---
-import EnviarOpinion from "@/components/templates/enviarOpinion.astro";
+import SendOpinion from "@/components/ui/Opinions/send/SendOpinions.astro";
 import Layout from "@/layouts/Layout.astro";
 ---
 
@@ -24,7 +24,7 @@ import Layout from "@/layouts/Layout.astro";
         </defs>
         <rect width="100%" height="100%" fill="url(#a)" mask="url(#fadeMask)" />
       </svg>
-      <EnviarOpinion />
+      <SendOpinion />
     </div>
   </header>
 </Layout>
diff --git a/src/pages/[lang]/home.astro b/src/pages/[lang]/home.astro
index 7edabdd..d431b9d 100644
--- a/src/pages/[lang]/home.astro
+++ b/src/pages/[lang]/home.astro
@@ -1,39 +1,53 @@
 ---
-import { Nav } from "@/components/organisms/Nav";
-import Acerca from "@/components/templates/Acerca.astro";
-import Contactos from "@/components/templates/Contacto.astro";
-import Header from "@/components/templates/Header.astro";
-import Opiniones from "@/components/templates/Opiniones.astro";
-import Proyectos from "@/components/templates/Proyectos.astro";
+import { Nav } from "@/components/ui/Navbar/Nav";
+import About from "@/components/ui/About/About.astro";
+import Contact from "@/components/ui/Contact/Contact.astro";
+import Home from "@/components/ui/Home/Home.astro";
+import Opinions from "@/components/ui/Opinions/Opiniones.astro";
+import Projects from "@/components/ui/Projects/Projects.astro";
 import Layout from "@/layouts/Layout.astro";
 
 const { currentLocale } = Astro;
 ---
 
 <Layout>
-  <header class="relative w-full" role="banner"> 
+  <header class="relative w-full" role="banner">
     <div class="w-full lg:p-0 md:p-10 p-10">
-      <Nav client:load currentLocale={currentLocale}/>
+      <Nav client:load currentLocale={currentLocale} />
     </div>
     <main role="main">
       <section class="w-full h-full">
-        <div class="hero bg-base-300 min-h-screen scroll-m-4 lg:scroll-m-0 md:scroll-m-0" id="home">
-          <Header />
+        <div
+          class="hero bg-base-300 min-h-screen scroll-m-4 lg:scroll-m-0 md:scroll-m-0"
+          id="home"
+        >
+          <Home />
         </div>
-        <div class="hero bg-base-300 min-h-screen flex justify-center items-start scroll-m-4 lg:scroll-m-0 md:scroll-m-0" id="about">
-          <Acerca />
+        <div
+          class="hero bg-base-300 min-h-screen flex justify-center items-start scroll-m-4 lg:scroll-m-0 md:scroll-m-0"
+          id="about"
+        >
+          <About />
         </div>
-        <div class="hero bg-base-300 min-h-screen flex justify-center items-start scroll-m-4 lg:scroll-m-0 md:scroll-m-0" id="projects">
-          <Proyectos />
+        <div
+          class="hero bg-base-300 min-h-screen flex justify-center items-start scroll-m-4 lg:scroll-m-0 md:scroll-m-0"
+          id="projects"
+        >
+          <Projects />
         </div>
-        <div class="hero bg-base-300 min-h-screen flex justify-center items-start" id="opinions">
-          <Opiniones />
+        <div
+          class="hero bg-base-300 min-h-screen flex justify-center items-start"
+          id="opinions"
+        >
+          <Opinions />
         </div>
-        <div class="hero bg-base-300 min-h-screen scroll-m-14 lg:scroll-m-12 md:scroll-m-0" id="contact">
-          <Contactos />
+        <div
+          class="hero bg-base-300 min-h-screen scroll-m-14 lg:scroll-m-12 md:scroll-m-0"
+          id="contact"
+        >
+          <Contact />
         </div>
       </section>
     </main>
   </header>
 </Layout>
-
diff --git a/src/types/typesDataHabilidades.ts b/src/types/typesSkills.ts
similarity index 100%
rename from src/types/typesDataHabilidades.ts
rename to src/types/typesSkills.ts
diff --git a/src/utils/en/dataTabsAcercaDeEN.ts b/src/utils/en/dataTabsAboutmeEN.ts
similarity index 95%
rename from src/utils/en/dataTabsAcercaDeEN.ts
rename to src/utils/en/dataTabsAboutmeEN.ts
index 3a9f60d..ed8c91b 100644
--- a/src/utils/en/dataTabsAcercaDeEN.ts
+++ b/src/utils/en/dataTabsAboutmeEN.ts
@@ -1,4 +1,4 @@
-import type { DataItemsHabilidades } from "@/types/typesDataHabilidades";
+import type { DataItemsHabilidades } from "@/types/typesSkills";
 
 export const dataTabsAcercaDeEN: DataItemsHabilidades[] = [
 	{
diff --git a/src/utils/es/dataTabsAcercaDe.ts b/src/utils/es/dataTabsAboutme.ts
similarity index 95%
rename from src/utils/es/dataTabsAcercaDe.ts
rename to src/utils/es/dataTabsAboutme.ts
index 501f316..875224c 100644
--- a/src/utils/es/dataTabsAcercaDe.ts
+++ b/src/utils/es/dataTabsAboutme.ts
@@ -1,4 +1,4 @@
-import type { DataItemsHabilidades } from "@/types/typesDataHabilidades";
+import type { DataItemsHabilidades } from "@/types/typesSkills";
 
 export const dataTabsAcercaDe: DataItemsHabilidades[] = [
 	{
diff --git a/src/utils/fr/dataTabsAcercaDeFR.ts b/src/utils/fr/dataTabsAboutmeFR.ts
similarity index 95%
rename from src/utils/fr/dataTabsAcercaDeFR.ts
rename to src/utils/fr/dataTabsAboutmeFR.ts
index 7db24aa..064b5b2 100644
--- a/src/utils/fr/dataTabsAcercaDeFR.ts
+++ b/src/utils/fr/dataTabsAboutmeFR.ts
@@ -1,4 +1,4 @@
-import type { DataItemsHabilidades } from "@/types/typesDataHabilidades";
+import type { DataItemsHabilidades } from "@/types/typesSkills";
 
 export const dataTabsAcercaDeFR: DataItemsHabilidades[] = [
 	{