diff --git a/examples/test_menus/assets/medium.lua b/examples/basic/test_menus/assets/medium.lua
similarity index 100%
rename from examples/test_menus/assets/medium.lua
rename to examples/basic/test_menus/assets/medium.lua
diff --git a/examples/test_menus/assets/medium.png b/examples/basic/test_menus/assets/medium.png
similarity index 100%
rename from examples/test_menus/assets/medium.png
rename to examples/basic/test_menus/assets/medium.png
diff --git a/examples/test_menus/init.lua b/examples/basic/test_menus/init.lua
similarity index 98%
rename from examples/test_menus/init.lua
rename to examples/basic/test_menus/init.lua
index d6ec700..6aa0bc0 100644
--- a/examples/test_menus/init.lua
+++ b/examples/basic/test_menus/init.lua
@@ -33,7 +33,7 @@ local MenuWidget = Widget.Text:extend()
 
 function TestScene:new()
   TestScene.super.new(self)
-  self.assets:addImageFont("medium", "examples/test_menus/assets/medium")
+  self.assets:addImageFont("medium", "examples/basic/test_menus/assets/medium")
 
   MenuType(self.menusystem, "testMenu1", 32, 32, 100, 24*8, 4)
   MenuWidget(self, "testMenu1", "text_menu1")
diff --git a/examples/test_scene/init.lua b/examples/basic/test_scene/init.lua
similarity index 100%
rename from examples/test_scene/init.lua
rename to examples/basic/test_scene/init.lua
diff --git a/examples/test_scene2/actors/explosion.lua b/examples/basic/test_scene2/actors/explosion.lua
similarity index 71%
rename from examples/test_scene2/actors/explosion.lua
rename to examples/basic/test_scene2/actors/explosion.lua
index 8a9ef42..0fc6575 100644
--- a/examples/test_scene2/actors/explosion.lua
+++ b/examples/basic/test_scene2/actors/explosion.lua
@@ -1,4 +1,4 @@
-local Parent = require "examples.test_scene2.actors.parent"
+local Parent = require "examples.basic.test_scene2.actors.parent"
 local Explosion = Parent:extend()
 
 function Explosion:new(scene, x, y)
diff --git a/examples/test_scene2/actors/parent.lua b/examples/basic/test_scene2/actors/parent.lua
similarity index 100%
rename from examples/test_scene2/actors/parent.lua
rename to examples/basic/test_scene2/actors/parent.lua
diff --git a/examples/test_scene2/assets/debris.png b/examples/basic/test_scene2/assets/debris.png
similarity index 100%
rename from examples/test_scene2/assets/debris.png
rename to examples/basic/test_scene2/assets/debris.png
diff --git a/examples/test_scene2/assets/poof.lua b/examples/basic/test_scene2/assets/poof.lua
similarity index 100%
rename from examples/test_scene2/assets/poof.lua
rename to examples/basic/test_scene2/assets/poof.lua
diff --git a/examples/test_scene2/assets/poof.png b/examples/basic/test_scene2/assets/poof.png
similarity index 100%
rename from examples/test_scene2/assets/poof.png
rename to examples/basic/test_scene2/assets/poof.png
diff --git a/examples/test_scene2/assets/weapon.lua b/examples/basic/test_scene2/assets/weapon.lua
similarity index 100%
rename from examples/test_scene2/assets/weapon.lua
rename to examples/basic/test_scene2/assets/weapon.lua
diff --git a/examples/test_scene2/assets/weapon.png b/examples/basic/test_scene2/assets/weapon.png
similarity index 100%
rename from examples/test_scene2/assets/weapon.png
rename to examples/basic/test_scene2/assets/weapon.png
diff --git a/examples/test_scene2/init.lua b/examples/basic/test_scene2/init.lua
similarity index 95%
rename from examples/test_scene2/init.lua
rename to examples/basic/test_scene2/init.lua
index c826969..de3b468 100644
--- a/examples/test_scene2/init.lua
+++ b/examples/basic/test_scene2/init.lua
@@ -24,10 +24,10 @@
 local Scene = require "gamecore.modules.scenes"
 local TestScene = Scene:extend()
 
-local folder = "examples/test_scene2/"
+local folder = "examples/basic/test_scene2/"
 
 local World   = require "gamecore.modules.world.baseworld"
-local Explosion = require "examples.test_scene2.actors.explosion"
+local Explosion = require "examples.basic.test_scene2.actors.explosion"
 
 function TestScene:new()
   TestScene.super.new(self)
diff --git a/examples/init.lua b/examples/init.lua
index 2596b13..f8e4064 100644
--- a/examples/init.lua
+++ b/examples/init.lua
@@ -1,7 +1,7 @@
 return {
-  Test = require "examples.test_scene",
-  Test2 = require "examples.test_scene2",
-  TestMenu = require "examples.test_menus",
   MainMenu = require "examples.mainmenu",
+  Test = require "examples.basic.test_scene",
+  Test2 = require "examples.basic.test_scene2",
+  TestMenu = require "examples.basic.test_menus",
   Inventory = require "examples.menus.inventory"
 }
diff --git a/examples/mainmenu/init.lua b/examples/mainmenu/init.lua
index fe2a84e..ef97f2f 100644
--- a/examples/mainmenu/init.lua
+++ b/examples/mainmenu/init.lua
@@ -33,7 +33,7 @@ local ExitWidget    = Widget.Text:extend()
 
 function MainMenu:new()
   MainMenu.super.new(self)
-  self.assets:addImageFont("medium", "examples/test_menus/assets/medium")
+  self.assets:addImageFont("medium", "examples/mainmenu/assets/medium")
 
   self:addMenu("main", true)
   self:addSubMenu("basic", "Basic Tests")
diff --git a/examples/menus/inventory/init.lua b/examples/menus/inventory/init.lua
index a41d003..3285c92 100644
--- a/examples/menus/inventory/init.lua
+++ b/examples/menus/inventory/init.lua
@@ -34,7 +34,7 @@ local ExitWidget      = Widget.Text:extend()
 
 function Inventory:new()
   Inventory.super.new(self)
-  self.assets:addImageFont("medium", "examples/test_menus/assets/medium")
+  self.assets:addImageFont("medium", "examples/menus/inventory/assets/medium")
 
 
   HListBox(self.menusystem, "main", 42, 32, 424-84, 32, 5)