diff --git a/examples/scenes/basic/test_menus/init.lua b/examples/scenes/basic/test_menus/init.lua
index 39dc6e8..870f973 100644
--- a/examples/scenes/basic/test_menus/init.lua
+++ b/examples/scenes/basic/test_menus/init.lua
@@ -21,13 +21,13 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Scene = require "framework.modules.scenes"
+local Scene = require "framework.scenes"
 local TestScene = Scene:extend()
 
-local MenuType  = require "framework.modules.gui.menus.listbox"
-local MenuType2 = require "framework.modules.gui.menus.flowbox"
-local MenuType3 = require "framework.modules.gui.menus.grid"
-local Widget    = require "framework.modules.gui.menus.widgets"
+local MenuType  = require "framework.scenes.gui.menus.listbox"
+local MenuType2 = require "framework.scenes.gui.menus.flowbox"
+local MenuType3 = require "framework.scenes.gui.menus.grid"
+local Widget    = require "framework.scenes.gui.menus.widgets"
 
 local MenuWidget = Widget.Text:extend()
 
diff --git a/examples/scenes/basic/test_scene/init.lua b/examples/scenes/basic/test_scene/init.lua
index 95460dc..86bb229 100644
--- a/examples/scenes/basic/test_scene/init.lua
+++ b/examples/scenes/basic/test_scene/init.lua
@@ -21,7 +21,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Scene = require "framework.modules.scenes"
+local Scene = require "framework.scenes"
 local TestScene = Scene:extend()
 
 function TestScene:new()
diff --git a/examples/scenes/basic/test_scene2/actors/parent.lua b/examples/scenes/basic/test_scene2/actors/parent.lua
index 0c26297..ac33a8c 100644
--- a/examples/scenes/basic/test_scene2/actors/parent.lua
+++ b/examples/scenes/basic/test_scene2/actors/parent.lua
@@ -1,4 +1,4 @@
-local Base = require "framework.modules.world.actors.actor2D"
+local Base = require "framework.scenes.world.actors.actor2D"
 local Parent = Base:extend()
 
 function Parent:new(world, type, x, y, w, h)
diff --git a/examples/scenes/basic/test_scene2/init.lua b/examples/scenes/basic/test_scene2/init.lua
index 9f22f51..26deeeb 100644
--- a/examples/scenes/basic/test_scene2/init.lua
+++ b/examples/scenes/basic/test_scene2/init.lua
@@ -21,12 +21,12 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Scene = require "framework.modules.scenes"
+local Scene = require "framework.scenes"
 local TestScene = Scene:extend()
 
 local folder = "scenes/basic/test_scene2/"
 
-local World   = require "framework.modules.world.baseworld"
+local World   = require "framework.scenes.world.baseworld"
 
 function TestScene:new()
   TestScene.super.new(self)
diff --git a/examples/scenes/gameplay/action3D/actors/box.lua b/examples/scenes/gameplay/action3D/actors/box.lua
index 73b4a9a..4b7717d 100644
--- a/examples/scenes/gameplay/action3D/actors/box.lua
+++ b/examples/scenes/gameplay/action3D/actors/box.lua
@@ -1,4 +1,4 @@
-local Base = require "framework.modules.world.actors.actor3D"
+local Base = require "framework.scenes.world.actors.actor3D"
 local Box = Base:extend()
 
 function Box:new(world, x, y, z)
diff --git a/examples/scenes/gameplay/action3D/actors/coin.lua b/examples/scenes/gameplay/action3D/actors/coin.lua
index d8807a7..75714b4 100644
--- a/examples/scenes/gameplay/action3D/actors/coin.lua
+++ b/examples/scenes/gameplay/action3D/actors/coin.lua
@@ -1,4 +1,4 @@
-local Base = require "framework.modules.world.actors.actor3D"
+local Base = require "framework.scenes.world.actors.actor3D"
 local Coin = Base:extend()
 
 function Coin:new(world, x, y, z)
diff --git a/examples/scenes/gameplay/action3D/actors/init.lua b/examples/scenes/gameplay/action3D/actors/init.lua
index 94943db..7d17fe2 100644
--- a/examples/scenes/gameplay/action3D/actors/init.lua
+++ b/examples/scenes/gameplay/action3D/actors/init.lua
@@ -5,7 +5,7 @@ local cwd  = (...):gsub('%.init$', '') .. "."
 Obj.Player  = require(cwd .. "player")
 Obj.Box     = require(cwd .. "box")
 Obj.Coin    = require(cwd .. "coin")
-Obj.GFX     = require("framework.modules.world.actors.gfx3D")
+Obj.GFX     = require("framework.scenes.world.actors.gfx3D")
 
 Obj.index     = {}
 Obj.index["player"]   = Obj.Player
diff --git a/examples/scenes/gameplay/action3D/actors/parent.lua b/examples/scenes/gameplay/action3D/actors/parent.lua
index 48ccebf..aa39640 100644
--- a/examples/scenes/gameplay/action3D/actors/parent.lua
+++ b/examples/scenes/gameplay/action3D/actors/parent.lua
@@ -1,4 +1,4 @@
-local Base = require "framework.modules.world.actors.actor3D"
+local Base = require "framework.scenes.world.actors.actor3D"
 local Parent = Base:extend()
 
 function Parent:new(world, type, x, y, z, w, h, d, isSolid)
diff --git a/examples/scenes/gameplay/action3D/actors/wall.lua b/examples/scenes/gameplay/action3D/actors/wall.lua
index 07448f5..9cf1d1e 100644
--- a/examples/scenes/gameplay/action3D/actors/wall.lua
+++ b/examples/scenes/gameplay/action3D/actors/wall.lua
@@ -1,4 +1,4 @@
-local Base = require "framework.modules.world.actors.actor3D"
+local Base = require "framework.scenes.world.actors.actor3D"
 local Wall = Base:extend()
 
 function Wall:new(world, x, y, z, w, h, d)
diff --git a/examples/scenes/gameplay/action3D/init.lua b/examples/scenes/gameplay/action3D/init.lua
index 1bed8c9..63daf12 100644
--- a/examples/scenes/gameplay/action3D/init.lua
+++ b/examples/scenes/gameplay/action3D/init.lua
@@ -21,10 +21,10 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Scene = require "framework.modules.scenes"
+local Scene = require "framework.scenes"
 local MovePlayer = Scene:extend()
 
-local World = require "framework.modules.world.world3D"
+local World = require "framework.scenes.world.world3D"
 
 function MovePlayer:new(playerNumber, cameraMode)
   local playerNumber  = playerNumber or 1
diff --git a/examples/scenes/gameplay/moveplayer/actors/parent.lua b/examples/scenes/gameplay/moveplayer/actors/parent.lua
index 1ab7b24..9de5ea3 100644
--- a/examples/scenes/gameplay/moveplayer/actors/parent.lua
+++ b/examples/scenes/gameplay/moveplayer/actors/parent.lua
@@ -1,4 +1,4 @@
-local Base = require "framework.modules.world.actors.actor2D"
+local Base = require "framework.scenes.world.actors.actor2D"
 local Parent = Base:extend()
 
 function Parent:new(world, type, x, y, w, h, isSolid)
