diff --git a/src/main/java/com/extendedae_plus/content/ScaledProcessingPattern.java b/src/main/java/com/extendedae_plus/ae/api/crafting/ScaledProcessingPattern.java
similarity index 99%
rename from src/main/java/com/extendedae_plus/content/ScaledProcessingPattern.java
rename to src/main/java/com/extendedae_plus/ae/api/crafting/ScaledProcessingPattern.java
index 0b672ff..ab8c924 100644
--- a/src/main/java/com/extendedae_plus/content/ScaledProcessingPattern.java
+++ b/src/main/java/com/extendedae_plus/ae/api/crafting/ScaledProcessingPattern.java
@@ -1,4 +1,4 @@
-package com.extendedae_plus.content;
+package com.extendedae_plus.ae.api.crafting;
 
 import appeng.api.crafting.IPatternDetails;
 import appeng.api.stacks.AEItemKey;
diff --git a/src/main/java/com/extendedae_plus/NewIcon.java b/src/main/java/com/extendedae_plus/ae/client/gui/NewIcon.java
similarity index 91%
rename from src/main/java/com/extendedae_plus/NewIcon.java
rename to src/main/java/com/extendedae_plus/ae/client/gui/NewIcon.java
index 8535a1f..db82062 100644
--- a/src/main/java/com/extendedae_plus/NewIcon.java
+++ b/src/main/java/com/extendedae_plus/ae/client/gui/NewIcon.java
@@ -1,6 +1,7 @@
-package com.extendedae_plus;
+package com.extendedae_plus.ae.client.gui;
 
 import appeng.client.gui.style.Blitter;
