diff --git a/birb/modules/menusystem/init.lua b/birb/modules/menusystem/init.lua
index 780796d..769077c 100644
--- a/birb/modules/menusystem/init.lua
+++ b/birb/modules/menusystem/init.lua
@@ -27,13 +27,13 @@ local cwd  = (...):gsub('%.init$', '') .. "."
 local MenuSystem = Object:extend()
 
 -- Load the differents menu object to get an easy access
-MenuSystem.Parent       = require(cwd .. "parent")
-MenuSystem.ListBox      = require(cwd .. "listbox")
-MenuSystem.FlowBox      = require(cwd .. "flowbox")
-MenuSystem.Grid         = require(cwd .. "grid")
+MenuSystem.Parent       = require(cwd .. "menus.parent")
+MenuSystem.ListBox      = require(cwd .. "menus.listbox")
+MenuSystem.FlowBox      = require(cwd .. "menus.flowbox")
+MenuSystem.Grid         = require(cwd .. "menus.grid")
 
 -- load widgets object
-MenuSystem.Widget       = require(cwd .. "widgets")
+MenuSystem.Widget       = require(cwd .. "menus.widgets")
 
 -- INIT FUNCTIONS
 -- Initialize and configure the menu controller
diff --git a/birb/modules/menusystem/flowbox.lua b/birb/modules/menusystem/menus/flowbox.lua
similarity index 100%
rename from birb/modules/menusystem/flowbox.lua
rename to birb/modules/menusystem/menus/flowbox.lua
diff --git a/birb/modules/menusystem/grid.lua b/birb/modules/menusystem/menus/grid.lua
similarity index 100%
rename from birb/modules/menusystem/grid.lua
rename to birb/modules/menusystem/menus/grid.lua
diff --git a/birb/modules/menusystem/hlistbox.lua b/birb/modules/menusystem/menus/hlistbox.lua
similarity index 100%
rename from birb/modules/menusystem/hlistbox.lua
rename to birb/modules/menusystem/menus/hlistbox.lua
diff --git a/birb/modules/menusystem/listbox.lua b/birb/modules/menusystem/menus/listbox.lua
similarity index 100%
rename from birb/modules/menusystem/listbox.lua
rename to birb/modules/menusystem/menus/listbox.lua
diff --git a/birb/modules/menusystem/parent.lua b/birb/modules/menusystem/menus/parent.lua
similarity index 100%
rename from birb/modules/menusystem/parent.lua
rename to birb/modules/menusystem/menus/parent.lua
diff --git a/birb/modules/menusystem/widgets/init.lua b/birb/modules/menusystem/menus/widgets/init.lua
similarity index 100%
rename from birb/modules/menusystem/widgets/init.lua
rename to birb/modules/menusystem/menus/widgets/init.lua
diff --git a/birb/modules/menusystem/widgets/utils.lua b/birb/modules/menusystem/menus/widgets/utils.lua
similarity index 100%
rename from birb/modules/menusystem/widgets/utils.lua
rename to birb/modules/menusystem/menus/widgets/utils.lua
diff --git a/examples/scenes/basic/test_menus/init.lua b/examples/scenes/basic/test_menus/init.lua
index 21bfe38..f5af5da 100644
--- a/examples/scenes/basic/test_menus/init.lua
+++ b/examples/scenes/basic/test_menus/init.lua
@@ -24,10 +24,10 @@
 local Scene = require "birb.modules.scenes"
 local TestScene = Scene:extend()
 
-local MenuType  = require "birb.modules.menusystem.listbox"
-local MenuType2 = require "birb.modules.menusystem.flowbox"
-local MenuType3 = require "birb.modules.menusystem.grid"
-local Widget    = require "birb.modules.menusystem.widgets"
+local MenuType  = require "birb.modules.menusystem.menus.listbox"
+local MenuType2 = require "birb.modules.menusystem.menus.flowbox"
+local MenuType3 = require "birb.modules.menusystem.menus.grid"
+local Widget    = require "birb.modules.menusystem.menus.widgets"
 
 local MenuWidget = Widget.Text:extend()
 
