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 MenuType  = require "framework.scenes.gui.menus.listbox"
-local MenuType2 = require "framework.modules.gui.menus.flowbox"
+local MenuType2 = require "framework.scenes.gui.menus.flowbox"
-local MenuType3 = require "framework.modules.gui.menus.grid"
+local MenuType3 = require "framework.scenes.gui.menus.grid"
-local Widget    = require "framework.modules.gui.menus.widgets"
+local Widget    = require "framework.scenes.gui.menus.widgets"
 
 local MenuWidget = Widget.Text:extend()
 

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()

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)

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)

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)

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)

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

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)

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)

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

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)

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)

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

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)

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)

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

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)

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")

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)

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)

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()

examples/scenes/gameplay/plateform/pause.lua

@@ -1,5 +1,5 @@
-local ListMenu  = require "framework.modules.gui.menus.listbox"
+local ListMenu  = require "framework.scenes.gui.menus.listbox"
-local Widget    = require "framework.modules.gui.menus.widgets"
+local Widget    = require "framework.scenes.gui.menus.widgets"
 
 local PauseMenu = ListMenu:extend()
 

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"

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

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 HListBox  = require "framework.scenes.gui.menus.hlistbox"
-local FloxBox      = require "framework.modules.gui.menus.flowbox"
+local FloxBox      = require "framework.scenes.gui.menus.flowbox"
-local Widget    = require "framework.modules.gui.menus.widgets"
+local Widget    = require "framework.scenes.gui.menus.widgets"
 
 local InventoryWidget = Widget.Text:extend()
 local ItemWidget      = Widget.Text:extend()

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"

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"

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()

framework/modules/transitions/init.lua

@@ -1,4 +0,0 @@
-return {
-    default = require "framework.modules.transitions.default",
-    circle = require "framework.modules.transitions.circle"
-}

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)

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)

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)

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)

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)

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)

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)

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)

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)

framework/scenes/gui/init.lua

@@ -23,8 +23,8 @@
 
 local Gui = Object:extend()
 
-local ElementList = require "framework.modules.gui.mixins.elements"
+local ElementList = require "framework.scenes.gui.mixins.elements"
-local ScreenList = require "framework.modules.gui.mixins.screens"
+local ScreenList = require "framework.scenes.gui.mixins.screens"
 Gui:implement(ScreenList)
 Gui:implement(ElementList)
 

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

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

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.

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)

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.Base   = require "framework.scenes.gui.menus.widgets.base"
-Widget.Text   = require "framework.modules.gui.menus.widgets.text"
+Widget.Text   = require "framework.scenes.gui.menus.widgets.text"
 
 return Widget

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

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"
 

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
 

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()
 

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()
 

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.Base   = require "framework.scenes.gui.textmenu.widgets.basic"
-Widget.SubMenu= require "framework.modules.gui.textmenu.widgets.submenu"
+Widget.SubMenu= require "framework.scenes.gui.textmenu.widgets.submenu"
-Widget.Back   = require "framework.modules.gui.textmenu.widgets.back"
+Widget.Back   = require "framework.scenes.gui.textmenu.widgets.back"
 
 return Widget

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()
 

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 Assets  = require "framework.scenes.assets"
-local Gui = require (cwd .. "gui")
+local Gui     = require "framework.scenes.gui"
 
 -- INIT FUNCTIONS
 -- Initialize and configure the scene

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)

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)

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)

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)

framework/scenes/transitions/init.lua

@@ -0,0 +1,4 @@
+return {
+    default = require "framework.scenes.transitions.default",
+    circle = require "framework.scenes.transitions.circle"
+}

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 BaseActor = require "framework.scenes.world.actors.mixins.base"
-local SpritedActor = require("framework.modules.world.actors.mixins.sprites")
+local SpritedActor = require("framework.scenes.world.actors.mixins.sprites")
-local TimedActor = require("framework.modules.world.actors.mixins.timers")
+local TimedActor = require("framework.scenes.world.actors.mixins.timers")
-local InputActor = require("framework.modules.world.actors.mixins.inputs")
+local InputActor = require("framework.scenes.world.actors.mixins.inputs")
-local PhysicalActor = require("framework.modules.world.actors.mixins.physics")
+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

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 Hitbox  = require("framework.scenes.world.actors.utils.hitbox3D")
-local Boxes   = require("framework.modules.world.actors.utils.boxes")
+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 BaseActor = require("framework.scenes.world.actors.mixins.base")
-local SpritedActor = require("framework.modules.world.actors.mixins.sprites")
+local SpritedActor = require("framework.scenes.world.actors.mixins.sprites")
-local TimedActor = require("framework.modules.world.actors.mixins.timers")
+local TimedActor = require("framework.scenes.world.actors.mixins.timers")
-local InputActor = require("framework.modules.world.actors.mixins.inputs")
+local InputActor = require("framework.scenes.world.actors.mixins.inputs")
-local PhysicalActor = require("framework.modules.world.actors.mixins.physics")
+local PhysicalActor = require("framework.scenes.world.actors.mixins.physics")
-local Shape3DActor = require("framework.modules.world.actors.mixins.shapes")
+local Shape3DActor = require("framework.scenes.world.actors.mixins.shapes")
 
 local Actor3D = BasicBox:extend()
 Actor3D:implement(BaseActor)

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)