diff --git a/lignumis/graphics/entity/burner-agricultural-tower-base.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-base.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-base.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-base.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-1-1.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-1.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-1-1.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-1.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-1-2.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-2.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-1-2.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-2.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-10.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-10.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-10.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-10.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-3.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-3.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-3.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-3.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-4.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-4.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-4.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-4.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-5-1.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-1.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-5-1.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-1.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-5-2.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-2.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-5-2.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-2.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-5.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-5.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-6.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-6.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-6.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-6.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-7-1.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-1.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-7-1.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-1.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-7-2.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-2.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-7-2.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-2.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-7.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-7.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-8.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-8.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-8.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-8.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-crane-9.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-9.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-crane-9.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-crane-9.png
diff --git a/lignumis/graphics/entity/burner-agricultural-tower-remnants.png b/lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-remnants.png
similarity index 100%
rename from lignumis/graphics/entity/burner-agricultural-tower-remnants.png
rename to lignumis/graphics/entity/burner-agricultural-tower/burner-agricultural-tower-remnants.png
diff --git a/lignumis/graphics/entity/burner-assembling-machine-remnants.png b/lignumis/graphics/entity/burner-assembling-machine/burner-assembling-machine-remnants.png
similarity index 100%
rename from lignumis/graphics/entity/burner-assembling-machine-remnants.png
rename to lignumis/graphics/entity/burner-assembling-machine/burner-assembling-machine-remnants.png
diff --git a/lignumis/graphics/entity/burner-assembling-machine.png b/lignumis/graphics/entity/burner-assembling-machine/burner-assembling-machine.png
similarity index 100%
rename from lignumis/graphics/entity/burner-assembling-machine.png
rename to lignumis/graphics/entity/burner-assembling-machine/burner-assembling-machine.png
diff --git a/lignumis/graphics/entity/burner-inserter-hand-base.png b/lignumis/graphics/entity/burner-inserter/burner-inserter-hand-base.png
similarity index 100%
rename from lignumis/graphics/entity/burner-inserter-hand-base.png
rename to lignumis/graphics/entity/burner-inserter/burner-inserter-hand-base.png
diff --git a/lignumis/graphics/entity/burner-inserter-hand-closed.png b/lignumis/graphics/entity/burner-inserter/burner-inserter-hand-closed.png
similarity index 100%
rename from lignumis/graphics/entity/burner-inserter-hand-closed.png
rename to lignumis/graphics/entity/burner-inserter/burner-inserter-hand-closed.png
diff --git a/lignumis/graphics/entity/burner-inserter-hand-open.png b/lignumis/graphics/entity/burner-inserter/burner-inserter-hand-open.png
similarity index 100%
rename from lignumis/graphics/entity/burner-inserter-hand-open.png
rename to lignumis/graphics/entity/burner-inserter/burner-inserter-hand-open.png
diff --git a/lignumis/graphics/entity/burner-inserter-platform.png b/lignumis/graphics/entity/burner-inserter/burner-inserter-platform.png
similarity index 100%
rename from lignumis/graphics/entity/burner-inserter-platform.png
rename to lignumis/graphics/entity/burner-inserter/burner-inserter-platform.png
diff --git a/lignumis/graphics/entity/burner-inserter-remnants.png b/lignumis/graphics/entity/burner-inserter/burner-inserter-remnants.png
similarity index 100%
rename from lignumis/graphics/entity/burner-inserter-remnants.png
rename to lignumis/graphics/entity/burner-inserter/burner-inserter-remnants.png
diff --git a/lignumis/graphics/entity/burner-long-handed-inserter-hand-base.png b/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-base.png
similarity index 100%
rename from lignumis/graphics/entity/burner-long-handed-inserter-hand-base.png
rename to lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-base.png
diff --git a/lignumis/graphics/entity/burner-long-handed-inserter-hand-closed.png b/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-closed.png
similarity index 100%
rename from lignumis/graphics/entity/burner-long-handed-inserter-hand-closed.png
rename to lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-closed.png
diff --git a/lignumis/graphics/entity/burner-long-handed-inserter-hand-open.png b/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-open.png
similarity index 100%
rename from lignumis/graphics/entity/burner-long-handed-inserter-hand-open.png
rename to lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-open.png
diff --git a/lignumis/graphics/entity/burner-long-handed-inserter-platform.png b/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-platform.png
similarity index 100%
rename from lignumis/graphics/entity/burner-long-handed-inserter-platform.png
rename to lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-platform.png
diff --git a/lignumis/graphics/entity/burner-long-handed-inserter-remnants.png b/lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-remnants.png
similarity index 100%
rename from lignumis/graphics/entity/burner-long-handed-inserter-remnants.png
rename to lignumis/graphics/entity/burner-long-handed-inserter/burner-long-handed-inserter-remnants.png
diff --git a/lignumis/graphics/entity/burner-mining-drill-E.png b/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-E.png
similarity index 100%
rename from lignumis/graphics/entity/burner-mining-drill-E.png
rename to lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-E.png
diff --git a/lignumis/graphics/entity/burner-mining-drill-N.png b/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-N.png
similarity index 100%
rename from lignumis/graphics/entity/burner-mining-drill-N.png
rename to lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-N.png
diff --git a/lignumis/graphics/entity/burner-mining-drill-S.png b/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-S.png
similarity index 100%
rename from lignumis/graphics/entity/burner-mining-drill-S.png
rename to lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-S.png
diff --git a/lignumis/graphics/entity/burner-mining-drill-W.png b/lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-W.png
similarity index 100%
rename from lignumis/graphics/entity/burner-mining-drill-W.png
rename to lignumis/graphics/entity/burner-mining-drill/burner-mining-drill-W.png
diff --git a/lignumis/graphics/entity/gold-storage-tank-remnants.png b/lignumis/graphics/entity/gold-storage-tank/gold-storage-tank-remnants.png
similarity index 100%
rename from lignumis/graphics/entity/gold-storage-tank-remnants.png
rename to lignumis/graphics/entity/gold-storage-tank/gold-storage-tank-remnants.png
diff --git a/lignumis/graphics/entity/gold-storage-tank-window-background.png b/lignumis/graphics/entity/gold-storage-tank/gold-storage-tank-window-background.png
similarity index 100%
rename from lignumis/graphics/entity/gold-storage-tank-window-background.png
rename to lignumis/graphics/entity/gold-storage-tank/gold-storage-tank-window-background.png
diff --git a/lignumis/graphics/entity/gold-storage-tank.png b/lignumis/graphics/entity/gold-storage-tank/gold-storage-tank.png
similarity index 100%
rename from lignumis/graphics/entity/gold-storage-tank.png
rename to lignumis/graphics/entity/gold-storage-tank/gold-storage-tank.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-01.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-01.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-01.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-01.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-02.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-02.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-02.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-02.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-03.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-03.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-03.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-03.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-04.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-04.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-04.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-04.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-05.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-05.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-05.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-05.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-06.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-06.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-06.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-06.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-07.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-07.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-07.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-07.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-08.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-08.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-08.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-08.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-09.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-09.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-09.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-09.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-10.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-10.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-10.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-10.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-11.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-11.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-11.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-11.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-12.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-12.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-12.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-12.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-13.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-13.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-13.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-13.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-14.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-14.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-14.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-14.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-15.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-15.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-15.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-15.png
diff --git a/lignumis/graphics/entity/gold-stromatolite-16.png b/lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-16.png
similarity index 100%
rename from lignumis/graphics/entity/gold-stromatolite-16.png
rename to lignumis/graphics/entity/gold-stromatolite/gold-stromatolite-16.png
diff --git a/lignumis/graphics/entity/steam-assembling-machine-remnants.png b/lignumis/graphics/entity/steam-assembling-machine/steam-assembling-machine-remnants.png
similarity index 100%
rename from lignumis/graphics/entity/steam-assembling-machine-remnants.png
rename to lignumis/graphics/entity/steam-assembling-machine/steam-assembling-machine-remnants.png
diff --git a/lignumis/graphics/entity/steam-assembling-machine.png b/lignumis/graphics/entity/steam-assembling-machine/steam-assembling-machine.png
similarity index 100%
rename from lignumis/graphics/entity/steam-assembling-machine.png
rename to lignumis/graphics/entity/steam-assembling-machine/steam-assembling-machine.png
diff --git a/lignumis/graphics/entity/wood-lab-light.png b/lignumis/graphics/entity/wood-lab/wood-lab-light.png
similarity index 100%
rename from lignumis/graphics/entity/wood-lab-light.png
rename to lignumis/graphics/entity/wood-lab/wood-lab-light.png
diff --git a/lignumis/graphics/entity/wood-lab.png b/lignumis/graphics/entity/wood-lab/wood-lab.png
similarity index 100%
rename from lignumis/graphics/entity/wood-lab.png
rename to lignumis/graphics/entity/wood-lab/wood-lab.png
diff --git a/lignumis/prototypes/content/burner-agricultural-tower.lua b/lignumis/prototypes/content/burner-agricultural-tower.lua
index e7555ad..997f907 100644
--- a/lignumis/prototypes/content/burner-agricultural-tower.lua
+++ b/lignumis/prototypes/content/burner-agricultural-tower.lua
@@ -1,15 +1,16 @@
 local item_sounds = require("__base__.prototypes.item_sounds")
 