diff --git a/examples/scenes/gameplay/moveplayer/actors/wall.lua b/examples/scenes/gameplay/moveplayer/actors/wall.lua
index 8b0202f..2fa73dc 100644
--- a/examples/scenes/gameplay/moveplayer/actors/wall.lua
+++ b/examples/scenes/gameplay/moveplayer/actors/wall.lua
@@ -1,4 +1,4 @@
-local Base = require "framework.modules.world.actors.actor2D"
+local Base = require "framework.scenes.world.actors.actor2D"
 local Wall = Base:extend()
 
 function Wall:new(world, x, y, w, h)
diff --git a/examples/scenes/gameplay/moveplayer/init.lua b/examples/scenes/gameplay/moveplayer/init.lua
index cc08fb7..9691a7f 100644
--- a/examples/scenes/gameplay/moveplayer/init.lua
+++ b/examples/scenes/gameplay/moveplayer/init.lua
@@ -21,10 +21,10 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Scene = require "framework.modules.scenes"
+local Scene = require "framework.scenes"
 local MovePlayer = Scene:extend()
 
-local World = require "framework.modules.world.world2D"
+local World = require "framework.scenes.world.world2D"
 
 function MovePlayer:new(playerNumber, cameraMode)
   local playerNumber  = playerNumber or 1
diff --git a/examples/scenes/gameplay/moveplayer3D/actors/parent.lua b/examples/scenes/gameplay/moveplayer3D/actors/parent.lua
index a49826d..456450d 100644
--- a/examples/scenes/gameplay/moveplayer3D/actors/parent.lua
+++ b/examples/scenes/gameplay/moveplayer3D/actors/parent.lua
@@ -1,4 +1,4 @@
-local Base = require "framework.modules.world.actors.actor3D"
+local Base = require "framework.scenes.world.actors.actor3D"
 local Parent = Base:extend()
 
 function Parent:new(world, type, x, y, z, w, h, d, isSolid)
diff --git a/examples/scenes/gameplay/moveplayer3D/actors/wall.lua b/examples/scenes/gameplay/moveplayer3D/actors/wall.lua
index e599af3..137540a 100644
--- a/examples/scenes/gameplay/moveplayer3D/actors/wall.lua
+++ b/examples/scenes/gameplay/moveplayer3D/actors/wall.lua
@@ -1,4 +1,4 @@
-local Base = require "framework.modules.world.actors.actor3D"
+local Base = require "framework.scenes.world.actors.actor3D"
 local Wall = Base:extend()
 
 function Wall:new(world, x, y, z, w, h, d)
diff --git a/examples/scenes/gameplay/moveplayer3D/init.lua b/examples/scenes/gameplay/moveplayer3D/init.lua
index 52443e4..23a5266 100644
--- a/examples/scenes/gameplay/moveplayer3D/init.lua
+++ b/examples/scenes/gameplay/moveplayer3D/init.lua
@@ -21,10 +21,10 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Scene = require "framework.modules.scenes"
+local Scene = require "framework.scenes"
 local MovePlayer = Scene:extend()
 
-local World = require "framework.modules.world.world3D"
+local World = require "framework.scenes.world.world3D"
 
 function MovePlayer:new(playerNumber, cameraMode)
   local playerNumber  = playerNumber or 1
diff --git a/examples/scenes/gameplay/plateform/actors/coin.lua b/examples/scenes/gameplay/plateform/actors/coin.lua
index c3fb0b1..34e1003 100644
--- a/examples/scenes/gameplay/plateform/actors/coin.lua
+++ b/examples/scenes/gameplay/plateform/actors/coin.lua
@@ -1,4 +1,4 @@
-local Base = require "framework.modules.world.actors.actor2D"
+local Base = require "framework.scenes.world.actors.actor2D"
 local Coin = Base:extend()
 
 function Coin:new(world, x, y)
diff --git a/examples/scenes/gameplay/plateform/actors/init.lua b/examples/scenes/gameplay/plateform/actors/init.lua
index 50e75e4..7a7ff0c 100644
--- a/examples/scenes/gameplay/plateform/actors/init.lua
+++ b/examples/scenes/gameplay/plateform/actors/init.lua
@@ -4,7 +4,7 @@ local Obj = {}
 local cwd  = (...):gsub('%.init$', '') .. "."
 
 Obj.Player              = require(cwd .. "player")
-Obj.GFX                 = require("framework.modules.world.actors.gfx2D")
+Obj.GFX                 = require("framework.scenes.world.actors.gfx2D")
 
 Obj.index     = {}
 Obj.index["player"]     = require(cwd ..  "player")
diff --git a/examples/scenes/gameplay/plateform/actors/player.lua b/examples/scenes/gameplay/plateform/actors/player.lua
index 46ae764..43217a0 100644
--- a/examples/scenes/gameplay/plateform/actors/player.lua
+++ b/examples/scenes/gameplay/plateform/actors/player.lua
@@ -1,4 +1,4 @@
-local Base = require "framework.modules.world.actors.actor2D"
+local Base = require "framework.scenes.world.actors.actor2D"
 local Player = Base:extend()
 
 function Player:new(world, x, y, id)
diff --git a/examples/scenes/gameplay/plateform/actors/wall.lua b/examples/scenes/gameplay/plateform/actors/wall.lua
index d5bcbf7..20893c2 100644
--- a/examples/scenes/gameplay/plateform/actors/wall.lua
+++ b/examples/scenes/gameplay/plateform/actors/wall.lua
@@ -1,4 +1,4 @@
-local Base = require "framework.modules.world.actors.actor2D"
+local Base = require "framework.scenes.world.actors.actor2D"
 local Wall = Base:extend()
 
 function Wall:new(world, x, y, w, h)
diff --git a/examples/scenes/gameplay/plateform/init.lua b/examples/scenes/gameplay/plateform/init.lua
index cc12ee0..1660bd3 100644
--- a/examples/scenes/gameplay/plateform/init.lua
+++ b/examples/scenes/gameplay/plateform/init.lua
@@ -21,10 +21,10 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Scene = require "framework.modules.scenes"
+local Scene = require "framework.scenes"
 local Plateformer = Scene:extend()
 
-local World = require "framework.modules.world.world2D"
+local World = require "framework.scenes.world.world2D"
 local Pause = require "scenes.gameplay.plateform.pause"
 
 function Plateformer:new()
diff --git a/examples/scenes/gameplay/plateform/pause.lua b/examples/scenes/gameplay/plateform/pause.lua
index 2c9f683..66e6035 100644
--- a/examples/scenes/gameplay/plateform/pause.lua
+++ b/examples/scenes/gameplay/plateform/pause.lua
@@ -1,5 +1,5 @@
-local ListMenu  = require "framework.modules.gui.menus.listbox"
-local Widget    = require "framework.modules.gui.menus.widgets"
+local ListMenu  = require "framework.scenes.gui.menus.listbox"
+local Widget    = require "framework.scenes.gui.menus.widgets"
 
 local PauseMenu = ListMenu:extend()
 
diff --git a/examples/scenes/mainmenu/init.lua b/examples/scenes/mainmenu/init.lua
index ce76b9b..5621cfc 100644
--- a/examples/scenes/mainmenu/init.lua
+++ b/examples/scenes/mainmenu/init.lua
@@ -21,7 +21,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Scene     = require "framework.modules.scenes"
+local Scene     = require "framework.scenes"
 local MainMenu  = Scene:extend()
 
 local Menu = require "scenes.mainmenu.menu"