+import com.extendedae_plus.ExtendedAEPlus;
 import net.minecraft.resources.ResourceLocation;
 
 public class NewIcon {
diff --git a/src/main/java/com/extendedae_plus/ae/menu/EntitySpeedTickerMenu.java b/src/main/java/com/extendedae_plus/ae/menu/EntitySpeedTickerMenu.java
index 753b97a..70f956b 100644
--- a/src/main/java/com/extendedae_plus/ae/menu/EntitySpeedTickerMenu.java
+++ b/src/main/java/com/extendedae_plus/ae/menu/EntitySpeedTickerMenu.java
@@ -9,8 +9,8 @@ import com.extendedae_plus.ae.screen.EntitySpeedTickerScreen;
 import com.extendedae_plus.config.ModConfig;
 import com.extendedae_plus.init.ModItems;
 import com.extendedae_plus.init.ModMenuTypes;
-import com.extendedae_plus.util.ConfigParsingUtils;
-import com.extendedae_plus.util.PowerUtils;
+import com.extendedae_plus.util.entitySpeed.ConfigParsingUtils;
+import com.extendedae_plus.util.entitySpeed.PowerUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.level.block.entity.BlockEntity;
diff --git a/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java b/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java
index 91fa27f..bfa7f86 100644
--- a/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java
+++ b/src/main/java/com/extendedae_plus/ae/parts/EntitySpeedTickerPart.java
@@ -22,8 +22,8 @@ import com.extendedae_plus.ae.menu.EntitySpeedTickerMenu;
 import com.extendedae_plus.config.ModConfig;
 import com.extendedae_plus.init.ModItems;
 import com.extendedae_plus.init.ModMenuTypes;
-import com.extendedae_plus.util.ConfigParsingUtils;
-import com.extendedae_plus.util.PowerUtils;
+import com.extendedae_plus.util.entitySpeed.ConfigParsingUtils;
+import com.extendedae_plus.util.entitySpeed.PowerUtils;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.InteractionHand;
diff --git a/src/main/java/com/extendedae_plus/ae/screen/EntitySpeedTickerScreen.java b/src/main/java/com/extendedae_plus/ae/screen/EntitySpeedTickerScreen.java
index 0f6ae50..842ad03 100644
--- a/src/main/java/com/extendedae_plus/ae/screen/EntitySpeedTickerScreen.java
+++ b/src/main/java/com/extendedae_plus/ae/screen/EntitySpeedTickerScreen.java
@@ -11,7 +11,7 @@ import appeng.util.Platform;
 import com.extendedae_plus.ae.menu.EntitySpeedTickerMenu;
 import com.extendedae_plus.init.ModNetwork;
 import com.extendedae_plus.network.ToggleEntityTickerC2SPacket;
-import com.extendedae_plus.util.PowerUtils;
+import com.extendedae_plus.util.entitySpeed.PowerUtils;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Inventory;
 
diff --git a/src/main/java/com/extendedae_plus/wireless/IWirelessEndpoint.java b/src/main/java/com/extendedae_plus/ae/wireless/IWirelessEndpoint.java
similarity index 94%
rename from src/main/java/com/extendedae_plus/wireless/IWirelessEndpoint.java
rename to src/main/java/com/extendedae_plus/ae/wireless/IWirelessEndpoint.java
index 15a991b..d21ebae 100644
--- a/src/main/java/com/extendedae_plus/wireless/IWirelessEndpoint.java
+++ b/src/main/java/com/extendedae_plus/ae/wireless/IWirelessEndpoint.java
@@ -1,4 +1,4 @@
-package com.extendedae_plus.wireless;
+package com.extendedae_plus.ae.wireless;
 
 import appeng.api.networking.IGridNode;
 import net.minecraft.core.BlockPos;
diff --git a/src/main/java/com/extendedae_plus/wireless/WirelessMasterLink.java b/src/main/java/com/extendedae_plus/ae/wireless/WirelessMasterLink.java
similarity index 97%
rename from src/main/java/com/extendedae_plus/wireless/WirelessMasterLink.java
rename to src/main/java/com/extendedae_plus/ae/wireless/WirelessMasterLink.java
index 4024b49..6d40cc2 100644
--- a/src/main/java/com/extendedae_plus/wireless/WirelessMasterLink.java
+++ b/src/main/java/com/extendedae_plus/ae/wireless/WirelessMasterLink.java
@@ -1,4 +1,4 @@
-package com.extendedae_plus.wireless;
+package com.extendedae_plus.ae.wireless;
 
 import net.minecraft.server.level.ServerLevel;
 
diff --git a/src/main/java/com/extendedae_plus/wireless/WirelessMasterRegistry.java b/src/main/java/com/extendedae_plus/ae/wireless/WirelessMasterRegistry.java
similarity index 98%
rename from src/main/java/com/extendedae_plus/wireless/WirelessMasterRegistry.java
rename to src/main/java/com/extendedae_plus/ae/wireless/WirelessMasterRegistry.java
index a5f35b8..6d411a8 100644
--- a/src/main/java/com/extendedae_plus/wireless/WirelessMasterRegistry.java
+++ b/src/main/java/com/extendedae_plus/ae/wireless/WirelessMasterRegistry.java
@@ -1,4 +1,4 @@
-package com.extendedae_plus.wireless;
+package com.extendedae_plus.ae.wireless;
 
 import com.extendedae_plus.config.ModConfig;
 import net.minecraft.resources.ResourceKey;
diff --git a/src/main/java/com/extendedae_plus/wireless/WirelessSlaveLink.java b/src/main/java/com/extendedae_plus/ae/wireless/WirelessSlaveLink.java
similarity index 99%
rename from src/main/java/com/extendedae_plus/wireless/WirelessSlaveLink.java
rename to src/main/java/com/extendedae_plus/ae/wireless/WirelessSlaveLink.java
index 84035fd..8196349 100644
--- a/src/main/java/com/extendedae_plus/wireless/WirelessSlaveLink.java
+++ b/src/main/java/com/extendedae_plus/ae/wireless/WirelessSlaveLink.java
@@ -1,4 +1,4 @@
-package com.extendedae_plus.wireless;
+package com.extendedae_plus.ae.wireless;
 
 import appeng.api.networking.GridHelper;
 import appeng.api.networking.IGridNode;
diff --git a/src/main/java/com/extendedae_plus/wireless/endpoint/GenericNodeEndpointImpl.java b/src/main/java/com/extendedae_plus/ae/wireless/endpoint/GenericNodeEndpointImpl.java
similarity index 93%
rename from src/main/java/com/extendedae_plus/wireless/endpoint/GenericNodeEndpointImpl.java
rename to src/main/java/com/extendedae_plus/ae/wireless/endpoint/GenericNodeEndpointImpl.java
index 84cd191..3653e12 100644
--- a/src/main/java/com/extendedae_plus/wireless/endpoint/GenericNodeEndpointImpl.java
+++ b/src/main/java/com/extendedae_plus/ae/wireless/endpoint/GenericNodeEndpointImpl.java
@@ -1,7 +1,7 @@
-package com.extendedae_plus.wireless.endpoint;
+package com.extendedae_plus.ae.wireless.endpoint;
 
 import appeng.api.networking.IGridNode;
-import com.extendedae_plus.wireless.IWirelessEndpoint;
+import com.extendedae_plus.ae.wireless.IWirelessEndpoint;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.Level;
diff --git a/src/main/java/com/extendedae_plus/wireless/endpoint/InterfaceNodeEndpointImpl.java b/src/main/java/com/extendedae_plus/ae/wireless/endpoint/InterfaceNodeEndpointImpl.java
similarity index 92%
rename from src/main/java/com/extendedae_plus/wireless/endpoint/InterfaceNodeEndpointImpl.java
rename to src/main/java/com/extendedae_plus/ae/wireless/endpoint/InterfaceNodeEndpointImpl.java
index 6736f4c..f6dbfff 100644
--- a/src/main/java/com/extendedae_plus/wireless/endpoint/InterfaceNodeEndpointImpl.java
+++ b/src/main/java/com/extendedae_plus/ae/wireless/endpoint/InterfaceNodeEndpointImpl.java
@@ -1,8 +1,8 @@
-package com.extendedae_plus.wireless.endpoint;
+package com.extendedae_plus.ae.wireless.endpoint;
 
 import appeng.api.networking.IGridNode;
 import appeng.helpers.InterfaceLogicHost;
-import com.extendedae_plus.wireless.IWirelessEndpoint;
+import com.extendedae_plus.ae.wireless.IWirelessEndpoint;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.Level;
diff --git a/src/main/java/com/extendedae_plus/content/wireless/WirelessTransceiverBlockEntity.java b/src/main/java/com/extendedae_plus/content/wireless/WirelessTransceiverBlockEntity.java
index 09b843d..6884308 100644
--- a/src/main/java/com/extendedae_plus/content/wireless/WirelessTransceiverBlockEntity.java
+++ b/src/main/java/com/extendedae_plus/content/wireless/WirelessTransceiverBlockEntity.java
@@ -3,11 +3,11 @@ package com.extendedae_plus.content.wireless;
 import appeng.api.networking.*;
 import appeng.api.util.AECableType;
 import appeng.blockentity.AEBaseBlockEntity;
+import com.extendedae_plus.ae.wireless.IWirelessEndpoint;
+import com.extendedae_plus.ae.wireless.WirelessMasterLink;
+import com.extendedae_plus.ae.wireless.WirelessSlaveLink;
 import com.extendedae_plus.init.ModBlockEntities;
 import com.extendedae_plus.init.ModItems;
-import com.extendedae_plus.wireless.IWirelessEndpoint;
-import com.extendedae_plus.wireless.WirelessMasterLink;
-import com.extendedae_plus.wireless.WirelessSlaveLink;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.nbt.CompoundTag;
diff --git a/src/main/java/com/extendedae_plus/integration/jade/WirelessTransceiverProvider.java b/src/main/java/com/extendedae_plus/integration/jade/WirelessTransceiverProvider.java
index 7786e1c..d0529fc 100644
--- a/src/main/java/com/extendedae_plus/integration/jade/WirelessTransceiverProvider.java
+++ b/src/main/java/com/extendedae_plus/integration/jade/WirelessTransceiverProvider.java
@@ -2,9 +2,9 @@ package com.extendedae_plus.integration.jade;
 
 import appeng.api.networking.IGrid;
 import appeng.api.networking.IGridNode;
+import com.extendedae_plus.ae.wireless.IWirelessEndpoint;
+import com.extendedae_plus.ae.wireless.WirelessMasterRegistry;
 import com.extendedae_plus.content.wireless.WirelessTransceiverBlockEntity;
-import com.extendedae_plus.wireless.IWirelessEndpoint;
-import com.extendedae_plus.wireless.WirelessMasterRegistry;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.resources.ResourceLocation;
diff --git a/src/main/java/com/extendedae_plus/mixin/advancedae/AdvPatternProviderLogicContainsRedirectMixin.java b/src/main/java/com/extendedae_plus/mixin/advancedae/AdvPatternProviderLogicContainsRedirectMixin.java
index 0773388..fb482b9 100644
--- a/src/main/java/com/extendedae_plus/mixin/advancedae/AdvPatternProviderLogicContainsRedirectMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/advancedae/AdvPatternProviderLogicContainsRedirectMixin.java
@@ -1,7 +1,7 @@
 package com.extendedae_plus.mixin.advancedae;
 
 import appeng.api.crafting.IPatternDetails;
-import com.extendedae_plus.content.ScaledProcessingPattern;
+import com.extendedae_plus.ae.api.crafting.ScaledProcessingPattern;
 import net.pedroksl.advanced_ae.common.logic.AdvPatternProviderLogic;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingServiceGetProvidersMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingServiceGetProvidersMixin.java
index ccc4812..1a508c2 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingServiceGetProvidersMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingServiceGetProvidersMixin.java
@@ -2,7 +2,7 @@ package com.extendedae_plus.mixin.ae2.autopattern;
 
 import appeng.api.crafting.IPatternDetails;
 import appeng.me.service.CraftingService;
-import com.extendedae_plus.content.ScaledProcessingPattern;
+import com.extendedae_plus.ae.api.crafting.ScaledProcessingPattern;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeNodeMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeNodeMixin.java
index aa4f062..c37d9b0 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeNodeMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeNodeMixin.java
@@ -3,7 +3,7 @@ package com.extendedae_plus.mixin.ae2.autopattern;
 import appeng.api.stacks.KeyCounter;
 import appeng.crafting.CraftingTreeNode;
 import appeng.crafting.inv.CraftingSimulationState;
-import com.extendedae_plus.util.RequestedAmountHolder;
+import com.extendedae_plus.util.smartDoubling.RequestedAmountHolder;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeProcessMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeProcessMixin.java
index 2bc2189..30a2c80 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeProcessMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/CraftingTreeProcessMixin.java
@@ -9,11 +9,11 @@ import appeng.crafting.CraftingTreeNode;
 import appeng.crafting.CraftingTreeProcess;
 import appeng.crafting.pattern.AEProcessingPattern;
 import appeng.me.service.CraftingService;
+import com.extendedae_plus.ae.api.crafting.ScaledProcessingPattern;
 import com.extendedae_plus.api.smartDoubling.ISmartDoublingAwarePattern;
 import com.extendedae_plus.config.ModConfig;
-import com.extendedae_plus.content.ScaledProcessingPattern;
-import com.extendedae_plus.util.PatternScaler;
-import com.extendedae_plus.util.RequestedAmountHolder;
+import com.extendedae_plus.util.smartDoubling.PatternScaler;
+import com.extendedae_plus.util.smartDoubling.RequestedAmountHolder;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/PatternProviderLogicContainsRedirectMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/PatternProviderLogicContainsRedirectMixin.java
index d6dc2a5..a1b6bf7 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/PatternProviderLogicContainsRedirectMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/autopattern/PatternProviderLogicContainsRedirectMixin.java
@@ -2,7 +2,7 @@ package com.extendedae_plus.mixin.ae2.autopattern;
 
 import appeng.api.crafting.IPatternDetails;
 import appeng.helpers.patternprovider.PatternProviderLogic;
-import com.extendedae_plus.content.ScaledProcessingPattern;
+import com.extendedae_plus.ae.api.crafting.ScaledProcessingPattern;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/InterfaceScreenMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/InterfaceScreenMixin.java
index 0c6f828..5bfd4f0 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/InterfaceScreenMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/client/gui/InterfaceScreenMixin.java
@@ -3,17 +3,15 @@ package com.extendedae_plus.mixin.ae2.client.gui;
 import appeng.client.gui.AEBaseScreen;
 import appeng.client.gui.implementations.InterfaceScreen;
 import appeng.menu.AEBaseMenu;
-import com.extendedae_plus.NewIcon;
-import com.extendedae_plus.init.ModNetwork;
-import com.extendedae_plus.network.InterfaceAdjustConfigAmountC2SPacket;
 import appeng.menu.SlotSemantics;
-import net.minecraft.world.inventory.Slot;
+import com.extendedae_plus.ae.client.gui.NewIcon;
+import com.extendedae_plus.init.ModNetwork;
 import com.extendedae_plus.mixin.accessor.AbstractContainerScreenAccessor;
 import com.extendedae_plus.mixin.accessor.ScreenAccessor;
+import com.extendedae_plus.network.InterfaceAdjustConfigAmountC2SPacket;
 import com.glodblock.github.extendedae.client.button.ActionEPPButton;
-import net.minecraft.client.gui.components.Tooltip;
-import net.minecraft.network.chat.Component;
 import com.mojang.logging.LogUtils;
+import net.minecraft.world.inventory.Slot;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java
index bad667d..69e52af 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/compat/PatternProviderLogicCompatMixin.java
@@ -8,11 +8,11 @@ import appeng.api.upgrades.UpgradeInventories;
 import appeng.helpers.patternprovider.PatternProviderLogic;
 import appeng.helpers.patternprovider.PatternProviderLogicHost;
 import com.extendedae_plus.ae.items.ChannelCardItem;
+import com.extendedae_plus.ae.wireless.WirelessSlaveLink;
+import com.extendedae_plus.ae.wireless.endpoint.GenericNodeEndpointImpl;
 import com.extendedae_plus.api.bridge.IInterfaceWirelessLinkBridge;
 import com.extendedae_plus.compat.UpgradeSlotCompat;
 import com.extendedae_plus.init.ModItems;
-import com.extendedae_plus.wireless.WirelessSlaveLink;
-import com.extendedae_plus.wireless.endpoint.GenericNodeEndpointImpl;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Final;
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/helpers/InterfaceLogicChannelCardMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/helpers/InterfaceLogicChannelCardMixin.java
index 4e9b52a..a5ea0e3 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/helpers/InterfaceLogicChannelCardMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/helpers/InterfaceLogicChannelCardMixin.java
@@ -4,10 +4,10 @@ import appeng.api.upgrades.IUpgradeInventory;
 import appeng.helpers.InterfaceLogic;
 import appeng.helpers.InterfaceLogicHost;
 import com.extendedae_plus.ae.items.ChannelCardItem;
+import com.extendedae_plus.ae.wireless.WirelessSlaveLink;
+import com.extendedae_plus.ae.wireless.endpoint.InterfaceNodeEndpointImpl;
 import com.extendedae_plus.api.bridge.IInterfaceWirelessLinkBridge;
 import com.extendedae_plus.init.ModItems;
-import com.extendedae_plus.wireless.WirelessSlaveLink;
-import com.extendedae_plus.wireless.endpoint.InterfaceNodeEndpointImpl;
 import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/parts/automation/IOBusPartChannelCardMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/parts/automation/IOBusPartChannelCardMixin.java
index 1ce2e5d..eee7501 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/parts/automation/IOBusPartChannelCardMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/parts/automation/IOBusPartChannelCardMixin.java
@@ -5,11 +5,11 @@ import appeng.api.upgrades.IUpgradeInventory;
 import appeng.api.upgrades.IUpgradeableObject;
 import appeng.parts.automation.IOBusPart;
 import com.extendedae_plus.ae.items.ChannelCardItem;
+import com.extendedae_plus.ae.wireless.WirelessSlaveLink;
+import com.extendedae_plus.ae.wireless.endpoint.GenericNodeEndpointImpl;
 import com.extendedae_plus.api.bridge.IInterfaceWirelessLinkBridge;
 import com.extendedae_plus.init.ModItems;
 import com.extendedae_plus.util.ExtendedAELogger;
-import com.extendedae_plus.wireless.WirelessSlaveLink;
-import com.extendedae_plus.wireless.endpoint.GenericNodeEndpointImpl;
 import net.minecraft.nbt.CompoundTag;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
diff --git a/src/main/java/com/extendedae_plus/mixin/ae2/parts/storagebus/StorageBusPartChannelCardMixin.java b/src/main/java/com/extendedae_plus/mixin/ae2/parts/storagebus/StorageBusPartChannelCardMixin.java
index d1f4264..d54d757 100644
--- a/src/main/java/com/extendedae_plus/mixin/ae2/parts/storagebus/StorageBusPartChannelCardMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/ae2/parts/storagebus/StorageBusPartChannelCardMixin.java
@@ -6,11 +6,11 @@ import appeng.api.upgrades.IUpgradeInventory;
 import appeng.api.upgrades.IUpgradeableObject;
 import appeng.parts.storagebus.StorageBusPart;
 import com.extendedae_plus.ae.items.ChannelCardItem;
+import com.extendedae_plus.ae.wireless.WirelessSlaveLink;
+import com.extendedae_plus.ae.wireless.endpoint.GenericNodeEndpointImpl;
 import com.extendedae_plus.api.bridge.IInterfaceWirelessLinkBridge;
 import com.extendedae_plus.init.ModItems;
 import com.extendedae_plus.util.ExtendedAELogger;
-import com.extendedae_plus.wireless.WirelessSlaveLink;
-import com.extendedae_plus.wireless.endpoint.GenericNodeEndpointImpl;
 import net.minecraft.nbt.CompoundTag;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
diff --git a/src/main/java/com/extendedae_plus/mixin/extendedae/client/gui/GuiExPatternProviderMixin.java b/src/main/java/com/extendedae_plus/mixin/extendedae/client/gui/GuiExPatternProviderMixin.java
index 72101ae..6cc4b9d 100644
--- a/src/main/java/com/extendedae_plus/mixin/extendedae/client/gui/GuiExPatternProviderMixin.java
+++ b/src/main/java/com/extendedae_plus/mixin/extendedae/client/gui/GuiExPatternProviderMixin.java
@@ -4,7 +4,7 @@ import appeng.client.gui.Icon;
 import appeng.client.gui.implementations.PatternProviderScreen;
 import appeng.client.gui.style.ScreenStyle;
 import appeng.menu.SlotSemantics;
-import com.extendedae_plus.NewIcon;
+import com.extendedae_plus.ae.client.gui.NewIcon;
 import com.extendedae_plus.api.IExPatternButtonsAccessor;
 import com.extendedae_plus.api.IExPatternPageAccessor;
 import com.extendedae_plus.config.ModConfig;
diff --git a/src/main/java/com/extendedae_plus/util/PatternProviderUIHelper.java b/src/main/java/com/extendedae_plus/util/PatternProviderUIHelper.java
deleted file mode 100644
index 435a5a9..0000000
--- a/src/main/java/com/extendedae_plus/util/PatternProviderUIHelper.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.extendedae_plus.util;
-
-import appeng.client.gui.implementations.PatternProviderScreen;
-import appeng.helpers.patternprovider.PatternProviderLogic;
-import appeng.menu.implementations.PatternProviderMenu;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-
-/**
- * 样板供应器UI辅助工具类
- * 用于在样板供应器界面中获取PatternProviderLogic对象
- */
-public class PatternProviderUIHelper {
-
-    /**
-     * 获取当前打开的样板供应器的PatternProviderLogic
-     * 
-     * @return PatternProviderLogic对象，如果当前没有打开样板供应器界面则返回null
-     */
-    public static PatternProviderLogic getCurrentPatternProvider() {
-        Minecraft mc = Minecraft.getInstance();
-        Screen currentScreen = mc.screen;
-        
-        if (currentScreen instanceof PatternProviderScreen patternScreen) {
-            PatternProviderMenu menu = (PatternProviderMenu) patternScreen.getMenu();
-            
-            // 通过反射安全地访问protected字段
-            try {
-                var logicField = PatternProviderMenu.class.getDeclaredField("logic");
-                logicField.setAccessible(true);
-                return (PatternProviderLogic) logicField.get(menu);
-            } catch (Exception e) {
-                // 如果反射失败，返回null
-                return null;
-            }
-        }
-        
-        return null;
-    }
-
-    /**
-     * 检查当前是否打开了样板供应器界面
-     * 
-     * @return 如果当前打开的是样板供应器界面则返回true
-     */
-    public static boolean isPatternProviderScreenOpen() {
-        Minecraft mc = Minecraft.getInstance();
-        return mc.screen instanceof PatternProviderScreen;
-    }
-
-    /**
-     * 获取当前样板供应器界面的Screen对象
-     * 
-     * @return PatternProviderScreen对象，如果当前没有打开样板供应器界面则返回null
-     */
-    public static PatternProviderScreen getCurrentPatternProviderScreen() {
-        Minecraft mc = Minecraft.getInstance();
-        Screen currentScreen = mc.screen;
-        
-        if (currentScreen instanceof PatternProviderScreen patternScreen) {
-            return patternScreen;
-        }
-        
-        return null;
-    }
-
-    /**
-     * 在当前样板供应器中执行样板数量倍增
-     * 
-     * @param multiplier 倍数（必须大于0）
-     * @return 缩放操作结果，如果当前没有打开样板供应器界面则返回null
-     */
-    public static PatternProviderDataUtil.PatternScalingResult multiplyCurrentPatternAmounts(double multiplier) {
-        PatternProviderLogic patternProvider = getCurrentPatternProvider();
-        if (patternProvider == null) {
-            return null;
-        }
-        
-        return PatternProviderDataUtil.multiplyPatternAmounts(patternProvider, multiplier);
-    }
-
-    /**
-     * ExtendedAE风格的样板复制倍增
-     * 提供更好的错误处理和恢复机制
-     * 
-     * @param multiplier 倍数（必须大于0）
-     * @return 缩放操作结果，如果当前没有打开样板供应器界面则返回null
-     */
-    public static PatternProviderDataUtil.PatternScalingResult duplicateCurrentPatternAmountsExtendedAEStyle(double multiplier) {
-        PatternProviderLogic patternProvider = getCurrentPatternProvider();
-        if (patternProvider == null) {
-            return null;
-        }
-        
-        return PatternProviderDataUtil.duplicatePatternAmountsExtendedAEStyle(patternProvider, multiplier);
-    }
-
-    /**
-     * 在当前样板供应器中执行样板数量倍除
-     * 
-     * @param divisor 除数（必须大于0）
-     * @return 缩放操作结果，如果当前没有打开样板供应器界面则返回null
-     */
-    public static PatternProviderDataUtil.PatternScalingResult divideCurrentPatternAmounts(double divisor) {
-        PatternProviderLogic patternProvider = getCurrentPatternProvider();
-        if (patternProvider == null) {
-            return null;
-        }
-        
-        return PatternProviderDataUtil.dividePatternAmounts(patternProvider, divisor);
-    }
-
-    /**
-     * 预览当前样板供应器的缩放效果
-     * 
-     * @param scaleFactor 缩放因子
-     * @return 预览结果列表，如果当前没有打开样板供应器界面则返回空列表
-     */
-    public static java.util.List<PatternProviderDataUtil.PatternScalingPreview> previewCurrentPatternScaling(double scaleFactor) {
-        PatternProviderLogic patternProvider = getCurrentPatternProvider();
-        if (patternProvider == null) {
-            return new java.util.ArrayList<>();
-        }
-        
-        return PatternProviderDataUtil.previewPatternScaling(patternProvider, scaleFactor);
-    }
-}
diff --git a/src/main/java/com/extendedae_plus/util/ConfigParsingUtils.java b/src/main/java/com/extendedae_plus/util/entitySpeed/ConfigParsingUtils.java
similarity index 99%
rename from src/main/java/com/extendedae_plus/util/ConfigParsingUtils.java
rename to src/main/java/com/extendedae_plus/util/entitySpeed/ConfigParsingUtils.java
index f74da49..44c9713 100644
--- a/src/main/java/com/extendedae_plus/util/ConfigParsingUtils.java
+++ b/src/main/java/com/extendedae_plus/util/entitySpeed/ConfigParsingUtils.java
@@ -1,4 +1,4 @@
-package com.extendedae_plus.util;
+package com.extendedae_plus.util.entitySpeed;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/src/main/java/com/extendedae_plus/util/PowerUtils.java b/src/main/java/com/extendedae_plus/util/entitySpeed/PowerUtils.java
similarity index 98%
rename from src/main/java/com/extendedae_plus/util/PowerUtils.java
rename to src/main/java/com/extendedae_plus/util/entitySpeed/PowerUtils.java
index e8c2776..529b40f 100644
--- a/src/main/java/com/extendedae_plus/util/PowerUtils.java
+++ b/src/main/java/com/extendedae_plus/util/entitySpeed/PowerUtils.java
@@ -1,4 +1,4 @@
-package com.extendedae_plus.util;
+package com.extendedae_plus.util.entitySpeed;
 
 import appeng.api.upgrades.IUpgradeInventory;
 import com.extendedae_plus.ae.definitions.upgrades.EntitySpeedCardItem;
diff --git a/src/main/java/com/extendedae_plus/util/PatternScaler.java b/src/main/java/com/extendedae_plus/util/smartDoubling/PatternScaler.java
similarity index 96%
rename from src/main/java/com/extendedae_plus/util/PatternScaler.java
rename to src/main/java/com/extendedae_plus/util/smartDoubling/PatternScaler.java
index e14fce0..3a2eccf 100644
--- a/src/main/java/com/extendedae_plus/util/PatternScaler.java
+++ b/src/main/java/com/extendedae_plus/util/smartDoubling/PatternScaler.java
@@ -1,11 +1,11 @@
-package com.extendedae_plus.util;
+package com.extendedae_plus.util.smartDoubling;
 
 import appeng.api.stacks.AEKey;
 import appeng.api.stacks.GenericStack;
 import appeng.crafting.pattern.AEProcessingPattern;
+import com.extendedae_plus.ae.api.crafting.ScaledProcessingPattern;
 import com.extendedae_plus.api.smartDoubling.ISmartDoublingAwarePattern;
 import com.extendedae_plus.config.ModConfig;
-import com.extendedae_plus.content.ScaledProcessingPattern;
 
 public final class PatternScaler {
     private PatternScaler() {
diff --git a/src/main/java/com/extendedae_plus/util/RequestedAmountHolder.java b/src/main/java/com/extendedae_plus/util/smartDoubling/RequestedAmountHolder.java
similarity index 95%
rename from src/main/java/com/extendedae_plus/util/RequestedAmountHolder.java
rename to src/main/java/com/extendedae_plus/util/smartDoubling/RequestedAmountHolder.java
index e70187a..005f919 100644
--- a/src/main/java/com/extendedae_plus/util/RequestedAmountHolder.java
+++ b/src/main/java/com/extendedae_plus/util/smartDoubling/RequestedAmountHolder.java
@@ -1,4 +1,4 @@
-package com.extendedae_plus.util;
+package com.extendedae_plus.util.smartDoubling;
 
 import java.util.ArrayDeque;
 import java.util.Deque;