diff --git a/examples/scenes/gameplay/plateform/pause.lua b/examples/scenes/gameplay/plateform/pause.lua
index 734e005..cac6f66 100644
--- a/examples/scenes/gameplay/plateform/pause.lua
+++ b/examples/scenes/gameplay/plateform/pause.lua
@@ -1,5 +1,5 @@
-local ListMenu  = require "birb.modules.menusystem.listbox"
-local Widget    = require "birb.modules.menusystem.widgets"
+local ListMenu  = require "birb.modules.menusystem.menus.listbox"
+local Widget    = require "birb.modules.menusystem.menus.widgets"
 
 local PauseMenu = ListMenu:extend()
 
diff --git a/examples/scenes/mainmenu/init.lua b/examples/scenes/mainmenu/init.lua
index 68041d1..161bb9e 100644
--- a/examples/scenes/mainmenu/init.lua
+++ b/examples/scenes/mainmenu/init.lua
@@ -24,8 +24,8 @@
 local Scene     = require "birb.modules.scenes"
 local MainMenu  = Scene:extend()
 
-local ListBox   = require "birb.modules.menusystem.listbox"
-local Widget    = require "birb.modules.menusystem.widgets"
+local ListBox   = require "birb.modules.menusystem.menus.listbox"
+local Widget    = require "birb.modules.menusystem.menus.widgets"
 
 local SubMenuWidget = Widget.Text:extend()
 local SceneWidget   = Widget.Text:extend()
diff --git a/examples/scenes/menus/inventory/init.lua b/examples/scenes/menus/inventory/init.lua
index af94dac..e2566c4 100644
--- a/examples/scenes/menus/inventory/init.lua
+++ b/examples/scenes/menus/inventory/init.lua
@@ -24,9 +24,9 @@
 local Scene       = require "birb.modules.scenes"
 local Inventory   = Scene:extend()
 
-local HListBox  = require "birb.modules.menusystem.hlistbox"
-local FloxBox      = require "birb.modules.menusystem.flowbox"
-local Widget    = require "birb.modules.menusystem.widgets"
+local HListBox  = require "birb.modules.menusystem.menus.hlistbox"
+local FloxBox      = require "birb.modules.menusystem.menus.flowbox"
+local Widget    = require "birb.modules.menusystem.menus.widgets"
 
 local InventoryWidget = Widget.Text:extend()
 local ItemWidget      = Widget.Text:extend()
diff --git a/examples/scenes/menus/options/init.lua b/examples/scenes/menus/options/init.lua
index fb3ae28..86be3f0 100644
--- a/examples/scenes/menus/options/init.lua
+++ b/examples/scenes/menus/options/init.lua
@@ -24,7 +24,7 @@
 local Scene     = require "birb.modules.scenes"
 local OptionsMenu  = Scene:extend()
 
-local ListBox   = require "birb.modules.menusystem.listbox"
+local ListBox   = require "birb.modules.menusystem.menus.listbox"
 local Widgets   = require "scenes.menus.options.widgets"
 
 function OptionsMenu:new()
diff --git a/examples/scenes/menus/options/widgets.lua b/examples/scenes/menus/options/widgets.lua
index faa30bc..dcb19f0 100644
--- a/examples/scenes/menus/options/widgets.lua
+++ b/examples/scenes/menus/options/widgets.lua
@@ -23,7 +23,7 @@
 
 local widgets   = {}
 
-local Widget            = require "birb.modules.menusystem.widgets"
+local Widget            = require "birb.modules.menusystem.menus.widgets"
 local DoubleTextWidget  = Widget.Text:extend()
 
 widgets.SubMenu       = DoubleTextWidget:extend()