diff --git a/src/main/java/vazkii/quark/content/automation/module/ChainsConnectBlocksModule.java b/src/main/java/vazkii/quark/content/automation/module/ChainsConnectBlocksModule.java
index 4f4e3a2a7c..60512be76b 100644
--- a/src/main/java/vazkii/quark/content/automation/module/ChainsConnectBlocksModule.java
+++ b/src/main/java/vazkii/quark/content/automation/module/ChainsConnectBlocksModule.java
@@ -1,9 +1,5 @@
 package vazkii.quark.content.automation.module;
 
-import java.util.function.Predicate;
-
-import org.apache.commons.lang3.tuple.Pair;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.world.item.Item;
@@ -12,14 +8,16 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.ChainBlock;
 import net.minecraft.world.level.block.state.BlockState;
+import org.apache.commons.lang3.tuple.Pair;
 import vazkii.zeta.api.IIndirectConnector;
-import vazkii.quark.base.module.LoadModule;
-import vazkii.zeta.module.ZetaLoadModule;
-import vazkii.zeta.module.ZetaModule;
-import vazkii.zeta.util.Hint;
 import vazkii.zeta.event.ZConfigChanged;
 import vazkii.zeta.event.ZRegister;
 import vazkii.zeta.event.bus.LoadEvent;
