diff --git a/inc/item_actions.lua b/inc/actions.inventory.lua
similarity index 100%
rename from inc/item_actions.lua
rename to inc/actions.inventory.lua
diff --git a/inc/menu_actions.lua b/inc/actions.menu.lua
similarity index 100%
rename from inc/menu_actions.lua
rename to inc/actions.menu.lua
diff --git a/inc/npc_actions.lua b/inc/actions.npc.lua
similarity index 100%
rename from inc/npc_actions.lua
rename to inc/actions.npc.lua
diff --git a/inc/player.lua b/inc/entity.player.lua
similarity index 100%
rename from inc/player.lua
rename to inc/entity.player.lua
diff --git a/inc/config.lua b/inc/init.config.lua
similarity index 100%
rename from inc/config.lua
rename to inc/init.config.lua
diff --git a/inc/context.lua b/inc/init.context.lua
similarity index 100%
rename from inc/context.lua
rename to inc/init.context.lua
diff --git a/inc/modules.lua b/inc/init.modules.lua
similarity index 100%
rename from inc/modules.lua
rename to inc/init.modules.lua
diff --git a/inc/windows.lua b/inc/init.windows.lua
similarity index 100%
rename from inc/windows.lua
rename to inc/init.windows.lua
diff --git a/inc/assets.lua b/inc/meta.assets.lua
similarity index 100%
rename from inc/assets.lua
rename to inc/meta.assets.lua
diff --git a/inc/header.lua b/inc/meta.header.lua
similarity index 92%
rename from inc/header.lua
rename to inc/meta.header.lua
index a29be5d..91d3707 100644
--- a/inc/header.lua
+++ b/inc/meta.header.lua
@@ -3,5 +3,5 @@
 -- desc:    Life of a programmer in the Vector
 -- site:    https://github.com/rastasi/mranderson
 -- license: MIT License
--- version: 0.9
+-- version: 0.10
 -- script:  lua
diff --git a/inc/input.lua b/inc/system.input.lua
similarity index 100%
rename from inc/input.lua
rename to inc/system.input.lua
diff --git a/inc/main.lua b/inc/system.main.lua
similarity index 100%
rename from inc/main.lua
rename to inc/system.main.lua
diff --git a/inc/ui.lua b/inc/system.ui.lua
similarity index 100%
rename from inc/ui.lua
rename to inc/system.ui.lua
diff --git a/inc/game.lua b/inc/window.game.lua
similarity index 100%
rename from inc/game.lua
rename to inc/window.game.lua
diff --git a/inc/intro.lua b/inc/window.intro.lua
similarity index 100%
rename from inc/intro.lua
rename to inc/window.intro.lua
diff --git a/inc/inventory.lua b/inc/window.inventory.lua
similarity index 100%
rename from inc/inventory.lua
rename to inc/window.inventory.lua
diff --git a/inc/menu.lua b/inc/window.menu.lua
similarity index 100%
rename from inc/menu.lua
rename to inc/window.menu.lua
diff --git a/inc/popup.lua b/inc/window.popup.lua
similarity index 100%
rename from inc/popup.lua
rename to inc/window.popup.lua
diff --git a/inc/splash.lua b/inc/window.splash.lua
similarity index 100%
rename from inc/splash.lua
rename to inc/window.splash.lua
diff --git a/mranderson.inc b/mranderson.inc
index d1498e4..bde3037 100644
--- a/mranderson.inc
+++ b/mranderson.inc
@@ -1,18 +1,18 @@
-header.lua
-config.lua
-windows.lua
-modules.lua
-context.lua
-inventory.lua
-menu_actions.lua
-npc_actions.lua
-item_actions.lua
-input.lua
-ui.lua
-splash.lua
-intro.lua
-menu.lua
-game.lua
-popup.lua
-main.lua
-assets.lua
+meta.header.lua
+init.config.lua
+init.windows.lua
+init.modules.lua
+init.context.lua
+window.inventory.lua
+actions.menu.lua
+actions.npc.lua
+actions.inventory.lua
+system.input.lua
+system.ui.lua
+window.splash.lua
+window.intro.lua
+window.menu.lua
+window.game.lua
+window.popup.lua
+system.main.lua
+meta.assets.lua