55 files changed, 128 insertions, 128 deletions
diff --git a/src/main/java/at/lorenz/mod/LorenzMod.java b/src/main/java/at/lorenz/mod/LorenzMod.java
index c9a8486db..9e840f9e8 100644
--- a/src/main/java/at/lorenz/mod/LorenzMod.java
+++ b/src/main/java/at/lorenz/mod/LorenzMod.java
@@ -15,7 +15,7 @@ import at.lorenz.mod.misc.*;
 import at.lorenz.mod.test.LorenzTest;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.thatgravyboat.amod.commands.Commands;
+import at.lorenz.mod.config.commands.Commands;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/at/lorenz/mod/config/Features.java b/src/main/java/at/lorenz/mod/config/Features.java
index 9cb5d9450..4dc65baa7 100644
--- a/src/main/java/at/lorenz/mod/config/Features.java
+++ b/src/main/java/at/lorenz/mod/config/Features.java
@@ -2,12 +2,12 @@ package at.lorenz.mod.config;
 
 import at.lorenz.mod.LorenzMod;
 import com.google.gson.annotations.Expose;
-import com.thatgravyboat.amod.config.ConfigEditor;
-import com.thatgravyboat.amod.core.GuiElement;
-import com.thatgravyboat.amod.core.GuiScreenElementWrapper;
-import com.thatgravyboat.amod.core.config.Position;
-import com.thatgravyboat.amod.core.config.annotations.*;
-import com.thatgravyboat.amod.core.config.gui.GuiPositionEditor;
+import at.lorenz.mod.config.config.ConfigEditor;
+import at.lorenz.mod.config.core.GuiElement;
+import at.lorenz.mod.config.core.GuiScreenElementWrapper;
+import at.lorenz.mod.config.core.config.Position;
+import at.lorenz.mod.config.core.config.annotations.*;
+import at.lorenz.mod.config.core.config.gui.GuiPositionEditor;
 import net.minecraft.client.Minecraft;
 
 public class Features {
diff --git a/src/main/java/com/thatgravyboat/amod/GuiTextures.java b/src/main/java/at/lorenz/mod/config/GuiTextures.java
index 605fc5c00..e24f1879d 100644
--- a/src/main/java/com/thatgravyboat/amod/GuiTextures.java
+++ b/src/main/java/at/lorenz/mod/config/GuiTextures.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod;
+package at.lorenz.mod.config;
 
 import net.minecraft.util.ResourceLocation;
 
diff --git a/src/main/java/com/thatgravyboat/amod/commands/Commands.java b/src/main/java/at/lorenz/mod/config/commands/Commands.java
index 97188933a..05963ead6 100644
--- a/src/main/java/com/thatgravyboat/amod/commands/Commands.java
+++ b/src/main/java/at/lorenz/mod/config/commands/Commands.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.amod.commands;
+package at.lorenz.mod.config.commands;
 
 import at.lorenz.mod.LorenzMod;
-import com.thatgravyboat.amod.config.ConfigEditor;
-import com.thatgravyboat.amod.core.GuiScreenElementWrapper;
+import at.lorenz.mod.config.config.ConfigEditor;
+import at.lorenz.mod.config.core.GuiScreenElementWrapper;
 import net.minecraft.command.ICommandSender;
 import net.minecraftforge.client.ClientCommandHandler;
 import org.apache.commons.lang3.StringUtils;
diff --git a/src/main/java/com/thatgravyboat/amod/commands/SimpleCommand.java b/src/main/java/at/lorenz/mod/config/commands/SimpleCommand.java
index dc1657976..170080a59 100644
--- a/src/main/java/com/thatgravyboat/amod/commands/SimpleCommand.java
+++ b/src/main/java/at/lorenz/mod/config/commands/SimpleCommand.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.commands;
+package at.lorenz.mod.config.commands;
 
 import java.util.List;
 import net.minecraft.command.CommandBase;
diff --git a/src/main/java/com/thatgravyboat/amod/config/ConfigEditor.java b/src/main/java/at/lorenz/mod/config/config/ConfigEditor.java
index 1c22fbbe8..cee1846b5 100644
--- a/src/main/java/com/thatgravyboat/amod/config/ConfigEditor.java
+++ b/src/main/java/at/lorenz/mod/config/config/ConfigEditor.java
@@ -1,19 +1,19 @@
-package com.thatgravyboat.amod.config;
+package at.lorenz.mod.config.config;
 
-import static com.thatgravyboat.amod.GuiTextures.DISCORD;
+import static at.lorenz.mod.config.GuiTextures.DISCORD;
 
 import at.lorenz.mod.LorenzMod;
 import at.lorenz.mod.config.Features;
 import com.google.common.collect.Lists;
-import com.thatgravyboat.amod.core.GlScissorStack;
-import com.thatgravyboat.amod.core.GuiElement;
-import com.thatgravyboat.amod.core.config.gui.GuiOptionEditor;
-import com.thatgravyboat.amod.core.config.gui.GuiOptionEditorAccordion;
-import com.thatgravyboat.amod.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.amod.core.util.lerp.LerpUtils;
-import com.thatgravyboat.amod.core.util.lerp.LerpingInteger;
-import com.thatgravyboat.amod.core.util.render.RenderUtils;
-import com.thatgravyboat.amod.core.util.render.TextRenderUtils;
+import at.lorenz.mod.config.core.GlScissorStack;
+import at.lorenz.mod.config.core.GuiElement;
+import at.lorenz.mod.config.core.config.gui.GuiOptionEditor;
+import at.lorenz.mod.config.core.config.gui.GuiOptionEditorAccordion;
+import at.lorenz.mod.config.core.config.struct.ConfigProcessor;
+import at.lorenz.mod.config.core.util.lerp.LerpUtils;
+import at.lorenz.mod.config.core.util.lerp.LerpingInteger;
+import at.lorenz.mod.config.core.util.render.RenderUtils;
+import at.lorenz.mod.config.core.util.render.TextRenderUtils;
 import java.awt.*;
 import java.net.URI;
 import java.util.*;
diff --git a/src/main/java/com/thatgravyboat/amod/core/BackgroundBlur.java b/src/main/java/at/lorenz/mod/config/core/BackgroundBlur.java
index 93dafb9b3..780e02a1b 100644
--- a/src/main/java/com/thatgravyboat/amod/core/BackgroundBlur.java
+++ b/src/main/java/at/lorenz/mod/config/core/BackgroundBlur.java
@@ -1,6 +1,6 @@
-package com.thatgravyboat.amod.core;
+package at.lorenz.mod.config.core;
 
-import com.thatgravyboat.amod.core.util.render.RenderUtils;
+import at.lorenz.mod.config.core.util.render.RenderUtils;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
diff --git a/src/main/java/com/thatgravyboat/amod/core/ChromaColour.java b/src/main/java/at/lorenz/mod/config/core/ChromaColour.java
index 2e4e2a20a..b670ce081 100644
--- a/src/main/java/com/thatgravyboat/amod/core/ChromaColour.java
+++ b/src/main/java/at/lorenz/mod/config/core/ChromaColour.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core;
+package at.lorenz.mod.config.core;
 
 import java.awt.*;
 
diff --git a/src/main/java/com/thatgravyboat/amod/core/GlScissorStack.java b/src/main/java/at/lorenz/mod/config/core/GlScissorStack.java
index ae9162f77..e3758fb37 100644
--- a/src/main/java/com/thatgravyboat/amod/core/GlScissorStack.java
+++ b/src/main/java/at/lorenz/mod/config/core/GlScissorStack.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core;
+package at.lorenz.mod.config.core;
 
 import java.util.LinkedList;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/thatgravyboat/amod/core/GuiElement.java b/src/main/java/at/lorenz/mod/config/core/GuiElement.java
index 2310702bb..a177089bc 100644
--- a/src/main/java/com/thatgravyboat/amod/core/GuiElement.java
+++ b/src/main/java/at/lorenz/mod/config/core/GuiElement.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core;
+package at.lorenz.mod.config.core;
 
 import net.minecraft.client.gui.Gui;
 
diff --git a/src/main/java/com/thatgravyboat/amod/core/GuiElementBoolean.java b/src/main/java/at/lorenz/mod/config/core/GuiElementBoolean.java
index 06e2c8c0e..c944fe0af 100644
--- a/src/main/java/com/thatgravyboat/amod/core/GuiElementBoolean.java
+++ b/src/main/java/at/lorenz/mod/config/core/GuiElementBoolean.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.amod.core;
+package at.lorenz.mod.config.core;
 
-import com.thatgravyboat.amod.GuiTextures;
-import com.thatgravyboat.amod.core.util.lerp.LerpUtils;
-import com.thatgravyboat.amod.core.util.render.RenderUtils;
+import at.lorenz.mod.config.GuiTextures;
+import at.lorenz.mod.config.core.util.lerp.LerpUtils;
+import at.lorenz.mod.config.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/com/thatgravyboat/amod/core/GuiElementColour.java b/src/main/java/at/lorenz/mod/config/core/GuiElementColour.java
index 7a1753fc1..c1504fa12 100644
--- a/src/main/java/com/thatgravyboat/amod/core/GuiElementColour.java
+++ b/src/main/java/at/lorenz/mod/config/core/GuiElementColour.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.amod.core;
+package at.lorenz.mod.config.core;
 
-import com.thatgravyboat.amod.core.util.render.RenderUtils;
-import com.thatgravyboat.amod.core.util.render.TextRenderUtils;
+import at.lorenz.mod.config.core.util.render.RenderUtils;
+import at.lorenz.mod.config.core.util.render.TextRenderUtils;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.util.function.Consumer;
diff --git a/src/main/java/com/thatgravyboat/amod/core/GuiElementTextField.java b/src/main/java/at/lorenz/mod/config/core/GuiElementTextField.java
index f7d38545b..d88d098fc 100644
--- a/src/main/java/com/thatgravyboat/amod/core/GuiElementTextField.java
+++ b/src/main/java/at/lorenz/mod/config/core/GuiElementTextField.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.amod.core;
+package at.lorenz.mod.config.core;
 
-import com.thatgravyboat.amod.core.util.StringUtils;
-import com.thatgravyboat.amod.core.util.render.TextRenderUtils;
+import at.lorenz.mod.config.core.util.StringUtils;
+import at.lorenz.mod.config.core.util.render.TextRenderUtils;
 import java.awt.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/main/java/com/thatgravyboat/amod/core/GuiScreenElementWrapper.java b/src/main/java/at/lorenz/mod/config/core/GuiScreenElementWrapper.java
index 71b9eee90..9f2aa8e6b 100644
--- a/src/main/java/com/thatgravyboat/amod/core/GuiScreenElementWrapper.java
+++ b/src/main/java/at/lorenz/mod/config/core/GuiScreenElementWrapper.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core;
+package at.lorenz.mod.config.core;
 
 import java.io.IOException;
 import net.minecraft.client.gui.GuiScreen;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/Config.java b/src/main/java/at/lorenz/mod/config/core/config/Config.java
index 5866778d7..e223f34d6 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/Config.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/Config.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config;
+package at.lorenz.mod.config.core.config;
 //public class Config {
 //
 //    public void executeRunnable(String runnableId) {}
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/KeybindHelper.java b/src/main/java/at/lorenz/mod/config/core/config/KeybindHelper.java
index 0d60acc36..8cc8ce794 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/KeybindHelper.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/KeybindHelper.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config;
+package at.lorenz.mod.config.core.config;
 
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/Position.java b/src/main/java/at/lorenz/mod/config/core/config/Position.java
index 10a46c466..993fe8567 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/Position.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/Position.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config;
+package at.lorenz.mod.config.core.config;
 
 import com.google.gson.annotations.Expose;
 import net.minecraft.client.gui.ScaledResolution;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/Category.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/Category.java
index 00f9336af..296109574 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/Category.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/Category.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigAccordionId.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigAccordionId.java
index 23fdd4e58..6ca061d68 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigAccordionId.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigAccordionId.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorAccordion.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorAccordion.java
index 58f564840..519097a33 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorAccordion.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorAccordion.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorBoolean.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorBoolean.java
index 7648d4973..00ac8bdec 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorBoolean.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorBoolean.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorButton.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorButton.java
index 438cb8c4f..2dde81831 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorButton.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorButton.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorColour.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorColour.java
index ca88122c6..286c534d1 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorColour.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorColour.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorDraggableList.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorDraggableList.java
index f0a9bc5d2..7c814ccc7 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorDraggableList.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorDraggableList.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorDropdown.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorDropdown.java
index 9a7813e5b..5b36610cc 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorDropdown.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorDropdown.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorKeybind.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorKeybind.java
index e7a4bf501..ae04da3a7 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorKeybind.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorKeybind.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorSlider.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorSlider.java
index 256de0400..04582a71d 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorSlider.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorSlider.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorStyle.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorStyle.java
index 222e108b1..4048b28d2 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorStyle.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorStyle.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorText.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorText.java
index 0d38f42bf..649a8df26 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigEditorText.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigEditorText.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigOption.java b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigOption.java
index 5a9a0bfd8..8a3fbafda 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/annotations/ConfigOption.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/annotations/ConfigOption.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.config.annotations;
+package at.lorenz.mod.config.core.config.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditor.java b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditor.java
index cd403b794..6bae7fa6e 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditor.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditor.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.amod.core.config.gui;
+package at.lorenz.mod.config.core.config.gui;
 
-import com.thatgravyboat.amod.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.amod.core.util.render.RenderUtils;
-import com.thatgravyboat.amod.core.util.render.TextRenderUtils;
+import at.lorenz.mod.config.core.config.struct.ConfigProcessor;
+import at.lorenz.mod.config.core.util.render.RenderUtils;
+import at.lorenz.mod.config.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/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorAccordion.java b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorAccordion.java
index 2c56db814..d7f0b44b3 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorAccordion.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorAccordion.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.amod.core.config.gui;
+package at.lorenz.mod.config.core.config.gui;
 
-import com.thatgravyboat.amod.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.amod.core.util.render.RenderUtils;
-import com.thatgravyboat.amod.core.util.render.TextRenderUtils;
+import at.lorenz.mod.config.core.config.struct.ConfigProcessor;
+import at.lorenz.mod.config.core.util.render.RenderUtils;
+import at.lorenz.mod.config.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/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorBoolean.java b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorBoolean.java
index 54f364c02..efb56c585 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorBoolean.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorBoolean.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.amod.core.config.gui;
+package at.lorenz.mod.config.core.config.gui;
 
-import com.thatgravyboat.amod.core.GuiElementBoolean;
-import com.thatgravyboat.amod.core.config.struct.ConfigProcessor;
+import at.lorenz.mod.config.core.GuiElementBoolean;
+import at.lorenz.mod.config.core.config.struct.ConfigProcessor;
 
 public class GuiOptionEditorBoolean extends GuiOptionEditor {
 
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorButton.java b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorButton.java
index 8b04c1d77..8d2b81bb7 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorButton.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorButton.java
@@ -1,11 +1,11 @@
-package com.thatgravyboat.amod.core.config.gui;
+package at.lorenz.mod.config.core.config.gui;
 
-import static com.thatgravyboat.amod.GuiTextures.button_tex;
+import static at.lorenz.mod.config.GuiTextures.button_tex;
 
 import at.lorenz.mod.config.Features;
-import com.thatgravyboat.amod.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.amod.core.util.render.RenderUtils;
-import com.thatgravyboat.amod.core.util.render.TextRenderUtils;
+import at.lorenz.mod.config.core.config.struct.ConfigProcessor;
+import at.lorenz.mod.config.core.util.render.RenderUtils;
+import at.lorenz.mod.config.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/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorColour.java b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorColour.java
index f315b7ee1..ede551a2d 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorColour.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorColour.java
@@ -1,11 +1,11 @@
-package com.thatgravyboat.amod.core.config.gui;
+package at.lorenz.mod.config.core.config.gui;
 
-import static com.thatgravyboat.amod.GuiTextures.*;
+import static at.lorenz.mod.config.GuiTextures.*;
 
-import com.thatgravyboat.amod.core.ChromaColour;
-import com.thatgravyboat.amod.core.GuiElementColour;
-import com.thatgravyboat.amod.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.amod.core.util.render.RenderUtils;
+import at.lorenz.mod.config.core.ChromaColour;
+import at.lorenz.mod.config.core.GuiElementColour;
+import at.lorenz.mod.config.core.config.struct.ConfigProcessor;
+import at.lorenz.mod.config.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/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorDraggableList.java b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorDraggableList.java
index b3c51475b..ddf5bdb48 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorDraggableList.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorDraggableList.java
@@ -1,13 +1,13 @@
-package com.thatgravyboat.amod.core.config.gui;
+package at.lorenz.mod.config.core.config.gui;
 
-import static com.thatgravyboat.amod.GuiTextures.DELETE;
-import static com.thatgravyboat.amod.GuiTextures.button_tex;
+import static at.lorenz.mod.config.GuiTextures.DELETE;
+import static at.lorenz.mod.config.GuiTextures.button_tex;
 
-import com.thatgravyboat.amod.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.amod.core.util.lerp.LerpUtils;
-import com.thatgravyboat.amod.core.util.render.RenderUtils;
-import com.thatgravyboat.amod.core.util.render.TextRenderUtils;
-import com.thatgravyboat.amod.utils.Utils;
+import at.lorenz.mod.config.core.config.struct.ConfigProcessor;
+import at.lorenz.mod.config.core.util.lerp.LerpUtils;
+import at.lorenz.mod.config.core.util.render.RenderUtils;
+import at.lorenz.mod.config.core.util.render.TextRenderUtils;
+import at.lorenz.mod.config.utils.Utils;
 import java.util.ArrayList;
 import java.util.List;
 import net.minecraft.client.Minecraft;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorDropdown.java b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorDropdown.java
index f9dd6c794..be873550a 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorDropdown.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorDropdown.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.amod.core.config.gui;
+package at.lorenz.mod.config.core.config.gui;
 
-import com.thatgravyboat.amod.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.amod.core.util.render.RenderUtils;
-import com.thatgravyboat.amod.core.util.render.TextRenderUtils;
+import at.lorenz.mod.config.core.config.struct.ConfigProcessor;
+import at.lorenz.mod.config.core.util.render.RenderUtils;
+import at.lorenz.mod.config.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/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorKeybind.java b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorKeybind.java
index 0a331889f..730a96c34 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorKeybind.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorKeybind.java
@@ -1,11 +1,11 @@
-package com.thatgravyboat.amod.core.config.gui;
+package at.lorenz.mod.config.core.config.gui;
 
-import static com.thatgravyboat.amod.GuiTextures.*;
+import static at.lorenz.mod.config.GuiTextures.*;
 
-import com.thatgravyboat.amod.core.config.KeybindHelper;
-import com.thatgravyboat.amod.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.amod.core.util.render.RenderUtils;
-import com.thatgravyboat.amod.core.util.render.TextRenderUtils;
+import at.lorenz.mod.config.core.config.KeybindHelper;
+import at.lorenz.mod.config.core.config.struct.ConfigProcessor;
+import at.lorenz.mod.config.core.util.render.RenderUtils;
+import at.lorenz.mod.config.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/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorSlider.java b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorSlider.java
index 4f9d4333f..79448ac70 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorSlider.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorSlider.java
@@ -1,8 +1,8 @@
-package com.thatgravyboat.amod.core.config.gui;
+package at.lorenz.mod.config.core.config.gui;
 
-import com.thatgravyboat.amod.core.GuiElementTextField;
-import com.thatgravyboat.amod.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.amod.core.util.GuiElementSlider;
+import at.lorenz.mod.config.core.GuiElementTextField;
+import at.lorenz.mod.config.core.config.struct.ConfigProcessor;
+import at.lorenz.mod.config.core.util.GuiElementSlider;
 import net.minecraft.client.Minecraft;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorStyle.java b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorStyle.java
index 4ee7fbc6e..43e769a83 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorStyle.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorStyle.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.amod.core.config.gui;
+package at.lorenz.mod.config.core.config.gui;
 
-import com.thatgravyboat.amod.core.config.struct.ConfigProcessor;
-import com.thatgravyboat.amod.textures.Textures;
+import at.lorenz.mod.config.core.config.struct.ConfigProcessor;
+import at.lorenz.mod.config.textures.Textures;
 import java.util.stream.Collectors;
 import org.lwjgl.input.Mouse;
 
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorText.java b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorText.java
index c9ecacdc6..b35f9e60f 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiOptionEditorText.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiOptionEditorText.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.amod.core.config.gui;
+package at.lorenz.mod.config.core.config.gui;
 
-import com.thatgravyboat.amod.core.GuiElementTextField;
-import com.thatgravyboat.amod.core.config.struct.ConfigProcessor;
+import at.lorenz.mod.config.core.GuiElementTextField;
+import at.lorenz.mod.config.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/com/thatgravyboat/amod/core/config/gui/GuiPositionEditor.java b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiPositionEditor.java
index 48b1a3f84..ead75930c 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/gui/GuiPositionEditor.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/gui/GuiPositionEditor.java
@@ -1,7 +1,7 @@
-package com.thatgravyboat.amod.core.config.gui;
+package at.lorenz.mod.config.core.config.gui;
 
-import com.thatgravyboat.amod.core.config.Position;
-import com.thatgravyboat.amod.utils.Utils;
+import at.lorenz.mod.config.core.config.Position;
+import at.lorenz.mod.config.utils.Utils;
 import java.io.IOException;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
diff --git a/src/main/java/com/thatgravyboat/amod/core/config/struct/ConfigProcessor.java b/src/main/java/at/lorenz/mod/config/core/config/struct/ConfigProcessor.java
index 93e0c77d4..e594791ad 100644
--- a/src/main/java/com/thatgravyboat/amod/core/config/struct/ConfigProcessor.java
+++ b/src/main/java/at/lorenz/mod/config/core/config/struct/ConfigProcessor.java
@@ -1,9 +1,9 @@
-package com.thatgravyboat.amod.core.config.struct;
+package at.lorenz.mod.config.core.config.struct;
 
 import at.lorenz.mod.config.Features;
 import com.google.gson.annotations.Expose;
-import com.thatgravyboat.amod.core.config.annotations.*;
-import com.thatgravyboat.amod.core.config.gui.*;
+import at.lorenz.mod.config.core.config.annotations.*;
+import at.lorenz.mod.config.core.config.gui.*;
 import java.lang.reflect.Field;
 import java.util.LinkedHashMap;
 import java.util.List;
diff --git a/src/main/java/com/thatgravyboat/amod/core/util/GuiElementSlider.java b/src/main/java/at/lorenz/mod/config/core/util/GuiElementSlider.java
index e3ec33790..327e5a2f9 100644
--- a/src/main/java/com/thatgravyboat/amod/core/util/GuiElementSlider.java
+++ b/src/main/java/at/lorenz/mod/config/core/util/GuiElementSlider.java
@@ -1,9 +1,9 @@
-package com.thatgravyboat.amod.core.util;
+package at.lorenz.mod.config.core.util;
 
-import static com.thatgravyboat.amod.GuiTextures.*;
+import static at.lorenz.mod.config.GuiTextures.*;
 
-import com.thatgravyboat.amod.core.GuiElement;
-import com.thatgravyboat.amod.utils.Utils;
+import at.lorenz.mod.config.core.GuiElement;
+import at.lorenz.mod.config.utils.Utils;
 import java.util.function.Consumer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
diff --git a/src/main/java/com/thatgravyboat/amod/core/util/StringUtils.java b/src/main/java/at/lorenz/mod/config/core/util/StringUtils.java
index f8e2e49ce..5dfdfda2e 100644
--- a/src/main/java/com/thatgravyboat/amod/core/util/StringUtils.java
+++ b/src/main/java/at/lorenz/mod/config/core/util/StringUtils.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.util;
+package at.lorenz.mod.config.core.util;
 
 public class StringUtils {
 
diff --git a/src/main/java/com/thatgravyboat/amod/core/util/lerp/LerpUtils.java b/src/main/java/at/lorenz/mod/config/core/util/lerp/LerpUtils.java
index f88a5be4d..4b73385cc 100644
--- a/src/main/java/com/thatgravyboat/amod/core/util/lerp/LerpUtils.java
+++ b/src/main/java/at/lorenz/mod/config/core/util/lerp/LerpUtils.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.util.lerp;
+package at.lorenz.mod.config.core.util.lerp;
 
 public class LerpUtils {
 
diff --git a/src/main/java/com/thatgravyboat/amod/core/util/lerp/LerpingFloat.java b/src/main/java/at/lorenz/mod/config/core/util/lerp/LerpingFloat.java
index 1a3de3962..880b2d03f 100644
--- a/src/main/java/com/thatgravyboat/amod/core/util/lerp/LerpingFloat.java
+++ b/src/main/java/at/lorenz/mod/config/core/util/lerp/LerpingFloat.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.util.lerp;
+package at.lorenz.mod.config.core.util.lerp;
 
 public class LerpingFloat {
 
diff --git a/src/main/java/com/thatgravyboat/amod/core/util/lerp/LerpingInteger.java b/src/main/java/at/lorenz/mod/config/core/util/lerp/LerpingInteger.java
index ebda9e650..4d0553275 100644
--- a/src/main/java/com/thatgravyboat/amod/core/util/lerp/LerpingInteger.java
+++ b/src/main/java/at/lorenz/mod/config/core/util/lerp/LerpingInteger.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.util.lerp;
+package at.lorenz.mod.config.core.util.lerp;
 
 public class LerpingInteger {
 
diff --git a/src/main/java/com/thatgravyboat/amod/core/util/render/RenderUtils.java b/src/main/java/at/lorenz/mod/config/core/util/render/RenderUtils.java
index 800229773..80948c43a 100644
--- a/src/main/java/com/thatgravyboat/amod/core/util/render/RenderUtils.java
+++ b/src/main/java/at/lorenz/mod/config/core/util/render/RenderUtils.java
@@ -1,6 +1,6 @@
-package com.thatgravyboat.amod.core.util.render;
+package at.lorenz.mod.config.core.util.render;
 
-import com.thatgravyboat.amod.core.BackgroundBlur;
+import at.lorenz.mod.config.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/com/thatgravyboat/amod/core/util/render/TextRenderUtils.java b/src/main/java/at/lorenz/mod/config/core/util/render/TextRenderUtils.java
index cc9bfe302..4a54c37df 100644
--- a/src/main/java/com/thatgravyboat/amod/core/util/render/TextRenderUtils.java
+++ b/src/main/java/at/lorenz/mod/config/core/util/render/TextRenderUtils.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.core.util.render;
+package at.lorenz.mod.config.core.util.render;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/com/thatgravyboat/amod/textures/TextureObject.java b/src/main/java/at/lorenz/mod/config/textures/TextureObject.java
index e9280b5a7..0d91c7428 100644
--- a/src/main/java/com/thatgravyboat/amod/textures/TextureObject.java
+++ b/src/main/java/at/lorenz/mod/config/textures/TextureObject.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.textures;
+package at.lorenz.mod.config.textures;
 
 import com.google.gson.JsonObject;
 import java.util.Arrays;
diff --git a/src/main/java/com/thatgravyboat/amod/textures/Textures.java b/src/main/java/at/lorenz/mod/config/textures/Textures.java
index 9985fc43c..914f19b04 100644
--- a/src/main/java/com/thatgravyboat/amod/textures/Textures.java
+++ b/src/main/java/at/lorenz/mod/config/textures/Textures.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.textures;
+package at.lorenz.mod.config.textures;
 
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
diff --git a/src/main/java/com/thatgravyboat/amod/utils/Utils.java b/src/main/java/at/lorenz/mod/config/utils/Utils.java
index 1ebe2f15a..6af6c0243 100644
--- a/src/main/java/com/thatgravyboat/amod/utils/Utils.java
+++ b/src/main/java/at/lorenz/mod/config/utils/Utils.java
@@ -1,4 +1,4 @@
-package com.thatgravyboat.amod.utils;
+package at.lorenz.mod.config.utils;
 
 import java.math.RoundingMode;
 import java.nio.FloatBuffer;
diff --git a/src/main/java/at/lorenz/mod/misc/ButtonOnPause.kt b/src/main/java/at/lorenz/mod/misc/ButtonOnPause.kt
index 735f1db99..7b4785ee0 100644
--- a/src/main/java/at/lorenz/mod/misc/ButtonOnPause.kt
+++ b/src/main/java/at/lorenz/mod/misc/ButtonOnPause.kt
@@ -2,8 +2,8 @@ package at.lorenz.mod.misc
 
 import at.lorenz.mod.LorenzMod
 import at.lorenz.mod.utils.LorenzUtils
-import com.thatgravyboat.amod.config.ConfigEditor
-import com.thatgravyboat.amod.core.GuiScreenElementWrapper
+import at.lorenz.mod.config.config.ConfigEditor
+import at.lorenz.mod.config.core.GuiScreenElementWrapper
 import net.minecraft.client.gui.GuiButton
 import net.minecraft.client.gui.GuiIngameMenu
 import net.minecraftforge.client.event.GuiScreenEvent
diff --git a/src/main/java/at/lorenz/mod/utils/GuiRender.kt b/src/main/java/at/lorenz/mod/utils/GuiRender.kt
index c16cab56f..03918fb66 100644
--- a/src/main/java/at/lorenz/mod/utils/GuiRender.kt
+++ b/src/main/java/at/lorenz/mod/utils/GuiRender.kt
@@ -1,7 +1,7 @@
 package at.lorenz.mod.utils
 
 import at.lorenz.mod.utils.LorenzUtils.removeColorCodes
-import com.thatgravyboat.amod.core.config.Position
+import at.lorenz.mod.config.core.config.Position
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.client.renderer.GlStateManager