refactor (#36)

* refactor

* fix vig compat

* fix nanovg thingy

* e

* finalize

* gui utils package thingy

81 files changed, 452 insertions, 450 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/Config.java b/src/main/java/cc/polyfrost/oneconfig/config/Config.java
index 8eb5eb1..d0d8acf 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/Config.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/Config.java
@@ -1,16 +1,20 @@
-package cc.polyfrost.oneconfig.config.interfaces;
+package cc.polyfrost.oneconfig.config;
 
 import cc.polyfrost.oneconfig.config.annotations.ConfigPage;
 import cc.polyfrost.oneconfig.config.annotations.Option;
 import cc.polyfrost.oneconfig.config.core.ConfigCore;
 import cc.polyfrost.oneconfig.config.data.*;
+import cc.polyfrost.oneconfig.config.elements.BasicOption;
+import cc.polyfrost.oneconfig.config.elements.OptionCategory;
+import cc.polyfrost.oneconfig.config.elements.OptionPage;
+import cc.polyfrost.oneconfig.config.elements.OptionSubcategory;
 import cc.polyfrost.oneconfig.config.profiles.Profiles;
 import cc.polyfrost.oneconfig.gui.OneConfigGui;
 import cc.polyfrost.oneconfig.gui.elements.config.*;
 import cc.polyfrost.oneconfig.gui.pages.ModConfigPage;
 import cc.polyfrost.oneconfig.hud.BasicHud;
 import cc.polyfrost.oneconfig.hud.HudCore;
-import cc.polyfrost.oneconfig.utils.GuiUtils;
+import cc.polyfrost.oneconfig.utils.gui.GuiUtils;
 import com.google.gson.*;
 
 import java.io.*;
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/compatibility/VigilanceConfig.java b/src/main/java/cc/polyfrost/oneconfig/config/compatibility/vigilance/VigilanceConfig.java
index fa4f058..cfa717f 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/compatibility/VigilanceConfig.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/compatibility/vigilance/VigilanceConfig.java
@@ -1,13 +1,13 @@
-package cc.polyfrost.oneconfig.config.compatibility;
+package cc.polyfrost.oneconfig.config.compatibility.vigilance;
 
 import cc.polyfrost.oneconfig.config.core.ConfigCore;
 import cc.polyfrost.oneconfig.config.core.OneColor;
 import cc.polyfrost.oneconfig.config.data.Mod;
-import cc.polyfrost.oneconfig.config.data.OptionCategory;
-import cc.polyfrost.oneconfig.config.data.OptionPage;
-import cc.polyfrost.oneconfig.config.data.OptionSubcategory;
-import cc.polyfrost.oneconfig.config.interfaces.BasicOption;
-import cc.polyfrost.oneconfig.config.interfaces.Config;
+import cc.polyfrost.oneconfig.config.elements.OptionCategory;
+import cc.polyfrost.oneconfig.config.elements.OptionPage;
+import cc.polyfrost.oneconfig.config.elements.OptionSubcategory;
+import cc.polyfrost.oneconfig.config.elements.BasicOption;
+import cc.polyfrost.oneconfig.config.Config;
 import cc.polyfrost.oneconfig.gui.elements.config.*;
 import gg.essential.vigilance.Vigilant;
 import gg.essential.vigilance.data.*;
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/compatibility/VigilantAccessor.java b/src/main/java/cc/polyfrost/oneconfig/config/compatibility/vigilance/VigilantAccessor.java
index ca2b1da..c449bd9 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/compatibility/VigilantAccessor.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/compatibility/vigilance/VigilantAccessor.java
@@ -1,4 +1,4 @@
-package cc.polyfrost.oneconfig.config.compatibility;
+package cc.polyfrost.oneconfig.config.compatibility.vigilance;
 
 import gg.essential.vigilance.data.PropertyCollector;
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java b/src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java
index 241dca7..090d1f8 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/data/Mod.java
@@ -1,7 +1,8 @@
 package cc.polyfrost.oneconfig.config.data;
 
-import cc.polyfrost.oneconfig.config.interfaces.Config;
-import cc.polyfrost.oneconfig.config.migration.Migrator;
+import cc.polyfrost.oneconfig.config.Config;
+import cc.polyfrost.oneconfig.config.elements.OptionPage;
+import cc.polyfrost.oneconfig.config.migration.vigilance.Migrator;
 import org.jetbrains.annotations.Nullable;
 
 public class Mod {
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/BasicOption.java b/src/main/java/cc/polyfrost/oneconfig/config/elements/BasicOption.java
index d4b4498..d4efeaa 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/interfaces/BasicOption.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/elements/BasicOption.java
@@ -1,4 +1,4 @@
-package cc.polyfrost.oneconfig.config.interfaces;
+package cc.polyfrost.oneconfig.config.elements;
 
 import java.lang.reflect.Field;
 import java.util.function.Supplier;
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/data/OptionCategory.java b/src/main/java/cc/polyfrost/oneconfig/config/elements/OptionCategory.java
index 76b2b34..4a37bfc 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/data/OptionCategory.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/elements/OptionCategory.java
@@ -1,4 +1,4 @@
-package cc.polyfrost.oneconfig.config.data;
+package cc.polyfrost.oneconfig.config.elements;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/data/OptionPage.java b/src/main/java/cc/polyfrost/oneconfig/config/elements/OptionPage.java
index 32a07b9..5eaac8b 100644
--- a/src/main/java/cc/polyfrost/oneconfig/config/data/OptionPage.java
+++ b/src/main/java/cc/polyfrost/oneconfig/config/elements/OptionPage.java
@@ -1,15 +1,12 @@
-package cc.polyfrost.oneconfig.config.data;
+package cc.polyfrost.oneconfig.config.elements;
+
+import cc.polyfrost.oneconfig.config.data.Mod;
 
 import java.util.LinkedHashMap;
 
 public class OptionPage {
     public final String name;
     public final Mod mod;
-    /**
-     * Depth 1 = categories
-     * Depth 2 = subcategories
-     * Depth 3 = list of options
-     */
     public final LinkedHashMap<String, OptionCategory> categories = new LinkedHashMap<>();
 
     public OptionPage(String name, Mod mod) {
diff --git a/src/main/java/cc/polyfrost/oneconfig/config/data/OptionSubcategory.java b/src/main/java/cc/polyfrost/oneconfig/config/elements/OptionSubcategory.java
index e69e077..ff1d770 100644
--- a/src/main/java/cc/polyfro