64 files changed, 157 insertions, 156 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
index f3fe2c8f7..1f63c54ac 100644
--- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
+++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java
@@ -7,7 +7,7 @@ import at.hannibal2.skyhanni.chat.ChatFilter;
 import at.hannibal2.skyhanni.chat.ChatManager;
 import at.hannibal2.skyhanni.chat.PlayerChatFilter;
 import at.hannibal2.skyhanni.config.Features;
-import at.hannibal2.skyhanni.config.commands.Commands;
+import at.hannibal2.skyhanni.config.gui.commands.Commands;
 import at.hannibal2.skyhanni.dungeon.*;
 import at.hannibal2.skyhanni.dungeon.damageindicator.DungeonBossDamageIndicator;
 import at.hannibal2.skyhanni.fishing.TrophyFishMessages;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java
index 394e21ece..990bbae5c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/Features.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java
@@ -1,12 +1,12 @@
 package at.hannibal2.skyhanni.config;
 
 import at.hannibal2.skyhanni.SkyHanniMod;
-import at.hannibal2.skyhanni.config.config.ConfigEditor;
-import at.hannibal2.skyhanni.config.core.GuiElement;
-import at.hannibal2.skyhanni.config.core.GuiScreenElementWrapper;
-import at.hannibal2.skyhanni.config.core.config.Position;
-import at.hannibal2.skyhanni.config.core.config.annotations.*;
-import at.hannibal2.skyhanni.config.core.config.gui.GuiPositionEditor;
+import at.hannibal2.skyhanni.config.gui.config.ConfigEditor;
+import at.hannibal2.skyhanni.config.gui.core.GuiElement;
+import at.hannibal2.skyhanni.config.gui.core.GuiScreenElementWrapper;
+import at.hannibal2.skyhanni.config.gui.core.config.Position;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.*;
+import at.hannibal2.skyhanni.config.gui.core.config.gui.GuiPositionEditor;
 import at.hannibal2.skyhanni.config.features.*;
 import com.google.gson.annotations.Expose;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/ApiData.java b/src/main/java/at/hannibal2/skyhanni/config/features/ApiData.java
