diff --git a/src/main/java/com/extendedae_plus/api/IAdvancedBlocking.java b/src/main/java/com/extendedae_plus/api/advancedBlocking/IAdvancedBlocking.java
similarity index 72%
rename from src/main/java/com/extendedae_plus/api/IAdvancedBlocking.java
rename to src/main/java/com/extendedae_plus/api/advancedBlocking/IAdvancedBlocking.java
index 1895a7d..962f11a 100644
--- a/src/main/java/com/extendedae_plus/api/IAdvancedBlocking.java
+++ b/src/main/java/com/extendedae_plus/api/advancedBlocking/IAdvancedBlocking.java
@@ -1,4 +1,4 @@
-package com.extendedae_plus.api;
+package com.extendedae_plus.api.advancedBlocking;
 
 public interface IAdvancedBlocking {
     boolean eap$getAdvancedBlocking();
diff --git a/src/main/java/com/extendedae_plus/api/IPatternProviderMenuAdvancedSync.java b/src/main/java/com/extendedae_plus/api/advancedBlocking/IPatternProviderMenuAdvancedSync.java
similarity index 66%
rename from src/main/java/com/extendedae_plus/api/IPatternProviderMenuAdvancedSync.java
rename to src/main/java/com/extendedae_plus/api/advancedBlocking/IPatternProviderMenuAdvancedSync.java
index 5d5147d..6c06afc 100644
--- a/src/main/java/com/extendedae_plus/api/IPatternProviderMenuAdvancedSync.java
+++ b/src/main/java/com/extendedae_plus/api/advancedBlocking/IPatternProviderMenuAdvancedSync.java
@@ -1,4 +1,4 @@
-package com.extendedae_plus.api;
+package com.extendedae_plus.api.advancedBlocking;
 
 public interface IPatternProviderMenuAdvancedSync {
     boolean eap$getAdvancedBlockingSynced();
diff --git a/src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/AdvPatternProviderScreenMixin.java b/src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/AdvPatternProviderScreenMixin.java
index dbc985f..5d46e1b 100644
--- a/src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/AdvPatternProviderScreenMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/AdvPatternProviderScreenMixin.java
@@ -4,7 +4,7 @@ import appeng.api.config.YesNo;
 import appeng.client.gui.AEBaseScreen;
 import appeng.client.gui.style.ScreenStyle;
 import appeng.client.gui.widgets.SettingToggleButton;
-import com.extendedae_plus.api.IPatternProviderMenuAdvancedSync;
+import com.extendedae_plus.api.advancedBlocking.IPatternProviderMenuAdvancedSync;
 import com.extendedae_plus.api.smartDoubling.IPatternProviderMenuDoublingSync;
 import com.extendedae_plus.init.ModNetwork;
 import com.extendedae_plus.network.provider.SetPerProviderScalingLimitC2SPacket;
diff --git a/src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/SmallAdvPatternProviderScreenMixin.java b/src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/SmallAdvPatternProviderScreenMixin.java
index 955f996..a5a4537 100644
--- a/src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/SmallAdvPatternProviderScreenMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/advancedae/client/gui/SmallAdvPatternProviderScreenMixin.java
@@ -4,7 +4,7 @@ import appeng.api.config.YesNo;
 import appeng.client.gui.AEBaseScreen;
 import appeng.client.gui.style.ScreenStyle;
 import appeng.client.gui.widgets.SettingToggleButton;
-import com.extendedae_plus.api.IPatternProviderMenuAdvancedSync;
+import com.extendedae_plus.api.advancedBlocking.IPatternProviderMenuAdvancedSync;
 import com.extendedae_plus.api.smartDoubling.IPatternProviderMenuDoublingSync;
 import com.extendedae_plus.init.ModNetwork;
 import com.extendedae_plus.network.provider.SetPerProviderScalingLimitC2SPacket;
diff --git a/src/main/java/com/extendedae_plus/mixin/advancedae/helpers/AdvPatternProviderLogicAdvancedMixin.java b/src/main/java/com/extendedae_plus/mixin/advancedae/helpers/AdvPatternProviderLogicAdvancedMixin.java
index 50fa861..05321f7 100644
--- a/src/main/java/com/extendedae_plus/mixin/advancedae/helpers/AdvPatternProviderLogicAdvancedMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/advancedae/helpers/AdvPatternProviderLogicAdvancedMixin.java
@@ -5,7 +5,7 @@ import appeng.api.crafting.IPatternDetails.IInput;
 import appeng.api.stacks.AEKey;
 import appeng.api.stacks.GenericStack;
 import appeng.helpers.patternprovider.PatternProviderTarget;
-import com.extendedae_plus.api.IAdvancedBlocking;
+import com.extendedae_plus.api.advancedBlocking.IAdvancedBlocking;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.player.Player;
 import net.pedroksl.advanced_ae.common.logic.AdvPatternProviderLogic;
diff --git a/src/main/java/com/extendedae_plus/mixin/advancedae/menu/AdvPatternProviderMenuAdvancedMixin.java b/src/main/java/com/extendedae_plus/mixin/advancedae/menu/AdvPatternProviderMenuAdvancedMixin.java
index 4be69e0..b28a19d 100644
--- a/src/main/java/com/extendedae_plus/mixin/advancedae/menu/AdvPatternProviderMenuAdvancedMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/advancedae/menu/AdvPatternProviderMenuAdvancedMixin.java
@@ -2,8 +2,8 @@ package com.extendedae_plus.mixin.advancedae.menu;
 
 import appeng.menu.AEBaseMenu;
 import appeng.menu.guisync.GuiSync;
-import com.extendedae_plus.api.IAdvancedBlocking;
-import com.extendedae_plus.api.IPatternProviderMenuAdvancedSync;
+import com.extendedae_plus.api.advancedBlocking.IAdvancedBlocking;
+import com.extendedae_plus.api.advancedBlocking.IPatternProviderMenuAdvancedSync;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.MenuType;
 import net.pedroksl.advanced_ae.common.logic.AdvPatternProviderLogic;
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternProviderScreenMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternProviderScreenMixin.java
index d68870d..8087a6c 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternProviderScreenMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/PatternProviderScreenMixin.java
@@ -7,7 +7,7 @@ import appeng.client.gui.style.ScreenStyle;
 import appeng.client.gui.widgets.SettingToggleButton;
 import appeng.menu.implementations.PatternProviderMenu;
 import com.extendedae_plus.api.IExPatternButton;
-import com.extendedae_plus.api.IPatternProviderMenuAdvancedSync;
+import com.extendedae_plus.api.advancedBlocking.IPatternProviderMenuAdvancedSync;
 import com.extendedae_plus.api.smartDoubling.IPatternProviderMenuDoublingSync;
 import com.extendedae_plus.init.ModNetwork;
 import com.extendedae_plus.network.provider.SetPerProviderScalingLimitC2SPacket;
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/helpers/patternprovider/PatternProviderLogicAdvancedMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/helpers/patternprovider/PatternProviderLogicAdvancedMixin.java
index 157d81f..c1d927a 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/helpers/patternprovider/PatternProviderLogicAdvancedMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/helpers/patternprovider/PatternProviderLogicAdvancedMixin.java
@@ -6,7 +6,7 @@ import appeng.api.stacks.AEKey;
 import appeng.api.stacks.GenericStack;
 import appeng.helpers.patternprovider.PatternProviderLogic;
 import appeng.helpers.patternprovider.PatternProviderTarget;
-import com.extendedae_plus.api.IAdvancedBlocking;
+import com.extendedae_plus.api.advancedBlocking.IAdvancedBlocking;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.player.Player;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/menu/PatternProviderMenuAdvancedMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/menu/PatternProviderMenuAdvancedMixin.java
index 0ff4559..b800e01 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/menu/PatternProviderMenuAdvancedMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/menu/PatternProviderMenuAdvancedMixin.java
@@ -5,8 +5,8 @@ import appeng.helpers.patternprovider.PatternProviderLogicHost;
 import appeng.menu.AEBaseMenu;
 import appeng.menu.guisync.GuiSync;
 import appeng.menu.implementations.PatternProviderMenu;
-import com.extendedae_plus.api.IAdvancedBlocking;
-import com.extendedae_plus.api.IPatternProviderMenuAdvancedSync;
+import com.extendedae_plus.api.advancedBlocking.IAdvancedBlocking;
+import com.extendedae_plus.api.advancedBlocking.IPatternProviderMenuAdvancedSync;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.MenuType;
 import org.spongepowered.asm.mixin.Final;
diff --git a/src/main/java/com/extendedae_plus/network/provider/GlobalToggleProviderModesC2SPacket.java b/src/main/java/com/extendedae_plus/network/provider/GlobalToggleProviderModesC2SPacket.java
index a07dc5d..7aab96e 100644
--- a/src/main/java/com/extendedae_plus/network/provider/GlobalToggleProviderModesC2SPacket.java
+++ b/src/main/java/com/extendedae_plus/network/provider/GlobalToggleProviderModesC2SPacket.java
@@ -7,7 +7,7 @@ import appeng.blockentity.crafting.PatternProviderBlockEntity;
 import appeng.helpers.patternprovider.PatternProviderLogic;
 import appeng.helpers.patternprovider.PatternProviderLogicHost;
 import appeng.parts.crafting.PatternProviderPart;
-import com.extendedae_plus.api.IAdvancedBlocking;
+import com.extendedae_plus.api.advancedBlocking.IAdvancedBlocking;
 import com.extendedae_plus.api.smartDoubling.ISmartDoublingHolder;
 import com.extendedae_plus.content.controller.NetworkPatternControllerBlockEntity;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/extendedae_plus/network/provider/ToggleAdvancedBlockingC2SPacket.java b/src/main/java/com/extendedae_plus/network/provider/ToggleAdvancedBlockingC2SPacket.java
index 9162194..67dee9b 100644
--- a/src/main/java/com/extendedae_plus/network/provider/ToggleAdvancedBlockingC2SPacket.java
+++ b/src/main/java/com/extendedae_plus/network/provider/ToggleAdvancedBlockingC2SPacket.java
@@ -3,7 +3,7 @@ package com.extendedae_plus.network.provider;
 import appeng.api.config.Settings;
 import appeng.api.config.YesNo;
 import appeng.menu.implementations.PatternProviderMenu;
-import com.extendedae_plus.api.IAdvancedBlocking;
+import com.extendedae_plus.api.advancedBlocking.IAdvancedBlocking;
 import com.extendedae_plus.mixin.advancedae.accessor.AdvPatternProviderMenuAdvancedAccessor;
 import com.extendedae_plus.mixin.ae2.accessor.PatternProviderMenuAccessor;
 import net.minecraft.network.FriendlyByteBuf;