diff --git a/src/alisolarflare/uhc/AddToUHC.java b/src/alisolarflare/events/uhc/AddToUHC.java
similarity index 100%
rename from src/alisolarflare/uhc/AddToUHC.java
rename to src/alisolarflare/events/uhc/AddToUHC.java
diff --git a/src/alisolarflare/uhc/UHCMatch.java b/src/alisolarflare/events/uhc/UHCMatch.java
similarity index 100%
rename from src/alisolarflare/uhc/UHCMatch.java
rename to src/alisolarflare/events/uhc/UHCMatch.java
diff --git a/src/alisolarflare/uhc/UHCSubPlugin.java b/src/alisolarflare/events/uhc/UHCModule.java
similarity index 100%
rename from src/alisolarflare/uhc/UHCSubPlugin.java
rename to src/alisolarflare/events/uhc/UHCModule.java
diff --git a/src/alisolarflare/aliarrow/AliArrowListener.java b/src/alisolarflare/magictrick/aliarrow/AliArrowListener.java
similarity index 100%
rename from src/alisolarflare/aliarrow/AliArrowListener.java
rename to src/alisolarflare/magictrick/aliarrow/AliArrowListener.java
diff --git a/src/alisolarflare/aliarrow/AliArrowSubPlugin.java b/src/alisolarflare/magictrick/aliarrow/AliArrowSubPlugin.java
similarity index 100%
rename from src/alisolarflare/aliarrow/AliArrowSubPlugin.java
rename to src/alisolarflare/magictrick/aliarrow/AliArrowSubPlugin.java
diff --git a/src/alisolarflare/aliarrow/AliArrowTask.java b/src/alisolarflare/magictrick/aliarrow/AliArrowTask.java
similarity index 100%
rename from src/alisolarflare/aliarrow/AliArrowTask.java
rename to src/alisolarflare/magictrick/aliarrow/AliArrowTask.java
diff --git a/src/alisolarflare/flairdoors/FlairDoorsSubPlug.java b/src/alisolarflare/tools/flairdoors/FlairDoorsSubPlug.java
similarity index 100%
rename from src/alisolarflare/flairdoors/FlairDoorsSubPlug.java
rename to src/alisolarflare/tools/flairdoors/FlairDoorsSubPlug.java
diff --git a/src/alisolarflare/flairdoors/FlairMe.java b/src/alisolarflare/tools/flairdoors/FlairMe.java
similarity index 100%
rename from src/alisolarflare/flairdoors/FlairMe.java
rename to src/alisolarflare/tools/flairdoors/FlairMe.java
diff --git a/src/alisolarflare/flairdoors/PortalListener.java b/src/alisolarflare/tools/flairdoors/PortalListener.java
similarity index 100%
rename from src/alisolarflare/flairdoors/PortalListener.java
rename to src/alisolarflare/tools/flairdoors/PortalListener.java
diff --git a/src/alisolarflare/flairdoors/SetFlairDoorColour.java b/src/alisolarflare/tools/flairdoors/SetFlairDoorColour.java
similarity index 100%
rename from src/alisolarflare/flairdoors/SetFlairDoorColour.java
rename to src/alisolarflare/tools/flairdoors/SetFlairDoorColour.java
diff --git a/src/alisolarflare/gpowers/commands/PowerDown.java b/src/alisolarflare/tools/gpowers/commands/PowerDown.java
similarity index 100%
rename from src/alisolarflare/gpowers/commands/PowerDown.java
rename to src/alisolarflare/tools/gpowers/commands/PowerDown.java
diff --git a/src/alisolarflare/gpowers/commands/PowerUp.java b/src/alisolarflare/tools/gpowers/commands/PowerUp.java
similarity index 100%
rename from src/alisolarflare/gpowers/commands/PowerUp.java
rename to src/alisolarflare/tools/gpowers/commands/PowerUp.java
diff --git a/src/alisolarflare/gpowers/gPowerCommand.java b/src/alisolarflare/tools/gpowers/gPowerCommand.java
similarity index 100%
rename from src/alisolarflare/gpowers/gPowerCommand.java
rename to src/alisolarflare/tools/gpowers/gPowerCommand.java
diff --git a/src/alisolarflare/gpowers/gPowerMemory.java b/src/alisolarflare/tools/gpowers/gPowerMemory.java
similarity index 100%
rename from src/alisolarflare/gpowers/gPowerMemory.java
rename to src/alisolarflare/tools/gpowers/gPowerMemory.java
diff --git a/src/alisolarflare/gpowers/listeners/gPowerApplyingTask.java b/src/alisolarflare/tools/gpowers/listeners/gPowerApplyingTask.java
similarity index 100%
rename from src/alisolarflare/gpowers/listeners/gPowerApplyingTask.java
rename to src/alisolarflare/tools/gpowers/listeners/gPowerApplyingTask.java
diff --git a/src/alisolarflare/gpowers/listeners/gPowerListener.java b/src/alisolarflare/tools/gpowers/listeners/gPowerListener.java
similarity index 100%
rename from src/alisolarflare/gpowers/listeners/gPowerListener.java
rename to src/alisolarflare/tools/gpowers/listeners/gPowerListener.java
diff --git a/src/alisolarflare/links/AliLinkSubPlug.java b/src/alisolarflare/tools/links/AliLinkSubPlug.java
similarity index 100%
rename from src/alisolarflare/links/AliLinkSubPlug.java
rename to src/alisolarflare/tools/links/AliLinkSubPlug.java
diff --git a/src/alisolarflare/links/commands/PressAliLink.java b/src/alisolarflare/tools/links/commands/PressAliLink.java
similarity index 100%
rename from src/alisolarflare/links/commands/PressAliLink.java
rename to src/alisolarflare/tools/links/commands/PressAliLink.java
diff --git a/src/alisolarflare/links/commands/SetAliLink.java b/src/alisolarflare/tools/links/commands/SetAliLink.java
similarity index 100%
rename from src/alisolarflare/links/commands/SetAliLink.java
rename to src/alisolarflare/tools/links/commands/SetAliLink.java
diff --git a/src/alisolarflare/links/entities/Link.java b/src/alisolarflare/tools/links/entities/Link.java
similarity index 100%
rename from src/alisolarflare/links/entities/Link.java
rename to src/alisolarflare/tools/links/entities/Link.java
diff --git a/src/alisolarflare/links/serializer/Deserializer.java b/src/alisolarflare/tools/links/serializer/Deserializer.java
similarity index 100%
rename from src/alisolarflare/links/serializer/Deserializer.java
rename to src/alisolarflare/tools/links/serializer/Deserializer.java
diff --git a/src/alisolarflare/links/serializer/Serializer.java b/src/alisolarflare/tools/links/serializer/Serializer.java
similarity index 100%
rename from src/alisolarflare/links/serializer/Serializer.java
rename to src/alisolarflare/tools/links/serializer/Serializer.java
diff --git a/src/alisolarflare/links/tasks/UnpressTask.java b/src/alisolarflare/tools/links/tasks/UnpressTask.java
similarity index 100%
rename from src/alisolarflare/links/tasks/UnpressTask.java
rename to src/alisolarflare/tools/links/tasks/UnpressTask.java
diff --git a/src/alisolarflare/shulker/AliShulker.java b/src/alisolarflare/tools/shulker/AliShulker.java
similarity index 100%
rename from src/alisolarflare/shulker/AliShulker.java
rename to src/alisolarflare/tools/shulker/AliShulker.java