index 8bad8cea5..86a874fd8 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/ApiData.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/ApiData.java
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.config.features;
 
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigOption;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
 import com.google.gson.annotations.Expose;
 
 public class ApiData {
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java b/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java
index 614568903..2dbc8af68 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Bazaar.java
@@ -1,9 +1,9 @@
 package at.hannibal2.skyhanni.config.features;
 
-import at.hannibal2.skyhanni.config.core.config.Position;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorButton;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigOption;
+import at.hannibal2.skyhanni.config.gui.core.config.Position;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorButton;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
 import com.google.gson.annotations.Expose;
 
 public class Bazaar {
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
index 869d61e01..bdd7e8f0d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Chat.java
@@ -1,9 +1,9 @@
 package at.hannibal2.skyhanni.config.features;
 
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigAccordionId;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorAccordion;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigOption;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigAccordionId;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorAccordion;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
 import com.google.gson.annotations.Expose;
 
 public class Chat {
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Debug.java b/src/main/java/at/hannibal2/skyhanni/config/features/Debug.java
index dca3ad805..c514a0d20 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Debug.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Debug.java
@@ -1,10 +1,10 @@
 package at.hannibal2.skyhanni.config.features;
 
 
-import at.hannibal2.skyhanni.config.core.config.Position;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorButton;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigOption;
+import at.hannibal2.skyhanni.config.gui.core.config.Position;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorButton;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
 import com.google.gson.annotations.Expose;
 
 public class Debug {
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
index 3f3c645bc..466192e72 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Dungeon.java
@@ -1,9 +1,9 @@
 package at.hannibal2.skyhanni.config.features;
 
-import at.hannibal2.skyhanni.config.core.config.Position;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorButton;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigOption;
+import at.hannibal2.skyhanni.config.gui.core.config.Position;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorButton;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
 import com.google.gson.annotations.Expose;
 
 public class Dungeon {
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
index d850f44a9..d4f99afb5 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Fishing.java
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.config.features;
 
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigOption;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
 import com.google.gson.annotations.Expose;
 
 public class Fishing {
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Items.java b/src/main/java/at/hannibal2/skyhanni/config/features/Items.java
index 135bde02e..2c172aa9f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Items.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Items.java
@@ -1,9 +1,9 @@
 package at.hannibal2.skyhanni.config.features;
 
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigAccordionId;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorAccordion;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigOption;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigAccordionId;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorAccordion;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
 import com.google.gson.annotations.Expose;
 
 public class Items {
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
index 20d8f99aa..82268e2aa 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
@@ -1,9 +1,9 @@
 package at.hannibal2.skyhanni.config.features;
 
-import at.hannibal2.skyhanni.config.core.config.Position;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorButton;
-import at.hannibal2.skyhanni.config.core.config.annotations.ConfigOption;
+import at.hannibal2.skyhanni.config.gui.core.config.Position;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorButton;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
 import com.google.gson.annotations.Expose;
 
 public class Misc {
diff --git a/src/main/java/at/hannibal2/skyhanni/config/GuiTextures.java b/src/main/java/at/hannibal2/skyhanni/config/gui/GuiTextures.java
index 8f96fd9f2..3bcf08e47 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/GuiTextures.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/GuiTextures.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config;
+package at.hannibal2.skyhanni.config.gui;
 
 import net.minecraft.util.ResourceLocation;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.java b/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java
index 4de83ad8a..b9260b71a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/Commands.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java
@@ -1,8 +1,8 @@
-package at.hannibal2.skyhanni.config.commands;
+package at.hannibal2.skyhanni.config.gui.commands;
 
 import at.hannibal2.skyhanni.SkyHanniMod;
-import at.hannibal2.skyhanni.config.config.ConfigEditor;
-import at.hannibal2.skyhanni.config.core.GuiScreenElementWrapper;
+import at.hannibal2.skyhanni.config.gui.config.ConfigEditor;
+import at.hannibal2.skyhanni.config.gui.core.GuiScreenElementWrapper;
 import at.hannibal2.skyhanni.test.LorenzTest;
 import net.minecraft.command.ICommandSender;
 import net.minecraftforge.client.ClientCommandHandler;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/commands/SimpleCommand.java b/src/main/java/at/hannibal2/skyhanni/config/gui/commands/SimpleCommand.java
index de03ee2bd..fe0e4fb55 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/commands/SimpleCommand.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/commands/SimpleCommand.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.commands;
+package at.hannibal2.skyhanni.config.gui.commands;
 
 import java.util.List;
 import net.minecraft.command.CommandBase;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/config/ConfigEditor.java b/src/main/java/at/hannibal2/skyhanni/config/gui/config/ConfigEditor.java
index f7fc63896..39fd02780 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/config/ConfigEditor.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/config/ConfigEditor.java
@@ -1,17 +1,17 @@
-package at.hannibal2.skyhanni.config.config;
+package at.hannibal2.skyhanni.config.gui.config;
 
 import at.hannibal2.skyhanni.SkyHanniMod;
 import at.hannibal2.skyhanni.config.Features;
-import at.hannibal2.skyhanni.config.GuiTextures;
-import at.hannibal2.skyhanni.config.core.GlScissorStack;
-import at.hannibal2.skyhanni.config.core.GuiElement;
-import at.hannibal2.skyhanni.config.core.config.gui.GuiOptionEditor;
-import at.hannibal2.skyhanni.config.core.config.gui.GuiOptionEditorAccordion;
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
-import at.hannibal2.skyhanni.config.core.util.lerp.LerpUtils;
-import at.hannibal2.skyhanni.config.core.util.lerp.LerpingInteger;
-import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
-import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils;
+import at.hannibal2.skyhanni.config.gui.GuiTextures;
+import at.hannibal2.skyhanni.config.gui.core.GlScissorStack;
+import at.hannibal2.skyhanni.config.gui.core.GuiElement;
+import at.hannibal2.skyhanni.config.gui.core.config.gui.GuiOptionEditor;
+import at.hannibal2.skyhanni.config.gui.core.config.gui.GuiOptionEditorAccordion;
+import at.hannibal2.skyhanni.config.gui.core.config.struct.ConfigProcessor;
+import at.hannibal2.skyhanni.config.gui.core.util.lerp.LerpUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.lerp.LerpingInteger;
+import at.hannibal2.skyhanni.config.gui.core.util.render.RenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.TextRenderUtils;
 import com.google.common.collect.Lists;
 import java.awt.*;
 import java.net.URI;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/BackgroundBlur.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/BackgroundBlur.java
index eb70e1282..97ba6af54 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/BackgroundBlur.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/BackgroundBlur.java
@@ -1,6 +1,6 @@
-package at.hannibal2.skyhanni.config.core;
+package at.hannibal2.skyhanni.config.gui.core;
 
-import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.RenderUtils;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/ChromaColour.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/ChromaColour.java
index d5966c975..8f1936c20 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/ChromaColour.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/ChromaColour.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core;
+package at.hannibal2.skyhanni.config.gui.core;
 
 import java.awt.*;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/GlScissorStack.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/GlScissorStack.java
index 1bded14e6..446cc995c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/GlScissorStack.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/GlScissorStack.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core;
+package at.hannibal2.skyhanni.config.gui.core;
 
 import java.util.LinkedList;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/GuiElement.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/GuiElement.java
index 6e30449ef..3e17e5f0d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/GuiElement.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/GuiElement.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core;
+package at.hannibal2.skyhanni.config.gui.core;
 
 import net.minecraft.client.gui.Gui;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/GuiElementBoolean.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/GuiElementBoolean.java
index 02d57de4e..07673d433 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/GuiElementBoolean.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/GuiElementBoolean.java
@@ -1,8 +1,8 @@
-package at.hannibal2.skyhanni.config.core;
+package at.hannibal2.skyhanni.config.gui.core;
 
-import at.hannibal2.skyhanni.config.GuiTextures;
-import at.hannibal2.skyhanni.config.core.util.lerp.LerpUtils;
-import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
+import at.hannibal2.skyhanni.config.gui.GuiTextures;
+import at.hannibal2.skyhanni.config.gui.core.util.lerp.LerpUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.RenderUtils;
 import java.util.function.Consumer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/GuiElementColour.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/GuiElementColour.java
index 1ab229a38..b685ee8fc 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/GuiElementColour.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/GuiElementColour.java
@@ -1,7 +1,7 @@
-package at.hannibal2.skyhanni.config.core;
+package at.hannibal2.skyhanni.config.gui.core;
 
-import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
-import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.RenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.TextRenderUtils;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.util.function.Consumer;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/GuiElementTextField.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/GuiElementTextField.java
index 91ce080cf..e3c64c3d1 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/GuiElementTextField.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/GuiElementTextField.java
@@ -1,7 +1,7 @@
-package at.hannibal2.skyhanni.config.core;
+package at.hannibal2.skyhanni.config.gui.core;
 
-import at.hannibal2.skyhanni.config.core.util.StringUtils;
-import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.StringUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.TextRenderUtils;
 import java.awt.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/GuiScreenElementWrapper.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/GuiScreenElementWrapper.java
index 3dd5f19f6..bf3b53302 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/GuiScreenElementWrapper.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/GuiScreenElementWrapper.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core;
+package at.hannibal2.skyhanni.config.gui.core;
 
 import java.io.IOException;
 import net.minecraft.client.gui.GuiScreen;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/Config.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/Config.java
index c9f6ea5b2..ce2aee6a8 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/Config.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/Config.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config;
+package at.hannibal2.skyhanni.config.gui.core.config;
 //public class Config {
 //
 //    public void executeRunnable(String runnableId) {}
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/KeybindHelper.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/KeybindHelper.java
index faa5022f2..aaaf5e430 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/KeybindHelper.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/KeybindHelper.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config;
+package at.hannibal2.skyhanni.config.gui.core.config;
 
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/Position.java
index b67139b7b..d89a950e3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/Position.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/Position.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config;
+package at.hannibal2.skyhanni.config.gui.core.config;
 
 import com.google.gson.annotations.Expose;
 import net.minecraft.client.gui.ScaledResolution;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/Category.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/Category.java
index 8cb74ed1e..0564bd8db 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/Category.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/Category.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigAccordionId.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigAccordionId.java
index 6eb9bc938..504078bd1 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigAccordionId.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigAccordionId.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorAccordion.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorAccordion.java
index b8a446be2..48d2b31a0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorAccordion.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorAccordion.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorBoolean.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorBoolean.java
index bdb65e090..0ef0bd6d3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorBoolean.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorBoolean.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorButton.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorButton.java
index 8a39660ec..c453f1f1b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorButton.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorButton.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorColour.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorColour.java
index 6d3da7061..0ee2f580a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorColour.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorColour.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorDraggableList.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorDraggableList.java
index 97ebe26ed..5c15da156 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorDraggableList.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorDraggableList.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorDropdown.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorDropdown.java
index 3b0256ee3..7deee74ad 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorDropdown.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorDropdown.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorKeybind.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorKeybind.java
index 9153b3896..4fb77b922 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorKeybind.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorKeybind.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorSlider.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorSlider.java
index 32ff46581..bd636ffc0 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorSlider.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorSlider.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorStyle.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorStyle.java
index d6d2d8a46..b28d00bb6 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorStyle.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorStyle.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorText.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorText.java
index 2ce2277ca..56175995f 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigEditorText.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigEditorText.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigOption.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigOption.java
index f3df0a9f1..5dbb5ce67 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/annotations/ConfigOption.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/annotations/ConfigOption.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.config.annotations;
+package at.hannibal2.skyhanni.config.gui.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditor.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditor.java
index 4d1c2ff0a..1c4deb331 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditor.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditor.java
@@ -1,8 +1,8 @@
-package at.hannibal2.skyhanni.config.core.config.gui;
+package at.hannibal2.skyhanni.config.gui.core.config.gui;
 
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
-import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
-import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.config.struct.ConfigProcessor;
+import at.hannibal2.skyhanni.config.gui.core.util.render.RenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.TextRenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.GlStateManager;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorAccordion.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorAccordion.java
index e2f6d3a4c..df473eeb5 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorAccordion.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorAccordion.java
@@ -1,8 +1,8 @@
-package at.hannibal2.skyhanni.config.core.config.gui;
+package at.hannibal2.skyhanni.config.gui.core.config.gui;
 
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
-import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
-import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.config.struct.ConfigProcessor;
+import at.hannibal2.skyhanni.config.gui.core.util.render.RenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.TextRenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorBoolean.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorBoolean.java
index 2425c11bd..23bec2ad7 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorBoolean.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorBoolean.java
@@ -1,7 +1,7 @@
-package at.hannibal2.skyhanni.config.core.config.gui;
+package at.hannibal2.skyhanni.config.gui.core.config.gui;
 
-import at.hannibal2.skyhanni.config.core.GuiElementBoolean;
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
+import at.hannibal2.skyhanni.config.gui.core.GuiElementBoolean;
+import at.hannibal2.skyhanni.config.gui.core.config.struct.ConfigProcessor;
 
 public class GuiOptionEditorBoolean extends GuiOptionEditor {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorButton.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorButton.java
index 6fc4ff98c..05db7d216 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorButton.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorButton.java
@@ -1,11 +1,11 @@
-package at.hannibal2.skyhanni.config.core.config.gui;
+package at.hannibal2.skyhanni.config.gui.core.config.gui;
 
-import static at.hannibal2.skyhanni.config.GuiTextures.button_tex;
+import static at.hannibal2.skyhanni.config.gui.GuiTextures.button_tex;
 
 import at.hannibal2.skyhanni.config.Features;
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
-import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
-import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.config.struct.ConfigProcessor;
+import at.hannibal2.skyhanni.config.gui.core.util.render.RenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.TextRenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorColour.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorColour.java
index 96e6b55b4..716df0dca 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorColour.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorColour.java
@@ -1,11 +1,11 @@
-package at.hannibal2.skyhanni.config.core.config.gui;
+package at.hannibal2.skyhanni.config.gui.core.config.gui;
 
-import static at.hannibal2.skyhanni.config.GuiTextures.*;
+import static at.hannibal2.skyhanni.config.gui.GuiTextures.*;
 
-import at.hannibal2.skyhanni.config.core.ChromaColour;
-import at.hannibal2.skyhanni.config.core.GuiElementColour;
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
-import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.ChromaColour;
+import at.hannibal2.skyhanni.config.gui.core.GuiElementColour;
+import at.hannibal2.skyhanni.config.gui.core.config.struct.ConfigProcessor;
+import at.hannibal2.skyhanni.config.gui.core.util.render.RenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorDraggableList.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorDraggableList.java
index e276cfd94..dccab640a 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorDraggableList.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorDraggableList.java
@@ -1,13 +1,13 @@
-package at.hannibal2.skyhanni.config.core.config.gui;
+package at.hannibal2.skyhanni.config.gui.core.config.gui;
 
-import static at.hannibal2.skyhanni.config.GuiTextures.DELETE;
-import static at.hannibal2.skyhanni.config.GuiTextures.button_tex;
+import static at.hannibal2.skyhanni.config.gui.GuiTextures.DELETE;
+import static at.hannibal2.skyhanni.config.gui.GuiTextures.button_tex;
 
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
-import at.hannibal2.skyhanni.config.core.util.lerp.LerpUtils;
-import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
-import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils;
-import at.hannibal2.skyhanni.config.utils.Utils;
+import at.hannibal2.skyhanni.config.gui.core.config.struct.ConfigProcessor;
+import at.hannibal2.skyhanni.config.gui.core.util.lerp.LerpUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.RenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.TextRenderUtils;
+import at.hannibal2.skyhanni.config.gui.utils.Utils;
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorDropdown.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorDropdown.java
index ebeecfe78..c171a5754 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorDropdown.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorDropdown.java
@@ -1,8 +1,8 @@
-package at.hannibal2.skyhanni.config.core.config.gui;
+package at.hannibal2.skyhanni.config.gui.core.config.gui;
 
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
-import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
-import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.config.struct.ConfigProcessor;
+import at.hannibal2.skyhanni.config.gui.core.util.render.RenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.TextRenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.Gui;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorKeybind.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorKeybind.java
index 53149ceb4..2d737352c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorKeybind.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorKeybind.java
@@ -1,11 +1,11 @@
-package at.hannibal2.skyhanni.config.core.config.gui;
+package at.hannibal2.skyhanni.config.gui.core.config.gui;
 
-import static at.hannibal2.skyhanni.config.GuiTextures.*;
+import static at.hannibal2.skyhanni.config.gui.GuiTextures.*;
 
-import at.hannibal2.skyhanni.config.core.config.KeybindHelper;
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
-import at.hannibal2.skyhanni.config.core.util.render.RenderUtils;
-import at.hannibal2.skyhanni.config.core.util.render.TextRenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.config.KeybindHelper;
+import at.hannibal2.skyhanni.config.gui.core.config.struct.ConfigProcessor;
+import at.hannibal2.skyhanni.config.gui.core.util.render.RenderUtils;
+import at.hannibal2.skyhanni.config.gui.core.util.render.TextRenderUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorSlider.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorSlider.java
index d010c378d..b321d66a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorSlider.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorSlider.java
@@ -1,8 +1,8 @@
-package at.hannibal2.skyhanni.config.core.config.gui;
+package at.hannibal2.skyhanni.config.gui.core.config.gui;
 
-import at.hannibal2.skyhanni.config.core.GuiElementTextField;
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
-import at.hannibal2.skyhanni.config.core.util.GuiElementSlider;
+import at.hannibal2.skyhanni.config.gui.core.GuiElementTextField;
+import at.hannibal2.skyhanni.config.gui.core.config.struct.ConfigProcessor;
+import at.hannibal2.skyhanni.config.gui.core.util.GuiElementSlider;
 import net.minecraft.client.Minecraft;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorStyle.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorStyle.java
index 2bcdc8339..e495f2080 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorStyle.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorStyle.java
@@ -1,7 +1,7 @@
-package at.hannibal2.skyhanni.config.core.config.gui;
+package at.hannibal2.skyhanni.config.gui.core.config.gui;
 
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
-import at.hannibal2.skyhanni.config.textures.Textures;
+import at.hannibal2.skyhanni.config.gui.core.config.struct.ConfigProcessor;
+import at.hannibal2.skyhanni.config.gui.textures.Textures;
 import java.util.stream.Collectors;
 import org.lwjgl.input.Mouse;
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorText.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorText.java
index 1279ee7e9..05d9e3445 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiOptionEditorText.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiOptionEditorText.java
@@ -1,7 +1,7 @@
-package at.hannibal2.skyhanni.config.core.config.gui;
+package at.hannibal2.skyhanni.config.gui.core.config.gui;
 
-import at.hannibal2.skyhanni.config.core.GuiElementTextField;
-import at.hannibal2.skyhanni.config.core.config.struct.ConfigProcessor;
+import at.hannibal2.skyhanni.config.gui.core.GuiElementTextField;
+import at.hannibal2.skyhanni.config.gui.core.config.struct.ConfigProcessor;
 import net.minecraft.client.Minecraft;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiPositionEditor.java
index ce86a46ea..087fab743 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/gui/GuiPositionEditor.java
@@ -1,7 +1,7 @@
-package at.hannibal2.skyhanni.config.core.config.gui;
+package at.hannibal2.skyhanni.config.gui.core.config.gui;
 
-import at.hannibal2.skyhanni.config.core.config.Position;
-import at.hannibal2.skyhanni.config.utils.Utils;
+import at.hannibal2.skyhanni.config.gui.core.config.Position;
+import at.hannibal2.skyhanni.config.gui.utils.Utils;
 import java.io.IOException;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/struct/ConfigProcessor.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/struct/ConfigProcessor.java
index 2e87d36a0..2ba554a8b 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/struct/ConfigProcessor.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/config/struct/ConfigProcessor.java
@@ -1,8 +1,8 @@
-package at.hannibal2.skyhanni.config.core.config.struct;
+package at.hannibal2.skyhanni.config.gui.core.config.struct;
 
 import at.hannibal2.skyhanni.config.Features;
-import at.hannibal2.skyhanni.config.core.config.annotations.*;
-import at.hannibal2.skyhanni.config.core.config.gui.*;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.*;
+import at.hannibal2.skyhanni.config.gui.core.config.gui.*;
 import com.google.gson.annotations.Expose;
 import java.lang.reflect.Field;
 import java.util.LinkedHashMap;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/util/GuiElementSlider.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/GuiElementSlider.java
index f59d6bb8d..b5bd6636c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/util/GuiElementSlider.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/GuiElementSlider.java
@@ -1,9 +1,9 @@
-package at.hannibal2.skyhanni.config.core.util;
+package at.hannibal2.skyhanni.config.gui.core.util;
 
-import static at.hannibal2.skyhanni.config.GuiTextures.*;
+import static at.hannibal2.skyhanni.config.gui.GuiTextures.*;
 
-import at.hannibal2.skyhanni.config.core.GuiElement;
-import at.hannibal2.skyhanni.config.utils.Utils;
+import at.hannibal2.skyhanni.config.gui.core.GuiElement;
+import at.hannibal2.skyhanni.config.gui.utils.Utils;
 import java.util.function.Consumer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/util/StringUtils.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/StringUtils.java
index 9f88a7c07..ef3940dab 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/util/StringUtils.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/StringUtils.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.util;
+package at.hannibal2.skyhanni.config.gui.core.util;
 
 public class StringUtils {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/util/lerp/LerpUtils.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/lerp/LerpUtils.java
index 9fa20b839..33eed5222 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/util/lerp/LerpUtils.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/lerp/LerpUtils.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.util.lerp;
+package at.hannibal2.skyhanni.config.gui.core.util.lerp;
 
 public class LerpUtils {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/util/lerp/LerpingFloat.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/lerp/LerpingFloat.java
index f76c73c9c..cd8873c59 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/util/lerp/LerpingFloat.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/lerp/LerpingFloat.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.util.lerp;
+package at.hannibal2.skyhanni.config.gui.core.util.lerp;
 
 public class LerpingFloat {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/util/lerp/LerpingInteger.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/lerp/LerpingInteger.java
index a5d7ad9eb..22a57b4d1 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/util/lerp/LerpingInteger.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/lerp/LerpingInteger.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.util.lerp;
+package at.hannibal2.skyhanni.config.gui.core.util.lerp;
 
 public class LerpingInteger {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/util/render/RenderUtils.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/render/RenderUtils.java
index 04d3f2ef8..7e466cd99 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/util/render/RenderUtils.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/render/RenderUtils.java
@@ -1,6 +1,6 @@
-package at.hannibal2.skyhanni.config.core.util.render;
+package at.hannibal2.skyhanni.config.gui.core.util.render;
 
-import at.hannibal2.skyhanni.config.core.BackgroundBlur;
+import at.hannibal2.skyhanni.config.gui.core.BackgroundBlur;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.ScaledResolution;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/util/render/TextRenderUtils.java b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/render/TextRenderUtils.java
index 309bdb2bf..c40db66b4 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/util/render/TextRenderUtils.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/core/util/render/TextRenderUtils.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.core.util.render;
+package at.hannibal2.skyhanni.config.gui.core.util.render;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/textures/TextureObject.java b/src/main/java/at/hannibal2/skyhanni/config/gui/textures/TextureObject.java
index 1804299de..8d7832da3 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/textures/TextureObject.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/textures/TextureObject.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.textures;
+package at.hannibal2.skyhanni.config.gui.textures;
 
 import com.google.gson.JsonObject;
 import java.util.Arrays;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/textures/Textures.java b/src/main/java/at/hannibal2/skyhanni/config/gui/textures/Textures.java
index dc6a0bdd0..9f34b435c 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/textures/Textures.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/textures/Textures.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.textures;
+package at.hannibal2.skyhanni.config.gui.textures;
 
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/utils/Utils.java b/src/main/java/at/hannibal2/skyhanni/config/gui/utils/Utils.java
index e2c770a6d..77095bcd2 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/utils/Utils.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/utils/Utils.java
@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.config.utils;
+package at.hannibal2.skyhanni.config.gui.utils;
 
 import java.math.RoundingMode;
 import java.nio.FloatBuffer;
diff --git a/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt
index 6f2073969..b61d1706e 100644
--- a/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/items/ItemDisplayOverlayFeatures.kt
@@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.events.GuiRenderItemEvent
 import at.hannibal2.skyhanni.utils.ItemUtils
 import at.hannibal2.skyhanni.utils.ItemUtils.cleanName
+import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.between
 import at.hannibal2.skyhanni.utils.LorenzUtils.matchRegex
diff --git a/src/main/java/at/hannibal2/skyhanni/misc/ButtonOnPause.kt b/src/main/java/at/hannibal2/skyhanni/misc/ButtonOnPause.kt
index c42c304db..68ae8a93c 100644
--- a/src/main/java/at/hannibal2/skyhanni/misc/ButtonOnPause.kt
+++ b/src/main/java/at/hannibal2/skyhanni/misc/ButtonOnPause.kt
@@ -1,8 +1,8 @@
 package at.hannibal2.skyhanni.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
-import at.hannibal2.skyhanni.config.config.ConfigEditor
-import at.hannibal2.skyhanni.config.core.GuiScreenElementWrapper
+import at.hannibal2.skyhanni.config.gui.config.ConfigEditor
+import at.hannibal2.skyhanni.config.gui.core.GuiScreenElementWrapper
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import net.minecraft.client.gui.GuiButton
 import net.minecraft.client.gui.GuiIngameMenu
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/GuiRender.kt b/src/main/java/at/hannibal2/skyhanni/utils/GuiRender.kt
index 221cbd9a2..9ea9f37bb 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/GuiRender.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/GuiRender.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.utils
 
-import at.hannibal2.skyhanni.config.core.config.Position
+import at.hannibal2.skyhanni.config.gui.core.config.Position
 import at.hannibal2.skyhanni.utils.LorenzUtils.removeColorCodes
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.ScaledResolution