diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_black.png b/src/main/resources/textures/block/cubes/clay/dyed/black.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_black.png
rename to src/main/resources/textures/block/cubes/clay/dyed/black.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_blue.png b/src/main/resources/textures/block/cubes/clay/dyed/blue.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_blue.png
rename to src/main/resources/textures/block/cubes/clay/dyed/blue.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_brown.png b/src/main/resources/textures/block/cubes/clay/dyed/brown.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_brown.png
rename to src/main/resources/textures/block/cubes/clay/dyed/brown.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_cyan.png b/src/main/resources/textures/block/cubes/clay/dyed/cyan.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_cyan.png
rename to src/main/resources/textures/block/cubes/clay/dyed/cyan.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_gray.png b/src/main/resources/textures/block/cubes/clay/dyed/gray.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_gray.png
rename to src/main/resources/textures/block/cubes/clay/dyed/gray.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_green.png b/src/main/resources/textures/block/cubes/clay/dyed/green.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_green.png
rename to src/main/resources/textures/block/cubes/clay/dyed/green.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_light_blue.png b/src/main/resources/textures/block/cubes/clay/dyed/light_blue.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_light_blue.png
rename to src/main/resources/textures/block/cubes/clay/dyed/light_blue.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_light_gray.png b/src/main/resources/textures/block/cubes/clay/dyed/light_gray.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_light_gray.png
rename to src/main/resources/textures/block/cubes/clay/dyed/light_gray.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_lime.png b/src/main/resources/textures/block/cubes/clay/dyed/lime.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_lime.png
rename to src/main/resources/textures/block/cubes/clay/dyed/lime.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_magenta.png b/src/main/resources/textures/block/cubes/clay/dyed/magenta.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_magenta.png
rename to src/main/resources/textures/block/cubes/clay/dyed/magenta.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_orange.png b/src/main/resources/textures/block/cubes/clay/dyed/orange.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_orange.png
rename to src/main/resources/textures/block/cubes/clay/dyed/orange.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_pink.png b/src/main/resources/textures/block/cubes/clay/dyed/pink.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_pink.png
rename to src/main/resources/textures/block/cubes/clay/dyed/pink.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_purple.png b/src/main/resources/textures/block/cubes/clay/dyed/purple.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_purple.png
rename to src/main/resources/textures/block/cubes/clay/dyed/purple.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_red.png b/src/main/resources/textures/block/cubes/clay/dyed/red.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_red.png
rename to src/main/resources/textures/block/cubes/clay/dyed/red.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_white.png b/src/main/resources/textures/block/cubes/clay/dyed/white.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_white.png
rename to src/main/resources/textures/block/cubes/clay/dyed/white.png
diff --git a/src/main/resources/textures/block/cubes/clay/dyed_clay_stained_yellow.png b/src/main/resources/textures/block/cubes/clay/dyed/yellow.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/clay/dyed_clay_stained_yellow.png
rename to src/main/resources/textures/block/cubes/clay/dyed/yellow.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_black.png b/src/main/resources/textures/block/cubes/concrete/black.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_black.png
rename to src/main/resources/textures/block/cubes/concrete/black.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_blue.png b/src/main/resources/textures/block/cubes/concrete/blue.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_blue.png
rename to src/main/resources/textures/block/cubes/concrete/blue.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_brown.png b/src/main/resources/textures/block/cubes/concrete/brown.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_brown.png
rename to src/main/resources/textures/block/cubes/concrete/brown.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_cyan.png b/src/main/resources/textures/block/cubes/concrete/cyan.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_cyan.png
rename to src/main/resources/textures/block/cubes/concrete/cyan.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_gray.png b/src/main/resources/textures/block/cubes/concrete/gray.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_gray.png
rename to src/main/resources/textures/block/cubes/concrete/gray.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_green.png b/src/main/resources/textures/block/cubes/concrete/green.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_green.png
rename to src/main/resources/textures/block/cubes/concrete/green.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_light_blue.png b/src/main/resources/textures/block/cubes/concrete/light_blue.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_light_blue.png
rename to src/main/resources/textures/block/cubes/concrete/light_blue.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_lime.png b/src/main/resources/textures/block/cubes/concrete/lime.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_lime.png
rename to src/main/resources/textures/block/cubes/concrete/lime.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_magenta.png b/src/main/resources/textures/block/cubes/concrete/magenta.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_magenta.png
rename to src/main/resources/textures/block/cubes/concrete/magenta.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_orange.png b/src/main/resources/textures/block/cubes/concrete/orange.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_orange.png
rename to src/main/resources/textures/block/cubes/concrete/orange.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_pink.png b/src/main/resources/textures/block/cubes/concrete/pink.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_pink.png
rename to src/main/resources/textures/block/cubes/concrete/pink.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_black.png b/src/main/resources/textures/block/cubes/concrete/powder/black.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_black.png
rename to src/main/resources/textures/block/cubes/concrete/powder/black.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_blue.png b/src/main/resources/textures/block/cubes/concrete/powder/blue.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_blue.png
rename to src/main/resources/textures/block/cubes/concrete/powder/blue.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_brown.png b/src/main/resources/textures/block/cubes/concrete/powder/brown.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_brown.png
rename to src/main/resources/textures/block/cubes/concrete/powder/brown.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_cyan.png b/src/main/resources/textures/block/cubes/concrete/powder/cyan.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_cyan.png
rename to src/main/resources/textures/block/cubes/concrete/powder/cyan.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_gray.png b/src/main/resources/textures/block/cubes/concrete/powder/gray.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_gray.png
rename to src/main/resources/textures/block/cubes/concrete/powder/gray.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_green.png b/src/main/resources/textures/block/cubes/concrete/powder/green.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_green.png
rename to src/main/resources/textures/block/cubes/concrete/powder/green.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_light_blue.png b/src/main/resources/textures/block/cubes/concrete/powder/light_blue.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_light_blue.png
rename to src/main/resources/textures/block/cubes/concrete/powder/light_blue.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_lime.png b/src/main/resources/textures/block/cubes/concrete/powder/lime.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_lime.png
rename to src/main/resources/textures/block/cubes/concrete/powder/lime.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_magenta.png b/src/main/resources/textures/block/cubes/concrete/powder/magenta.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_magenta.png
rename to src/main/resources/textures/block/cubes/concrete/powder/magenta.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_orange.png b/src/main/resources/textures/block/cubes/concrete/powder/orange.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_orange.png
rename to src/main/resources/textures/block/cubes/concrete/powder/orange.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_pink.png b/src/main/resources/textures/block/cubes/concrete/powder/pink.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_pink.png
rename to src/main/resources/textures/block/cubes/concrete/powder/pink.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_purple.png b/src/main/resources/textures/block/cubes/concrete/powder/purple.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_purple.png
rename to src/main/resources/textures/block/cubes/concrete/powder/purple.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_red.png b/src/main/resources/textures/block/cubes/concrete/powder/red.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_red.png
rename to src/main/resources/textures/block/cubes/concrete/powder/red.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_silver.png b/src/main/resources/textures/block/cubes/concrete/powder/silver.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_silver.png
rename to src/main/resources/textures/block/cubes/concrete/powder/silver.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_white.png b/src/main/resources/textures/block/cubes/concrete/powder/white.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_white.png
rename to src/main/resources/textures/block/cubes/concrete/powder/white.png
diff --git a/src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_yellow.png b/src/main/resources/textures/block/cubes/concrete/powder/yellow.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/powder/concrete_powder_yellow.png
rename to src/main/resources/textures/block/cubes/concrete/powder/yellow.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_purple.png b/src/main/resources/textures/block/cubes/concrete/purple.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_purple.png
rename to src/main/resources/textures/block/cubes/concrete/purple.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_red.png b/src/main/resources/textures/block/cubes/concrete/red.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_red.png
rename to src/main/resources/textures/block/cubes/concrete/red.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_silver.png b/src/main/resources/textures/block/cubes/concrete/silver.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_silver.png
rename to src/main/resources/textures/block/cubes/concrete/silver.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_white.png b/src/main/resources/textures/block/cubes/concrete/white.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_white.png
rename to src/main/resources/textures/block/cubes/concrete/white.png
diff --git a/src/main/resources/textures/block/cubes/concrete/concrete_yellow.png b/src/main/resources/textures/block/cubes/concrete/yellow.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/concrete/concrete_yellow.png
rename to src/main/resources/textures/block/cubes/concrete/yellow.png
diff --git a/src/main/resources/textures/block/cubes/door/door_acacia_lower.png b/src/main/resources/textures/block/cubes/door/acacia_lower.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_acacia_lower.png
rename to src/main/resources/textures/block/cubes/door/acacia_lower.png
diff --git a/src/main/resources/textures/block/cubes/door/door_acacia_upper.png b/src/main/resources/textures/block/cubes/door/acacia_upper.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_acacia_upper.png
rename to src/main/resources/textures/block/cubes/door/acacia_upper.png
diff --git a/src/main/resources/textures/block/cubes/door/door_birch_lower.png b/src/main/resources/textures/block/cubes/door/birch_lower.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_birch_lower.png
rename to src/main/resources/textures/block/cubes/door/birch_lower.png
diff --git a/src/main/resources/textures/block/cubes/door/door_birch_upper.png b/src/main/resources/textures/block/cubes/door/birch_upper.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_birch_upper.png
rename to src/main/resources/textures/block/cubes/door/birch_upper.png
diff --git a/src/main/resources/textures/block/cubes/door/door_dark_oak_lower.png b/src/main/resources/textures/block/cubes/door/dark_oak_lower.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_dark_oak_lower.png
rename to src/main/resources/textures/block/cubes/door/dark_oak_lower.png
diff --git a/src/main/resources/textures/block/cubes/door/door_dark_oak_upper.png b/src/main/resources/textures/block/cubes/door/dark_oak_upper.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_dark_oak_upper.png
rename to src/main/resources/textures/block/cubes/door/dark_oak_upper.png
diff --git a/src/main/resources/textures/block/cubes/door/door_iron_lower.png b/src/main/resources/textures/block/cubes/door/iron_lower.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_iron_lower.png
rename to src/main/resources/textures/block/cubes/door/iron_lower.png
diff --git a/src/main/resources/textures/block/cubes/door/door_iron_upper.png b/src/main/resources/textures/block/cubes/door/iron_upper.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_iron_upper.png
rename to src/main/resources/textures/block/cubes/door/iron_upper.png
diff --git a/src/main/resources/textures/block/cubes/door/door_jungle_lower.png b/src/main/resources/textures/block/cubes/door/jungle_lower.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_jungle_lower.png
rename to src/main/resources/textures/block/cubes/door/jungle_lower.png
diff --git a/src/main/resources/textures/block/cubes/door/door_jungle_upper.png b/src/main/resources/textures/block/cubes/door/jungle_upper.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_jungle_upper.png
rename to src/main/resources/textures/block/cubes/door/jungle_upper.png
diff --git a/src/main/resources/textures/block/cubes/door/door_oak_lower.png b/src/main/resources/textures/block/cubes/door/oak_lower.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_oak_lower.png
rename to src/main/resources/textures/block/cubes/door/oak_lower.png
diff --git a/src/main/resources/textures/block/cubes/door/door_oak_upper.png b/src/main/resources/textures/block/cubes/door/oak_upper.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_oak_upper.png
rename to src/main/resources/textures/block/cubes/door/oak_upper.png
diff --git a/src/main/resources/textures/block/cubes/door/door_spruce_lower.png b/src/main/resources/textures/block/cubes/door/spruce_lower.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_spruce_lower.png
rename to src/main/resources/textures/block/cubes/door/spruce_lower.png
diff --git a/src/main/resources/textures/block/cubes/door/door_spruce_upper.png b/src/main/resources/textures/block/cubes/door/spruce_upper.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/door/door_spruce_upper.png
rename to src/main/resources/textures/block/cubes/door/spruce_upper.png
diff --git a/src/main/resources/textures/block/cubes/leaves/leaves_acacia.png b/src/main/resources/textures/block/cubes/leaves/acacia.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/leaves/leaves_acacia.png
rename to src/main/resources/textures/block/cubes/leaves/acacia.png
diff --git a/src/main/resources/textures/block/cubes/leaves/leaves_big_oak.png b/src/main/resources/textures/block/cubes/leaves/big_oak.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/leaves/leaves_big_oak.png
rename to src/main/resources/textures/block/cubes/leaves/big_oak.png
diff --git a/src/main/resources/textures/block/cubes/leaves/leaves_birch.png b/src/main/resources/textures/block/cubes/leaves/birch.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/leaves/leaves_birch.png
rename to src/main/resources/textures/block/cubes/leaves/birch.png
diff --git a/src/main/resources/textures/block/cubes/leaves/leaves_jungle.png b/src/main/resources/textures/block/cubes/leaves/jungle.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/leaves/leaves_jungle.png
rename to src/main/resources/textures/block/cubes/leaves/jungle.png
diff --git a/src/main/resources/textures/block/cubes/leaves/leaves_oak.png b/src/main/resources/textures/block/cubes/leaves/oak.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/leaves/leaves_oak.png
rename to src/main/resources/textures/block/cubes/leaves/oak.png
diff --git a/src/main/resources/textures/block/cubes/leaves/leaves_spruce.png b/src/main/resources/textures/block/cubes/leaves/spruce.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/leaves/leaves_spruce.png
rename to src/main/resources/textures/block/cubes/leaves/spruce.png
diff --git a/src/main/resources/textures/block/cubes/mineral_blocks/desktop.ini b/src/main/resources/textures/block/cubes/mineral_blocks/desktop.ini
deleted file mode 100644
index 0481e39..0000000
--- a/src/main/resources/textures/block/cubes/mineral_blocks/desktop.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[LocalizedFileNames]
-emerald_block.png=@emerald_block.png,0
-lapis_block.png=@lapis_block.png,0
-diamond_block.png=@diamond_block.png,0
-iron_block.png=@iron_block.png,0
-coal_block.png=@coal_block.png,0
-gold_block.png=@gold_block.png,0
diff --git a/src/main/resources/textures/block/cubes/ore/desktop.ini b/src/main/resources/textures/block/cubes/ore/desktop.ini
deleted file mode 100644
index 5ba8946..0000000
--- a/src/main/resources/textures/block/cubes/ore/desktop.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[LocalizedFileNames]
-emerald_ore.png=@emerald_ore.png,0
-lapis_ore.png=@lapis_ore.png,0
-diamond_ore.png=@diamond_ore.png,0
-iron_ore.png=@iron_ore.png,0
-coal_ore.png=@coal_ore.png,0
-gold_ore.png=@gold_ore.png,0
-quartz_ore.png=@quartz_ore.png,0
diff --git a/src/main/resources/textures/block/cubes/pumpkin/pumpkin_face_off.png b/src/main/resources/textures/block/cubes/pumpkin/face_off.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/pumpkin/pumpkin_face_off.png
rename to src/main/resources/textures/block/cubes/pumpkin/face_off.png
diff --git a/src/main/resources/textures/block/cubes/pumpkin/pumpkin_face_on.png b/src/main/resources/textures/block/cubes/pumpkin/face_on.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/pumpkin/pumpkin_face_on.png
rename to src/main/resources/textures/block/cubes/pumpkin/face_on.png
diff --git a/src/main/resources/textures/block/cubes/pumpkin/pumpkin_side.png b/src/main/resources/textures/block/cubes/pumpkin/side.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/pumpkin/pumpkin_side.png
rename to src/main/resources/textures/block/cubes/pumpkin/side.png
diff --git a/src/main/resources/textures/block/cubes/pumpkin/pumpkin_top.png b/src/main/resources/textures/block/cubes/pumpkin/top.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/pumpkin/pumpkin_top.png
rename to src/main/resources/textures/block/cubes/pumpkin/top.png
diff --git a/src/main/resources/textures/block/cubes/stone/stone_andesite.png b/src/main/resources/textures/block/cubes/stone/basic/andesite.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/stone_andesite.png
rename to src/main/resources/textures/block/cubes/stone/basic/andesite.png
diff --git a/src/main/resources/textures/block/cubes/stone/stone_diorite.png b/src/main/resources/textures/block/cubes/stone/basic/diorite.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/stone_diorite.png
rename to src/main/resources/textures/block/cubes/stone/basic/diorite.png
diff --git a/src/main/resources/textures/block/cubes/stone/stone.png b/src/main/resources/textures/block/cubes/stone/basic/gneiss.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/stone.png
rename to src/main/resources/textures/block/cubes/stone/basic/gneiss.png
diff --git a/src/main/resources/textures/block/cubes/stone/stone_granite.png b/src/main/resources/textures/block/cubes/stone/basic/granite.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/stone_granite.png
rename to src/main/resources/textures/block/cubes/stone/basic/granite.png
diff --git a/src/main/resources/textures/block/cubes/stone/sandstone/sandstone_bottom.png b/src/main/resources/textures/block/cubes/stone/sandstone/normal_bottom.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/sandstone/sandstone_bottom.png
rename to src/main/resources/textures/block/cubes/stone/sandstone/normal_bottom.png
diff --git a/src/main/resources/textures/block/cubes/stone/sandstone/sandstone_carved.png b/src/main/resources/textures/block/cubes/stone/sandstone/normal_carved.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/sandstone/sandstone_carved.png
rename to src/main/resources/textures/block/cubes/stone/sandstone/normal_carved.png
diff --git a/src/main/resources/textures/block/cubes/stone/sandstone/sandstone_normal.png b/src/main/resources/textures/block/cubes/stone/sandstone/normal_normal.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/sandstone/sandstone_normal.png
rename to src/main/resources/textures/block/cubes/stone/sandstone/normal_normal.png
diff --git a/src/main/resources/textures/block/cubes/stone/sandstone/sandstone_top.png b/src/main/resources/textures/block/cubes/stone/sandstone/normal_top.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/sandstone/sandstone_top.png
rename to src/main/resources/textures/block/cubes/stone/sandstone/normal_top.png
diff --git a/src/main/resources/textures/block/cubes/stone/red_sandstone_bottom.png b/src/main/resources/textures/block/cubes/stone/sandstone/red_bottom.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/red_sandstone_bottom.png
rename to src/main/resources/textures/block/cubes/stone/sandstone/red_bottom.png
diff --git a/src/main/resources/textures/block/cubes/stone/red_sandstone_carved.png b/src/main/resources/textures/block/cubes/stone/sandstone/red_carved.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/red_sandstone_carved.png
rename to src/main/resources/textures/block/cubes/stone/sandstone/red_carved.png
diff --git a/src/main/resources/textures/block/cubes/stone/red_sandstone_normal.png b/src/main/resources/textures/block/cubes/stone/sandstone/red_normal.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/red_sandstone_normal.png
rename to src/main/resources/textures/block/cubes/stone/sandstone/red_normal.png
diff --git a/src/main/resources/textures/block/cubes/stone/red_sandstone_smooth.png b/src/main/resources/textures/block/cubes/stone/sandstone/red_smooth.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/red_sandstone_smooth.png
rename to src/main/resources/textures/block/cubes/stone/sandstone/red_smooth.png
diff --git a/src/main/resources/textures/block/cubes/stone/red_sandstone_top.png b/src/main/resources/textures/block/cubes/stone/sandstone/red_top.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/stone/red_sandstone_top.png
rename to src/main/resources/textures/block/cubes/stone/sandstone/red_top.png
diff --git a/src/main/resources/textures/block/cubes/util/crafting_table_front.png b/src/main/resources/textures/block/cubes/util/crafting_table/front.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/util/crafting_table_front.png
rename to src/main/resources/textures/block/cubes/util/crafting_table/front.png
diff --git a/src/main/resources/textures/block/cubes/util/crafting_table_side.png b/src/main/resources/textures/block/cubes/util/crafting_table/side.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/util/crafting_table_side.png
rename to src/main/resources/textures/block/cubes/util/crafting_table/side.png
diff --git a/src/main/resources/textures/block/cubes/util/crafting_table_top.png b/src/main/resources/textures/block/cubes/util/crafting_table/top.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/util/crafting_table_top.png
rename to src/main/resources/textures/block/cubes/util/crafting_table/top.png
diff --git a/src/main/resources/textures/block/cubes/wood/planks/desktop.ini b/src/main/resources/textures/block/cubes/wood/planks/desktop.ini
deleted file mode 100644
index 9fe53d0..0000000
--- a/src/main/resources/textures/block/cubes/wood/planks/desktop.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[LocalizedFileNames]
-acacia_planks_4.png=@acacia_planks_4.png,0
-acacia_planks_3.png=@acacia_planks_3.png,0
-acacia_planks_2.png=@acacia_planks_2.png,0
-planks_acacia.png=@planks_acacia.png,0
-acacia_planks_1.png=@acacia_planks_1.png,0
-jungle_planks_corner_inner.png=@jungle_planks_corner_inner.png,0
-jungle_planks_corner_outer.png=@jungle_planks_corner_outer.png,0
-planks_jungle.png=@planks_jungle.png,0
-dark_oak_planks_bottom.png=@dark_oak_planks_bottom.png,0
-dark_oak_planks_corner_outer.png=@dark_oak_planks_corner_outer.png,0
-planks_big_oak.png=@planks_big_oak.png,0
-dark_oak_planks_corner_inner.png=@dark_oak_planks_corner_inner.png,0
-planks_spruce.png=@planks_spruce.png,0
-spruce_planks.png=@spruce_planks.png,0
-spruce_planks_corner_outer.png=@spruce_planks_corner_outer.png,0
-spruce_planks_bottom.png=@spruce_planks_bottom.png,0
-spruce_planks_corner_inner.png=@spruce_planks_corner_inner.png,0
-planks_oak.png=@planks_oak.png,0
-birch_planks_corner_outer.png=@birch_planks_corner_outer.png,0
-birch_planks_2.png=@birch_planks_2.png,0
-birch_planks_3.png=@birch_planks_3.png,0
-birch_planks_corner_inner.png=@birch_planks_corner_inner.png,0
-planks_birch.png=@planks_birch.png,0
-oak_planks_corner_outer.png=@oak_planks_corner_outer.png,0
-oak_planks_corner_inner.png=@oak_planks_corner_inner.png,0
-acacia_planks_corner_inner.png=@acacia_planks_corner_inner.png,0
-acacia_planks_corner_outer.png=@acacia_planks_corner_outer.png,0
diff --git a/src/main/resources/textures/block/cubes/wood/planks/spruce_bottom.png b/src/main/resources/textures/block/cubes/wood/planks/spruce_bottom.png
deleted file mode 100644
index 5608e04..0000000
Binary files a/src/main/resources/textures/block/cubes/wood/planks/spruce_bottom.png and /dev/null differ
diff --git a/src/main/resources/textures/block/cubes/wool/black_wool.png b/src/main/resources/textures/block/cubes/wool/black.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/black_wool.png
rename to src/main/resources/textures/block/cubes/wool/black.png
diff --git a/src/main/resources/textures/block/cubes/wool/blue_wool.png b/src/main/resources/textures/block/cubes/wool/blue.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/blue_wool.png
rename to src/main/resources/textures/block/cubes/wool/blue.png
diff --git a/src/main/resources/textures/block/cubes/wool/brown_wool.png b/src/main/resources/textures/block/cubes/wool/brown.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/brown_wool.png
rename to src/main/resources/textures/block/cubes/wool/brown.png
diff --git a/src/main/resources/textures/block/cubes/wool/cyan_wool.png b/src/main/resources/textures/block/cubes/wool/cyan.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/cyan_wool.png
rename to src/main/resources/textures/block/cubes/wool/cyan.png
diff --git a/src/main/resources/textures/block/cubes/wool/gray_wool.png b/src/main/resources/textures/block/cubes/wool/gray.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/gray_wool.png
rename to src/main/resources/textures/block/cubes/wool/gray.png
diff --git a/src/main/resources/textures/block/cubes/wool/green_wool.png b/src/main/resources/textures/block/cubes/wool/green.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/green_wool.png
rename to src/main/resources/textures/block/cubes/wool/green.png
diff --git a/src/main/resources/textures/block/cubes/wool/light_blue_wool.png b/src/main/resources/textures/block/cubes/wool/light_blue.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/light_blue_wool.png
rename to src/main/resources/textures/block/cubes/wool/light_blue.png
diff --git a/src/main/resources/textures/block/cubes/wool/lime_wool.png b/src/main/resources/textures/block/cubes/wool/lime.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/lime_wool.png
rename to src/main/resources/textures/block/cubes/wool/lime.png
diff --git a/src/main/resources/textures/block/cubes/wool/magenta_wool.png b/src/main/resources/textures/block/cubes/wool/magenta.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/magenta_wool.png
rename to src/main/resources/textures/block/cubes/wool/magenta.png
diff --git a/src/main/resources/textures/block/cubes/wool/orange_wool.png b/src/main/resources/textures/block/cubes/wool/orange.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/orange_wool.png
rename to src/main/resources/textures/block/cubes/wool/orange.png
diff --git a/src/main/resources/textures/block/cubes/wool/pink_wool.png b/src/main/resources/textures/block/cubes/wool/pink.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/pink_wool.png
rename to src/main/resources/textures/block/cubes/wool/pink.png
diff --git a/src/main/resources/textures/block/cubes/wool/purple_wool.png b/src/main/resources/textures/block/cubes/wool/purple.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/purple_wool.png
rename to src/main/resources/textures/block/cubes/wool/purple.png
diff --git a/src/main/resources/textures/block/cubes/wool/red_wool.png b/src/main/resources/textures/block/cubes/wool/red.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/red_wool.png
rename to src/main/resources/textures/block/cubes/wool/red.png
diff --git a/src/main/resources/textures/block/cubes/wool/silver_wool.png b/src/main/resources/textures/block/cubes/wool/silver.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/silver_wool.png
rename to src/main/resources/textures/block/cubes/wool/silver.png
diff --git a/src/main/resources/textures/block/cubes/wool/white_wool.png b/src/main/resources/textures/block/cubes/wool/white.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/white_wool.png
rename to src/main/resources/textures/block/cubes/wool/white.png
diff --git a/src/main/resources/textures/block/cubes/wool/yellow_wool.png b/src/main/resources/textures/block/cubes/wool/yellow.png
similarity index 100%
rename from src/main/resources/textures/block/cubes/wool/yellow_wool.png
rename to src/main/resources/textures/block/cubes/wool/yellow.png