diff --git a/birb/objects/2D/indexedrect.lua b/birb/classes/2D/indexedrect.lua
similarity index 97%
rename from birb/objects/2D/indexedrect.lua
rename to birb/classes/2D/indexedrect.lua
index fe87245..7511046 100644
--- a/birb/objects/2D/indexedrect.lua
+++ b/birb/classes/2D/indexedrect.lua
@@ -23,7 +23,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Rect = require "birb.objects.2D.rect"
+local Rect = require "birb.classes.2D.rect"
 local IndexedRect = Rect:extend()
 
 function IndexedRect:new(origin, ox, oy, w, h)
diff --git a/birb/objects/2D/point.lua b/birb/classes/2D/point.lua
similarity index 100%
rename from birb/objects/2D/point.lua
rename to birb/classes/2D/point.lua
diff --git a/birb/objects/2D/rect.lua b/birb/classes/2D/rect.lua
similarity index 97%
rename from birb/objects/2D/rect.lua
rename to birb/classes/2D/rect.lua
index 97fa54e..81f2849 100644
--- a/birb/objects/2D/rect.lua
+++ b/birb/classes/2D/rect.lua
@@ -21,7 +21,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Point = require "birb.objects.2D.point"
+local Point = require "birb.classes.2D.point"
 local Rect = Point:extend()
 
 function Rect:new(x, y, w, h)
diff --git a/birb/objects/3D/box.lua b/birb/classes/3D/box.lua
similarity index 97%
rename from birb/objects/3D/box.lua
rename to birb/classes/3D/box.lua
index 8453374..084c1b3 100644
--- a/birb/objects/3D/box.lua
+++ b/birb/classes/3D/box.lua
@@ -21,7 +21,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Point = require "birb.objects.3D.point3D"
+local Point = require "birb.classes.3D.point3D"
 local Box = Point:extend()
 
 function Box:new(x, y, z, w, h, d)
diff --git a/birb/objects/3D/indexedbox.lua b/birb/classes/3D/indexedbox.lua
similarity index 97%
rename from birb/objects/3D/indexedbox.lua
rename to birb/classes/3D/indexedbox.lua
index 8ee36b2..e8b2857 100644
--- a/birb/objects/3D/indexedbox.lua
+++ b/birb/classes/3D/indexedbox.lua
@@ -23,7 +23,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Rect = require "birb.objects.2D.rect"
+local Rect = require "birb.classes.2D.rect"
 local IndexedRect = Rect:extend()
 
 function IndexedRect:new(origin, ox, oy, oz, w, h, d)
diff --git a/birb/objects/3D/point3D.lua b/birb/classes/3D/point3D.lua
similarity index 100%
rename from birb/objects/3D/point3D.lua
rename to birb/classes/3D/point3D.lua
diff --git a/birb/modules/menusystem/parent.lua b/birb/modules/menusystem/parent.lua
index 059fd34..30491da 100644
--- a/birb/modules/menusystem/parent.lua
+++ b/birb/modules/menusystem/parent.lua
@@ -1,4 +1,4 @@
-local Rect = require "birb.objects.2D.rect"
+local Rect = require "birb.classes.2D.rect"
 
 local GuiElement = Rect:extend()
 
diff --git a/birb/modules/world/actors/actor2D.lua b/birb/modules/world/actors/actor2D.lua
index 393edc9..6e3b7bd 100644
--- a/birb/modules/world/actors/actor2D.lua
+++ b/birb/modules/world/actors/actor2D.lua
@@ -22,7 +22,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local Rect = require "birb.objects.2D.rect"
+local Rect = require "birb.classes.2D.rect"
 
 local BaseActor = require("birb.modules.world.actors.mixins.base")
 local SpritedActor = require("birb.modules.world.actors.mixins.sprites")
diff --git a/birb/modules/world/actors/actor3D.lua b/birb/modules/world/actors/actor3D.lua
index 7a479bd..d0178b2 100644
--- a/birb/modules/world/actors/actor3D.lua
+++ b/birb/modules/world/actors/actor3D.lua
@@ -22,7 +22,7 @@
   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ]]
 
-local BasicBox = require "birb.objects.3D.box"
+local BasicBox = require "birb.classes.3D.box"
 
 local BaseActor = require("birb.modules.world.actors.mixins.base")
 local SpritedActor = require("birb.modules.world.actors.mixins.sprites")