diff --git a/examples/scenes/mainmenu/menu.lua b/examples/scenes/mainmenu/menu.lua
index 3033d7e..9101269 100644
--- a/examples/scenes/mainmenu/menu.lua
+++ b/examples/scenes/mainmenu/menu.lua
@@ -1,7 +1,7 @@
-local Parent = require "framework.modules.gui.textmenu"
+local Parent = require "framework.scenes.gui.textmenu"
 local MainMenu = Parent:extend()
 
-local defTransitions = require "framework.modules.transitions"
+local defTransitions = require "framework.scenes.transitions"
 
 local MENU_X, MENU_Y = 24, 48
 local MENU_W = 424/3
diff --git a/examples/scenes/menus/inventory/init.lua b/examples/scenes/menus/inventory/init.lua
index f829520..22dfaf2 100644
--- a/examples/scenes/menus/inventory/init.lua
+++ b/examples/scenes/menus/inventory/init.lua
@@ -21,12 +21,12 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Scene       = require "framework.modules.scenes"
+local Scene       = require "framework.scenes"
 local Inventory   = Scene:extend()
 
-local HListBox  = require "framework.modules.gui.menus.hlistbox"
-local FloxBox      = require "framework.modules.gui.menus.flowbox"
-local Widget    = require "framework.modules.gui.menus.widgets"
+local HListBox  = require "framework.scenes.gui.menus.hlistbox"
+local FloxBox      = require "framework.scenes.gui.menus.flowbox"
+local Widget    = require "framework.scenes.gui.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 d879f3b..8be6ece 100644
--- a/examples/scenes/menus/options/init.lua
+++ b/examples/scenes/menus/options/init.lua
@@ -21,7 +21,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Scene     = require "framework.modules.scenes"
+local Scene     = require "framework.scenes"
 local OptionsMenu  = Scene:extend()
 
 local Widgets   = require "scenes.menus.options.widgets"
diff --git a/examples/scenes/menus/options/menu.lua b/examples/scenes/menus/options/menu.lua
index 4614bc5..5f1ff28 100644
--- a/examples/scenes/menus/options/menu.lua
+++ b/examples/scenes/menus/options/menu.lua
@@ -1,4 +1,4 @@
-local TextMenu   = require "framework.modules.gui.textmenu"
+local TextMenu   = require "framework.scenes.gui.textmenu"
 local OptionMenu = TextMenu:extend()
 
 local consts = require "scenes.menus.options.consts"
diff --git a/examples/scenes/menus/options/widgets.lua b/examples/scenes/menus/options/widgets.lua
index 284e9d8..65df85e 100644
--- a/examples/scenes/menus/options/widgets.lua
+++ b/examples/scenes/menus/options/widgets.lua
@@ -23,7 +23,7 @@
 
 local widgets   = {}
 
-local Widget            = require "framework.modules.gui.textmenu.widgets.basic"
+local Widget            = require "framework.scenes.gui.textmenu.widgets.basic"
 local DoubleTextWidget  = Widget:extend()
 
 widgets.SubMenu       = DoubleTextWidget:extend()
diff --git a/framework/modules/transitions/init.lua b/framework/modules/transitions/init.lua
deleted file mode 100644
index 8ba0eb4..0000000
--- a/framework/modules/transitions/init.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-return {
-    default = require "framework.modules.transitions.default",
-    circle = require "framework.modules.transitions.circle"
-}
\ No newline at end of file
diff --git a/framework/modules/assets/init.lua b/framework/scenes/assets/init.lua
similarity index 100%
rename from framework/modules/assets/init.lua
rename to framework/scenes/assets/init.lua
diff --git a/framework/modules/assets/types/animator.lua b/framework/scenes/assets/types/animator.lua
similarity index 100%
rename from framework/modules/assets/types/animator.lua
rename to framework/scenes/assets/types/animator.lua
diff --git a/framework/modules/assets/types/autotile.lua b/framework/scenes/assets/types/autotile.lua
similarity index 100%
rename from framework/modules/assets/types/autotile.lua
rename to framework/scenes/assets/types/autotile.lua
diff --git a/framework/modules/assets/types/background.lua b/framework/scenes/assets/types/background.lua
similarity index 100%
rename from framework/modules/assets/types/background.lua
rename to framework/scenes/assets/types/background.lua
diff --git a/framework/modules/assets/types/fonts.lua b/framework/scenes/assets/types/fonts.lua
similarity index 100%
rename from framework/modules/assets/types/fonts.lua
rename to framework/scenes/assets/types/fonts.lua
diff --git a/framework/modules/assets/types/imagefonts.lua b/framework/scenes/assets/types/imagefonts.lua
similarity index 100%
rename from framework/modules/assets/types/imagefonts.lua
rename to framework/scenes/assets/types/imagefonts.lua
diff --git a/framework/modules/assets/types/sfx.lua b/framework/scenes/assets/types/sfx.lua
similarity index 100%
rename from framework/modules/assets/types/sfx.lua
rename to framework/scenes/assets/types/sfx.lua
diff --git a/framework/modules/assets/types/sprites.lua b/framework/scenes/assets/types/sprites.lua
similarity index 100%
rename from framework/modules/assets/types/sprites.lua
rename to framework/scenes/assets/types/sprites.lua
diff --git a/framework/modules/assets/types/texture.lua b/framework/scenes/assets/types/texture.lua
similarity index 100%
rename from framework/modules/assets/types/texture.lua
rename to framework/scenes/assets/types/texture.lua
diff --git a/framework/modules/assets/types/tileset.lua b/framework/scenes/assets/types/tileset.lua
similarity index 100%
rename from framework/modules/assets/types/tileset.lua
rename to framework/scenes/assets/types/tileset.lua
diff --git a/framework/modules/gui/elements/assets.lua b/framework/scenes/gui/elements/assets.lua
similarity index 84%
rename from framework/modules/gui/elements/assets.lua
rename to framework/scenes/gui/elements/assets.lua
index f5b6cae..daa2ccf 100644
--- a/framework/modules/gui/elements/assets.lua
+++ b/framework/scenes/gui/elements/assets.lua
@@ -1,4 +1,4 @@
-local Parent = require "framework.modules.gui.elements.drawable"
+local Parent = require "framework.scenes.gui.elements.drawable"
 local AssetElement = Parent:extend()
 
 function AssetElement:new(name, assetType, assetName, x, y,r,sx,sy,ox,oy, opacity)
diff --git a/framework/modules/gui/elements/canvas.lua b/framework/scenes/gui/elements/canvas.lua
similarity index 96%
rename from framework/modules/gui/elements/canvas.lua
rename to framework/scenes/gui/elements/canvas.lua
index ff43e3a..07d3565 100644
--- a/framework/modules/gui/elements/canvas.lua
+++ b/framework/scenes/gui/elements/canvas.lua
@@ -1,4 +1,4 @@
-local Parent = require "framework.modules.gui.elements.parent"
+local Parent = require "framework.scenes.gui.elements.parent"
 local CanvasElement = Parent:extend()
 
 function CanvasElement:new(name, x, y, w, h, r,sx,sy,ox,oy, opacity)
