diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/gtceu/GTLCoreMEPatternBufferPartMachineMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/gtceu/GTLCoreMEPatternBufferPartMachineMixin.java
index 48e778b..9d405db 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/gtceu/GTLCoreMEPatternBufferPartMachineMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/gtceu/GTLCoreMEPatternBufferPartMachineMixin.java
@@ -2,8 +2,8 @@ package com.extendedae_plus.mixin.ae2.autopattern.gtceu;
 
 import appeng.api.crafting.IPatternDetails;
 import appeng.crafting.pattern.AEProcessingPattern;
-import com.extendedae_plus.api.SmartDoublingAwarePattern;
-import com.extendedae_plus.content.ScaledProcessingPattern;
+import com.extendedae_plus.ae.api.crafting.ScaledProcessingPattern;
+import com.extendedae_plus.api.smartDoubling.ISmartDoublingAwarePattern;
 import com.google.common.collect.BiMap;
 import org.gtlcore.gtlcore.common.machine.multiblock.part.ae.MEPatternBufferPartMachine;
 import org.spongepowered.asm.mixin.Final;
@@ -33,7 +33,7 @@ public class GTLCoreMEPatternBufferPartMachineMixin {
         if (patternSlotMap == null) return;
         for (Map.Entry<IPatternDetails, Integer> entry : patternSlotMap.entrySet()) {
             IPatternDetails key = entry.getKey();
-            if (key instanceof AEProcessingPattern proc && proc instanceof SmartDoublingAwarePattern aware) {
+            if (key instanceof AEProcessingPattern proc && proc instanceof ISmartDoublingAwarePattern aware) {
                 aware.eap$setAllowScaling(true);
             }
         }
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/gtceu/MEPatternBufferPartMachineMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/gtceu/MEPatternBufferPartMachineMixin.java
index a3ca4a1..80032d6 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/gtceu/MEPatternBufferPartMachineMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/gtceu/MEPatternBufferPartMachineMixin.java
@@ -2,8 +2,8 @@ package com.extendedae_plus.mixin.ae2.autopattern.gtceu;
 
 import appeng.api.crafting.IPatternDetails;
 import appeng.crafting.pattern.AEProcessingPattern;
-import com.extendedae_plus.api.SmartDoublingAwarePattern;
-import com.extendedae_plus.content.ScaledProcessingPattern;
+import com.extendedae_plus.ae.api.crafting.ScaledProcessingPattern;
+import com.extendedae_plus.api.smartDoubling.ISmartDoublingAwarePattern;
 import com.google.common.collect.BiMap;
 import com.gregtechceu.gtceu.integration.ae2.machine.MEPatternBufferPartMachine;
 import org.spongepowered.asm.mixin.Final;
@@ -33,7 +33,7 @@ public class MEPatternBufferPartMachineMixin {
         if (detailsSlotMap == null) return;
         for (Map.Entry<IPatternDetails, Integer> entry : detailsSlotMap.entrySet()) {
             IPatternDetails key = entry.getKey();
-            if (key instanceof AEProcessingPattern proc && proc instanceof SmartDoublingAwarePattern aware) {
+            if (key instanceof AEProcessingPattern proc && proc instanceof ISmartDoublingAwarePattern aware) {
                 aware.eap$setAllowScaling(true);
             }
         }
diff --git a/src/main/java/com/extendedae_plus/network/CraftingMonitorOpenProviderC2SPacket.java b/src/main/java/com/extendedae_plus/network/CraftingMonitorOpenProviderC2SPacket.java
index 5415836..d73002a 100644
--- a/src/main/java/com/extendedae_plus/network/CraftingMonitorOpenProviderC2SPacket.java
+++ b/src/main/java/com/extendedae_plus/network/CraftingMonitorOpenProviderC2SPacket.java
@@ -13,6 +13,7 @@ import appeng.menu.me.crafting.CraftingCPUMenu;
 import appeng.parts.AEBasePart;
 import com.extendedae_plus.init.ModNetwork;
 import com.extendedae_plus.mixin.ae2.accessor.PatternProviderLogicAccessor;
+import com.extendedae_plus.network.provider.SetProviderPageS2CPacket;
 import com.extendedae_plus.util.PatternProviderDataUtil;
 import com.glodblock.github.extendedae.util.FCClientUtil;
 import com.glodblock.github.glodium.util.GlodUtil;
diff --git a/src/main/resources/extendedae_plus.mixins.json b/src/main/resources/extendedae_plus.mixins.json
index 92c9229..79a075e 100644
--- a/src/main/resources/extendedae_plus.mixins.json
+++ b/src/main/resources/extendedae_plus.mixins.json
@@ -21,7 +21,6 @@
     "ae2.client.gui.SlotGridLayoutMixin",
     "ae2.compat.PatternProviderScreenCompatMixin",
     "ae2.items.QuartzCuttingKnifeItemMixin",
-    "ae2.compat.PatternProviderScreenCompatMixin",
     "ae2.menu.CraftConfirmMenuGoBackMixin",
     "extendedae.accessor.GuiExPatternTerminalAccessor",
     "extendedae.accessor.GuiExPatternTerminalSlotsRowAccessor",
@@ -47,7 +46,6 @@
     "ae2.AEProcessingPatternMixin",
     "ae2.CraftingCPUClusterMixin",
     "ae2.EncodedPatternItemMixin",
-    "ae2.InterfaceLogicUpgradesMixin",
     "ae2.accessor.MEStorageMenuAccessor",
     "ae2.accessor.PatternEncodingTermMenuAccessor",
     "ae2.accessor.PatternProviderLogicAccessor",
@@ -57,6 +55,8 @@
     "ae2.autopattern.CraftingTreeNodeMixin",
     "ae2.autopattern.CraftingTreeProcessMixin",
     "ae2.autopattern.PatternProviderLogicContainsRedirectMixin",
+    "ae2.autopattern.gtceu.GTLCoreMEPatternBufferPartMachineMixin",
+    "ae2.autopattern.gtceu.MEPatternBufferPartMachineMixin",
     "ae2.compat.PatternProviderCompatMixin",
     "ae2.compat.PatternProviderLogicCompatMixin",
     "ae2.compat.PatternProviderLogicHostCompatMixin",
@@ -67,16 +67,6 @@
     "ae2.helpers.patternprovider.PatternProviderLogicDoublingMixin",
     "ae2.helpers.patternprovider.PatternProviderLogicTickerMixin",
     "ae2.items.MemoryCardItemMixin",
-    "ae2.autopattern.gtceu.GTLCoreMEPatternBufferPartMachineMixin",
-    "ae2.autopattern.gtceu.MEPatternBufferPartMachineMixin",
-    "ae2.compat.PatternProviderCompatMixin",
-    "ae2.compat.PatternProviderLogicCompatMixin",
-    "ae2.compat.PatternProviderLogicHostCompatMixin",
-    "ae2.helpers.InterfaceLogicChannelCardMixin",
-    "ae2.helpers.InterfaceLogicTickerMixin",
-    "ae2.helpers.PatternProviderLogicAdvancedMixin",
-    "ae2.helpers.PatternProviderLogicDoublingMixin",
-    "ae2.helpers.patternprovider.PatternProviderLogicTickerMixin",
     "ae2.menu.ContainerPatternEncodingTermMenuMixin",
     "ae2.menu.MEStorageMenuMixin",
     "ae2.menu.PatternEncodingTermMenuMixin",