62 files changed, 96 insertions, 91 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
index 848d45421..c614cba01 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
@@ -1,27 +1,34 @@
 package at.hannibal2.skyhanni;
 
-import at.hannibal2.skyhanni.bazaar.BazaarApi;
-import at.hannibal2.skyhanni.bazaar.BazaarBestSellMethod;
-import at.hannibal2.skyhanni.bazaar.BazaarOrderHelper;
-import at.hannibal2.skyhanni.chat.ChatFilter;
-import at.hannibal2.skyhanni.chat.ChatManager;
-import at.hannibal2.skyhanni.chat.NewChatFilter;
-import at.hannibal2.skyhanni.chat.PlayerChatFilter;
 import at.hannibal2.skyhanni.config.Features;
 import at.hannibal2.skyhanni.config.gui.commands.Commands;
-import at.hannibal2.skyhanni.damageindicator.DamageIndicatorManager;
-import at.hannibal2.skyhanni.dungeon.*;
-import at.hannibal2.skyhanni.fishing.SeaCreatureManager;
-import at.hannibal2.skyhanni.fishing.SeaCreatureMessageShortener;
-import at.hannibal2.skyhanni.fishing.TrophyFishMessages;
-import at.hannibal2.skyhanni.inventory.anvil.AnvilCombineHelper;
-import at.hannibal2.skyhanni.items.HideNotClickableItems;
-import at.hannibal2.skyhanni.items.ItemDisplayOverlayFeatures;
-import at.hannibal2.skyhanni.items.abilitycooldown.ItemAbilityCooldown;
-import at.hannibal2.skyhanni.misc.*;
-import at.hannibal2.skyhanni.misc.nether.ashfang.AshfangFreezeCooldown;
-import at.hannibal2.skyhanni.misc.nether.ashfang.AshfangNextResetCooldown;
-import at.hannibal2.skyhanni.repo.RepoManager;
+import at.hannibal2.skyhanni.data.ApiData;
+import at.hannibal2.skyhanni.data.HypixelData;
+import at.hannibal2.skyhanni.data.ItemRenderBackground;
+import at.hannibal2.skyhanni.data.ScoreboardData;
+import at.hannibal2.skyhanni.data.repo.RepoManager;
+import at.hannibal2.skyhanni.features.ButtonOnPause;
+import at.hannibal2.skyhanni.features.CurrentPetDisplay;
+import at.hannibal2.skyhanni.features.ExpBottleOnGroundHider;
+import at.hannibal2.skyhanni.features.SummoningSoulsName;
+import at.hannibal2.skyhanni.features.anvil.AnvilCombineHelper;
+import at.hannibal2.skyhanni.features.bazaar.BazaarApi;
+import at.hannibal2.skyhanni.features.bazaar.BazaarBestSellMethod;
+import at.hannibal2.skyhanni.features.bazaar.BazaarOrderHelper;
+import at.hannibal2.skyhanni.features.chat.ChatFilter;
+import at.hannibal2.skyhanni.features.chat.ChatManager;
+import at.hannibal2.skyhanni.features.chat.NewChatFilter;
+import at.hannibal2.skyhanni.features.chat.PlayerChatFilter;
+import at.hannibal2.skyhanni.features.damageindicator.DamageIndicatorManager;
+import at.hannibal2.skyhanni.features.dungeon.*;
+import at.hannibal2.skyhanni.features.fishing.SeaCreatureManager;
+import at.hannibal2.skyhanni.features.fishing.SeaCreatureMessageShortener;
+import at.hannibal2.skyhanni.features.fishing.TrophyFishMessages;
+import at.hannibal2.skyhanni.features.items.HideNotClickableItems;
+import at.hannibal2.skyhanni.features.items.ItemDisplayOverlayFeatures;
+import at.hannibal2.skyhanni.features.items.abilitycooldown.ItemAbilityCooldown;
+import at.hannibal2.skyhanni.features.nether.ashfang.AshfangFreezeCooldown;
+import at.hannibal2.skyhanni.features.nether.ashfang.AshfangNextResetCooldown;
 import at.hannibal2.skyhanni.test.LorenzTest;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/ApiData.kt b/src/main/java/at/hannibal2/skyhanni/data/ApiData.kt
