diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json b/src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json
index 3b821cb6..2d89c8d8 100644
--- a/src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json
+++ b/src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json
@@ -11,7 +11,7 @@
 	
 	"images": {
 		"workbench": {
-			"location": "ebwizardry:textures/gui/handbook/picturesarcane_workbench_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/arcane_workbench_picture.png",
 			"caption": "The Arcane Workbench",
 			"u": 0,
 			"v": 0,
@@ -19,7 +19,7 @@
 			"height": 110
 		},
 		"crystal_ore": {
-			"location": "ebwizardry:textures/gui/handbook/picturesore_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/ore_picture.png",
 			"caption": "Crystal Ore",
 			"u": 0,
 			"v": 0,
@@ -47,7 +47,7 @@
 			"border": false
 		},
 		"crystal_flower": {
-			"location": "ebwizardry:textures/gui/handbook/picturesflower_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/flower_picture.png",
 			"caption": "A Crystal Flower",
 			"u": 0,
 			"v": 0,
@@ -55,7 +55,7 @@
 			"height": 48
 		},
 		"wizard_tower": {
-			"location": "ebwizardry:textures/gui/handbook/picturestower_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/tower_picture.png",
 			"caption": "A Wizard's Tower",
 			"u": 0,
 			"v": 0,
@@ -63,7 +63,7 @@
 			"height": 110
 		},
 		"wizard_armour": {
-			"location": "ebwizardry:textures/gui/handbook/picturesarmour_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/armour_picture.png",
 			"caption": "A Set Of Wizard Armour",
 			"u": 0,
 			"v": 0,
@@ -71,7 +71,7 @@
 			"height": 90
 		},
 		"obelisk": {
-			"location": "ebwizardry:textures/gui/handbook/picturesobelisk_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/obelisk_picture.png",
 			"caption": "An Obelisk",
 			"u": 0,
 			"v": 0,
@@ -79,7 +79,7 @@
 			"height": 67
 		},
 		"shrine": {
-			"location": "ebwizardry:textures/gui/handbook/picturesshrine_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/shrine_picture.png",
 			"caption": "An Earth Shrine",
 			"u": 0,
 			"v": 0,
@@ -87,7 +87,7 @@
 			"height": 67
 		},
 		"tiers": {
-			"location": "ebwizardry:textures/gui/handbook/picturestiers_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/tiers_picture.png",
 			"caption": "The 4 Tiers Of Wand",
 			"u": 0,
 			"v": 0,
@@ -96,7 +96,7 @@
 			"border": false
 		},
 		"elements": {
-			"location": "ebwizardry:textures/gui/handbook/pictureselements_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/elements_picture.png",
 			"caption": "The 7 Arcane Elements",
 			"u": 0,
 			"v": 0,
diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_en_us.json b/src/main/resources/assets/ebwizardry/texts/handbook_en_us.json
index 34703d44..1d4d65cd 100644
--- a/src/main/resources/assets/ebwizardry/texts/handbook_en_us.json
+++ b/src/main/resources/assets/ebwizardry/texts/handbook_en_us.json
@@ -11,7 +11,7 @@
 	
 	"images": {
 		"workbench": {
-			"location": "ebwizardry:textures/gui/handbook/picturesarcane_workbench_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/arcane_workbench_picture.png",
 			"caption": "The Arcane Workbench",
 			"u": 0,
 			"v": 0,
@@ -19,7 +19,7 @@
 			"height": 110
 		},
 		"crystal_ore": {
-			"location": "ebwizardry:textures/gui/handbook/picturesore_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/ore_picture.png",
 			"caption": "Crystal Ore",
 			"u": 0,
 			"v": 0,
@@ -47,7 +47,7 @@
 			"border": false
 		},
 		"crystal_flower": {
-			"location": "ebwizardry:textures/gui/handbook/picturesflower_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/flower_picture.png",
 			"caption": "A Crystal Flower",
 			"u": 0,
 			"v": 0,
@@ -55,7 +55,7 @@
 			"height": 48
 		},
 		"wizard_tower": {
-			"location": "ebwizardry:textures/gui/handbook/picturestower_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/tower_picture.png",
 			"caption": "A Wizard's Tower",
 			"u": 0,
 			"v": 0,
@@ -63,7 +63,7 @@
 			"height": 110
 		},
 		"wizard_armour": {
-			"location": "ebwizardry:textures/gui/handbook/picturesarmour_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/armour_picture.png",
 			"caption": "A Set Of Wizard Armour",
 			"u": 0,
 			"v": 0,
@@ -71,7 +71,7 @@
 			"height": 90
 		},
 		"obelisk": {
-			"location": "ebwizardry:textures/gui/handbook/picturesobelisk_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/obelisk_picture.png",
 			"caption": "An Obelisk",
 			"u": 0,
 			"v": 0,
@@ -79,7 +79,7 @@
 			"height": 67
 		},
 		"shrine": {
-			"location": "ebwizardry:textures/gui/handbook/picturesshrine_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/shrine_picture.png",
 			"caption": "An Earth Shrine",
 			"u": 0,
 			"v": 0,
@@ -87,7 +87,7 @@
 			"height": 67
 		},
 		"tiers": {
-			"location": "ebwizardry:textures/gui/handbook/picturestiers_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/tiers_picture.png",
 			"caption": "The 4 Tiers Of Wand",
 			"u": 0,
 			"v": 0,
@@ -96,7 +96,7 @@
 			"border": false
 		},
 		"elements": {
-			"location": "ebwizardry:textures/gui/handbook/pictureselements_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/elements_picture.png",
 			"caption": "The 7 Arcane Elements",
 			"u": 0,
 			"v": 0,
diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_es_es.json b/src/main/resources/assets/ebwizardry/texts/handbook_es_es.json
index 1ab4d80d..d0386c39 100644
--- a/src/main/resources/assets/ebwizardry/texts/handbook_es_es.json
+++ b/src/main/resources/assets/ebwizardry/texts/handbook_es_es.json
@@ -11,7 +11,7 @@
 
 	"images": {
 		"workbench": {
-			"location": "ebwizardry:textures/gui/handbook/picturesarcane_workbench_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/arcane_workbench_picture.png",
 			"caption": "Mesa Arcana",
 			"u": 0,
 			"v": 0,
@@ -19,7 +19,7 @@
 			"height": 110
 		},
 		"crystal_ore": {
-			"location": "ebwizardry:textures/gui/handbook/picturesore_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/ore_picture.png",
 			"caption": "Mena de Cristal Mágico",
 			"u": 0,
 			"v": 0,
@@ -47,7 +47,7 @@
 			"border": false
 		},
 		"crystal_flower": {
-			"location": "ebwizardry:textures/gui/handbook/picturesflower_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/flower_picture.png",
 			"caption": "Flor de Cristal",
 			"u": 0,
 			"v": 0,
@@ -55,7 +55,7 @@
 			"height": 48
 		},
 		"wizard_tower": {
-			"location": "ebwizardry:textures/gui/handbook/picturestower_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/tower_picture.png",
 			"caption": "Torre de mago",
 			"u": 0,
 			"v": 0,
@@ -63,7 +63,7 @@
 			"height": 110
 		},
 		"wizard_armour": {
-			"location": "ebwizardry:textures/gui/handbook/picturesarmour_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/armour_picture.png",
 			"caption": "Conjunto de Armadura de mago",
 			"u": 0,
 			"v": 0,
@@ -71,7 +71,7 @@
 			"height": 90
 		},
 		"obelisk": {
-			"location": "ebwizardry:textures/gui/handbook/picturesobelisk_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/obelisk_picture.png",
 			"caption": "Obelisco",
 			"u": 0,
 			"v": 0,
@@ -79,7 +79,7 @@
 			"height": 67
 		},
 		"shrine": {
-			"location": "ebwizardry:textures/gui/handbook/picturesshrine_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/shrine_picture.png",
 			"caption": "Santuario de la tierra",
 			"u": 0,
 			"v": 0,
@@ -87,7 +87,7 @@
 			"height": 67
 		},
 		"tiers": {
-			"location": "ebwizardry:textures/gui/handbook/picturestiers_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/tiers_picture.png",
 			"caption": "Los 4 niveles en las Varitas",
 			"u": 0,
 			"v": 0,
@@ -96,7 +96,7 @@
 			"border": false
 		},
 		"elements": {
-			"location": "ebwizardry:textures/gui/handbook/pictureselements_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/elements_picture.png",
 			"caption": "Los 7 elementos Arcanos",
 			"u": 0,
 			"v": 0,
diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_zh_cn.json b/src/main/resources/assets/ebwizardry/texts/handbook_zh_cn.json
index 5d892c93..009819c9 100644
--- a/src/main/resources/assets/ebwizardry/texts/handbook_zh_cn.json
+++ b/src/main/resources/assets/ebwizardry/texts/handbook_zh_cn.json
@@ -11,7 +11,7 @@
 	
 	"images": {
 		"workbench": {
-			"location": "ebwizardry:textures/gui/handbook/picturesarcane_workbench_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/arcane_workbench_picture.png",
 			"caption": "The Arcane Workbench",
 			"u": 0,
 			"v": 0,
@@ -19,7 +19,7 @@
 			"height": 110
 		},
 		"crystal_ore": {
-			"location": "ebwizardry:textures/gui/handbook/picturesore_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/ore_picture.png",
 			"caption": "Crystal Ore",
 			"u": 0,
 			"v": 0,
@@ -47,7 +47,7 @@
 			"border": false
 		},
 		"crystal_flower": {
-			"location": "ebwizardry:textures/gui/handbook/picturesflower_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/flower_picture.png",
 			"caption": "A Crystal Flower",
 			"u": 0,
 			"v": 0,
@@ -55,7 +55,7 @@
 			"height": 48
 		},
 		"wizard_tower": {
-			"location": "ebwizardry:textures/gui/handbook/picturestower_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/tower_picture.png",
 			"caption": "A Wizard's Tower",
 			"u": 0,
 			"v": 0,
@@ -63,7 +63,7 @@
 			"height": 110
 		},
 		"wizard_armour": {
-			"location": "ebwizardry:textures/gui/handbook/picturesarmour_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/armour_picture.png",
 			"caption": "A Set Of Wizard Armour",
 			"u": 0,
 			"v": 0,
@@ -71,7 +71,7 @@
 			"height": 90
 		},
 		"obelisk": {
-			"location": "ebwizardry:textures/gui/handbook/picturesobelisk_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/obelisk_picture.png",
 			"caption": "An Obelisk",
 			"u": 0,
 			"v": 0,
@@ -79,7 +79,7 @@
 			"height": 67
 		},
 		"shrine": {
-			"location": "ebwizardry:textures/gui/handbook/picturesshrine_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/shrine_picture.png",
 			"caption": "An Earth Shrine",
 			"u": 0,
 			"v": 0,
@@ -87,7 +87,7 @@
 			"height": 67
 		},
 		"tiers": {
-			"location": "ebwizardry:textures/gui/handbook/picturestiers_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/tiers_picture.png",
 			"caption": "The 4 Tiers Of Wand",
 			"u": 0,
 			"v": 0,
@@ -96,7 +96,7 @@
 			"border": false
 		},
 		"elements": {
-			"location": "ebwizardry:textures/gui/handbook/pictureselements_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/elements_picture.png",
 			"caption": "The 7 Arcane Elements",
 			"u": 0,
 			"v": 0,
diff --git a/src/main/resources/assets/ebwizardry/texts/handbook_zh_tw.json b/src/main/resources/assets/ebwizardry/texts/handbook_zh_tw.json
index 9b6f7e35..849c0a21 100644
--- a/src/main/resources/assets/ebwizardry/texts/handbook_zh_tw.json
+++ b/src/main/resources/assets/ebwizardry/texts/handbook_zh_tw.json
@@ -11,7 +11,7 @@
 	
 	"images": {
 		"workbench": {
-			"location": "ebwizardry:textures/gui/handbook/picturesarcane_workbench_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/arcane_workbench_picture.png",
 			"caption": "法術工作台",
 			"u": 0,
 			"v": 0,
@@ -19,7 +19,7 @@
 			"height": 110
 		},
 		"crystal_ore": {
-			"location": "ebwizardry:textures/gui/handbook/picturesore_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/ore_picture.png",
 			"caption": "水晶礦",
 			"u": 0,
 			"v": 0,
@@ -47,7 +47,7 @@
 			"border": false
 		},
 		"crystal_flower": {
-			"location": "ebwizardry:textures/gui/handbook/picturesflower_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/flower_picture.png",
 			"caption": "水晶花",
 			"u": 0,
 			"v": 0,
@@ -55,7 +55,7 @@
 			"height": 48
 		},
 		"wizard_tower": {
-			"location": "ebwizardry:textures/gui/handbook/picturestower_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/tower_picture.png",
 			"caption": "法師塔",
 			"u": 0,
 			"v": 0,
@@ -63,7 +63,7 @@
 			"height": 110
 		},
 		"wizard_armour": {
-			"location": "ebwizardry:textures/gui/handbook/picturesarmour_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/armour_picture.png",
 			"caption": "法師服",
 			"u": 0,
 			"v": 0,
@@ -71,7 +71,7 @@
 			"height": 90
 		},
 		"obelisk": {
-			"location": "ebwizardry:textures/gui/handbook/picturesobelisk_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/obelisk_picture.png",
 			"caption": "方尖碑",
 			"u": 0,
 			"v": 0,
@@ -79,7 +79,7 @@
 			"height": 67
 		},
 		"shrine": {
-			"location": "ebwizardry:textures/gui/handbook/picturesshrine_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/shrine_picture.png",
 			"caption": "神殿",
 			"u": 0,
 			"v": 0,
@@ -87,7 +87,7 @@
 			"height": 67
 		},
 		"tiers": {
-			"location": "ebwizardry:textures/gui/handbook/picturestiers_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/tiers_picture.png",
 			"caption": "四種等級的法杖",
 			"u": 0,
 			"v": 0,
@@ -96,7 +96,7 @@
 			"border": false
 		},
 		"elements": {
-			"location": "ebwizardry:textures/gui/handbook/pictureselements_picture.png",
+			"location": "ebwizardry:textures/gui/handbook/pictures/elements_picture.png",
 			"caption": "七種法術元素",
 			"u": 0,
 			"v": 0,