diff --git a/framework/modules/gui/elements/color.lua b/framework/scenes/gui/elements/color.lua
similarity index 85%
rename from framework/modules/gui/elements/color.lua
rename to framework/scenes/gui/elements/color.lua
index 8645e99..07d4849 100644
--- a/framework/modules/gui/elements/color.lua
+++ b/framework/scenes/gui/elements/color.lua
@@ -1,4 +1,4 @@
-local Parent = require "framework.modules.gui.elements.parent"
+local Parent = require "framework.scenes.gui.elements.parent"
 local ColorElement = Parent:extend()
 
 function ColorElement:new(name, r, g, b, opacity)
diff --git a/framework/modules/gui/elements/composite.lua b/framework/scenes/gui/elements/composite.lua
similarity index 91%
rename from framework/modules/gui/elements/composite.lua
rename to framework/scenes/gui/elements/composite.lua
index c17f3d9..47fb58f 100644
--- a/framework/modules/gui/elements/composite.lua
+++ b/framework/scenes/gui/elements/composite.lua
@@ -1,4 +1,4 @@
-local Parent = require "framework.modules.gui.elements.parent"
+local Parent = require "framework.scenes.gui.elements.parent"
 local CompositeElement = Parent:extend()
 
 function CompositeElement:new(name, x, y, childrenList)
diff --git a/framework/modules/gui/elements/counter.lua b/framework/scenes/gui/elements/counter.lua
similarity index 80%
rename from framework/modules/gui/elements/counter.lua
rename to framework/scenes/gui/elements/counter.lua
index 76e17f6..47f95bb 100644
--- a/framework/modules/gui/elements/counter.lua
+++ b/framework/scenes/gui/elements/counter.lua
@@ -1,4 +1,4 @@
-local Parent = require "framework.modules.gui.elements.variable"
+local Parent = require "framework.scenes.gui.elements.variable"
 local CounterElement = Parent:extend()
 
 function CounterElement:new(name, fontName, object, varName, nbrs, x, y, align)
diff --git a/framework/modules/gui/elements/drawable.lua b/framework/scenes/gui/elements/drawable.lua
similarity index 90%
rename from framework/modules/gui/elements/drawable.lua
rename to framework/scenes/gui/elements/drawable.lua
index d0adbad..966eaeb 100644
--- a/framework/modules/gui/elements/drawable.lua
+++ b/framework/scenes/gui/elements/drawable.lua
@@ -1,4 +1,4 @@
-local Parent = require "framework.modules.gui.elements.parent"
+local Parent = require "framework.scenes.gui.elements.parent"
 local DrawableElement = Parent:extend()
 
 function DrawableElement:new(name, drawable, x, y,r,sx,sy,ox,oy, opacity)
diff --git a/framework/modules/gui/elements/parent.lua b/framework/scenes/gui/elements/parent.lua
similarity index 100%
rename from framework/modules/gui/elements/parent.lua
rename to framework/scenes/gui/elements/parent.lua
diff --git a/framework/modules/gui/elements/text.lua b/framework/scenes/gui/elements/text.lua
similarity index 86%
rename from framework/modules/gui/elements/text.lua
rename to framework/scenes/gui/elements/text.lua
index 7bef983..0529fe6 100644
--- a/framework/modules/gui/elements/text.lua
+++ b/framework/scenes/gui/elements/text.lua
@@ -1,4 +1,4 @@
-local Parent = require "framework.modules.gui.elements.parent"
+local Parent = require "framework.scenes.gui.elements.parent"
 local TextElement = Parent:extend()
 
 function TextElement:new(name, fontName, text, x, y, align)
diff --git a/framework/modules/gui/elements/tile.lua b/framework/scenes/gui/elements/tile.lua
similarity index 87%
rename from framework/modules/gui/elements/tile.lua
rename to framework/scenes/gui/elements/tile.lua
index 49f05b1..a589f96 100644
--- a/framework/modules/gui/elements/tile.lua
+++ b/framework/scenes/gui/elements/tile.lua
@@ -1,4 +1,4 @@
-local Parent = require "framework.modules.gui.elements.drawable"
+local Parent = require "framework.scenes.gui.elements.drawable"
 local TileElement = Parent:extend()
 
 function TileElement:new(name, assetName, id, x, y,r,sx,sy,ox,oy, opacity)
diff --git a/framework/modules/gui/elements/variable.lua b/framework/scenes/gui/elements/variable.lua
similarity index 79%
rename from framework/modules/gui/elements/variable.lua
rename to framework/scenes/gui/elements/variable.lua
index a1dcea3..b56083e 100644
--- a/framework/modules/gui/elements/variable.lua
+++ b/framework/scenes/gui/elements/variable.lua
@@ -1,4 +1,4 @@
-local Parent = require "framework.modules.gui.elements.text"
+local Parent = require "framework.scenes.gui.elements.text"
 local VariableElement = Parent:extend()
 
 function VariableElement:new(name, fontName, object, varName, x, y, align)
diff --git a/framework/modules/gui/init.lua b/framework/scenes/gui/init.lua
similarity index 97%
rename from framework/modules/gui/init.lua
rename to framework/scenes/gui/init.lua
index 00a4f44..80c22d0 100644
--- a/framework/modules/gui/init.lua
+++ b/framework/scenes/gui/init.lua
@@ -23,8 +23,8 @@
 
 local Gui = Object:extend()
 
-local ElementList = require "framework.modules.gui.mixins.elements"
-local ScreenList = require "framework.modules.gui.mixins.screens"
+local ElementList = require "framework.scenes.gui.mixins.elements"
+local ScreenList = require "framework.scenes.gui.mixins.screens"
 Gui:implement(ScreenList)
 Gui:implement(ElementList)
 
diff --git a/framework/modules/gui/menus/flowbox.lua b/framework/scenes/gui/menus/flowbox.lua
similarity index 100%
rename from framework/modules/gui/menus/flowbox.lua
rename to framework/scenes/gui/menus/flowbox.lua
diff --git a/framework/modules/gui/menus/grid.lua b/framework/scenes/gui/menus/grid.lua
similarity index 99%
rename from framework/modules/gui/menus/grid.lua
rename to framework/scenes/gui/menus/grid.lua
index bf5f12f..b30b213 100644
--- a/framework/modules/gui/menus/grid.lua
+++ b/framework/scenes/gui/menus/grid.lua
@@ -26,7 +26,7 @@ local cwd  = (...):gsub('%.grid$', '') .. "."
 local Menu = require(cwd .. "parent")
 local GridBox = Menu:extend()
 
-local View2D = require "framework.modules.gui.menus.views.view2D"
+local View2D = require "framework.scenes.gui.menus.views.view2D"
 
 -- INIT FUNCTIONS
 -- Initialize and configure the menu
diff --git a/framework/modules/gui/menus/hlistbox.lua b/framework/scenes/gui/menus/hlistbox.lua
similarity index 100%
rename from framework/modules/gui/menus/hlistbox.lua
rename to framework/scenes/gui/menus/hlistbox.lua
diff --git a/framework/modules/gui/menus/listbox.lua b/framework/scenes/gui/menus/listbox.lua
similarity index 100%
rename from framework/modules/gui/menus/listbox.lua
rename to framework/scenes/gui/menus/listbox.lua
diff --git a/framework/modules/gui/menus/model/init.lua b/framework/scenes/gui/menus/model/init.lua
similarity index 98%
rename from framework/modules/gui/menus/model/init.lua
rename to framework/scenes/gui/menus/model/init.lua
index 39d0a29..601a003 100644
--- a/framework/modules/gui/menus/model/init.lua
+++ b/framework/scenes/gui/menus/model/init.lua
@@ -1,5 +1,5 @@
 local MenuModel = Object:extend()
