diff --git a/0/data/ap_combat/tags/blocks/endstone.json b/0/data/ap_combat/tags/block/endstone.json
similarity index 100%
rename from 0/data/ap_combat/tags/blocks/endstone.json
rename to 0/data/ap_combat/tags/block/endstone.json
diff --git a/0/data/ap_combat/tags/blocks/transparent_blocks.json b/0/data/ap_combat/tags/block/transparent_blocks.json
similarity index 100%
rename from 0/data/ap_combat/tags/blocks/transparent_blocks.json
rename to 0/data/ap_combat/tags/block/transparent_blocks.json
diff --git a/0/data/ap_combat/tags/blocks/weak_endstone.json b/0/data/ap_combat/tags/block/weak_endstone.json
similarity index 100%
rename from 0/data/ap_combat/tags/blocks/weak_endstone.json
rename to 0/data/ap_combat/tags/block/weak_endstone.json
diff --git a/0/data/ap_craft_flags/tags/blocks/ballast_tanks.json b/0/data/ap_craft_flags/tags/block/ballast_tanks.json
similarity index 100%
rename from 0/data/ap_craft_flags/tags/blocks/ballast_tanks.json
rename to 0/data/ap_craft_flags/tags/block/ballast_tanks.json
diff --git a/0/data/ap_craft_flags/tags/blocks/engines.json b/0/data/ap_craft_flags/tags/block/engines.json
similarity index 100%
rename from 0/data/ap_craft_flags/tags/blocks/engines.json
rename to 0/data/ap_craft_flags/tags/block/engines.json
diff --git a/0/data/ap_craft_flags/tags/blocks/forbidden_blocks.json b/0/data/ap_craft_flags/tags/block/forbidden_blocks.json
similarity index 100%
rename from 0/data/ap_craft_flags/tags/blocks/forbidden_blocks.json
rename to 0/data/ap_craft_flags/tags/block/forbidden_blocks.json
diff --git a/0/data/ap_craft_flags/tags/blocks/lifting_cells.json b/0/data/ap_craft_flags/tags/block/lifting_cells.json
similarity index 100%
rename from 0/data/ap_craft_flags/tags/blocks/lifting_cells.json
rename to 0/data/ap_craft_flags/tags/block/lifting_cells.json
diff --git a/0/data/ap_craft_flags/tags/blocks/small_inventories.json b/0/data/ap_craft_flags/tags/block/small_inventories.json
similarity index 100%
rename from 0/data/ap_craft_flags/tags/blocks/small_inventories.json
rename to 0/data/ap_craft_flags/tags/block/small_inventories.json
diff --git a/0/data/ap_type_construction/tags/blocks/base_logs.json b/0/data/ap_type_construction/tags/block/base_logs.json
similarity index 100%
rename from 0/data/ap_type_construction/tags/blocks/base_logs.json
rename to 0/data/ap_type_construction/tags/block/base_logs.json
diff --git a/0/data/ap_type_construction/tags/blocks/base_redstone.json b/0/data/ap_type_construction/tags/block/base_redstone.json
similarity index 100%
rename from 0/data/ap_type_construction/tags/blocks/base_redstone.json
rename to 0/data/ap_type_construction/tags/block/base_redstone.json
diff --git a/0/data/ap_type_construction/tags/blocks/base_slabs.json b/0/data/ap_type_construction/tags/block/base_slabs.json
similarity index 100%
rename from 0/data/ap_type_construction/tags/blocks/base_slabs.json
rename to 0/data/ap_type_construction/tags/block/base_slabs.json
diff --git a/0/data/ap_type_construction/tags/blocks/base_wooden_stairs.json b/0/data/ap_type_construction/tags/block/base_wooden_stairs.json
similarity index 100%
rename from 0/data/ap_type_construction/tags/blocks/base_wooden_stairs.json
rename to 0/data/ap_type_construction/tags/block/base_wooden_stairs.json
diff --git a/0/data/ap_type_construction/tags/blocks/strong_blocks.json b/0/data/ap_type_construction/tags/block/strong_blocks.json
similarity index 100%
rename from 0/data/ap_type_construction/tags/blocks/strong_blocks.json
rename to 0/data/ap_type_construction/tags/block/strong_blocks.json
diff --git a/0/data/ap_type_construction/tags/blocks/torpedo.json b/0/data/ap_type_construction/tags/block/torpedo.json
similarity index 100%
rename from 0/data/ap_type_construction/tags/blocks/torpedo.json
rename to 0/data/ap_type_construction/tags/block/torpedo.json
diff --git a/0/data/ap_type_construction/tags/blocks/utility.json b/0/data/ap_type_construction/tags/block/utility.json
similarity index 100%
rename from 0/data/ap_type_construction/tags/blocks/utility.json
rename to 0/data/ap_type_construction/tags/block/utility.json
diff --git a/0/data/ap_types/tags/blocks/portcullis.json b/0/data/ap_types/tags/block/portcullis.json
similarity index 100%
rename from 0/data/ap_types/tags/blocks/portcullis.json
rename to 0/data/ap_types/tags/block/portcullis.json
diff --git a/1/data/ap_combat/tags/blocks/strong_armor.json b/1/data/ap_combat/tags/block/strong_armor.json
similarity index 100%
rename from 1/data/ap_combat/tags/blocks/strong_armor.json
rename to 1/data/ap_combat/tags/block/strong_armor.json
diff --git a/1/data/ap_type_construction/tags/blocks/base_armor.json b/1/data/ap_type_construction/tags/block/base_armor.json
similarity index 100%
rename from 1/data/ap_type_construction/tags/blocks/base_armor.json
rename to 1/data/ap_type_construction/tags/block/base_armor.json
diff --git a/1/data/ap_type_construction/tags/blocks/redstone.json b/1/data/ap_type_construction/tags/block/redstone.json
similarity index 100%
rename from 1/data/ap_type_construction/tags/blocks/redstone.json
rename to 1/data/ap_type_construction/tags/block/redstone.json
diff --git a/1/data/ap_type_construction/tags/blocks/skiff_slabs.json b/1/data/ap_type_construction/tags/block/skiff_slabs.json
similarity index 100%
rename from 1/data/ap_type_construction/tags/blocks/skiff_slabs.json
rename to 1/data/ap_type_construction/tags/block/skiff_slabs.json
diff --git a/1/data/ap_types/tags/blocks/launchasm.json b/1/data/ap_types/tags/block/launchasm.json
similarity index 100%
rename from 1/data/ap_types/tags/blocks/launchasm.json
rename to 1/data/ap_types/tags/block/launchasm.json
diff --git a/1/data/ap_types/tags/blocks/launchlongarm.json b/1/data/ap_types/tags/block/launchlongarm.json
similarity index 100%
rename from 1/data/ap_types/tags/blocks/launchlongarm.json
rename to 1/data/ap_types/tags/block/launchlongarm.json
diff --git a/1/data/ap_types/tags/blocks/launchlongasm.json b/1/data/ap_types/tags/block/launchlongasm.json
similarity index 100%
rename from 1/data/ap_types/tags/blocks/launchlongasm.json
rename to 1/data/ap_types/tags/block/launchlongasm.json
diff --git a/1/data/ap_types/tags/blocks/launchtorpedo.json b/1/data/ap_types/tags/block/launchtorpedo.json
similarity index 100%
rename from 1/data/ap_types/tags/blocks/launchtorpedo.json
rename to 1/data/ap_types/tags/block/launchtorpedo.json
diff --git a/2/data/ap_type_construction/tags/blocks/base.json b/2/data/ap_type_construction/tags/block/base.json
similarity index 100%
rename from 2/data/ap_type_construction/tags/blocks/base.json
rename to 2/data/ap_type_construction/tags/block/base.json
diff --git a/2/data/ap_type_construction/tags/blocks/skiff_armor.json b/2/data/ap_type_construction/tags/block/skiff_armor.json
similarity index 100%
rename from 2/data/ap_type_construction/tags/blocks/skiff_armor.json
rename to 2/data/ap_type_construction/tags/block/skiff_armor.json
diff --git a/2/data/ap_type_construction/tags/blocks/turret_armor.json b/2/data/ap_type_construction/tags/block/turret_armor.json
similarity index 100%
rename from 2/data/ap_type_construction/tags/blocks/turret_armor.json
rename to 2/data/ap_type_construction/tags/block/turret_armor.json
diff --git a/3/data/ap_type_construction/tags/blocks/elevator_armor.json b/3/data/ap_type_construction/tags/block/elevator_armor.json
similarity index 100%
rename from 3/data/ap_type_construction/tags/blocks/elevator_armor.json
rename to 3/data/ap_type_construction/tags/block/elevator_armor.json
diff --git a/3/data/ap_type_construction/tags/blocks/ship_armor.json b/3/data/ap_type_construction/tags/block/ship_armor.json
similarity index 100%
rename from 3/data/ap_type_construction/tags/blocks/ship_armor.json
rename to 3/data/ap_type_construction/tags/block/ship_armor.json
diff --git a/3/data/ap_type_construction/tags/blocks/skiff.json b/3/data/ap_type_construction/tags/block/skiff.json
similarity index 100%
rename from 3/data/ap_type_construction/tags/blocks/skiff.json
rename to 3/data/ap_type_construction/tags/block/skiff.json
diff --git a/4/data/ap_type_construction/tags/blocks/airship_armor.json b/4/data/ap_type_construction/tags/block/airship_armor.json
similarity index 100%
rename from 4/data/ap_type_construction/tags/blocks/airship_armor.json
rename to 4/data/ap_type_construction/tags/block/airship_armor.json
diff --git a/5/data/ap_combat/tags/blocks/armor.json b/5/data/ap_combat/tags/block/armor.json
similarity index 100%
rename from 5/data/ap_combat/tags/blocks/armor.json
rename to 5/data/ap_combat/tags/block/armor.json
diff --git a/5/data/ap_types/tags/blocks/bigairskiff.json b/5/data/ap_types/tags/block/bigairskiff.json
similarity index 100%
rename from 5/data/ap_types/tags/blocks/bigairskiff.json
rename to 5/data/ap_types/tags/block/bigairskiff.json
diff --git a/5/data/ap_types/tags/blocks/bigsubairskiff.json b/5/data/ap_types/tags/block/bigsubairskiff.json
similarity index 100%
rename from 5/data/ap_types/tags/blocks/bigsubairskiff.json
rename to 5/data/ap_types/tags/block/bigsubairskiff.json
diff --git a/5/data/ap_types/tags/blocks/elevator.json b/5/data/ap_types/tags/block/elevator.json
similarity index 100%
rename from 5/data/ap_types/tags/blocks/elevator.json
rename to 5/data/ap_types/tags/block/elevator.json
diff --git a/5/data/ap_types/tags/blocks/ship.json b/5/data/ap_types/tags/block/ship.json
similarity index 100%
rename from 5/data/ap_types/tags/blocks/ship.json
rename to 5/data/ap_types/tags/block/ship.json
diff --git a/5/data/ap_types/tags/blocks/subairship.json b/5/data/ap_types/tags/block/subairship.json
similarity index 100%
rename from 5/data/ap_types/tags/blocks/subairship.json
rename to 5/data/ap_types/tags/block/subairship.json
diff --git a/6/data/ap_types/tags/blocks/airship.json b/6/data/ap_types/tags/block/airship.json
similarity index 100%
rename from 6/data/ap_types/tags/blocks/airship.json
rename to 6/data/ap_types/tags/block/airship.json
diff --git a/6/data/ap_types/tags/blocks/bigsubairship.json b/6/data/ap_types/tags/block/bigsubairship.json
similarity index 100%
rename from 6/data/ap_types/tags/blocks/bigsubairship.json
rename to 6/data/ap_types/tags/block/bigsubairship.json
diff --git a/6/data/ap_types/tags/blocks/dismantleelevator.json b/6/data/ap_types/tags/block/dismantleelevator.json
similarity index 100%
rename from 6/data/ap_types/tags/blocks/dismantleelevator.json
rename to 6/data/ap_types/tags/block/dismantleelevator.json
diff --git a/6/data/ap_types/tags/blocks/dryfactory.json b/6/data/ap_types/tags/block/dryfactory.json
similarity index 100%
rename from 6/data/ap_types/tags/blocks/dryfactory.json
rename to 6/data/ap_types/tags/block/dryfactory.json
diff --git a/6/data/ap_types/tags/blocks/duck.json b/6/data/ap_types/tags/block/duck.json
similarity index 100%
rename from 6/data/ap_types/tags/blocks/duck.json
rename to 6/data/ap_types/tags/block/duck.json
diff --git a/6/data/ap_types/tags/blocks/mediumsubairship.json b/6/data/ap_types/tags/block/mediumsubairship.json
similarity index 100%
rename from 6/data/ap_types/tags/blocks/mediumsubairship.json
rename to 6/data/ap_types/tags/block/mediumsubairship.json
diff --git a/6/data/ap_types/tags/blocks/sublightairship.json b/6/data/ap_types/tags/block/sublightairship.json
similarity index 100%
rename from 6/data/ap_types/tags/blocks/sublightairship.json
rename to 6/data/ap_types/tags/block/sublightairship.json
diff --git a/7/data/ap_types/tags/blocks/bigairship.json b/7/data/ap_types/tags/block/bigairship.json
similarity index 100%
rename from 7/data/ap_types/tags/blocks/bigairship.json
rename to 7/data/ap_types/tags/block/bigairship.json
diff --git a/7/data/ap_types/tags/blocks/factory.json b/7/data/ap_types/tags/block/factory.json
similarity index 100%
rename from 7/data/ap_types/tags/blocks/factory.json
rename to 7/data/ap_types/tags/block/factory.json
diff --git a/7/data/ap_types/tags/blocks/lightairship.json b/7/data/ap_types/tags/block/lightairship.json
similarity index 100%
rename from 7/data/ap_types/tags/blocks/lightairship.json
rename to 7/data/ap_types/tags/block/lightairship.json
diff --git a/7/data/ap_types/tags/blocks/mediumairship.json b/7/data/ap_types/tags/block/mediumairship.json
similarity index 100%
rename from 7/data/ap_types/tags/blocks/mediumairship.json
rename to 7/data/ap_types/tags/block/mediumairship.json
diff --git a/8/data/ap_types/tags/blocks/megafactory.json b/8/data/ap_types/tags/block/megafactory.json
similarity index 100%
rename from 8/data/ap_types/tags/blocks/megafactory.json
rename to 8/data/ap_types/tags/block/megafactory.json