index b0437e852..9e47d5d0f 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/ApiData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ApiData.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index 177917900..f9c0af979 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.PacketEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/ItemRenderBackground.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemRenderBackground.kt
index bd30ed597..bff39fc8c 100644
--- a/src/main/java/at/hannibal2/skyhanni/ItemRenderBackground.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ItemRenderBackground.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni
+package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.events.RenderRealOverlayEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
index 51bf32e56..179635250 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/ScoreboardData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.utils.LorenzUtils.removeColor
 import net.minecraft.client.Minecraft
diff --git a/src/main/java/at/hannibal2/skyhanni/repo/RepoManager.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
index eea0f83bd..8351991ab 100644
--- a/src/main/java/at/hannibal2/skyhanni/repo/RepoManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.repo
+package at.hannibal2.skyhanni.data.repo
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/repo/RepoUtils.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt
index efe656e1c..969b526cc 100644
--- a/src/main/java/at/hannibal2/skyhanni/repo/RepoUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoUtils.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.repo
+package at.hannibal2.skyhanni.data.repo
 
 import com.google.gson.Gson
 import com.google.gson.JsonObject
diff --git a/src/main/java/at/hannibal2/skyhanni/events/PlayerSendChatEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/PlayerSendChatEvent.kt
index 4ce9db1a8..1776b2bd0 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/PlayerSendChatEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/PlayerSendChatEvent.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.events
 
