diff --git a/source/director.cpp b/source/director.cpp
index c2cc4a1..dbdc455 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -34,7 +34,7 @@
 #include "resource.h"			  // Para Resource
 #include "screen.h"				  // Para Screen
 #include "section.h"			  // Para Name, Options, name, options
-#include "service_menu.h"		  // Para ServiceMenu
+#include "ui/service_menu.h"	  // Para ServiceMenu
 #include "title.h"				  // Para Title
 #include "utils.h"				  // Para Overrides, overrides
 
diff --git a/source/MenuOption.h b/source/ui/menu_option.h
similarity index 100%
rename from source/MenuOption.h
rename to source/ui/menu_option.h
diff --git a/source/MenuRenderer.cpp b/source/ui/menu_renderer.cpp
similarity index 98%
rename from source/MenuRenderer.cpp
rename to source/ui/menu_renderer.cpp
index ee66039..7d782b9 100644
--- a/source/MenuRenderer.cpp
+++ b/source/ui/menu_renderer.cpp
@@ -1,6 +1,6 @@
-#include "MenuRenderer.h"
+#include "menu_renderer.h"
 #include "text.h"
-#include "MenuOption.h" // Necesario para acceder a las opciones
+#include "menu_option.h" // Necesario para acceder a las opciones
 #include "screen.h"     // Para param
 #include <array>
 
diff --git a/source/MenuRenderer.h b/source/ui/menu_renderer.h
similarity index 100%
rename from source/MenuRenderer.h
rename to source/ui/menu_renderer.h
diff --git a/source/service_menu.cpp b/source/ui/service_menu.cpp
similarity index 99%
rename from source/service_menu.cpp
rename to source/ui/service_menu.cpp
index e62b248..88d83cd 100644
--- a/source/service_menu.cpp
+++ b/source/ui/service_menu.cpp
@@ -1,10 +1,10 @@
 #include "service_menu.h"
-#include "MenuRenderer.h" // <-- Incluido
-#include "MenuOption.h"
+#include "menu_renderer.h" 
+#include "menu_option.h"
 #include "resource.h"
 #include "audio.h"
 #include "section.h"
-#include "screen.h" // Para el UIMessage
+#include "screen.h" 
 #include "asset.h"
 
 // Singleton
diff --git a/source/service_menu.h b/source/ui/service_menu.h
similarity index 99%
rename from source/service_menu.h
rename to source/ui/service_menu.h
index 4ef6ec7..ca073e9 100644
--- a/source/service_menu.h
+++ b/source/ui/service_menu.h
@@ -5,7 +5,7 @@
 #include <string>
 #include <memory>
 #include "utils.h"
-#include "UIMessage.h"
+#include "ui_message.h"
 
 // Forward Declarations
 class Text;
diff --git a/source/UIMessage.cpp b/source/ui/ui_message.cpp
similarity index 99%
rename from source/UIMessage.cpp
rename to source/ui/ui_message.cpp
index ee27260..54f39c7 100644
--- a/source/UIMessage.cpp
+++ b/source/ui/ui_message.cpp
@@ -1,4 +1,4 @@
-#include "UIMessage.h"
+#include "ui_message.h"
 #include <cmath>    // Para pow
 #include "screen.h" // Para param y TEXT_CENTER
 
diff --git a/source/UIMessage.h b/source/ui/ui_message.h
similarity index 100%
rename from source/UIMessage.h
rename to source/ui/ui_message.h