diff --git a/src/main/java/org/terasology/irlCorp/events/MechanicalPowerToolPartAddedEvent.java b/src/main/java/org/terasology/irlCorp/events/MechanicalPowerToolPartAddedEvent.java
index 65088e2..f8bf166 100644
--- a/src/main/java/org/terasology/irlCorp/events/MechanicalPowerToolPartAddedEvent.java
+++ b/src/main/java/org/terasology/irlCorp/events/MechanicalPowerToolPartAddedEvent.java
@@ -16,7 +16,7 @@
 package org.terasology.irlCorp.events;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.Event;
+import org.terasology.gestalt.entitysystem.event.Event;
 
 public class MechanicalPowerToolPartAddedEvent implements Event {
     EntityRef toolEntity;
diff --git a/src/main/java/org/terasology/irlCorp/processParts/CreateMechanicalPowerToolProcessPartCommonSystem.java b/src/main/java/org/terasology/irlCorp/processParts/CreateMechanicalPowerToolProcessPartCommonSystem.java
index 9f4d2a5..749ca80 100644
--- a/src/main/java/org/terasology/irlCorp/processParts/CreateMechanicalPowerToolProcessPartCommonSystem.java
+++ b/src/main/java/org/terasology/irlCorp/processParts/CreateMechanicalPowerToolProcessPartCommonSystem.java
@@ -16,15 +16,15 @@
 package org.terasology.irlCorp.processParts;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
-import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.engine.registry.In;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.irlCorp.components.MechanicalPowerToolComponent;
 import org.terasology.irlCorp.components.MechanicalPowerToolPartComponent;
 import org.terasology.irlCorp.events.MechanicalPowerToolPartAddedEvent;
 import org.terasology.machines.ExtendedInventoryManager;
+import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.workstation.component.SpecificInputSlotComponent;
 import org.terasology.workstation.process.WorkstationInventoryUtils;
 import org.terasology.workstation.process.inventory.InventoryInputProcessPartCommonSystem;
diff --git a/src/main/java/org/terasology/irlCorp/processParts/MechanicalPowerWindingProcessPartCommonSystem.java b/src/main/java/org/terasology/irlCorp/processParts/MechanicalPowerWindingProcessPartCommonSystem.java
index 5f01751..30f4e55 100644
--- a/src/main/java/org/terasology/irlCorp/processParts/MechanicalPowerWindingProcessPartCommonSystem.java
+++ b/src/main/java/org/terasology/irlCorp/processParts/MechanicalPowerWindingProcessPartCommonSystem.java
@@ -16,13 +16,13 @@
 package org.terasology.irlCorp.processParts;
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
-import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.engine.registry.In;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.irlCorp.components.MechanicalPowerWinderComponent;
 import org.terasology.machines.ExtendedInventoryManager;
+import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.potentialEnergyDevices.components.PotentialEnergyDeviceComponent;
 import org.terasology.workstation.component.SpecificInputSlotComponent;
 import org.terasology.workstation.process.WorkstationInventoryUtils;
diff --git a/src/main/java/org/terasology/irlCorp/systems/MechanicalPowerToolAuthoritySystem.java b/src/main/java/org/terasology/irlCorp/systems/MechanicalPowerToolAuthoritySystem.java
index 8c70d93..f5a79c3 100644
--- a/src/main/java/org/terasology/irlCorp/systems/MechanicalPowerToolAuthoritySystem.java
+++ b/src/main/java/org/terasology/irlCorp/systems/MechanicalPowerToolAuthoritySystem.java
@@ -25,15 +25,12 @@
 import org.joml.Vector3ic;
 import org.terasology.RotationUtils;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.logic.characters.CharacterComponent;
 import org.terasology.engine.logic.characters.GazeAuthoritySystem;
 import org.terasology.engine.logic.common.ActivateEvent;
-import org.terasology.module.health.events.DoDamageEvent;
-import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.engine.logic.inventory.ItemComponent;
 import org.terasology.engine.logic.location.LocationComponent;
 import org.terasology.engine.math.Direction;
@@ -56,6 +53,7 @@
 import org.terasology.engine.world.block.family.BlockPlacementData;
 import org.terasology.engine.world.block.items.BlockItemComponent;
 import org.terasology.engine.world.block.items.OnBlockToItem;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.irlCorp.components.BlockPlacerAmmoChestComponent;
 import org.terasology.irlCorp.components.MechanicalPowerToolComponent;
 import org.terasology.irlCorp.components.MechanicalPowerToolDamageAdjacentComponent;
@@ -66,6 +64,8 @@
 import org.terasology.irlCorp.events.MechanicalPowerToolPartAddedEvent;
 import org.terasology.irlCorp.events.PowerToolUsedEvent;
 import org.terasology.machines.ExtendedInventoryManager;
+import org.terasology.module.health.events.DoDamageEvent;
+import org.terasology.module.inventory.systems.InventoryManager;
 import org.terasology.potentialEnergyDevices.components.PotentialEnergyDeviceComponent;
 
 import java.util.List;
diff --git a/src/main/java/org/terasology/irlCorp/systems/MechanicalPowerToolClientSystem.java b/src/main/java/org/terasology/irlCorp/systems/MechanicalPowerToolClientSystem.java
index 73ab47a..78b4104 100644
--- a/src/main/java/org/terasology/irlCorp/systems/MechanicalPowerToolClientSystem.java
+++ b/src/main/java/org/terasology/irlCorp/systems/MechanicalPowerToolClientSystem.java
@@ -4,29 +4,29 @@
 
 import org.joml.Vector2i;
 import org.joml.Vector3i;
-import org.terasology.gestalt.assets.ResourceUrn;
 import org.terasology.engine.entitySystem.entity.EntityRef;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
 import org.terasology.engine.entitySystem.systems.RenderSystem;
-import org.terasology.module.inventory.systems.InventoryManager;
-import org.terasology.module.inventory.components.SelectedInventorySlotComponent;
 import org.terasology.engine.logic.players.LocalPlayer;
 import org.terasology.engine.physics.Physics;
 import org.terasology.engine.registry.In;
 import org.terasology.engine.rendering.assets.texture.Texture;
 import org.terasology.engine.rendering.assets.texture.TextureUtil;
-import org.terasology.module.inventory.ui.GetItemTooltip;
-import org.terasology.module.inventory.ui.InventoryCellRendered;
 import org.terasology.engine.rendering.world.selection.BlockSelectionRenderer;
 import org.terasology.engine.utilities.Assets;
 import org.terasology.engine.world.WorldProvider;
+import org.terasology.gestalt.assets.ResourceUrn;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.irlCorp.components.MechanicalPowerToolComponent;
 import org.terasology.irlCorp.components.ToolBlockPlacementComponent;
 import org.terasology.irlCorp.components.ToolDamageAdjacentComponent;
 import org.terasology.joml.geom.Rectanglei;
+import org.terasology.module.inventory.components.SelectedInventorySlotComponent;
+import org.terasology.module.inventory.systems.InventoryManager;
+import org.terasology.module.inventory.ui.GetItemTooltip;
+import org.terasology.module.inventory.ui.InventoryCellRendered;
 import org.terasology.nui.Canvas;
 import org.terasology.nui.Color;
 import org.terasology.nui.util.RectUtility;
diff --git a/src/main/java/org/terasology/irlCorp/systems/MultiBlockTankAuthoritySystem.java b/src/main/java/org/terasology/irlCorp/systems/MultiBlockTankAuthoritySystem.java
index d645f0f..b81151b 100644
--- a/src/main/java/org/terasology/irlCorp/systems/MultiBlockTankAuthoritySystem.java
+++ b/src/main/java/org/terasology/irlCorp/systems/MultiBlockTankAuthoritySystem.java
@@ -17,7 +17,6 @@
 
 import org.terasology.engine.entitySystem.entity.EntityRef;
 import org.terasology.engine.entitySystem.entity.lifecycleEvents.OnActivatedComponent;
-import org.terasology.engine.entitySystem.event.ReceiveEvent;
 import org.terasology.engine.entitySystem.systems.BaseComponentSystem;
 import org.terasology.engine.entitySystem.systems.RegisterMode;
 import org.terasology.engine.entitySystem.systems.RegisterSystem;
@@ -28,14 +27,12 @@
 import org.terasology.engine.world.block.regions.ActAsBlockComponent;
 import org.terasology.engine.world.block.regions.BlockRegionComponent;
 import org.terasology.fluid.component.FluidInventoryComponent;
+import org.terasology.gestalt.entitysystem.event.ReceiveEvent;
 import org.terasology.irlCorp.components.MultiBlockActivatorComponent;
 import org.terasology.irlCorp.components.MultiBlockFluidTankComponent;
 import org.terasology.irlCorp.components.MultiBlockTankWallComponent;
 import org.terasology.module.health.components.HealthComponent;
-import org.terasology.module.health.components.RegenComponent;
-import org.terasology.module.health.core.BaseRegenAuthoritySystem;
 import org.terasology.module.health.core.BaseRegenComponent;
-import org.terasology.module.health.time.Instant;
 import org.terasology.multiBlock.MultiBlockCallback;
 import org.terasology.multiBlock.MultiBlockFormRecipeRegistry;
 import org.terasology.multiBlock.recipe.MultiBlockFormItemRecipe;