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