diff --git a/src/main/java/me/xginko/villageroptimizer/utils/ComponentLoggerProviderImpl.java b/src/main/java/me/xginko/villageroptimizer/logging/ComponentLoggerProviderImpl.java
similarity index 100%
rename from src/main/java/me/xginko/villageroptimizer/utils/ComponentLoggerProviderImpl.java
rename to src/main/java/me/xginko/villageroptimizer/logging/ComponentLoggerProviderImpl.java
diff --git a/src/main/java/me/xginko/villageroptimizer/utils/TranslatableMapper.java b/src/main/java/me/xginko/villageroptimizer/logging/TranslatableMapper.java
similarity index 100%
rename from src/main/java/me/xginko/villageroptimizer/utils/TranslatableMapper.java
rename to src/main/java/me/xginko/villageroptimizer/logging/TranslatableMapper.java
diff --git a/src/main/java/me/xginko/villageroptimizer/utils/Disableable.java b/src/main/java/me/xginko/villageroptimizer/struct/Disableable.java
similarity index 100%
rename from src/main/java/me/xginko/villageroptimizer/utils/Disableable.java
rename to src/main/java/me/xginko/villageroptimizer/struct/Disableable.java
diff --git a/src/main/java/me/xginko/villageroptimizer/utils/Enableable.java b/src/main/java/me/xginko/villageroptimizer/struct/Enableable.java
similarity index 100%
rename from src/main/java/me/xginko/villageroptimizer/utils/Enableable.java
rename to src/main/java/me/xginko/villageroptimizer/struct/Enableable.java
diff --git a/src/main/java/me/xginko/villageroptimizer/enums/Keyring.java b/src/main/java/me/xginko/villageroptimizer/struct/enums/Keyring.java
similarity index 98%
rename from src/main/java/me/xginko/villageroptimizer/enums/Keyring.java
rename to src/main/java/me/xginko/villageroptimizer/struct/enums/Keyring.java
index a7de718..53caade 100644
--- a/src/main/java/me/xginko/villageroptimizer/enums/Keyring.java
+++ b/src/main/java/me/xginko/villageroptimizer/struct/enums/Keyring.java
@@ -52,7 +52,7 @@ public final class Keyring {
         OPTIMIZATION_TYPE("optimization-type"),
         LAST_OPTIMIZE_SYSTIME_MILLIS("last-optimize"),
         LAST_LEVELUP_SYSTIME_MILLIS("last-levelup"),
-        LAST_RESTOCK_SYSTIME_MILLIS("last-restock");
+        LAST_RESTOCK_SYSTIME_MILLIS("last-restock-systime");
 
         private final @NotNull NamespacedKey key;
 
diff --git a/src/main/java/me/xginko/villageroptimizer/enums/OptimizationType.java b/src/main/java/me/xginko/villageroptimizer/struct/enums/OptimizationType.java
similarity index 100%
rename from src/main/java/me/xginko/villageroptimizer/enums/OptimizationType.java
rename to src/main/java/me/xginko/villageroptimizer/struct/enums/OptimizationType.java
diff --git a/src/main/java/me/xginko/villageroptimizer/enums/Permissions.java b/src/main/java/me/xginko/villageroptimizer/struct/enums/Permissions.java
similarity index 100%
rename from src/main/java/me/xginko/villageroptimizer/enums/Permissions.java
rename to src/main/java/me/xginko/villageroptimizer/struct/enums/Permissions.java
diff --git a/src/main/java/me/xginko/villageroptimizer/utils/ExpiringSet.java b/src/main/java/me/xginko/villageroptimizer/struct/models/ExpiringSet.java
similarity index 100%
rename from src/main/java/me/xginko/villageroptimizer/utils/ExpiringSet.java
rename to src/main/java/me/xginko/villageroptimizer/struct/models/ExpiringSet.java