+local gfx = "__lignumis__/graphics/entity/burner-agricultural-tower/"
+
 local agricultural_tower = table.deepcopy(data.raw["agricultural-tower"]["agricultural-tower"])
 agricultural_tower.name = "burner-agricultural-tower"
 agricultural_tower.minable.result = "burner-agricultural-tower"
 agricultural_tower.next_upgrade = "agricultural-tower"
 agricultural_tower.corpses = "burner-agricultural-tower-remnants"
 agricultural_tower.icon = "__lignumis__/graphics/icons/burner-agricultural-tower.png"
-agricultural_tower.graphics_set.animation.layers[1].filename =
-"__lignumis__/graphics/entity/burner-agricultural-tower-base.png"
-agricultural_tower.graphics_set.working_visualisations[1].animation.filename =
-"__lignumis__/graphics/entity/burner-agricultural-tower-base.png"
+agricultural_tower.graphics_set.animation.layers[1].filename = gfx .. "burner-agricultural-tower-base.png"
+agricultural_tower.graphics_set.working_visualisations[1].animation.filename = gfx ..
+"burner-agricultural-tower-base.png"
 agricultural_tower.energy_source = {
     type = "burner",
     fuel_categories = { "chemical" },
@@ -23,18 +24,18 @@ agricultural_tower.output_inventory_size = 3
 agricultural_tower.radius = 2
 
 local crane = agricultural_tower.crane
-crane.parts[1].rotated_sprite.filenames = { "__lignumis__/graphics/entity/burner-agricultural-tower-crane-1-1.png",
-    "__lignumis__/graphics/entity/burner-agricultural-tower-crane-1-2.png" }
-crane.parts[2].rotated_sprite.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-crane-3.png"
-crane.parts[3].rotated_sprite.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-crane-4.png"
-crane.parts[4].rotated_sprite.filenames = { "__lignumis__/graphics/entity/burner-agricultural-tower-crane-5-1.png",
-    "__lignumis__/graphics/entity/burner-agricultural-tower-crane-5-2.png" }
-crane.parts[5].rotated_sprite.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-crane-6.png"
-crane.parts[6].rotated_sprite.filenames = { "__lignumis__/graphics/entity/burner-agricultural-tower-crane-7-1.png",
-    "__lignumis__/graphics/entity/burner-agricultural-tower-crane-7-2.png" }
-crane.parts[7].rotated_sprite.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-crane-8.png"
-crane.parts[8].sprite.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-crane-9.png"
-crane.parts[9].sprite.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-crane-10.png"
+crane.parts[1].rotated_sprite.filenames = { gfx .. "burner-agricultural-tower-crane-1-1.png", gfx ..
+"burner-agricultural-tower-crane-1-2.png" }
+crane.parts[2].rotated_sprite.filename = gfx .. "burner-agricultural-tower-crane-3.png"
+crane.parts[3].rotated_sprite.filename = gfx .. "burner-agricultural-tower-crane-4.png"
+crane.parts[4].rotated_sprite.filenames = { gfx .. "burner-agricultural-tower-crane-5-1.png", gfx ..
+"burner-agricultural-tower-crane-5-2.png" }
+crane.parts[5].rotated_sprite.filename = gfx .. "burner-agricultural-tower-crane-6.png"
+crane.parts[6].rotated_sprite.filenames = { gfx .. "burner-agricultural-tower-crane-7-1.png", gfx ..
+"burner-agricultural-tower-crane-7-2.png" }
+crane.parts[7].rotated_sprite.filename = gfx .. "burner-agricultural-tower-crane-8.png"
+crane.parts[8].sprite.filename = gfx .. "burner-agricultural-tower-crane-9.png"
+crane.parts[9].sprite.filename = gfx .. "burner-agricultural-tower-crane-10.png"
 crane.speed = {
     arm = {
         turn_rate = 0.001,
@@ -51,7 +52,7 @@ crane.speed = {
 local remnants = table.deepcopy(data.raw["corpse"]["agricultural-tower-remnants"])
 remnants.name = "burner-agricultural-tower-remnants"
 remnants.icon = "__lignumis__/graphics/icons/burner-agricultural-tower.png"
-remnants.animation.filename = "__lignumis__/graphics/entity/burner-agricultural-tower-remnants.png"
+remnants.animation.filename = gfx .. "burner-agricultural-tower-remnants.png"
 remnants.order = "a[0-burner-agricultural-tower]"
 
 data:extend({
@@ -88,7 +89,7 @@ data:extend({
         name = "burner-agricultural-tower-electronic-circuit",
         icons = {
             { icon = "__lignumis__/graphics/icons/burner-agricultural-tower.png" },
-            { icon = "__base__/graphics/icons/electronic-circuit.png", scale = 0.25, shift = { 8, 8 } }
+            { icon = "__base__/graphics/icons/electronic-circuit.png",           scale = 0.25, shift = { 8, 8 } }
         },
         energy_required = 10,
         ingredients = {
@@ -118,4 +119,4 @@ data.raw.technology["fish-breeding"].prerequisites = { "agricultural-science-pac
 table.insert(data.raw.technology["electronics"].effects, {
     type = "unlock-recipe",
     recipe = "burner-agricultural-tower-electronic-circuit"
-})
\ No newline at end of file
+})
diff --git a/lignumis/prototypes/content/burner-assembling-machine.lua b/lignumis/prototypes/content/burner-assembling-machine.lua
index 1e25026..e121c90 100644
--- a/lignumis/prototypes/content/burner-assembling-machine.lua
+++ b/lignumis/prototypes/content/burner-assembling-machine.lua
@@ -1,5 +1,7 @@
 local item_sounds = require("__base__.prototypes.item_sounds")
 
+local gfx = "__lignumis__/graphics/entity/burner-assembling-machine/"
+
 local assembling_machine = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-1"])
 assembling_machine.name = "burner-assembling-machine"
 assembling_machine.icon = "__lignumis__/graphics/icons/burner-assembling-machine.png"
@@ -8,7 +10,7 @@ assembling_machine.next_upgrade = "steam-assembling-machine"
 assembling_machine.corpse = "burner-assembling-machine-remnants"
 assembling_machine.resistances = nil
 assembling_machine.graphics_set.animation.layers[1].filename =
-"__lignumis__/graphics/entity/burner-assembling-machine.png"
+gfx .. "burner-assembling-machine.png"
 assembling_machine.crafting_categories = {
     "crafting",
     "basic-crafting",
@@ -38,9 +40,9 @@ assembling_machine.energy_usage = "75kW"
 local remnants = table.deepcopy(data.raw["corpse"]["assembling-machine-1-remnants"])
 remnants.name = "burner-assembling-machine-remnants"
 remnants.icon = "__lignumis__/graphics/icons/burner-assembling-machine.png"
-remnants.animation[1].filename = "__lignumis__/graphics/entity/burner-assembling-machine-remnants.png"
-remnants.animation[2].filename = "__lignumis__/graphics/entity/burner-assembling-machine-remnants.png"
-remnants.animation[3].filename = "__lignumis__/graphics/entity/burner-assembling-machine-remnants.png"
+remnants.animation[1].filename = gfx .. "burner-assembling-machine-remnants.png"
+remnants.animation[2].filename = gfx .. "burner-assembling-machine-remnants.png"
+remnants.animation[3].filename = gfx .. "burner-assembling-machine-remnants.png"
 remnants.order = "0[burner-assembling-machine]"
 
 data:extend({
diff --git a/lignumis/prototypes/content/burner-long-handed-inserter.lua b/lignumis/prototypes/content/burner-long-handed-inserter.lua
index 4c3621b..257c584 100644
--- a/lignumis/prototypes/content/burner-long-handed-inserter.lua
+++ b/lignumis/prototypes/content/burner-long-handed-inserter.lua
@@ -1,5 +1,7 @@
 local item_sounds = require("__base__.prototypes.item_sounds")
 
+local gfx = "__lignumis__/graphics/entity/burner-long-handed-inserter/"
+
 local long_handed_inserter = table.deepcopy(data.raw["inserter"]["long-handed-inserter"])
 long_handed_inserter.name = "burner-long-handed-inserter"
 long_handed_inserter.icon = "__lignumis__/graphics/icons/burner-long-handed-inserter.png"
@@ -7,10 +9,10 @@ long_handed_inserter.minable.result = "burner-long-handed-inserter"
 long_handed_inserter.next_upgrade = "long-handed-inserter"
 long_handed_inserter.corpse = "burner-long-handed-inserter-remnants"
 long_handed_inserter.resistances = nil
-long_handed_inserter.hand_base_picture.filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-hand-base.png"
-long_handed_inserter.hand_closed_picture.filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-hand-closed.png"
-long_handed_inserter.hand_open_picture.filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-hand-open.png"
-long_handed_inserter.platform_picture.sheet.filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-platform.png"
+long_handed_inserter.hand_base_picture.filename = gfx .. "burner-long-handed-inserter-hand-base.png"
+long_handed_inserter.hand_closed_picture.filename = gfx .. "burner-long-handed-inserter-hand-closed.png"
+long_handed_inserter.hand_open_picture.filename = gfx .. "burner-long-handed-inserter-hand-open.png"
+long_handed_inserter.platform_picture.sheet.filename = gfx .. "burner-long-handed-inserter-platform.png"
 long_handed_inserter.energy_per_movement = "100kJ"
 long_handed_inserter.energy_per_rotation = "100kJ"
 long_handed_inserter.energy_source = {
@@ -35,10 +37,10 @@ long_handed_inserter.rotation_speed = 0.014
 local remnants = table.deepcopy(data.raw["corpse"]["long-handed-inserter-remnants"])
 remnants.name = "burner-long-handed-inserter-remnants"
 remnants.icon = "__lignumis__/graphics/icons/burner-long-handed-inserter.png"
-remnants.animation[1].filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-remnants.png"
-remnants.animation[2].filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-remnants.png"
-remnants.animation[3].filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-remnants.png"
-remnants.animation[4].filename = "__lignumis__/graphics/entity/burner-long-handed-inserter-remnants.png"
+remnants.animation[1].filename = gfx .. "burner-long-handed-inserter-remnants.png"
+remnants.animation[2].filename = gfx .. "burner-long-handed-inserter-remnants.png"
+remnants.animation[3].filename = gfx .. "burner-long-handed-inserter-remnants.png"
+remnants.animation[4].filename = gfx .. "burner-long-handed-inserter-remnants.png"
 remnants.order = "a-c-0"
 
 data:extend({
diff --git a/lignumis/prototypes/content/gold/pipes.lua b/lignumis/prototypes/content/gold/pipes.lua
index b0b69b3..12593ec 100644
--- a/lignumis/prototypes/content/gold/pipes.lua
+++ b/lignumis/prototypes/content/gold/pipes.lua
@@ -227,7 +227,7 @@ local tank = {
         picture = {
             sheets = {
                 {
-                    filename = "__lignumis__/graphics/entity/gold-storage-tank.png",
+                    filename = "__lignumis__/graphics/entity/gold-storage-tank/gold-storage-tank.png",
                     priority = "extra-high",
                     width = 128,
                     height = 160,
@@ -236,7 +236,7 @@ local tank = {
                     shift = util.by_pixel(0, -8)
                 },
                 {
-                    filename = "__lignumis__/graphics/entity/gold-storage-tank.png",
+                    filename = "__lignumis__/graphics/entity/gold-storage-tank/gold-storage-tank.png",
                     priority = "extra-high",
                     y = 160,
                     width = 160,
@@ -249,7 +249,7 @@ local tank = {
             }
         },
         window_background = {
-            filename = "__lignumis__/graphics/entity/gold-storage-tank-window-background.png",
+            filename = "__lignumis__/graphics/entity/gold-storage-tank/gold-storage-tank-window-background.png",
             priority = "extra-high",
             width = 20,
             height = 41,
@@ -376,7 +376,7 @@ local tank_remnants = {
     remove_on_tile_placement = false,
     animation = make_rotated_animation_variations_from_sheet(1,
         {
-            filename = "__lignumis__/graphics/entity/gold-storage-tank-remnants.png",
+            filename = "__lignumis__/graphics/entity/gold-storage-tank/gold-storage-tank-remnants.png",
             line_length = 1,
             width = 284,
             height = 188,
diff --git a/lignumis/prototypes/content/gold/stromatolite.lua b/lignumis/prototypes/content/gold/stromatolite.lua
index 9fc096c..a2b621e 100644
--- a/lignumis/prototypes/content/gold/stromatolite.lua
+++ b/lignumis/prototypes/content/gold/stromatolite.lua
@@ -18,7 +18,7 @@ stromatolite.minable.results = {
 stromatolite.map_color = { 255, 171, 0, 0.5 }
 stromatolite.pictures = {
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-01.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-01.png",
         width = 209,
         height = 138,
         shift = { 0.304688, -0.4 },
@@ -26,105 +26,105 @@ stromatolite.pictures = {
 
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-02.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-02.png",
         width = 165,
         height = 129,
         shift = { 0.0, 0.0390625 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-03.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-03.png",
         width = 151,
         height = 139,
         shift = { 0.151562, 0.0 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-04.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-04.png",
         width = 216,
         height = 110,
         shift = { 0.390625, 0.0 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-05.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-05.png",
         width = 154,
         height = 147,
         shift = { 0.328125, 0.0703125 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-06.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-06.png",
         width = 154,
         height = 132,
         shift = { 0.16875, -0.1 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-07.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-07.png",
         width = 193,
         height = 130,
         shift = { 0.3, -0.2 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-08.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-08.png",
         width = 136,
         height = 117,
         shift = { 0.0, 0.0 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-09.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-09.png",
         width = 157,
         height = 115,
         shift = { 0.1, 0.0 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-10.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-10.png",
         width = 198,
         height = 153,
         shift = { 0.325, -0.1 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-11.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-11.png",
         width = 190,
         height = 115,
         shift = { 0.453125, 0.0 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-12.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-12.png",
         width = 229,
         height = 126,
         shift = { 0.539062, -0.015625 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-13.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-13.png",
         width = 151,
         height = 125,
         shift = { 0.0703125, 0.179688 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-14.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-14.png",
         width = 137,
         height = 117,
         shift = { 0.160938, 0.0 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-15.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-15.png",
         width = 201,
         height = 141,
         shift = { 0.242188, -0.195312 },
         scale = 0.4
     },
     {
-        filename = "__lignumis__/graphics/entity/gold-stromatolite-16.png",
+        filename = "__lignumis__/graphics/entity/gold-stromatolite/gold-stromatolite-16.png",
         width = 209,
         height = 154,
         shift = { 0.351562, -0.1 },
diff --git a/lignumis/prototypes/content/steam-assembling-machine.lua b/lignumis/prototypes/content/steam-assembling-machine.lua
index c66ab03..3bf280c 100644
--- a/lignumis/prototypes/content/steam-assembling-machine.lua
+++ b/lignumis/prototypes/content/steam-assembling-machine.lua
@@ -1,6 +1,8 @@
 local item_sounds = require("__base__.prototypes.item_sounds")
 local pipecovers = require("prototypes/content/gold/pipecovers")
 
+local gfx = "__lignumis__/graphics/entity/steam-assembling-machine/"
+
 local assembling_machine = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-2"])
 assembling_machine.name = "steam-assembling-machine"
 assembling_machine.icon = "__lignumis__/graphics/icons/steam-assembling-machine.png"
@@ -11,7 +13,7 @@ assembling_machine.corpses = "steam-assembling-machine-remnants"
 assembling_machine.resistances = nil
 assembling_machine.graphics_set = table.deepcopy(data.raw["assembling-machine"]["assembling-machine-1"].graphics_set)
 assembling_machine.graphics_set.animation.layers[1].filename =
-"__lignumis__/graphics/entity/steam-assembling-machine.png"
+gfx .. "steam-assembling-machine.png"
 assembling_machine.crafting_categories = {
     "crafting",
     "basic-crafting",
@@ -43,9 +45,9 @@ assembling_machine.energy_source = {
 local remnants = table.deepcopy(data.raw["corpse"]["assembling-machine-1-remnants"])
 remnants.name = "steam-assembling-machine-remnants"
 remnants.icon = "__lignumis__/graphics/icons/steam-assembling-machine.png"
-remnants.animation[1].filename = "__lignumis__/graphics/entity/steam-assembling-machine-remnants.png"
-remnants.animation[2].filename = "__lignumis__/graphics/entity/steam-assembling-machine-remnants.png"
-remnants.animation[3].filename = "__lignumis__/graphics/entity/steam-assembling-machine-remnants.png"
+remnants.animation[1].filename = gfx .. "steam-assembling-machine-remnants.png"
+remnants.animation[2].filename = gfx .. "steam-assembling-machine-remnants.png"
+remnants.animation[3].filename = gfx .. "steam-assembling-machine-remnants.png"
 remnants.order = "1[steam-assembling-machine]"
 
 data:extend({
diff --git a/lignumis/prototypes/content/wood-lab.lua b/lignumis/prototypes/content/wood-lab.lua
index bc96eab..2f6748f 100644
--- a/lignumis/prototypes/content/wood-lab.lua
+++ b/lignumis/prototypes/content/wood-lab.lua
@@ -1,5 +1,7 @@
 local item_sounds = require("__base__.prototypes.item_sounds")
 
+local gfx = "__lignumis__/graphics/entity/wood-lab/"
+
 data:extend({
     {
         type = "lab",
@@ -17,7 +19,7 @@ data:extend({
         on_animation = {
             layers = {
                 {
-                    filename = "__lignumis__/graphics/entity/wood-lab.png",
+                    filename = gfx .. "wood-lab.png",
                     width = 194,
                     height = 174,
                     frame_count = 33,
@@ -37,7 +39,7 @@ data:extend({
                     scale = 0.5
                 },
                 {
-                    filename = "__lignumis__/graphics/entity/wood-lab-light.png",
+                    filename = gfx .. "wood-lab-light.png",
                     blend_mode = "additive",
                     draw_as_light = true,
                     width = 216,
@@ -64,7 +66,7 @@ data:extend({
         off_animation = {
             layers = {
                 {
-                    filename = "__lignumis__/graphics/entity/wood-lab.png",
+                    filename = gfx .. "wood-lab.png",
                     width = 194,
                     height = 174,
                     shift = util.by_pixel(0, 1.5),
diff --git a/lignumis/prototypes/integrations/vanilla.lua b/lignumis/prototypes/integrations/vanilla.lua
index 5bafcd8..ba2987f 100644
--- a/lignumis/prototypes/integrations/vanilla.lua
+++ b/lignumis/prototypes/integrations/vanilla.lua
@@ -8,10 +8,10 @@ drill.resource_searching_radius = 1.99
 drill.icon = "__lignumis__/graphics/icons/burner-mining-drill.png"
 drill.impact_category = "wood"
 drill.radius_visualisation_picture = table.deepcopy(data.raw["mining-drill"]["electric-mining-drill"].radius_visualisation_picture)
-drill_animation.north.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill-N.png"
-drill_animation.east.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill-E.png"
-drill_animation.south.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill-S.png"
-drill_animation.west.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill-W.png"
+drill_animation.north.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill/burner-mining-drill-N.png"
+drill_animation.east.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill/burner-mining-drill-E.png"
+drill_animation.south.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill/burner-mining-drill-S.png"
+drill_animation.west.layers[1].filename = "__lignumis__/graphics/entity/burner-mining-drill/burner-mining-drill-W.png"
 
 local drill_item = data.raw["item"]["burner-mining-drill"]
 drill_item.icon = "__lignumis__/graphics/icons/burner-mining-drill.png"
@@ -28,10 +28,10 @@ drill_recipe.ingredients = {
 
 local burner_inserter = data.raw["inserter"]["burner-inserter"]
 burner_inserter.icon = "__lignumis__/graphics/icons/burner-inserter.png"
-burner_inserter.hand_base_picture.filename = "__lignumis__/graphics/entity/burner-inserter-hand-base.png"
-burner_inserter.hand_closed_picture.filename = "__lignumis__/graphics/entity/burner-inserter-hand-closed.png"
-burner_inserter.hand_open_picture.filename = "__lignumis__/graphics/entity/burner-inserter-hand-open.png"
-burner_inserter.platform_picture.sheet.filename = "__lignumis__/graphics/entity/burner-inserter-platform.png"
+burner_inserter.hand_base_picture.filename = "__lignumis__/graphics/entity/burner-inserter/burner-inserter-hand-base.png"
+burner_inserter.hand_closed_picture.filename = "__lignumis__/graphics/entity/burner-inserter/burner-inserter-hand-closed.png"
+burner_inserter.hand_open_picture.filename = "__lignumis__/graphics/entity/burner-inserter/burner-inserter-hand-open.png"
+burner_inserter.platform_picture.sheet.filename = "__lignumis__/graphics/entity/burner-inserter/burner-inserter-platform.png"
 burner_inserter.energy_source.initial_fuel_percent = 0.15
 
 data.raw.item["burner-inserter"].icon = "__lignumis__/graphics/icons/burner-inserter.png"
diff --git a/sources/entity/burner-agricultural-tower-base.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-base.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-base.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-base.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-1-1.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-1.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-1-1.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-1.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-1-2.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-2.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-1-2.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-1-2.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-10.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-10.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-10.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-10.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-3.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-3.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-3.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-3.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-4.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-4.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-4.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-4.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-5-1.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-1.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-5-1.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-1.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-5-2.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-2.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-5-2.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5-2.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-5.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-5.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-5.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-6.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-6.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-6.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-6.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-7-1.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-1.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-7-1.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-1.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-7-2.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-2.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-7-2.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7-2.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-7.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-7.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-7.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-8.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-8.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-8.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-8.afphoto
diff --git a/sources/entity/burner-agricultural-tower-crane-9.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-9.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-crane-9.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-crane-9.afphoto
diff --git a/sources/entity/burner-agricultural-tower-remnants.afphoto b/sources/entity/burner-agricultural-tower/burner-agricultural-tower-remnants.afphoto
similarity index 100%
rename from sources/entity/burner-agricultural-tower-remnants.afphoto
rename to sources/entity/burner-agricultural-tower/burner-agricultural-tower-remnants.afphoto
diff --git a/sources/entity/burner-assembling-machine-remnants.afphoto b/sources/entity/burner-assembling-machine/burner-assembling-machine-remnants.afphoto
similarity index 100%
rename from sources/entity/burner-assembling-machine-remnants.afphoto
rename to sources/entity/burner-assembling-machine/burner-assembling-machine-remnants.afphoto
diff --git a/sources/entity/burner-assembling-machine.afphoto b/sources/entity/burner-assembling-machine/burner-assembling-machine.afphoto
similarity index 100%
rename from sources/entity/burner-assembling-machine.afphoto
rename to sources/entity/burner-assembling-machine/burner-assembling-machine.afphoto
diff --git a/sources/entity/burner-inserter-hand-base.afphoto b/sources/entity/burner-inserter/burner-inserter-hand-base.afphoto
similarity index 100%
rename from sources/entity/burner-inserter-hand-base.afphoto
rename to sources/entity/burner-inserter/burner-inserter-hand-base.afphoto
diff --git a/sources/entity/burner-inserter-hand-closed.afphoto b/sources/entity/burner-inserter/burner-inserter-hand-closed.afphoto
similarity index 100%
rename from sources/entity/burner-inserter-hand-closed.afphoto
rename to sources/entity/burner-inserter/burner-inserter-hand-closed.afphoto
diff --git a/sources/entity/burner-inserter-hand-open.afphoto b/sources/entity/burner-inserter/burner-inserter-hand-open.afphoto
similarity index 100%
rename from sources/entity/burner-inserter-hand-open.afphoto
rename to sources/entity/burner-inserter/burner-inserter-hand-open.afphoto
diff --git a/sources/entity/burner-inserter-platform.afphoto b/sources/entity/burner-inserter/burner-inserter-platform.afphoto
similarity index 100%
rename from sources/entity/burner-inserter-platform.afphoto
rename to sources/entity/burner-inserter/burner-inserter-platform.afphoto
diff --git a/sources/entity/burner-inserter-remnants.afphoto b/sources/entity/burner-inserter/burner-inserter-remnants.afphoto
similarity index 100%
rename from sources/entity/burner-inserter-remnants.afphoto
rename to sources/entity/burner-inserter/burner-inserter-remnants.afphoto
diff --git a/sources/entity/burner-long-handed-inserter-hand-base.afphoto b/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-base.afphoto
similarity index 100%
rename from sources/entity/burner-long-handed-inserter-hand-base.afphoto
rename to sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-base.afphoto
diff --git a/sources/entity/burner-long-handed-inserter-hand-closed.afphoto b/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-closed.afphoto
similarity index 100%
rename from sources/entity/burner-long-handed-inserter-hand-closed.afphoto
rename to sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-closed.afphoto
diff --git a/sources/entity/burner-long-handed-inserter-hand-open.afphoto b/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-open.afphoto
similarity index 100%
rename from sources/entity/burner-long-handed-inserter-hand-open.afphoto
rename to sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-hand-open.afphoto
diff --git a/sources/entity/burner-long-handed-inserter-platform.afphoto b/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-platform.afphoto
similarity index 100%
rename from sources/entity/burner-long-handed-inserter-platform.afphoto
rename to sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-platform.afphoto
diff --git a/sources/entity/burner-long-handed-inserter-remnants.afphoto b/sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-remnants.afphoto
similarity index 100%
rename from sources/entity/burner-long-handed-inserter-remnants.afphoto
rename to sources/entity/burner-long-handed-inserter/burner-long-handed-inserter-remnants.afphoto
diff --git a/sources/entity/burner-mining-drill-E.afphoto b/sources/entity/burner-mining-drill/burner-mining-drill-E.afphoto
similarity index 100%
rename from sources/entity/burner-mining-drill-E.afphoto
rename to sources/entity/burner-mining-drill/burner-mining-drill-E.afphoto
diff --git a/sources/entity/burner-mining-drill-N.afphoto b/sources/entity/burner-mining-drill/burner-mining-drill-N.afphoto
similarity index 100%
rename from sources/entity/burner-mining-drill-N.afphoto
rename to sources/entity/burner-mining-drill/burner-mining-drill-N.afphoto
diff --git a/sources/entity/burner-mining-drill-S.afphoto b/sources/entity/burner-mining-drill/burner-mining-drill-S.afphoto
similarity index 100%
rename from sources/entity/burner-mining-drill-S.afphoto
rename to sources/entity/burner-mining-drill/burner-mining-drill-S.afphoto
diff --git a/sources/entity/burner-mining-drill-W.afphoto b/sources/entity/burner-mining-drill/burner-mining-drill-W.afphoto
similarity index 100%
rename from sources/entity/burner-mining-drill-W.afphoto
rename to sources/entity/burner-mining-drill/burner-mining-drill-W.afphoto
diff --git a/sources/entity/gold-rift.afphoto b/sources/entity/gold-rift.afphoto
deleted file mode 100644
index 69765a3..0000000
Binary files a/sources/entity/gold-rift.afphoto and /dev/null differ
diff --git a/sources/entity/gold-rift.png b/sources/entity/gold-rift.png
deleted file mode 100644
index c10d94e..0000000
Binary files a/sources/entity/gold-rift.png and /dev/null differ
diff --git a/sources/entity/gold-storage-tank-remnants.afphoto b/sources/entity/gold-storage-tank/gold-storage-tank-remnants.afphoto
similarity index 100%
rename from sources/entity/gold-storage-tank-remnants.afphoto
rename to sources/entity/gold-storage-tank/gold-storage-tank-remnants.afphoto
diff --git a/sources/entity/gold-fluid-tank-window-background.png b/sources/entity/gold-storage-tank/gold-storage-tank-window-background.png
similarity index 100%
rename from sources/entity/gold-fluid-tank-window-background.png
rename to sources/entity/gold-storage-tank/gold-storage-tank-window-background.png
diff --git a/sources/entity/gold-fluid-tank.afphoto b/sources/entity/gold-storage-tank/gold-storage-tank.afphoto
similarity index 100%
rename from sources/entity/gold-fluid-tank.afphoto
rename to sources/entity/gold-storage-tank/gold-storage-tank.afphoto
diff --git a/sources/entity/gold-stromatolite-01.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-01.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-01.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-01.afphoto
diff --git a/sources/entity/gold-stromatolite-02.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-02.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-02.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-02.afphoto
diff --git a/sources/entity/gold-stromatolite-03.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-03.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-03.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-03.afphoto
diff --git a/sources/entity/gold-stromatolite-04.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-04.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-04.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-04.afphoto
diff --git a/sources/entity/gold-stromatolite-05.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-05.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-05.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-05.afphoto
diff --git a/sources/entity/gold-stromatolite-06.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-06.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-06.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-06.afphoto
diff --git a/sources/entity/gold-stromatolite-07.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-07.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-07.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-07.afphoto
diff --git a/sources/entity/gold-stromatolite-08.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-08.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-08.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-08.afphoto
diff --git a/sources/entity/gold-stromatolite-09.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-09.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-09.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-09.afphoto
diff --git a/sources/entity/gold-stromatolite-10.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-10.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-10.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-10.afphoto
diff --git a/sources/entity/gold-stromatolite-11.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-11.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-11.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-11.afphoto
diff --git a/sources/entity/gold-stromatolite-12.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-12.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-12.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-12.afphoto
diff --git a/sources/entity/gold-stromatolite-13.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-13.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-13.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-13.afphoto
diff --git a/sources/entity/gold-stromatolite-14.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-14.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-14.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-14.afphoto
diff --git a/sources/entity/gold-stromatolite-15.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-15.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-15.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-15.afphoto
diff --git a/sources/entity/gold-stromatolite-16.afphoto b/sources/entity/gold-stromatolite/gold-stromatolite-16.afphoto
similarity index 100%
rename from sources/entity/gold-stromatolite-16.afphoto
rename to sources/entity/gold-stromatolite/gold-stromatolite-16.afphoto
diff --git a/sources/entity/steam-assembling-machine-remnants.afphoto b/sources/entity/steam-assembling-machine/steam-assembling-machine-remnants.afphoto
similarity index 100%
rename from sources/entity/steam-assembling-machine-remnants.afphoto
rename to sources/entity/steam-assembling-machine/steam-assembling-machine-remnants.afphoto
diff --git a/sources/entity/steam-assembling-machine.afphoto b/sources/entity/steam-assembling-machine/steam-assembling-machine.afphoto
similarity index 100%
rename from sources/entity/steam-assembling-machine.afphoto
rename to sources/entity/steam-assembling-machine/steam-assembling-machine.afphoto
diff --git a/sources/entity/wood-lab-light.afphoto b/sources/entity/wood-lab/wood-lab-light.afphoto
similarity index 100%
rename from sources/entity/wood-lab-light.afphoto
rename to sources/entity/wood-lab/wood-lab-light.afphoto
diff --git a/sources/entity/wood-lab.afphoto b/sources/entity/wood-lab/wood-lab.afphoto
similarity index 100%
rename from sources/entity/wood-lab.afphoto
rename to sources/entity/wood-lab/wood-lab.afphoto
diff --git a/sources/entity/wood-splitter-east-top_patch.afphoto b/sources/entity/wood-splitter-east-top_patch.afphoto
deleted file mode 100644
index dd9d374..0000000
Binary files a/sources/entity/wood-splitter-east-top_patch.afphoto and /dev/null differ
diff --git a/sources/entity/wood-splitter-east.afphoto b/sources/entity/wood-splitter-east.afphoto
deleted file mode 100644
index 20711de..0000000
Binary files a/sources/entity/wood-splitter-east.afphoto and /dev/null differ
diff --git a/sources/entity/wood-splitter-north.afphoto b/sources/entity/wood-splitter-north.afphoto
deleted file mode 100644
index 0e63ce8..0000000
Binary files a/sources/entity/wood-splitter-north.afphoto and /dev/null differ
diff --git a/sources/entity/wood-splitter-remnants.afphoto b/sources/entity/wood-splitter-remnants.afphoto
deleted file mode 100644
index fcd5578..0000000
Binary files a/sources/entity/wood-splitter-remnants.afphoto and /dev/null differ
diff --git a/sources/entity/wood-splitter-south.afphoto b/sources/entity/wood-splitter-south.afphoto
deleted file mode 100644
index 510abaf..0000000
Binary files a/sources/entity/wood-splitter-south.afphoto and /dev/null differ
diff --git a/sources/entity/wood-splitter-west-top_patch.afphoto b/sources/entity/wood-splitter-west-top_patch.afphoto
deleted file mode 100644
index 80afaf0..0000000
Binary files a/sources/entity/wood-splitter-west-top_patch.afphoto and /dev/null differ
diff --git a/sources/entity/wood-splitter-west.afphoto b/sources/entity/wood-splitter-west.afphoto
deleted file mode 100644
index 4b67ce8..0000000
Binary files a/sources/entity/wood-splitter-west.afphoto and /dev/null differ
diff --git a/sources/entity/wood-transport-belt-remnants.afphoto b/sources/entity/wood-transport-belt-remnants.afphoto
deleted file mode 100644
index fe29894..0000000
Binary files a/sources/entity/wood-transport-belt-remnants.afphoto and /dev/null differ
diff --git a/sources/entity/wood-transport-belt.afphoto b/sources/entity/wood-transport-belt.afphoto
deleted file mode 100644
index 0e4059f..0000000
Binary files a/sources/entity/wood-transport-belt.afphoto and /dev/null differ
diff --git a/sources/entity/wood-underground-belt-remnants.afphoto b/sources/entity/wood-underground-belt-remnants.afphoto
deleted file mode 100644
index 7f0e6c3..0000000
Binary files a/sources/entity/wood-underground-belt-remnants.afphoto and /dev/null differ
diff --git a/sources/entity/wood-underground-belt-structure.afphoto b/sources/entity/wood-underground-belt-structure.afphoto
deleted file mode 100644
index 9d88a4e..0000000
Binary files a/sources/entity/wood-underground-belt-structure.afphoto and /dev/null differ