diff --git a/settings.gradle.kts b/settings.gradle.kts
index 095f63e..f1f2097 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -25,7 +25,7 @@ dependencyResolutionManagement {
     versionCatalogs {
         create("libs") {
             version("shadow", "9.6.1")
-            version("aonyx", "0.8.0")
+            version("aonyx", "0.8.1")
             version("pvp", "2026.05.30-26.1.1")
             version("cloudnet", "4.0.0-RC17-SNAPSHOT")
             version("slf4j", "2.0.18")
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/builder/GameMapBuilder.java b/setup/src/main/java/net/theevilreaper/bounce/setup/builder/GameMapBuilder.java
index 1db68f2..60d2e4e 100644
--- a/setup/src/main/java/net/theevilreaper/bounce/setup/builder/GameMapBuilder.java
+++ b/setup/src/main/java/net/theevilreaper/bounce/setup/builder/GameMapBuilder.java
@@ -62,13 +62,6 @@ public GameMapBuilder(@NotNull GameMap gameMap) {
         return this;
     }
 
-    /**
-     * Clears all builders from the data structure.
-     */
-    public void clearBuilders() {
-        this.builders.clear();
-    }
-
     /**
      * Builds a new {@link GameMap} instance with the current properties.
      *
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/MapSetupInventory.java b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/MapSetupInventory.java
index 745f4dc..b94c54e 100644
--- a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/MapSetupInventory.java
+++ b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/MapSetupInventory.java
@@ -9,7 +9,7 @@
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import net.theevilreaper.aves.inventory.GlobalInventoryBuilder;
-import net.theevilreaper.aves.inventory.InventoryLayout;
+import net.theevilreaper.aves.inventory.layout.InventoryLayout;
 import net.theevilreaper.aves.inventory.click.ClickHolder;
 import net.theevilreaper.aves.inventory.util.LayoutCalculator;
 import net.theevilreaper.aves.map.MapEntry;
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundBlockOverviewInventory.java b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundBlockOverviewInventory.java
index 5b7fe4c..f8da8e4 100644
--- a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundBlockOverviewInventory.java
+++ b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundBlockOverviewInventory.java
@@ -9,7 +9,7 @@
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import net.theevilreaper.aves.inventory.GlobalInventoryBuilder;
-import net.theevilreaper.aves.inventory.InventoryLayout;
+import net.theevilreaper.aves.inventory.layout.InventoryLayout;
 import net.theevilreaper.aves.inventory.click.ClickHolder;
 import net.theevilreaper.aves.inventory.util.LayoutCalculator;
 import net.theevilreaper.bounce.setup.event.ground.PlayerGroundBlockSelectEvent;
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundValueInventory.java b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundValueInventory.java
index ef1fed7..fecdfc4 100644
--- a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundValueInventory.java
+++ b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundValueInventory.java
@@ -7,7 +7,7 @@
 import net.minestom.server.inventory.click.Click;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
-import net.theevilreaper.aves.inventory.InventoryLayout;
+import net.theevilreaper.aves.inventory.layout.InventoryLayout;
 import net.theevilreaper.aves.inventory.PersonalInventoryBuilder;
 import net.theevilreaper.aves.inventory.click.ClickHolder;
 import net.theevilreaper.aves.inventory.util.LayoutCalculator;
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventory.java b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventory.java
index 373020e..3c45f04 100644
--- a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventory.java
+++ b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventory.java
@@ -8,7 +8,7 @@
 import net.minestom.server.inventory.click.Click;
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
-import net.theevilreaper.aves.inventory.InventoryLayout;
+import net.theevilreaper.aves.inventory.layout.InventoryLayout;
 import net.theevilreaper.aves.inventory.PersonalInventoryBuilder;
 import net.theevilreaper.aves.inventory.click.ClickHolder;
 import net.theevilreaper.aves.inventory.util.LayoutCalculator;
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/overview/MapOverviewInventory.java b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/overview/MapOverviewInventory.java
index 4ed95ec..73fbcdb 100644
--- a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/overview/MapOverviewInventory.java
+++ b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/overview/MapOverviewInventory.java
@@ -3,8 +3,8 @@
 import net.kyori.adventure.text.Component;
 import net.minestom.server.entity.Player;
 import net.minestom.server.inventory.InventoryType;
-import net.theevilreaper.aves.inventory.InventoryLayout;
 import net.theevilreaper.aves.inventory.PersonalInventoryBuilder;
+import net.theevilreaper.aves.inventory.layout.InventoryLayout;
 import net.theevilreaper.aves.inventory.slot.ISlot;
 import net.theevilreaper.aves.inventory.util.LayoutCalculator;
 import net.theevilreaper.bounce.setup.builder.GameMapBuilder;
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushBlockInventory.java b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushBlockInventory.java
index 13194d8..8dc8f3c 100644
--- a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushBlockInventory.java
+++ b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushBlockInventory.java
@@ -9,7 +9,7 @@
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
 import net.theevilreaper.aves.inventory.GlobalInventoryBuilder;
-import net.theevilreaper.aves.inventory.InventoryLayout;
+import net.theevilreaper.aves.inventory.layout.InventoryLayout;
 import net.theevilreaper.aves.inventory.click.ClickHolder;
 import net.theevilreaper.aves.inventory.util.LayoutCalculator;
 import net.theevilreaper.bounce.setup.event.SetupInventorySwitchEvent.SwitchTarget;
diff --git a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushValueInventory.java b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushValueInventory.java
index b22f454..d9433a4 100644
--- a/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushValueInventory.java
+++ b/setup/src/main/java/net/theevilreaper/bounce/setup/inventory/push/PushValueInventory.java
@@ -6,7 +6,7 @@
 import net.minestom.server.inventory.InventoryType;
 import net.minestom.server.inventory.click.Click;
 import net.minestom.server.item.ItemStack;
-import net.theevilreaper.aves.inventory.InventoryLayout;
+import net.theevilreaper.aves.inventory.layout.InventoryLayout;
 import net.theevilreaper.aves.inventory.PersonalInventoryBuilder;
 import net.theevilreaper.aves.inventory.click.ClickHolder;
 import net.theevilreaper.aves.inventory.util.LayoutCalculator;
@@ -48,7 +48,7 @@ public void updateLayout(int index) {
         if (index < 0 || index >= this.gameMapBuilder.getPushDataBuilder().getPushValues().size()) {
             throw new IndexOutOfBoundsException("Invalid push entry index: " + index);
         }
-            this.setDataLayoutFunction(dataLayoutFunction -> {
+        this.setDataLayoutFunction(dataLayoutFunction -> {
             InventoryLayout dataLayout = dataLayoutFunction == null ? InventoryLayout.fromType(getType()) : dataLayoutFunction;
 
             dataLayout.blank(LayoutCalculator.from(BLOCK_SLOT, VALUE_SLOT));
diff --git a/setup/src/test/java/net/theevilreaper/bounce/setup/SlotAssertions.java b/setup/src/test/java/net/theevilreaper/bounce/setup/SlotAssertions.java
index 3c67440..7009f8d 100644
--- a/setup/src/test/java/net/theevilreaper/bounce/setup/SlotAssertions.java
+++ b/setup/src/test/java/net/theevilreaper/bounce/setup/SlotAssertions.java
@@ -2,7 +2,8 @@
 
 import net.minestom.server.item.ItemStack;
 import net.minestom.server.item.Material;
-import net.theevilreaper.aves.inventory.InventoryLayout;
+
+import net.theevilreaper.aves.inventory.layout.InventoryLayout;
 import net.theevilreaper.aves.inventory.slot.ISlot;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
diff --git a/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/ground/GroundBlockOverviewInventoryIntegrationTest.java b/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/ground/GroundBlockOverviewInventoryIntegrationTest.java
index 6c51fd6..fc85794 100644
--- a/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/ground/GroundBlockOverviewInventoryIntegrationTest.java
+++ b/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/ground/GroundBlockOverviewInventoryIntegrationTest.java
@@ -5,7 +5,7 @@
 import net.minestom.server.item.Material;
 import net.minestom.testing.Env;
 import net.minestom.testing.extension.MicrotusExtension;
-import net.theevilreaper.aves.inventory.InventoryLayout;
+import net.theevilreaper.aves.inventory.layout.InventoryLayout;
 import net.theevilreaper.aves.inventory.slot.ISlot;
 import net.theevilreaper.aves.inventory.util.LayoutCalculator;
 import net.theevilreaper.bounce.setup.inventory.SetupBlocks;
diff --git a/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventoryIntegrationTest.java b/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventoryIntegrationTest.java
index a651bf5..708bc23 100644
--- a/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventoryIntegrationTest.java
+++ b/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/ground/GroundViewInventoryIntegrationTest.java
@@ -7,7 +7,7 @@
 import net.minestom.server.item.Material;
 import net.minestom.testing.Env;
 import net.minestom.testing.extension.MicrotusExtension;
-import net.theevilreaper.aves.inventory.InventoryLayout;
+import net.theevilreaper.aves.inventory.layout.InventoryLayout;
 import net.theevilreaper.aves.inventory.slot.ISlot;
 import net.theevilreaper.aves.inventory.util.LayoutCalculator;
 import net.theevilreaper.bounce.setup.builder.GameMapBuilder;
diff --git a/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/overview/MapOverviewInventoryIntegrationTest.java b/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/overview/MapOverviewInventoryIntegrationTest.java
index 1736f69..fce0b8a 100644
--- a/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/overview/MapOverviewInventoryIntegrationTest.java
+++ b/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/overview/MapOverviewInventoryIntegrationTest.java
@@ -5,7 +5,7 @@
 import net.minestom.server.item.ItemStack;
 import net.minestom.testing.Env;
 import net.minestom.testing.extension.MicrotusExtension;
-import net.theevilreaper.aves.inventory.InventoryLayout;
+import net.theevilreaper.aves.inventory.layout.InventoryLayout;
 import net.theevilreaper.aves.inventory.slot.ISlot;
 import net.theevilreaper.aves.inventory.util.LayoutCalculator;
 import net.theevilreaper.bounce.setup.builder.GameMapBuilder;
diff --git a/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/push/PushBlockInventoryIntegrationTest.java b/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/push/PushBlockInventoryIntegrationTest.java
index d9037ac..6658838 100644
--- a/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/push/PushBlockInventoryIntegrationTest.java
+++ b/setup/src/test/java/net/theevilreaper/bounce/setup/inventory/push/PushBlockInventoryIntegrationTest.java
@@ -5,7 +5,7 @@
 import net.minestom.server.item.Material;
 import net.minestom.testing.Env;
 import net.minestom.testing.extension.MicrotusExtension;
-import net.theevilreaper.aves.inventory.InventoryLayout;
+import net.theevilreaper.aves.inventory.layout.InventoryLayout;
 import net.theevilreaper.aves.inventory.slot.ISlot;
 import net.theevilreaper.aves.inventory.util.LayoutCalculator;
 import net.theevilreaper.bounce.setup.inventory.SetupBlocks;