diff --git a/inc/entity.item.lua b/inc/entity/entity.item.lua
similarity index 100%
rename from inc/entity.item.lua
rename to inc/entity/entity.item.lua
diff --git a/inc/entity.npc.lua b/inc/entity/entity.npc.lua
similarity index 100%
rename from inc/entity.npc.lua
rename to inc/entity/entity.npc.lua
diff --git a/inc/entity.player.lua b/inc/entity/entity.player.lua
similarity index 100%
rename from inc/entity.player.lua
rename to inc/entity/entity.player.lua
diff --git a/inc/init.config.lua b/inc/init/init.config.lua
similarity index 100%
rename from inc/init.config.lua
rename to inc/init/init.config.lua
diff --git a/inc/init.context.lua b/inc/init/init.context.lua
similarity index 100%
rename from inc/init.context.lua
rename to inc/init/init.context.lua
diff --git a/inc/init.modules.lua b/inc/init/init.modules.lua
similarity index 100%
rename from inc/init.modules.lua
rename to inc/init/init.modules.lua
diff --git a/inc/init.windows.lua b/inc/init/init.windows.lua
similarity index 100%
rename from inc/init.windows.lua
rename to inc/init/init.windows.lua
diff --git a/inc/meta.assets.lua b/inc/meta/meta.assets.lua
similarity index 100%
rename from inc/meta.assets.lua
rename to inc/meta/meta.assets.lua
diff --git a/inc/meta.header.lua b/inc/meta/meta.header.lua
similarity index 100%
rename from inc/meta.header.lua
rename to inc/meta/meta.header.lua
diff --git a/inc/system.input.lua b/inc/system/system.input.lua
similarity index 100%
rename from inc/system.input.lua
rename to inc/system/system.input.lua
diff --git a/inc/system.main.lua b/inc/system/system.main.lua
similarity index 100%
rename from inc/system.main.lua
rename to inc/system/system.main.lua
diff --git a/inc/system.ui.lua b/inc/system/system.ui.lua
similarity index 100%
rename from inc/system.ui.lua
rename to inc/system/system.ui.lua
diff --git a/inc/window.game.lua b/inc/window/window.game.lua
similarity index 100%
rename from inc/window.game.lua
rename to inc/window/window.game.lua
diff --git a/inc/window.intro.lua b/inc/window/window.intro.lua
similarity index 100%
rename from inc/window.intro.lua
rename to inc/window/window.intro.lua
diff --git a/inc/window.inventory.lua b/inc/window/window.inventory.lua
similarity index 100%
rename from inc/window.inventory.lua
rename to inc/window/window.inventory.lua
diff --git a/inc/window.menu.lua b/inc/window/window.menu.lua
similarity index 100%
rename from inc/window.menu.lua
rename to inc/window/window.menu.lua
diff --git a/inc/window.popup.lua b/inc/window/window.popup.lua
similarity index 100%
rename from inc/window.popup.lua
rename to inc/window/window.popup.lua
diff --git a/inc/window.splash.lua b/inc/window/window.splash.lua
similarity index 100%
rename from inc/window.splash.lua
rename to inc/window/window.splash.lua
diff --git a/mranderson.inc b/mranderson.inc
index ef5cfd0..0064094 100644
--- a/mranderson.inc
+++ b/mranderson.inc
@@ -1,18 +1,18 @@
-meta.header.lua
-init.config.lua
-init.windows.lua
-init.modules.lua
-init.context.lua
-entity.npc.lua
-entity.item.lua
-entity.player.lua
-system.input.lua
-system.ui.lua
-window.splash.lua
-window.intro.lua
-window.menu.lua
-window.popup.lua
-window.inventory.lua
-window.game.lua
-system.main.lua
-meta.assets.lua
+meta/meta.header.lua
+init/init.config.lua
+init/init.windows.lua
+init/init.modules.lua
+init/init.context.lua
+entity/entity.npc.lua
+entity/entity.item.lua
+entity/entity.player.lua
+system/system.input.lua
+system/system.ui.lua
+window/window.splash.lua
+window/window.intro.lua
+window/window.menu.lua
+window/window.popup.lua
+window/window.inventory.lua
+window/window.game.lua
+system/system.main.lua
+meta/meta.assets.lua