-local Page = require "framework.modules.gui.menus.model.page"
+local Page = require "framework.scenes.gui.menus.model.page"
 
 local function updateWidgetByOrder(a, b)
     if a.order ~= b.order then
diff --git a/framework/modules/gui/menus/model/page.lua b/framework/scenes/gui/menus/model/page.lua
similarity index 100%
rename from framework/modules/gui/menus/model/page.lua
rename to framework/scenes/gui/menus/model/page.lua
diff --git a/framework/modules/gui/menus/parent.lua b/framework/scenes/gui/menus/parent.lua
similarity index 96%
rename from framework/modules/gui/menus/parent.lua
rename to framework/scenes/gui/menus/parent.lua
index 74bf30b..34b06a3 100644
--- a/framework/modules/gui/menus/parent.lua
+++ b/framework/scenes/gui/menus/parent.lua
@@ -21,12 +21,12 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local GuiElement = require "framework.modules.gui.elements.canvas"
+local GuiElement = require "framework.scenes.gui.elements.canvas"
 
 local Menu = GuiElement:extend()
-local MenuModel = require "framework.modules.gui.menus.model"
+local MenuModel = require "framework.scenes.gui.menus.model"
 
-local menuUtils = require "framework.modules.gui.utils"
+local menuUtils = require "framework.scenes.gui.utils"
 
 -- INIT FUNCTIONS
 -- Initialize and configure functions.
diff --git a/framework/modules/gui/menus/views/view1D.lua b/framework/scenes/gui/menus/views/view1D.lua
similarity index 100%
rename from framework/modules/gui/menus/views/view1D.lua
rename to framework/scenes/gui/menus/views/view1D.lua
diff --git a/framework/modules/gui/menus/views/view2D.lua b/framework/scenes/gui/menus/views/view2D.lua
similarity index 96%
rename from framework/modules/gui/menus/views/view2D.lua
rename to framework/scenes/gui/menus/views/view2D.lua
index 5043737..1e3047e 100644
--- a/framework/modules/gui/menus/views/view2D.lua
+++ b/framework/scenes/gui/menus/views/view2D.lua
@@ -21,7 +21,7 @@
   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
-local View1D = require "framework.modules.gui.menus.views.view1D"
+local View1D = require "framework.scenes.gui.menus.views.view1D"
 local View2D = View1D:extend()
 
 function View2D:new(colNumber, lineNumber)
diff --git a/framework/modules/gui/menus/widgets/base.lua b/framework/scenes/gui/menus/widgets/base.lua
similarity index 100%
rename from framework/modules/gui/menus/widgets/base.lua
rename to framework/scenes/gui/menus/widgets/base.lua
diff --git a/framework/modules/gui/menus/widgets/init.lua b/framework/scenes/gui/menus/widgets/init.lua
similarity index 90%
rename from framework/modules/gui/menus/widgets/init.lua
rename to framework/scenes/gui/menus/widgets/init.lua
index b9d2b85..b37e0a3 100644
--- a/framework/modules/gui/menus/widgets/init.lua
+++ b/framework/scenes/gui/menus/widgets/init.lua
@@ -24,7 +24,7 @@
 local Widget = {}
 
 -- Add the widget as subvariable to the returned table
-Widget.Base   = require "framework.modules.gui.menus.widgets.base"
-Widget.Text   = require "framework.modules.gui.menus.widgets.text"
+Widget.Base   = require "framework.scenes.gui.menus.widgets.base"
+Widget.Text   = require "framework.scenes.gui.menus.widgets.text"
 
 return Widget
diff --git a/framework/modules/gui/menus/widgets/text.lua b/framework/scenes/gui/menus/widgets/text.lua
similarity index 98%
rename from framework/modules/gui/menus/widgets/text.lua
rename to framework/scenes/gui/menus/widgets/text.lua
index 84d1e2f..56f72e5 100644
--- a/framework/modules/gui/menus/widgets/text.lua
+++ b/framework/scenes/gui/menus/widgets/text.lua
@@ -20,7 +20,7 @@
   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
-local BaseWidget = require "framework.modules.gui.menus.widgets.base"
+local BaseWidget = require "framework.scenes.gui.menus.widgets.base"
 local TextWidget = BaseWidget:extend()
 
 -- TEXT WIDGET
diff --git a/framework/modules/gui/mixins/elements.lua b/framework/scenes/gui/mixins/elements.lua
similarity index 100%
rename from framework/modules/gui/mixins/elements.lua
rename to framework/scenes/gui/mixins/elements.lua
diff --git a/framework/modules/gui/mixins/screens.lua b/framework/scenes/gui/mixins/screens.lua
similarity index 100%
rename from framework/modules/gui/mixins/screens.lua
rename to framework/scenes/gui/mixins/screens.lua
diff --git a/framework/modules/gui/screen/init.lua b/framework/scenes/gui/screen/init.lua
similarity index 96%
rename from framework/modules/gui/screen/init.lua
rename to framework/scenes/gui/screen/init.lua
index 16eea34..cd91bdb 100644
--- a/framework/modules/gui/screen/init.lua
+++ b/framework/scenes/gui/screen/init.lua
@@ -1,9 +1,9 @@
 local GuiScreen = Object:extend()
-local ElementList = require "framework.modules.gui.mixins.elements"
+local ElementList = require "framework.scenes.gui.mixins.elements"
 GuiScreen:implement(ElementList)
 
 local TweenManager = require "framework.classes.time"
-local ScreenSet = require "framework.modules.gui.screen.screenset"
+local ScreenSet = require "framework.scenes.gui.screen.screenset"
 
 local elementDataStruct = require "framework.structures.elementData"
 
diff --git a/framework/modules/gui/screen/screenset.lua b/framework/scenes/gui/screen/screenset.lua
similarity index 100%
rename from framework/modules/gui/screen/screenset.lua
rename to framework/scenes/gui/screen/screenset.lua
diff --git a/framework/modules/gui/textmenu/init.lua b/framework/scenes/gui/textmenu/init.lua
similarity index 95%
rename from framework/modules/gui/textmenu/init.lua
rename to framework/scenes/gui/textmenu/init.lua
index ca2e25f..6806ffe 100644
--- a/framework/modules/gui/textmenu/init.lua
+++ b/framework/scenes/gui/textmenu/init.lua
@@ -24,10 +24,10 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local ListBox = require "framework.modules.gui.menus.listbox"
+local ListBox = require "framework.scenes.gui.menus.listbox"
 local TextMenu = ListBox:extend()
 
-TextMenu.baseWidgets = require "framework.modules.gui.textmenu.widgets"
+TextMenu.baseWidgets = require "framework.scenes.gui.textmenu.widgets"
 
 local BASE_PADDING = 8
 