-import at.hannibal2.skyhanni.chat.PlayerMessageChannel
+import at.hannibal2.skyhanni.features.chat.PlayerMessageChannel
 
 
 class PlayerSendChatEvent(
diff --git a/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt
index 841133ae9..f2c610e04 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.events
 
-import at.hannibal2.skyhanni.repo.RepoUtils
+import at.hannibal2.skyhanni.data.repo.RepoUtils
 import com.google.gson.Gson
 import com.google.gson.JsonObject
 import java.io.File
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/ButtonOnPause.kt b/src/main/java/at/hannibal2/skyhanni/features/ButtonOnPause.kt
index 68ae8a93c..4e85f4399 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/ButtonOnPause.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/ButtonOnPause.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.features
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.gui.config.ConfigEditor
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/CurrentPetDisplay.kt
index 9266dd4f5..f0e8e033e 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/CurrentPetDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/CurrentPetDisplay.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.features
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/ExpBottleOnGroundHider.kt b/src/main/java/at/hannibal2/skyhanni/features/ExpBottleOnGroundHider.kt
index 119160c4f..c9e2b4bf4 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/ExpBottleOnGroundHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/ExpBottleOnGroundHider.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.features
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/SummoningSoulsName.kt b/src/main/java/at/hannibal2/skyhanni/features/SummoningSoulsName.kt
index 4cb1a90ae..478cdc100 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/SummoningSoulsName.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/SummoningSoulsName.kt
@@ -1,7 +1,7 @@
-package at.hannibal2.skyhanni.misc
+package at.hannibal2.skyhanni.features
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.damageindicator.hasNameTagWith
+import at.hannibal2.skyhanni.features.damageindicator.hasNameTagWith
 import at.hannibal2.skyhanni.test.GriffinJavaUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.getSkullTexture
 import at.hannibal2.skyhanni.utils.LocationUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/inventory/anvil/AnvilCombineHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt
index 03405090b..251c4e7a6 100644
--- a/src/main/java/at/hannibal2/skyhanni/inventory/anvil/AnvilCombineHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.inventory.anvil
+package at.hannibal2.skyhanni.features.anvil
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiContainerEvent
@@ -9,7 +9,6 @@ import at.hannibal2.skyhanni.utils.RenderUtils.highlight
 import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.inventory.ContainerChest
-import net.minecraft.item.ItemStack
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.lwjgl.opengl.GL11
 
diff --git a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarApi.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
index cbebe951c..3de78206b 100644
--- a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarApi.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarApi.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.bazaar
+package at.hannibal2.skyhanni.features.bazaar
 
 import at.hannibal2.skyhanni.utils.LorenzUtils
 
diff --git a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarBestSellMethod.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
index 56c264312..c4afc33fc 100644
--- a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarBestSellMethod.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarBestSellMethod.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.bazaar
+package at.hannibal2.skyhanni.features.bazaar
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiContainerEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarData.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarData.kt
index 01300e67c..b43cb1eb3 100644
--- a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarData.kt
@@ -1,3 +1,3 @@
-package at.hannibal2.skyhanni.bazaar
+package at.hannibal2.skyhanni.features.bazaar
 
 data class BazaarData(val apiName: String, val itemName: String, val sellPrice: Double, val buyPrice: Double)
 \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarDataGrabber.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataGrabber.kt
index 1f2f1171a..324f180de 100644
--- a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarDataGrabber.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarDataGrabber.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.bazaar
+package at.hannibal2.skyhanni.features.bazaar
 
 import at.hannibal2.skyhanni.utils.APIUtil
 import at.hannibal2.skyhanni.utils.LorenzUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarOrderHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt
index eec055253..18822e7c2 100644
--- a/src/main/java/at/hannibal2/skyhanni/bazaar/BazaarOrderHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bazaar/BazaarOrderHelper.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.bazaar
+package at.hannibal2.skyhanni.features.bazaar
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiContainerEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/chat/ChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
index 7efbf2ff6..4dc106249 100644
--- a/src/main/java/at/hannibal2/skyhanni/chat/ChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatFilter.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.chat
+package at.hannibal2.skyhanni.features.chat
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/chat/ChatManager.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatManager.kt
index c189caa3d..f222705cb 100644
--- a/src/main/java/at/hannibal2/skyhanni/chat/ChatManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/ChatManager.kt
@@ -1,9 +1,9 @@
-package at.hannibal2.skyhanni.chat
+package at.hannibal2.skyhanni.features.chat
 
 import at.hannibal2.skyhanni.events.LorenzActionBarEvent
-import at.hannibal2.skyhanni.utils.LorenzLogger
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.PacketEvent
+import at.hannibal2.skyhanni.utils.LorenzLogger
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraft.network.play.server.S02PacketChat
 import net.minecraftforge.fml.common.eventhandler.EventPriority
diff --git a/src/main/java/at/hannibal2/skyhanni/chat/NewChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/NewChatFilter.kt
index b72f4fd4b..bf73917aa 100644
--- a/src/main/java/at/hannibal2/skyhanni/chat/NewChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/NewChatFilter.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.chat
+package at.hannibal2.skyhanni.features.chat
 
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/chat/PlayerChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerChatFilter.kt
index dde648a55..1a1047501 100644
--- a/src/main/java/at/hannibal2/skyhanni/chat/PlayerChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerChatFilter.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.chat
+package at.hannibal2.skyhanni.features.chat
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/chat/PlayerMessageChannel.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerMessageChannel.kt
index 826b490de..7d65f47ce 100644
--- a/src/main/java/at/hannibal2/skyhanni/chat/PlayerMessageChannel.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerMessageChannel.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.chat
+package at.hannibal2.skyhanni.features.chat
 
 enum class PlayerMessageChannel(val prefix: String) {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossFinder.kt
index 37cb085d1..a0895c753 100644
--- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossFinder.kt
@@ -1,6 +1,6 @@
-package at.hannibal2.skyhanni.damageindicator
+package at.hannibal2.skyhanni.features.damageindicator
 
-import at.hannibal2.skyhanni.dungeon.DungeonData
+import at.hannibal2.skyhanni.features.dungeon.DungeonData
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
 import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex
diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt
index dc467cbb9..0bae4bbbd 100644
--- a/src/main/java/at/hannibal2/skyhanni/damageindicator/BossType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/BossType.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.damageindicator
+package at.hannibal2.skyhanni.features.damageindicator
 
 enum class BossType(val fullName: String, val bossTypeToggle: Int, val shortName: String = fullName) {
     GENERIC_DUNGEON_BOSS("Generic Dungeon boss", 0),//TODO split into different bosses
diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/DamageCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageCounter.kt
index 92566a018..84bc7d50a 100644
--- a/src/main/java/at/hannibal2/skyhanni/damageindicator/DamageCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageCounter.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.damageindicator
+package at.hannibal2.skyhanni.features.damageindicator
 
 class DamageCounter {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
index fa7dbb530..ddfaed4cf 100644
--- a/src/main/java/at/hannibal2/skyhanni/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/DamageIndicatorManager.kt
@@ -1,10 +1,10 @@
-package at.hannibal2.skyhanni.damageindicator
+package at.hannibal2.skyhanni.features.damageindicator
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.dungeon.DungeonData
+import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.events.DamageIndicatorFinalBossEvent
 import at.hannibal2.skyhanni.events.LorenzChatEvent
-import at.hannibal2.skyhanni.misc.ScoreboardData
+import at.hannibal2.skyhanni.features.dungeon.DungeonData
 import at.hannibal2.skyhanni.test.LorenzTest
 import at.hannibal2.skyhanni.utils.*
 import at.hannibal2.skyhanni.utils.LorenzUtils.baseMaxHealth
diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/EntityData.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/EntityData.kt
index f1514ae93..a28c6822a 100644
--- a/src/main/java/at/hannibal2/skyhanni/damageindicator/EntityData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/EntityData.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.damageindicator
+package at.hannibal2.skyhanni.features.damageindicator
 
 import at.hannibal2.skyhanni.utils.LorenzVec
 import net.minecraft.entity.EntityLivingBase
diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/EntityResult.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/EntityResult.kt
index d3710a73d..a17adf309 100644
--- a/src/main/java/at/hannibal2/skyhanni/damageindicator/EntityResult.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/EntityResult.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.damageindicator
+package at.hannibal2.skyhanni.features.damageindicator
 
 class EntityResult(
     val delayedStart: Long = -1L,
diff --git a/src/main/java/at/hannibal2/skyhanni/damageindicator/OldDamage.kt b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/OldDamage.kt
index de5070a01..5cdb95aca 100644
--- a/src/main/java/at/hannibal2/skyhanni/damageindicator/OldDamage.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/damageindicator/OldDamage.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.damageindicator
+package at.hannibal2.skyhanni.features.damageindicator
 
 class OldDamage(val time: Long, val damage: Long, val healing: Long) {
 }
 \ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/diana/GriffinBurrowFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/diana/GriffinBurrowFinder.kt
index bdbda2e50..d98f46100 100644
--- a/src/main/java/at/hannibal2/skyhanni/diana/GriffinBurrowFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/diana/GriffinBurrowFinder.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.diana
+package at.hannibal2.skyhanni.features.diana
 
 import at.hannibal2.skyhanni.events.LorenzChatEvent
 import at.hannibal2.skyhanni.events.PacketEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonBossMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossMessages.kt
index 0dbfbd732..e8f569b4d 100644
--- a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonBossMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonBossMessages.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.dungeon
+package at.hannibal2.skyhanni.features.dungeon
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonChatFilter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
index 7f1f2d938..470e50e5a 100644
--- a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonChatFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonChatFilter.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.dungeon
+package at.hannibal2.skyhanni.features.dungeon
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
index f668fc22d..01950688a 100644
--- a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonCleanEnd.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.dungeon
+package at.hannibal2.skyhanni.features.dungeon
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonData.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonData.kt
index eedf664a3..1ae704653 100644
--- a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonData.kt
@@ -1,7 +1,7 @@
-package at.hannibal2.skyhanni.dungeon
+package at.hannibal2.skyhanni.features.dungeon
 
+import at.hannibal2.skyhanni.data.ScoreboardData
 import at.hannibal2.skyhanni.events.DungeonEnterEvent
-import at.hannibal2.skyhanni.misc.ScoreboardData
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonDeathCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt
index eae6535da..70709bc7f 100644
--- a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonDeathCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.dungeon
+package at.hannibal2.skyhanni.features.dungeon
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.DungeonEnterEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonHighlightClickedBlocks.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
index ff0ca6931..4af9d5efd 100644
--- a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonHighlightClickedBlocks.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHighlightClickedBlocks.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.dungeon
+package at.hannibal2.skyhanni.features.dungeon
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestoneDisplay.kt
index 96bfba678..8feeb9a5c 100644
--- a/src/main/java/at/hannibal2/skyhanni/dungeon/DungeonMilestoneDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestoneDisplay.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.dungeon
+package at.hannibal2.skyhanni.features.dungeon
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.DungeonEnterEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/fishing/SeaCreature.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreature.kt
index 935d415f3..c2b452cbe 100644
--- a/src/main/java/at/hannibal2/skyhanni/fishing/SeaCreature.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreature.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.fishing
+package at.hannibal2.skyhanni.features.fishing
 
 data class SeaCreature(
     val displayName: String,
diff --git a/src/main/java/at/hannibal2/skyhanni/fishing/SeaCreatureManager.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt
index eec0dd781..c61b8dd8a 100644
--- a/src/main/java/at/hannibal2/skyhanni/fishing/SeaCreatureManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureManager.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.fishing
+package at.hannibal2.skyhanni.features.fishing
 
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/fishing/SeaCreatureMessageShortener.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureMessageShortener.kt
index 4fc3a1f12..21703d227 100644
--- a/src/main/java/at/hannibal2/skyhanni/fishing/SeaCreatureMessageShortener.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SeaCreatureMessageShortener.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.fishing
+package at.hannibal2.skyhanni.features.fishing
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/fishing/TrophyFishMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/TrophyFishMessages.kt
index f8cd19191..a87433762 100644
--- a/src/main/java/at/hannibal2/skyhanni/fishing/TrophyFishMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/TrophyFishMessages.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.fishing
+package at.hannibal2.skyhanni.features.fishing
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/items/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/items/HideNotClickableItems.kt
index 323fb2254..c3b4a398d 100644
--- a/src/main/java/at/hannibal2/skyhanni/items/HideNotClickableItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/items/HideNotClickableItems.kt
@@ -1,10 +1,10 @@
-package at.hannibal2.skyhanni.items
+package at.hannibal2.skyhanni.features.items
 
-import at.hannibal2.skyhanni.ItemRenderBackground.Companion.background
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.bazaar.BazaarApi
+import at.hannibal2.skyhanni.data.ItemRenderBackground.Companion.background
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
+import at.hannibal2.skyhanni.features.bazaar.BazaarApi
 import at.hannibal2.skyhanni.utils.*
 import at.hannibal2.skyhanni.utils.ItemUtils.cleanName
 import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
diff --git a/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/items/ItemDisplayOverlayFeatures.kt
index 30428157f..1ad9aa39b 100644
--- a/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/items/ItemDisplayOverlayFeatures.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.items
+package at.hannibal2.skyhanni.features.items
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiRenderItemEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/items/VanillaItemManager.kt b/src/main/java/at/hannibal2/skyhanni/features/items/VanillaItemManager.kt
index 2997de20c..f138d9c23 100644
--- a/src/main/java/at/hannibal2/skyhanni/items/VanillaItemManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/items/VanillaItemManager.kt
@@ -1,6 +1,5 @@
-package at.hannibal2.skyhanni.items
+package at.hannibal2.skyhanni.features.items
 
-import at.hannibal2.skyhanni.utils.LorenzDebug
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonObject
 import java.io.BufferedReader
diff --git a/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/items/abilitycooldown/ItemAbilityCooldown.kt
index 7ddf1d2a5..0d094c4b4 100644
--- a/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/ItemAbilityCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/items/abilitycooldown/ItemAbilityCooldown.kt
@@ -1,7 +1,7 @@
-package at.hannibal2.skyhanni.items.abilitycooldown
+package at.hannibal2.skyhanni.features.items.abilitycooldown
 
-import at.hannibal2.skyhanni.ItemRenderBackground.Companion.background
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.data.ItemRenderBackground.Companion.background
 import at.hannibal2.skyhanni.events.GuiRenderItemEvent
 import at.hannibal2.skyhanni.events.LorenzActionBarEvent
 import at.hannibal2.skyhanni.utils.ItemUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/WitherImpactDetection.kt b/src/main/java/at/hannibal2/skyhanni/features/items/abilitycooldown/WitherImpactDetection.kt
index 4bc2939fd..da0d5068c 100644
--- a/src/main/java/at/hannibal2/skyhanni/items/abilitycooldown/WitherImpactDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/items/abilitycooldown/WitherImpactDetection.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.items.abilitycooldown
+package at.hannibal2.skyhanni.features.items.abilitycooldown
 
 import at.hannibal2.skyhanni.events.PacketEvent
 import at.hannibal2.skyhanni.utils.LorenzUtils
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/nether/ashfang/AshfangFreezeCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt
index 1a413d0bf..7cc7b54a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/nether/ashfang/AshfangFreezeCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc.nether.ashfang
+package at.hannibal2.skyhanni.features.nether.ashfang
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.LorenzChatEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/nether/ashfang/AshfangNextResetCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt
index 7f8373448..59a98552a 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/nether/ashfang/AshfangNextResetCooldown.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.misc.nether.ashfang
+package at.hannibal2.skyhanni.features.nether.ashfang
 
 import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.utils.GuiRender.renderString
diff --git a/src/main/java/at/hannibal2/skyhanni/mixinhooks/GuiContainerHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt
index 6f2c5c03e..d4287f074 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixinhooks/GuiContainerHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/GuiContainerHook.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.mixinhooks
+package at.hannibal2.skyhanni.mixins.hooks
 
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.GuiContainerEvent.CloseWindowEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/mixinhooks/NetHandlerPlayClientHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/NetHandlerPlayClientHook.kt
index 57511d618..b18d80613 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixinhooks/NetHandlerPlayClientHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/NetHandlerPlayClientHook.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.mixinhooks
+package at.hannibal2.skyhanni.mixins.hooks
 
 import at.hannibal2.skyhanni.events.PacketEvent
 import net.minecraft.network.Packet
diff --git a/src/main/java/at/hannibal2/skyhanni/mixinhooks/NetworkManagerHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/NetworkManagerHook.kt
index 44746cfbf..b9265587a 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixinhooks/NetworkManagerHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/NetworkManagerHook.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.mixinhooks
+package at.hannibal2.skyhanni.mixins.hooks
 
 import at.hannibal2.skyhanni.events.PacketEvent
 import io.netty.channel.ChannelHandlerContext
diff --git a/src/main/java/at/hannibal2/skyhanni/mixinhooks/RenderItemHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderItemHook.kt
index ae21c622b..48d98fb5d 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixinhooks/RenderItemHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderItemHook.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.mixinhooks
+package at.hannibal2.skyhanni.mixins.hooks
 
 import at.hannibal2.skyhanni.events.GuiRenderItemEvent
 import at.hannibal2.skyhanni.events.RenderRealOverlayEvent
diff --git a/src/main/java/at/hannibal2/skyhanni/mixinhooks/RenderManagerHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderManagerHook.kt
index a183a0caa..3e3283662 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixinhooks/RenderManagerHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/RenderManagerHook.kt
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.mixinhooks
+package at.hannibal2.skyhanni.mixins.hooks
 
 import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
 import net.minecraft.client.renderer.culling.ICamera
diff --git a/src/main/java/at/hannibal2/skyhanni/mixinhooks/render/BlockRendererDispatcherHook.kt b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/render/BlockRendererDispatcherHook.kt
index d04e248ea..d04e248ea 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixinhooks/render/BlockRendererDispatcherHook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/hooks/render/BlockRendererDispatcherHook.kt
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinNetHandlerPlayClient.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinNetHandlerPlayClient.java
index 0d48fae00..bd4107369 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinNetHandlerPlayClient.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinNetHandlerPlayClient.java
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.mixins.transformers;
 
-import at.hannibal2.skyhanni.mixinhooks.NetHandlerPlayClientHookKt;
+import at.hannibal2.skyhanni.mixins.hooks.NetHandlerPlayClientHookKt;
 import net.minecraft.client.multiplayer.WorldClient;
 import net.minecraft.client.network.NetHandlerPlayClient;
 import net.minecraft.network.Packet;
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinNetworkManager.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinNetworkManager.java
index d67243a8c..459da17a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinNetworkManager.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinNetworkManager.java
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.mixins.transformers;
 
-import at.hannibal2.skyhanni.mixinhooks.NetworkManagerHookKt;
+import at.hannibal2.skyhanni.mixins.hooks.NetworkManagerHookKt;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.SimpleChannelInboundHandler;
 import net.minecraft.network.NetworkManager;
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderItem.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderItem.java
index 9e41c5ba9..ebd3161ce 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderItem.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderItem.java
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.mixins.transformers;
 
-import at.hannibal2.skyhanni.mixinhooks.RenderItemHookKt;
+import at.hannibal2.skyhanni.mixins.hooks.RenderItemHookKt;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.item.ItemStack;
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderManager.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderManager.java
index 122c7732e..e36b87195 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderManager.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinRenderManager.java
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.mixins.transformers;
 
-import at.hannibal2.skyhanni.mixinhooks.RenderManagerHookKt;
+import at.hannibal2.skyhanni.mixins.hooks.RenderManagerHookKt;
 import net.minecraft.client.renderer.culling.ICamera;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.entity.Entity;
diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java
index 57add8571..3331c393f 100644
--- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java
+++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/gui/MixinGuiContainer.java
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.mixins.transformers.gui;
 
-import at.hannibal2.skyhanni.mixinhooks.GuiContainerHook;
+import at.hannibal2.skyhanni.mixins.hooks.GuiContainerHook;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.inventory.Slot;
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
index c84660caf..c4bc912ee 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.utils
 
-import at.hannibal2.skyhanni.misc.HypixelData
+import at.hannibal2.skyhanni.data.HypixelData
 import net.minecraft.client.Minecraft
 import net.minecraft.entity.EntityLivingBase
 import net.minecraft.entity.SharedMonsterAttributes