+import vazkii.zeta.module.ZetaLoadModule;
+import vazkii.zeta.module.ZetaModule;
+import vazkii.zeta.util.Hint;
+
+import java.util.function.Predicate;
 
 @ZetaLoadModule(category = "automation")
 public class ChainsConnectBlocksModule extends ZetaModule {
diff --git a/src/main/java/vazkii/quark/content/automation/module/ChuteModule.java b/src/main/java/vazkii/quark/content/automation/module/ChuteModule.java
index e40c9fed31..a357475570 100644
--- a/src/main/java/vazkii/quark/content/automation/module/ChuteModule.java
+++ b/src/main/java/vazkii/quark/content/automation/module/ChuteModule.java
@@ -7,14 +7,13 @@
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.material.Material;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.module.LoadModule;
-import vazkii.zeta.module.ZetaLoadModule;
-import vazkii.zeta.module.ZetaModule;
-import vazkii.zeta.util.Hint;
 import vazkii.quark.content.automation.block.ChuteBlock;
 import vazkii.quark.content.automation.block.be.ChuteBlockEntity;
 import vazkii.zeta.event.ZRegister;
 import vazkii.zeta.event.bus.LoadEvent;
+import vazkii.zeta.module.ZetaLoadModule;
+import vazkii.zeta.module.ZetaModule;
+import vazkii.zeta.util.Hint;
 
 /**
  * @author WireSegal
diff --git a/src/main/java/vazkii/quark/content/automation/module/DispensersPlaceBlocksModule.java b/src/main/java/vazkii/quark/content/automation/module/DispensersPlaceBlocksModule.java
index fb00e6cb1e..03933e4a15 100644
--- a/src/main/java/vazkii/quark/content/automation/module/DispensersPlaceBlocksModule.java
+++ b/src/main/java/vazkii/quark/content/automation/module/DispensersPlaceBlocksModule.java
@@ -19,7 +19,6 @@
 import net.minecraft.world.level.block.DispenserBlock;
 import net.minecraft.world.level.block.SlabBlock;
 import net.minecraft.world.level.block.StairBlock;
-import vazkii.quark.base.module.LoadModule;
 import vazkii.zeta.module.ZetaLoadModule;
 import vazkii.zeta.module.ZetaModule;
 import vazkii.quark.base.module.config.Config;
diff --git a/src/main/java/vazkii/quark/content/automation/module/EnderWatcherModule.java b/src/main/java/vazkii/quark/content/automation/module/EnderWatcherModule.java
index a01227993b..3822a46918 100644
--- a/src/main/java/vazkii/quark/content/automation/module/EnderWatcherModule.java
+++ b/src/main/java/vazkii/quark/content/automation/module/EnderWatcherModule.java
@@ -6,14 +6,13 @@
 import vazkii.quark.base.Quark;
 import vazkii.quark.base.handler.advancement.QuarkAdvancementHandler;
 import vazkii.quark.base.handler.advancement.QuarkGenericTrigger;
-import vazkii.quark.base.module.LoadModule;
-import vazkii.zeta.module.ZetaLoadModule;
-import vazkii.zeta.module.ZetaModule;
-import vazkii.zeta.util.Hint;
 import vazkii.quark.content.automation.block.EnderWatcherBlock;
 import vazkii.quark.content.automation.block.be.EnderWatcherBlockEntity;
 import vazkii.zeta.event.ZRegister;
 import vazkii.zeta.event.bus.LoadEvent;
+import vazkii.zeta.module.ZetaLoadModule;
+import vazkii.zeta.module.ZetaModule;
+import vazkii.zeta.util.Hint;
 
 @ZetaLoadModule(category = "automation")
 public class EnderWatcherModule extends ZetaModule {
diff --git a/src/main/java/vazkii/quark/content/automation/module/FeedingTroughModule.java b/src/main/java/vazkii/quark/content/automation/module/FeedingTroughModule.java
index a16bf3d161..a9ed0a13f0 100644
--- a/src/main/java/vazkii/quark/content/automation/module/FeedingTroughModule.java
+++ b/src/main/java/vazkii/quark/content/automation/module/FeedingTroughModule.java
@@ -1,14 +1,8 @@
 package vazkii.quark.content.automation.module;
 
-import java.util.Set;
-import java.util.function.Predicate;
-
-import javax.annotation.Nullable;
-
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableSet;
 import com.mojang.datafixers.util.Pair;
-
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.core.Registry;
@@ -35,24 +29,23 @@
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.event.entity.EntityJoinLevelEvent;
-import net.minecraftforge.event.entity.living.BabyEntitySpawnEvent;
-import net.minecraftforge.eventbus.api.EventPriority;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.module.LoadModule;
 import vazkii.quark.base.module.ModuleLoader;
+import vazkii.quark.base.module.config.Config;
+import vazkii.quark.content.automation.block.FeedingTroughBlock;
+import vazkii.quark.content.automation.block.be.FeedingTroughBlockEntity;
 import vazkii.zeta.event.ZBabyEntitySpawn;
 import vazkii.zeta.event.ZEntityJoinLevel;
+import vazkii.zeta.event.ZRegister;
+import vazkii.zeta.event.bus.LoadEvent;
 import vazkii.zeta.event.bus.PlayEvent;
 import vazkii.zeta.module.ZetaLoadModule;
 import vazkii.zeta.module.ZetaModule;
-import vazkii.quark.base.module.config.Config;
 import vazkii.zeta.util.Hint;
-import vazkii.quark.content.automation.block.FeedingTroughBlock;
-import vazkii.quark.content.automation.block.be.FeedingTroughBlockEntity;
-import vazkii.zeta.event.ZRegister;
-import vazkii.zeta.event.bus.LoadEvent;
+
+import javax.annotation.Nullable;
+import java.util.Set;
+import java.util.function.Predicate;
 
 /**
  * @author WireSegal
diff --git a/src/main/java/vazkii/quark/content/automation/module/GravisandModule.java b/src/main/java/vazkii/quark/content/automation/module/GravisandModule.java
index 03ece41196..10e83aeba9 100755
--- a/src/main/java/vazkii/quark/content/automation/module/GravisandModule.java
+++ b/src/main/java/vazkii/quark/content/automation/module/GravisandModule.java
@@ -9,16 +9,14 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.module.LoadModule;
-import vazkii.quark.content.tweaks.module.EmotesModule;
-import vazkii.zeta.module.ZetaLoadModule;
-import vazkii.zeta.module.ZetaModule;
-import vazkii.zeta.util.Hint;
 import vazkii.quark.content.automation.block.GravisandBlock;
 import vazkii.quark.content.automation.entity.Gravisand;
+import vazkii.zeta.client.event.ZClientSetup;
 import vazkii.zeta.event.ZRegister;
 import vazkii.zeta.event.bus.LoadEvent;
-import vazkii.zeta.client.event.ZClientSetup;
+import vazkii.zeta.module.ZetaLoadModule;
+import vazkii.zeta.module.ZetaModule;
+import vazkii.zeta.util.Hint;
 
 @ZetaLoadModule(category = "automation")
 public class GravisandModule extends ZetaModule {
diff --git a/src/main/java/vazkii/quark/content/automation/module/IronRodModule.java b/src/main/java/vazkii/quark/content/automation/module/IronRodModule.java
index 7f98128ea7..3b7deefc16 100644
--- a/src/main/java/vazkii/quark/content/automation/module/IronRodModule.java
+++ b/src/main/java/vazkii/quark/content/automation/module/IronRodModule.java
@@ -5,15 +5,14 @@
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.block.Block;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.module.LoadModule;
-import vazkii.zeta.module.ZetaLoadModule;
-import vazkii.zeta.module.ZetaModule;
 import vazkii.quark.base.module.config.Config;
-import vazkii.zeta.util.Hint;
 import vazkii.quark.content.automation.block.IronRodBlock;
 import vazkii.zeta.event.ZCommonSetup;
 import vazkii.zeta.event.ZRegister;
 import vazkii.zeta.event.bus.LoadEvent;
+import vazkii.zeta.module.ZetaLoadModule;
+import vazkii.zeta.module.ZetaModule;
+import vazkii.zeta.util.Hint;
 
 @ZetaLoadModule(category = "automation")
 public class IronRodModule extends ZetaModule {
diff --git a/src/main/java/vazkii/quark/content/automation/module/JukeboxAutomationModule.java b/src/main/java/vazkii/quark/content/automation/module/JukeboxAutomationModule.java
index 7e08af4472..0b46e34ad5 100644
--- a/src/main/java/vazkii/quark/content/automation/module/JukeboxAutomationModule.java
+++ b/src/main/java/vazkii/quark/content/automation/module/JukeboxAutomationModule.java
@@ -22,18 +22,15 @@
 import net.minecraftforge.common.capabilities.ForgeCapabilities;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import net.minecraftforge.common.util.LazyOptional;
-import net.minecraftforge.event.AttachCapabilitiesEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.items.IItemHandler;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.module.LoadModule;
 import vazkii.zeta.event.ZAttachCapabilities;
+import vazkii.zeta.event.ZCommonSetup;
+import vazkii.zeta.event.bus.LoadEvent;
 import vazkii.zeta.event.bus.PlayEvent;
 import vazkii.zeta.module.ZetaLoadModule;
 import vazkii.zeta.module.ZetaModule;
 import vazkii.zeta.util.Hint;
-import vazkii.zeta.event.ZCommonSetup;
-import vazkii.zeta.event.bus.LoadEvent;
 
 import javax.annotation.Nonnull;
 
diff --git a/src/main/java/vazkii/quark/content/automation/module/MetalButtonsModule.java b/src/main/java/vazkii/quark/content/automation/module/MetalButtonsModule.java
index 871e53005a..a013eb8ea3 100755
--- a/src/main/java/vazkii/quark/content/automation/module/MetalButtonsModule.java
+++ b/src/main/java/vazkii/quark/content/automation/module/MetalButtonsModule.java
@@ -1,14 +1,13 @@
 package vazkii.quark.content.automation.module;
 
 import net.minecraft.world.level.block.Block;
-import vazkii.quark.base.module.LoadModule;
-import vazkii.zeta.module.ZetaLoadModule;
-import vazkii.zeta.module.ZetaModule;
 import vazkii.quark.base.module.config.Config;
-import vazkii.zeta.util.Hint;
 import vazkii.quark.content.automation.block.MetalButtonBlock;
 import vazkii.zeta.event.ZRegister;
 import vazkii.zeta.event.bus.LoadEvent;
+import vazkii.zeta.module.ZetaLoadModule;
+import vazkii.zeta.module.ZetaModule;
+import vazkii.zeta.util.Hint;
 
 @ZetaLoadModule(category = "automation")
 public class MetalButtonsModule extends ZetaModule {
diff --git a/src/main/java/vazkii/quark/content/automation/module/ObsidianPlateModule.java b/src/main/java/vazkii/quark/content/automation/module/ObsidianPlateModule.java
index a174ede7bb..27d62648ac 100644
--- a/src/main/java/vazkii/quark/content/automation/module/ObsidianPlateModule.java
+++ b/src/main/java/vazkii/quark/content/automation/module/ObsidianPlateModule.java
@@ -4,12 +4,11 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
-import vazkii.quark.base.module.LoadModule;
-import vazkii.zeta.module.ZetaLoadModule;
-import vazkii.zeta.module.ZetaModule;
 import vazkii.quark.content.automation.block.ObsidianPressurePlateBlock;
 import vazkii.zeta.event.ZRegister;
 import vazkii.zeta.event.bus.LoadEvent;
+import vazkii.zeta.module.ZetaLoadModule;
+import vazkii.zeta.module.ZetaModule;
 
 /**
  * @author WireSegal
diff --git a/src/main/java/vazkii/quark/content/automation/module/PistonsMoveTileEntitiesModule.java b/src/main/java/vazkii/quark/content/automation/module/PistonsMoveTileEntitiesModule.java
index 33d1d7054b..c0c83d18e2 100644
--- a/src/main/java/vazkii/quark/content/automation/module/PistonsMoveTileEntitiesModule.java
+++ b/src/main/java/vazkii/quark/content/automation/module/PistonsMoveTileEntitiesModule.java
@@ -17,32 +17,30 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.ChestType;
 import net.minecraftforge.common.util.NonNullConsumer;
-import net.minecraftforge.event.TickEvent.LevelTickEvent;
 import net.minecraftforge.event.TickEvent.Phase;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import org.apache.commons.lang3.tuple.Pair;
-import vazkii.zeta.api.IIndirectConnector;
 import vazkii.quark.api.IPistonCallback;
 import vazkii.quark.api.QuarkCapabilities;
 import vazkii.quark.base.Quark;
-import vazkii.quark.base.module.LoadModule;
 import vazkii.quark.base.module.ModuleLoader;
-import vazkii.zeta.event.ZLevelTick;
-import vazkii.zeta.module.ZetaModule;
 import vazkii.quark.base.module.config.Config;
 import vazkii.quark.content.building.module.SturdyStoneModule;
+import vazkii.zeta.api.IIndirectConnector;
 import vazkii.zeta.event.ZConfigChanged;
 import vazkii.zeta.event.ZGatherHints;
+import vazkii.zeta.event.ZLevelTick;
 import vazkii.zeta.event.ZRegister;
 import vazkii.zeta.event.bus.LoadEvent;
 import vazkii.zeta.event.bus.PlayEvent;
+import vazkii.zeta.module.ZetaLoadModule;
+import vazkii.zeta.module.ZetaModule;
 import vazkii.zeta.piston.ZetaPistonStructureResolver;
 
 import javax.annotation.Nullable;
 import java.util.*;
 import java.util.function.Predicate;
 
-@LoadModule(category = "automation", hasSubscriptions = true)
+@ZetaLoadModule(category = "automation")
 public class PistonsMoveTileEntitiesModule extends ZetaModule {
 
 	private static final WeakHashMap<Level, Map<BlockPos, CompoundTag>> movements = new WeakHashMap<>();
diff --git a/src/main/java/vazkii/quark/content/automation/module/RedstoneRandomizerModule.java b/src/main/java/vazkii/quark/content/automation/module/RedstoneRandomizerModule.java
index 7e35b32a42..0deb093308 100644
--- a/src/main/java/vazkii/quark/content/automation/module/RedstoneRandomizerModule.java
+++ b/src/main/java/vazkii/quark/content/automation/module/RedstoneRandomizerModule.java
@@ -4,13 +4,12 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.material.Material;
-import vazkii.quark.base.module.LoadModule;
-import vazkii.zeta.module.ZetaLoadModule;
-import vazkii.zeta.module.ZetaModule;
-import vazkii.zeta.util.Hint;
 import vazkii.quark.content.automation.block.RedstoneRandomizerBlock;
 import vazkii.zeta.event.ZRegister;
 import vazkii.zeta.event.bus.LoadEvent;
+import vazkii.zeta.module.ZetaLoadModule;
+import vazkii.zeta.module.ZetaModule;
+import vazkii.zeta.util.Hint;
 
 /**
  * @author WireSegal