diff --git a/framework/modules/gui/textmenu/widgets/back.lua b/framework/scenes/gui/textmenu/widgets/back.lua
similarity index 93%
rename from framework/modules/gui/textmenu/widgets/back.lua
rename to framework/scenes/gui/textmenu/widgets/back.lua
index 95a641a..80f2326 100644
--- a/framework/modules/gui/textmenu/widgets/back.lua
+++ b/framework/scenes/gui/textmenu/widgets/back.lua
@@ -21,7 +21,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local TextMenuWidget = require "framework.modules.gui.textmenu.widgets.basic"
+local TextMenuWidget = require "framework.scenes.gui.textmenu.widgets.basic"
 
 local BackWidget = TextMenuWidget:extend()
 
diff --git a/framework/modules/gui/textmenu/widgets/basic.lua b/framework/scenes/gui/textmenu/widgets/basic.lua
similarity index 95%
rename from framework/modules/gui/textmenu/widgets/basic.lua
rename to framework/scenes/gui/textmenu/widgets/basic.lua
index 6cc74b3..07a37d9 100644
--- a/framework/modules/gui/textmenu/widgets/basic.lua
+++ b/framework/scenes/gui/textmenu/widgets/basic.lua
@@ -23,7 +23,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local TextWidget = require "framework.modules.gui.menus.widgets.text"
+local TextWidget = require "framework.scenes.gui.menus.widgets.text"
 
 local TextMenuWidget = TextWidget:extend()
 
diff --git a/framework/modules/gui/textmenu/widgets/init.lua b/framework/scenes/gui/textmenu/widgets/init.lua
similarity index 85%
rename from framework/modules/gui/textmenu/widgets/init.lua
rename to framework/scenes/gui/textmenu/widgets/init.lua
index 69c0f48..89c967c 100644
--- a/framework/modules/gui/textmenu/widgets/init.lua
+++ b/framework/scenes/gui/textmenu/widgets/init.lua
@@ -24,8 +24,8 @@
 local Widget = {}
 
 -- Add the widget as subvariable to the returned table
-Widget.Base   = require "framework.modules.gui.textmenu.widgets.basic"
-Widget.SubMenu= require "framework.modules.gui.textmenu.widgets.submenu"
-Widget.Back   = require "framework.modules.gui.textmenu.widgets.back"
+Widget.Base   = require "framework.scenes.gui.textmenu.widgets.basic"
+Widget.SubMenu= require "framework.scenes.gui.textmenu.widgets.submenu"
+Widget.Back   = require "framework.scenes.gui.textmenu.widgets.back"
 
 return Widget
diff --git a/framework/modules/gui/textmenu/widgets/submenu.lua b/framework/scenes/gui/textmenu/widgets/submenu.lua
similarity index 93%
rename from framework/modules/gui/textmenu/widgets/submenu.lua
rename to framework/scenes/gui/textmenu/widgets/submenu.lua
index b3d8253..faf5d84 100644
--- a/framework/modules/gui/textmenu/widgets/submenu.lua
+++ b/framework/scenes/gui/textmenu/widgets/submenu.lua
@@ -22,7 +22,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local TextMenuWidget = require "framework.modules.gui.textmenu.widgets.basic"
+local TextMenuWidget = require "framework.scenes.gui.textmenu.widgets.basic"
 
 local SubmenuWidget = TextMenuWidget:extend()
 
diff --git a/framework/modules/gui/utils.lua b/framework/scenes/gui/utils.lua
similarity index 100%
rename from framework/modules/gui/utils.lua
rename to framework/scenes/gui/utils.lua
diff --git a/framework/modules/scenes.lua b/framework/scenes/init.lua
similarity index 97%
rename from framework/modules/scenes.lua
rename to framework/scenes/init.lua
index 59ddeb8..8ce0ae4 100644
--- a/framework/modules/scenes.lua
+++ b/framework/scenes/init.lua
@@ -22,12 +22,10 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local cwd  = (...):gsub('%.scenes$', '') .. "."
-
 local Scene  = Object:extend()
 
-local Assets      = require(cwd .. "assets")
-local Gui = require (cwd .. "gui")
+local Assets  = require "framework.scenes.assets"
+local Gui     = require "framework.scenes.gui"
 
 -- INIT FUNCTIONS
 -- Initialize and configure the scene
diff --git a/framework/modules/transitions/canvas.lua b/framework/scenes/transitions/canvas.lua
similarity index 89%
rename from framework/modules/transitions/canvas.lua
rename to framework/scenes/transitions/canvas.lua
index 468d378..589171a 100644
--- a/framework/modules/transitions/canvas.lua
+++ b/framework/scenes/transitions/canvas.lua
@@ -1,4 +1,4 @@
-local TransitionParent = require "framework.modules.transitions.parent"
+local TransitionParent = require "framework.scenes.transitions.parent"
 local CanvasTransition = TransitionParent:extend()
 
 function CanvasTransition:new(func, ox, oy, fadeOut, easeIn, easeOut, duration, wait)
diff --git a/framework/modules/transitions/circle.lua b/framework/scenes/transitions/circle.lua
similarity index 83%
rename from framework/modules/transitions/circle.lua
rename to framework/scenes/transitions/circle.lua
index 7ea4422..8e9d35c 100644
--- a/framework/modules/transitions/circle.lua
+++ b/framework/scenes/transitions/circle.lua
@@ -1,4 +1,4 @@
-local TransitionParent = require "framework.modules.transitions.canvas"
+local TransitionParent = require "framework.scenes.transitions.canvas"
 local DefaultTransition = TransitionParent:extend()
 
 function DefaultTransition:new(func, ox, oy, fadeOut)
diff --git a/framework/modules/transitions/decal.lua b/framework/scenes/transitions/decal.lua
similarity index 88%
rename from framework/modules/transitions/decal.lua
rename to framework/scenes/transitions/decal.lua
index 54e71e5..6f68e65 100644
--- a/framework/modules/transitions/decal.lua
+++ b/framework/scenes/transitions/decal.lua
@@ -1,4 +1,4 @@
-local TransitionParent = require "framework.modules.transitions.canvas"
+local TransitionParent = require "framework.scenes.transitions.canvas"
 local DecalTransition = TransitionParent:extend()
 
 function DecalTransition:new(func, ox, oy, fadeOut, decal)
diff --git a/framework/modules/transitions/default.lua b/framework/scenes/transitions/default.lua
similarity index 79%
rename from framework/modules/transitions/default.lua
rename to framework/scenes/transitions/default.lua
index a1d7800..c96049a 100644
--- a/framework/modules/transitions/default.lua
+++ b/framework/scenes/transitions/default.lua
@@ -1,4 +1,4 @@
-local TransitionParent = require "framework.modules.transitions.parent"
+local TransitionParent = require "framework.scenes.transitions.parent"
 local DefaultTransition = TransitionParent:extend()
 
 function DefaultTransition:new(func, ox, oy, fadeOut)
diff --git a/framework/scenes/transitions/init.lua b/framework/scenes/transitions/init.lua
new file mode 100644
index 0000000..da16750
--- /dev/null
+++ b/framework/scenes/transitions/init.lua
@@ -0,0 +1,4 @@
+return {
+    default = require "framework.scenes.transitions.default",
+    circle = require "framework.scenes.transitions.circle"
+}
\ No newline at end of file
diff --git a/framework/modules/transitions/parent.lua b/framework/scenes/transitions/parent.lua
similarity index 100%
rename from framework/modules/transitions/parent.lua
rename to framework/scenes/transitions/parent.lua
diff --git a/framework/modules/world/actors/actor2D.lua b/framework/scenes/world/actors/actor2D.lua
similarity index 90%
rename from framework/modules/world/actors/actor2D.lua
rename to framework/scenes/world/actors/actor2D.lua
index 5ddcda7..cd88baf 100644
--- a/framework/modules/world/actors/actor2D.lua
+++ b/framework/scenes/world/actors/actor2D.lua
@@ -23,11 +23,11 @@
 ]]
 local Rect = require "framework.classes.2D.rect"
 
-local BaseActor = require "framework.modules.world.actors.mixins.base"
-local SpritedActor = require("framework.modules.world.actors.mixins.sprites")
-local TimedActor = require("framework.modules.world.actors.mixins.timers")
-local InputActor = require("framework.modules.world.actors.mixins.inputs")
-local PhysicalActor = require("framework.modules.world.actors.mixins.physics")
+local BaseActor = require "framework.scenes.world.actors.mixins.base"
+local SpritedActor = require("framework.scenes.world.actors.mixins.sprites")
+local TimedActor = require("framework.scenes.world.actors.mixins.timers")
+local InputActor = require("framework.scenes.world.actors.mixins.inputs")
+local PhysicalActor = require("framework.scenes.world.actors.mixins.physics")
 
 local Actor2D = Rect:extend()
 Actor2D:implement(BaseActor)
@@ -36,7 +36,7 @@ Actor2D:implement(TimedActor)
 Actor2D:implement(InputActor)
 Actor2D:implement(PhysicalActor)
 
-local Hitbox  = require "framework.modules.world.actors.utils.hitbox2D"
+local Hitbox  = require "framework.scenes.world.actors.utils.hitbox2D"
 
 -- INIT FUNCTIONS
 -- Initialise the actor and its base functions
diff --git a/framework/modules/world/actors/actor3D.lua b/framework/scenes/world/actors/actor3D.lua
similarity index 89%
rename from framework/modules/world/actors/actor3D.lua
rename to framework/scenes/world/actors/actor3D.lua
index 7b628ff..728a0c0 100644
--- a/framework/modules/world/actors/actor3D.lua
+++ b/framework/scenes/world/actors/actor3D.lua
@@ -22,16 +22,16 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Hitbox  = require("framework.modules.world.actors.utils.hitbox3D")
-local Boxes   = require("framework.modules.world.actors.utils.boxes")
+local Hitbox  = require("framework.scenes.world.actors.utils.hitbox3D")
+local Boxes   = require("framework.scenes.world.actors.utils.boxes")
 local BasicBox = require "framework.classes.3D.box"
 
-local BaseActor = require("framework.modules.world.actors.mixins.base")
-local SpritedActor = require("framework.modules.world.actors.mixins.sprites")
-local TimedActor = require("framework.modules.world.actors.mixins.timers")
-local InputActor = require("framework.modules.world.actors.mixins.inputs")
-local PhysicalActor = require("framework.modules.world.actors.mixins.physics")
-local Shape3DActor = require("framework.modules.world.actors.mixins.shapes")
+local BaseActor = require("framework.scenes.world.actors.mixins.base")
+local SpritedActor = require("framework.scenes.world.actors.mixins.sprites")
+local TimedActor = require("framework.scenes.world.actors.mixins.timers")
+local InputActor = require("framework.scenes.world.actors.mixins.inputs")
+local PhysicalActor = require("framework.scenes.world.actors.mixins.physics")
+local Shape3DActor = require("framework.scenes.world.actors.mixins.shapes")
 
 local Actor3D = BasicBox:extend()
 Actor3D:implement(BaseActor)
diff --git a/framework/modules/world/actors/gfx2D.lua b/framework/scenes/world/actors/gfx2D.lua
similarity index 100%
rename from framework/modules/world/actors/gfx2D.lua
rename to framework/scenes/world/actors/gfx2D.lua
diff --git a/framework/modules/world/actors/gfx3D.lua b/framework/scenes/world/actors/gfx3D.lua
similarity index 100%
rename from framework/modules/world/actors/gfx3D.lua
rename to framework/scenes/world/actors/gfx3D.lua
diff --git a/framework/modules/world/actors/mixins/base.lua b/framework/scenes/world/actors/mixins/base.lua
similarity index 100%
rename from framework/modules/world/actors/mixins/base.lua
rename to framework/scenes/world/actors/mixins/base.lua
diff --git a/framework/modules/world/actors/mixins/inputs.lua b/framework/scenes/world/actors/mixins/inputs.lua
similarity index 100%
rename from framework/modules/world/actors/mixins/inputs.lua
rename to framework/scenes/world/actors/mixins/inputs.lua
diff --git a/framework/modules/world/actors/mixins/physics.lua b/framework/scenes/world/actors/mixins/physics.lua
similarity index 100%
rename from framework/modules/world/actors/mixins/physics.lua
rename to framework/scenes/world/actors/mixins/physics.lua
diff --git a/framework/modules/world/actors/mixins/shapes.lua b/framework/scenes/world/actors/mixins/shapes.lua
similarity index 100%
rename from framework/modules/world/actors/mixins/shapes.lua
rename to framework/scenes/world/actors/mixins/shapes.lua
diff --git a/framework/modules/world/actors/mixins/sprites.lua b/framework/scenes/world/actors/mixins/sprites.lua
similarity index 97%
rename from framework/modules/world/actors/mixins/sprites.lua
rename to framework/scenes/world/actors/mixins/sprites.lua
index e473a19..a99af8b 100644
--- a/framework/modules/world/actors/mixins/sprites.lua
+++ b/framework/scenes/world/actors/mixins/sprites.lua
@@ -22,7 +22,7 @@
 ]]
 
 local SpritedActor = Object:extend()
-local Sprite  = require("framework.modules.world.actors.utils.sprites")
+local Sprite  = require("framework.scenes.world.actors.utils.sprites")
 
 function SpritedActor:initSprite()
     self:addUpdateFunction(self.updateSprite)
diff --git a/framework/modules/world/actors/mixins/timers.lua b/framework/scenes/world/actors/mixins/timers.lua
similarity index 100%
rename from framework/modules/world/actors/mixins/timers.lua
rename to framework/scenes/world/actors/mixins/timers.lua
diff --git a/framework/modules/world/actors/utils/boxes/init.lua b/framework/scenes/world/actors/utils/boxes/init.lua
similarity index 100%
rename from framework/modules/world/actors/utils/boxes/init.lua
rename to framework/scenes/world/actors/utils/boxes/init.lua
diff --git a/framework/modules/world/actors/utils/boxes/mapped.lua b/framework/scenes/world/actors/utils/boxes/mapped.lua
similarity index 100%
rename from framework/modules/world/actors/utils/boxes/mapped.lua
rename to framework/scenes/world/actors/utils/boxes/mapped.lua
diff --git a/framework/modules/world/actors/utils/boxes/parent.lua b/framework/scenes/world/actors/utils/boxes/parent.lua
similarity index 100%
rename from framework/modules/world/actors/utils/boxes/parent.lua
rename to framework/scenes/world/actors/utils/boxes/parent.lua
diff --git a/framework/modules/world/actors/utils/boxes/textured.lua b/framework/scenes/world/actors/utils/boxes/textured.lua
similarity index 100%
rename from framework/modules/world/actors/utils/boxes/textured.lua
rename to framework/scenes/world/actors/utils/boxes/textured.lua
diff --git a/framework/modules/world/actors/utils/hitbox2D.lua b/framework/scenes/world/actors/utils/hitbox2D.lua
similarity index 100%
rename from framework/modules/world/actors/utils/hitbox2D.lua
rename to framework/scenes/world/actors/utils/hitbox2D.lua
diff --git a/framework/modules/world/actors/utils/hitbox3D.lua b/framework/scenes/world/actors/utils/hitbox3D.lua
similarity index 100%
rename from framework/modules/world/actors/utils/hitbox3D.lua
rename to framework/scenes/world/actors/utils/hitbox3D.lua
diff --git a/framework/modules/world/actors/utils/sprites.lua b/framework/scenes/world/actors/utils/sprites.lua
similarity index 100%
rename from framework/modules/world/actors/utils/sprites.lua
rename to framework/scenes/world/actors/utils/sprites.lua
diff --git a/framework/modules/world/baseworld.lua b/framework/scenes/world/baseworld.lua
similarity index 100%
rename from framework/modules/world/baseworld.lua
rename to framework/scenes/world/baseworld.lua
diff --git a/framework/modules/world/camera/init.lua b/framework/scenes/world/camera/init.lua
similarity index 100%
rename from framework/modules/world/camera/init.lua
rename to framework/scenes/world/camera/init.lua
diff --git a/framework/modules/world/camera/utils.lua b/framework/scenes/world/camera/utils.lua
similarity index 100%
rename from framework/modules/world/camera/utils.lua
rename to framework/scenes/world/camera/utils.lua
diff --git a/framework/modules/world/libs/bump-3dpd.lua b/framework/scenes/world/libs/bump-3dpd.lua
similarity index 100%
rename from framework/modules/world/libs/bump-3dpd.lua
rename to framework/scenes/world/libs/bump-3dpd.lua
diff --git a/framework/modules/world/libs/bump.lua b/framework/scenes/world/libs/bump.lua
similarity index 100%
rename from framework/modules/world/libs/bump.lua
rename to framework/scenes/world/libs/bump.lua
diff --git a/framework/modules/world/libs/tsort.lua b/framework/scenes/world/libs/tsort.lua
similarity index 100%
rename from framework/modules/world/libs/tsort.lua
rename to framework/scenes/world/libs/tsort.lua
diff --git a/framework/modules/world/maps/init.lua b/framework/scenes/world/maps/init.lua
similarity index 100%
rename from framework/modules/world/maps/init.lua
rename to framework/scenes/world/maps/init.lua
diff --git a/framework/modules/world/maps/parent.lua b/framework/scenes/world/maps/parent.lua
similarity index 100%
rename from framework/modules/world/maps/parent.lua
rename to framework/scenes/world/maps/parent.lua
diff --git a/framework/modules/world/maps/tiled/init.lua b/framework/scenes/world/maps/tiled/init.lua
similarity index 85%
rename from framework/modules/world/maps/tiled/init.lua
rename to framework/scenes/world/maps/tiled/init.lua
index 103a662..49edf00 100644
--- a/framework/modules/world/maps/tiled/init.lua
+++ b/framework/scenes/world/maps/tiled/init.lua
@@ -1,8 +1,8 @@
-local Parent = require "framework.modules.world.maps.parent"
+local Parent = require "framework.scenes.world.maps.parent"
 local TiledMap = Parent:extend()
-local StiWrapper = require "framework.modules.world.maps.tiled.stiwrapper"
+local StiWrapper = require "framework.scenes.world.maps.tiled.stiwrapper"
 
-local TiledMixins = require "framework.modules.world.maps.tiled.mixins"
+local TiledMixins = require "framework.scenes.world.maps.tiled.mixins"
 
 TiledMap:implement(TiledMixins)
 
diff --git a/framework/modules/world/maps/tiled/libs/sti/graphics.lua b/framework/scenes/world/maps/tiled/libs/sti/graphics.lua
similarity index 100%
rename from framework/modules/world/maps/tiled/libs/sti/graphics.lua
rename to framework/scenes/world/maps/tiled/libs/sti/graphics.lua
diff --git a/framework/modules/world/maps/tiled/libs/sti/init.lua b/framework/scenes/world/maps/tiled/libs/sti/init.lua
similarity index 100%
rename from framework/modules/world/maps/tiled/libs/sti/init.lua
rename to framework/scenes/world/maps/tiled/libs/sti/init.lua
diff --git a/framework/modules/world/maps/tiled/libs/sti/plugins/box2d.lua b/framework/scenes/world/maps/tiled/libs/sti/plugins/box2d.lua
similarity index 100%
rename from framework/modules/world/maps/tiled/libs/sti/plugins/box2d.lua
rename to framework/scenes/world/maps/tiled/libs/sti/plugins/box2d.lua
diff --git a/framework/modules/world/maps/tiled/libs/sti/plugins/bump.lua b/framework/scenes/world/maps/tiled/libs/sti/plugins/bump.lua
similarity index 100%
rename from framework/modules/world/maps/tiled/libs/sti/plugins/bump.lua
rename to framework/scenes/world/maps/tiled/libs/sti/plugins/bump.lua
diff --git a/framework/modules/world/maps/tiled/libs/sti/utils.lua b/framework/scenes/world/maps/tiled/libs/sti/utils.lua
similarity index 100%
rename from framework/modules/world/maps/tiled/libs/sti/utils.lua
rename to framework/scenes/world/maps/tiled/libs/sti/utils.lua
diff --git a/framework/modules/world/maps/tiled/mixins.lua b/framework/scenes/world/maps/tiled/mixins.lua
similarity index 100%
rename from framework/modules/world/maps/tiled/mixins.lua
rename to framework/scenes/world/maps/tiled/mixins.lua
diff --git a/framework/modules/world/maps/tiled/stiwrapper.lua b/framework/scenes/world/maps/tiled/stiwrapper.lua
similarity index 99%
rename from framework/modules/world/maps/tiled/stiwrapper.lua
rename to framework/scenes/world/maps/tiled/stiwrapper.lua
index 5a2288c..46b79ca 100644
--- a/framework/modules/world/maps/tiled/stiwrapper.lua
+++ b/framework/scenes/world/maps/tiled/stiwrapper.lua
@@ -1,5 +1,5 @@
 local StiWrapper = Object:extend()
-local STI = require "framework.modules.world.maps.tiled.libs.sti"
+local STI = require "framework.scenes.world.maps.tiled.libs.sti"
 
 function StiWrapper:new(owner, mapfile, x, y, canLoadPlayer)
     self.sti = STI(mapfile)
diff --git a/framework/modules/world/world2D.lua b/framework/scenes/world/world2D.lua
similarity index 100%
rename from framework/modules/world/world2D.lua
rename to framework/scenes/world/world2D.lua
diff --git a/framework/modules/world/world3D.lua b/framework/scenes/world/world3D.lua
similarity index 100%
rename from framework/modules/world/world3D.lua
rename to framework/scenes/world/world3D.lua