diff --git a/src/main/java/net/Indyuce/mmocore/MMOCore.java b/src/main/java/net/Indyuce/mmocore/MMOCore.java
index 6db956a7..dbc393eb 100644
--- a/src/main/java/net/Indyuce/mmocore/MMOCore.java
+++ b/src/main/java/net/Indyuce/mmocore/MMOCore.java
@@ -16,10 +16,10 @@ import org.bukkit.scheduler.BukkitRunnable;
 
 import net.Indyuce.mmocore.api.ConfigFile;
 import net.Indyuce.mmocore.api.PlayerActionBar;
-import net.Indyuce.mmocore.api.debug.DebugMode;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource;
 import net.Indyuce.mmocore.api.player.stats.StatType;
+import net.Indyuce.mmocore.api.util.debug.DebugMode;
 import net.Indyuce.mmocore.command.AttributesCommand;
 import net.Indyuce.mmocore.command.ClassCommand;
 import net.Indyuce.mmocore.command.DepositCommand;
diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropItem.java b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropItem.java
index 44bdb94d..c53b8560 100644
--- a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropItem.java
+++ b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/DropItem.java
@@ -6,7 +6,7 @@ import java.util.Random;
 import org.bukkit.inventory.ItemStack;
 
 import net.Indyuce.mmocore.api.load.MMOLineConfig;
-import net.Indyuce.mmocore.api.math.formula.RandomAmount;
+import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
 
 public abstract class DropItem {
 	protected static final Random random = new Random();
diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/GoldDropItem.java b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/GoldDropItem.java
index ef46812c..1ffed335 100644
--- a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/GoldDropItem.java
+++ b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/GoldDropItem.java
@@ -4,8 +4,8 @@ import java.util.List;
 
 import org.bukkit.inventory.ItemStack;
 
-import net.Indyuce.mmocore.api.item.CurrencyItem;
 import net.Indyuce.mmocore.api.load.MMOLineConfig;
+import net.Indyuce.mmocore.api.util.item.CurrencyItem;
 
 public class GoldDropItem extends DropItem {
 	public GoldDropItem(MMOLineConfig config) {
diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/NoteDropItem.java b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/NoteDropItem.java
index 2c07acd6..70fa95b4 100644
--- a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/NoteDropItem.java
+++ b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/NoteDropItem.java
@@ -4,8 +4,8 @@ import java.util.List;
 
 import org.bukkit.inventory.ItemStack;
 
-import net.Indyuce.mmocore.api.item.CurrencyItem;
 import net.Indyuce.mmocore.api.load.MMOLineConfig;
+import net.Indyuce.mmocore.api.util.item.CurrencyItem;
 
 public class NoteDropItem extends DropItem {
 	private int min, max;
diff --git a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/fishing/FishingDropItem.java b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/fishing/FishingDropItem.java
index 53d85801..d0950da9 100644
--- a/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/fishing/FishingDropItem.java
+++ b/src/main/java/net/Indyuce/mmocore/api/droptable/dropitem/fishing/FishingDropItem.java
@@ -8,7 +8,7 @@ import org.bukkit.inventory.ItemStack;
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.droptable.dropitem.DropItem;
 import net.Indyuce.mmocore.api.load.MMOLineConfig;
-import net.Indyuce.mmocore.api.math.formula.RandomAmount;
+import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
 
 public class FishingDropItem {
 	private final RandomAmount experience, tugs;
diff --git a/src/main/java/net/Indyuce/mmocore/api/eco/Withdraw.java b/src/main/java/net/Indyuce/mmocore/api/eco/Withdraw.java
index f4b0dc84..2852be9c 100644
--- a/src/main/java/net/Indyuce/mmocore/api/eco/Withdraw.java
+++ b/src/main/java/net/Indyuce/mmocore/api/eco/Withdraw.java
@@ -17,8 +17,8 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.ItemStack;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.item.CurrencyItem;
-import net.Indyuce.mmocore.api.item.SmartGive;
+import net.Indyuce.mmocore.api.util.item.CurrencyItem;
+import net.Indyuce.mmocore.api.util.item.SmartGive;
 
 public class Withdraw implements Listener {
 	private static final Set<UUID> withdrawing = new HashSet<>();
diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/Profession.java b/src/main/java/net/Indyuce/mmocore/api/experience/Profession.java
index e6f24e66..d0fccc36 100644
--- a/src/main/java/net/Indyuce/mmocore/api/experience/Profession.java
+++ b/src/main/java/net/Indyuce/mmocore/api/experience/Profession.java
@@ -11,7 +11,7 @@ import org.bukkit.potion.PotionType;
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.load.MMOLineConfig;
 import net.Indyuce.mmocore.api.load.MMOLoadException;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.mmogroup.mmolib.MMOLib;
 
 public class Profession {
diff --git a/src/main/java/net/Indyuce/mmocore/api/experience/source/type/SpecificExperienceSource.java b/src/main/java/net/Indyuce/mmocore/api/experience/source/type/SpecificExperienceSource.java
index 1e1f9c05..cddad8fa 100644
--- a/src/main/java/net/Indyuce/mmocore/api/experience/source/type/SpecificExperienceSource.java
+++ b/src/main/java/net/Indyuce/mmocore/api/experience/source/type/SpecificExperienceSource.java
@@ -4,8 +4,8 @@ import org.bukkit.Location;
 
 import net.Indyuce.mmocore.api.experience.Profession;
 import net.Indyuce.mmocore.api.load.MMOLineConfig;
-import net.Indyuce.mmocore.api.math.formula.RandomAmount;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
 
 public abstract class SpecificExperienceSource<T> extends ExperienceSource<T> {
 	private final RandomAmount amount;
diff --git a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
index ffeee467..311a792c 100644
--- a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
+++ b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
@@ -32,7 +32,6 @@ import net.Indyuce.mmocore.api.Waypoint;
 import net.Indyuce.mmocore.api.event.PlayerCastSkillEvent;
 import net.Indyuce.mmocore.api.event.PlayerExperienceGainEvent;
 import net.Indyuce.mmocore.api.event.PlayerLevelUpEvent;
-import net.Indyuce.mmocore.api.math.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute;
 import net.Indyuce.mmocore.api.player.attribute.PlayerAttributes;
 import net.Indyuce.mmocore.api.player.profess.PlayerClass;
@@ -47,6 +46,7 @@ import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.Skill.SkillInfo;
 import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.SkillResult.CancelReason;
+import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.listener.SpellCast.SkillCasting;
 import net.Indyuce.mmoitems.MMOItems;
 import net.md_5.bungee.api.ChatMessageType;
diff --git a/src/main/java/net/Indyuce/mmocore/api/player/Professions.java b/src/main/java/net/Indyuce/mmocore/api/player/Professions.java
index 74a9cb05..689b2030 100644
--- a/src/main/java/net/Indyuce/mmocore/api/player/Professions.java
+++ b/src/main/java/net/Indyuce/mmocore/api/player/Professions.java
@@ -15,7 +15,7 @@ import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.ConfigMessage;
 import net.Indyuce.mmocore.api.event.PlayerLevelUpEvent;
 import net.Indyuce.mmocore.api.experience.Profession;
-import net.Indyuce.mmocore.api.math.particle.SmallParticleEffect;
+import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect;
 
 public class Professions {
 	private final Map<String, Integer> exp = new HashMap<>();
diff --git a/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java b/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java
index 2f813887..1b2f036d 100644
--- a/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java
+++ b/src/main/java/net/Indyuce/mmocore/api/player/profess/PlayerClass.java
@@ -23,13 +23,10 @@ import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.MMOCoreUtils;
 import net.Indyuce.mmocore.api.AltChar;
 import net.Indyuce.mmocore.api.experience.source.type.ExperienceSource;
 import net.Indyuce.mmocore.api.load.MMOLineConfig;
 import net.Indyuce.mmocore.api.load.MMOLoadException;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
-import net.Indyuce.mmocore.api.math.particle.CastingParticle;
 import net.Indyuce.mmocore.api.player.profess.event.EventTrigger;
 import net.Indyuce.mmocore.api.player.profess.resource.ManaDisplayOptions;
 import net.Indyuce.mmocore.api.player.profess.resource.PlayerResource;
@@ -37,6 +34,9 @@ import net.Indyuce.mmocore.api.player.profess.resource.ResourceHandler;
 import net.Indyuce.mmocore.api.player.stats.StatType;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.Skill.SkillInfo;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.particle.CastingParticle;
 import net.Indyuce.mmocore.manager.ClassManager;
 import net.mmogroup.mmolib.version.VersionMaterial;
 
diff --git a/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ResourceHandler.java b/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ResourceHandler.java
index bb363fd9..7c9a88ef 100644
--- a/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ResourceHandler.java
+++ b/src/main/java/net/Indyuce/mmocore/api/player/profess/resource/ResourceHandler.java
@@ -5,8 +5,8 @@ import java.util.function.BiFunction;
 import org.apache.commons.lang.Validate;
 import org.bukkit.configuration.ConfigurationSection;
 
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 
 public class ResourceHandler {
 
diff --git a/src/main/java/net/Indyuce/mmocore/api/player/stats/StatType.java b/src/main/java/net/Indyuce/mmocore/api/player/stats/StatType.java
index 64bc10ff..449ff797 100644
--- a/src/main/java/net/Indyuce/mmocore/api/player/stats/StatType.java
+++ b/src/main/java/net/Indyuce/mmocore/api/player/stats/StatType.java
@@ -7,7 +7,7 @@ import org.bukkit.configuration.file.FileConfiguration;
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.ConfigFile;
 import net.Indyuce.mmocore.api.experience.Profession;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 
 public enum StatType {
 
diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ExperienceTrigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ExperienceTrigger.java
index baafaef1..a232022d 100644
--- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ExperienceTrigger.java
+++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ExperienceTrigger.java
@@ -6,8 +6,8 @@ import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.experience.ExperienceInfo;
 import net.Indyuce.mmocore.api.experience.Profession;
 import net.Indyuce.mmocore.api.load.MMOLineConfig;
-import net.Indyuce.mmocore.api.math.formula.RandomAmount;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
 
 public class ExperienceTrigger extends Trigger {
 	private final RandomAmount amount;
diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ItemTrigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ItemTrigger.java
index 76d215c9..4e89fea6 100644
--- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ItemTrigger.java
+++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ItemTrigger.java
@@ -3,9 +3,9 @@ package net.Indyuce.mmocore.api.quest.trigger;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
-import net.Indyuce.mmocore.api.item.SmartGive;
 import net.Indyuce.mmocore.api.load.MMOLineConfig;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.item.SmartGive;
 
 public class ItemTrigger extends Trigger {
 	private final Material material;
diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ManaTrigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ManaTrigger.java
index 512d0431..c55eb502 100644
--- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ManaTrigger.java
+++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/ManaTrigger.java
@@ -1,8 +1,8 @@
 package net.Indyuce.mmocore.api.quest.trigger;
 
 import net.Indyuce.mmocore.api.load.MMOLineConfig;
-import net.Indyuce.mmocore.api.math.formula.RandomAmount;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
 
 public class ManaTrigger extends Trigger {
 	private final RandomAmount amount;
diff --git a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StelliumTrigger.java b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StelliumTrigger.java
index d6e27773..9b999ee4 100644
--- a/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StelliumTrigger.java
+++ b/src/main/java/net/Indyuce/mmocore/api/quest/trigger/StelliumTrigger.java
@@ -1,9 +1,9 @@
 package net.Indyuce.mmocore.api.quest.trigger;
 
 import net.Indyuce.mmocore.api.load.MMOLineConfig;
-import net.Indyuce.mmocore.api.math.formula.RandomAmount;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.quest.trigger.ManaTrigger.Operation;
+import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
 
 public class StelliumTrigger extends Trigger {
 	private final RandomAmount amount;
diff --git a/src/main/java/net/Indyuce/mmocore/api/skill/Skill.java b/src/main/java/net/Indyuce/mmocore/api/skill/Skill.java
index 2c1494ca..38f9c4ec 100644
--- a/src/main/java/net/Indyuce/mmocore/api/skill/Skill.java
+++ b/src/main/java/net/Indyuce/mmocore/api/skill/Skill.java
@@ -14,11 +14,11 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.inventory.ItemStack;
 
-import net.Indyuce.mmocore.MMOCoreUtils;
-import net.Indyuce.mmocore.api.math.formula.IntegerLinearValue;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.SkillResult.CancelReason;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
+import net.Indyuce.mmocore.api.util.math.formula.IntegerLinearValue;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 
 public abstract class Skill {
 	private final String id;
diff --git a/src/main/java/net/Indyuce/mmocore/api/skill/TargetSkillResult.java b/src/main/java/net/Indyuce/mmocore/api/skill/TargetSkillResult.java
index d7159efd..89c989ae 100644
--- a/src/main/java/net/Indyuce/mmocore/api/skill/TargetSkillResult.java
+++ b/src/main/java/net/Indyuce/mmocore/api/skill/TargetSkillResult.java
@@ -3,9 +3,9 @@ package net.Indyuce.mmocore.api.skill;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.util.RayTraceResult;
 
-import net.Indyuce.mmocore.MMOCoreUtils;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill.SkillInfo;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
 
 public class TargetSkillResult extends SkillResult {
 	private LivingEntity target;
diff --git a/src/main/java/net/Indyuce/mmocore/MMOCoreUtils.java b/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java
similarity index 98%
rename from src/main/java/net/Indyuce/mmocore/MMOCoreUtils.java
rename to src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java
index 664c9d78..f61782d9 100644
--- a/src/main/java/net/Indyuce/mmocore/MMOCoreUtils.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/MMOCoreUtils.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore;
+package net.Indyuce.mmocore.api.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -20,6 +20,7 @@ import org.bukkit.util.io.BukkitObjectInputStream;
 import org.bukkit.util.io.BukkitObjectOutputStream;
 import org.yaml.snakeyaml.external.biz.base64Coder.Base64Coder;
 
+import net.Indyuce.mmocore.MMOCore;
 import net.mmogroup.mmolib.MMOLib;
 
 public class MMOCoreUtils {
diff --git a/src/main/java/net/Indyuce/mmocore/api/debug/ActionBarRunnable.java b/src/main/java/net/Indyuce/mmocore/api/util/debug/ActionBarRunnable.java
similarity index 92%
rename from src/main/java/net/Indyuce/mmocore/api/debug/ActionBarRunnable.java
rename to src/main/java/net/Indyuce/mmocore/api/util/debug/ActionBarRunnable.java
index 38770812..3a81df8b 100644
--- a/src/main/java/net/Indyuce/mmocore/api/debug/ActionBarRunnable.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/debug/ActionBarRunnable.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.debug;
+package net.Indyuce.mmocore.api.util.debug;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/net/Indyuce/mmocore/api/debug/DebugMode.java b/src/main/java/net/Indyuce/mmocore/api/util/debug/DebugMode.java
similarity index 80%
rename from src/main/java/net/Indyuce/mmocore/api/debug/DebugMode.java
rename to src/main/java/net/Indyuce/mmocore/api/util/debug/DebugMode.java
index 74be61d7..6497f94c 100644
--- a/src/main/java/net/Indyuce/mmocore/api/debug/DebugMode.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/debug/DebugMode.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.debug;
+package net.Indyuce.mmocore.api.util.debug;
 
 import net.Indyuce.mmocore.MMOCore;
 
diff --git a/src/main/java/net/Indyuce/mmocore/api/input/AnvilGUI.java b/src/main/java/net/Indyuce/mmocore/api/util/input/AnvilGUI.java
similarity index 98%
rename from src/main/java/net/Indyuce/mmocore/api/input/AnvilGUI.java
rename to src/main/java/net/Indyuce/mmocore/api/util/input/AnvilGUI.java
index 8cbbd126..a8e4bddb 100644
--- a/src/main/java/net/Indyuce/mmocore/api/input/AnvilGUI.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/input/AnvilGUI.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.input;
+package net.Indyuce.mmocore.api.util.input;
 
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/net/Indyuce/mmocore/api/input/ChatInput.java b/src/main/java/net/Indyuce/mmocore/api/util/input/ChatInput.java
similarity index 96%
rename from src/main/java/net/Indyuce/mmocore/api/input/ChatInput.java
rename to src/main/java/net/Indyuce/mmocore/api/util/input/ChatInput.java
index 162db4a8..9f7267ce 100644
--- a/src/main/java/net/Indyuce/mmocore/api/input/ChatInput.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/input/ChatInput.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.input;
+package net.Indyuce.mmocore.api.util.input;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/net/Indyuce/mmocore/api/input/PlayerInput.java b/src/main/java/net/Indyuce/mmocore/api/util/input/PlayerInput.java
similarity index 95%
rename from src/main/java/net/Indyuce/mmocore/api/input/PlayerInput.java
rename to src/main/java/net/Indyuce/mmocore/api/util/input/PlayerInput.java
index b2022267..aa1f374f 100644
--- a/src/main/java/net/Indyuce/mmocore/api/input/PlayerInput.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/input/PlayerInput.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.input;
+package net.Indyuce.mmocore.api.util.input;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
diff --git a/src/main/java/net/Indyuce/mmocore/api/item/ConfigItem.java b/src/main/java/net/Indyuce/mmocore/api/util/item/ConfigItem.java
similarity index 98%
rename from src/main/java/net/Indyuce/mmocore/api/item/ConfigItem.java
rename to src/main/java/net/Indyuce/mmocore/api/util/item/ConfigItem.java
index 1f3a2977..9aced1ac 100644
--- a/src/main/java/net/Indyuce/mmocore/api/item/ConfigItem.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/item/ConfigItem.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.item;
+package net.Indyuce.mmocore.api.util.item;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
diff --git a/src/main/java/net/Indyuce/mmocore/api/item/CurrencyItem.java b/src/main/java/net/Indyuce/mmocore/api/util/item/CurrencyItem.java
similarity index 96%
rename from src/main/java/net/Indyuce/mmocore/api/item/CurrencyItem.java
rename to src/main/java/net/Indyuce/mmocore/api/util/item/CurrencyItem.java
index 5b250b1c..3dbeccd7 100644
--- a/src/main/java/net/Indyuce/mmocore/api/item/CurrencyItem.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/item/CurrencyItem.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.item;
+package net.Indyuce.mmocore.api.util.item;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/net/Indyuce/mmocore/api/item/NamedItemStack.java b/src/main/java/net/Indyuce/mmocore/api/util/item/NamedItemStack.java
similarity index 90%
rename from src/main/java/net/Indyuce/mmocore/api/item/NamedItemStack.java
rename to src/main/java/net/Indyuce/mmocore/api/util/item/NamedItemStack.java
index 55a903a1..8a46934e 100644
--- a/src/main/java/net/Indyuce/mmocore/api/item/NamedItemStack.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/item/NamedItemStack.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.item;
+package net.Indyuce.mmocore.api.util.item;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
diff --git a/src/main/java/net/Indyuce/mmocore/api/item/SmartGive.java b/src/main/java/net/Indyuce/mmocore/api/util/item/SmartGive.java
similarity index 94%
rename from src/main/java/net/Indyuce/mmocore/api/item/SmartGive.java
rename to src/main/java/net/Indyuce/mmocore/api/util/item/SmartGive.java
index 3f4be946..506365fa 100644
--- a/src/main/java/net/Indyuce/mmocore/api/item/SmartGive.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/item/SmartGive.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.item;
+package net.Indyuce.mmocore.api.util.item;
 
 import java.util.List;
 
diff --git a/src/main/java/net/Indyuce/mmocore/api/math/Line3D.java b/src/main/java/net/Indyuce/mmocore/api/util/math/Line3D.java
similarity index 89%
rename from src/main/java/net/Indyuce/mmocore/api/math/Line3D.java
rename to src/main/java/net/Indyuce/mmocore/api/util/math/Line3D.java
index 3275b2b4..6ab5683a 100644
--- a/src/main/java/net/Indyuce/mmocore/api/math/Line3D.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/math/Line3D.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.math;
+package net.Indyuce.mmocore.api.util.math;
 
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;
@@ -38,8 +38,8 @@ public class Line3D {
 		// ( a + t * alpha - e ; b + t * beta - f ; c + t * gamma - g )
 
 		// length of vector is:
-		// d = sqrt( (a-e)² + (b-f)² + (c-g)² + 2t( alpha(a-e) + beta(b-f) +
-		// gamma(c-g) ) + t²(alpha² + beta² + gamma²) )
+		// d = sqrt( (a-e)� + (b-f)� + (c-g)� + 2t( alpha(a-e) + beta(b-f) +
+		// gamma(c-g) ) + t�(alpha� + beta� + gamma�) )
 
 		// analysis: we find the value of t for which the distance d is the
 		// smallest. (canonical form) axis of symetry is min = -b/2a therefore
diff --git a/src/main/java/net/Indyuce/mmocore/api/math/VectorRotation.java b/src/main/java/net/Indyuce/mmocore/api/util/math/VectorRotation.java
similarity index 96%
rename from src/main/java/net/Indyuce/mmocore/api/math/VectorRotation.java
rename to src/main/java/net/Indyuce/mmocore/api/util/math/VectorRotation.java
index e919714c..548028eb 100644
--- a/src/main/java/net/Indyuce/mmocore/api/math/VectorRotation.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/math/VectorRotation.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.math;
+package net.Indyuce.mmocore.api.util.math;
 
 import org.bukkit.Location;
 import org.bukkit.util.Vector;
diff --git a/src/main/java/net/Indyuce/mmocore/api/math/format/DelayFormat.java b/src/main/java/net/Indyuce/mmocore/api/util/math/format/DelayFormat.java
similarity index 93%
rename from src/main/java/net/Indyuce/mmocore/api/math/format/DelayFormat.java
rename to src/main/java/net/Indyuce/mmocore/api/util/math/format/DelayFormat.java
index ae1a3e52..7635d749 100644
--- a/src/main/java/net/Indyuce/mmocore/api/math/format/DelayFormat.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/math/format/DelayFormat.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.math.format;
+package net.Indyuce.mmocore.api.util.math.format;
 
 public class DelayFormat {
 	private int display = charArray.length;
diff --git a/src/main/java/net/Indyuce/mmocore/api/math/format/RomanFormat.java b/src/main/java/net/Indyuce/mmocore/api/util/math/format/RomanFormat.java
similarity index 66%
rename from src/main/java/net/Indyuce/mmocore/api/math/format/RomanFormat.java
rename to src/main/java/net/Indyuce/mmocore/api/util/math/format/RomanFormat.java
index 29c28676..9726c71f 100644
--- a/src/main/java/net/Indyuce/mmocore/api/math/format/RomanFormat.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/math/format/RomanFormat.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.math.format;
+package net.Indyuce.mmocore.api.util.math.format;
 
 public class RomanFormat {
 
diff --git a/src/main/java/net/Indyuce/mmocore/api/math/formula/IntegerLinearValue.java b/src/main/java/net/Indyuce/mmocore/api/util/math/formula/IntegerLinearValue.java
similarity index 91%
rename from src/main/java/net/Indyuce/mmocore/api/math/formula/IntegerLinearValue.java
rename to src/main/java/net/Indyuce/mmocore/api/util/math/formula/IntegerLinearValue.java
index ebb28d62..5ac319bb 100644
--- a/src/main/java/net/Indyuce/mmocore/api/math/formula/IntegerLinearValue.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/math/formula/IntegerLinearValue.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.math.formula;
+package net.Indyuce.mmocore.api.util.math.formula;
 
 import org.bukkit.configuration.ConfigurationSection;
 
diff --git a/src/main/java/net/Indyuce/mmocore/api/math/formula/LinearValue.java b/src/main/java/net/Indyuce/mmocore/api/util/math/formula/LinearValue.java
similarity index 97%
rename from src/main/java/net/Indyuce/mmocore/api/math/formula/LinearValue.java
rename to src/main/java/net/Indyuce/mmocore/api/util/math/formula/LinearValue.java
index d56e0405..4b11bcc3 100644
--- a/src/main/java/net/Indyuce/mmocore/api/math/formula/LinearValue.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/math/formula/LinearValue.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.math.formula;
+package net.Indyuce.mmocore.api.util.math.formula;
 
 import org.bukkit.configuration.ConfigurationSection;
 
diff --git a/src/main/java/net/Indyuce/mmocore/api/math/formula/RandomAmount.java b/src/main/java/net/Indyuce/mmocore/api/util/math/formula/RandomAmount.java
similarity index 93%
rename from src/main/java/net/Indyuce/mmocore/api/math/formula/RandomAmount.java
rename to src/main/java/net/Indyuce/mmocore/api/util/math/formula/RandomAmount.java
index b7c4ea3c..32d2a714 100644
--- a/src/main/java/net/Indyuce/mmocore/api/math/formula/RandomAmount.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/math/formula/RandomAmount.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.math.formula;
+package net.Indyuce.mmocore.api.util.math.formula;
 
 import java.util.Random;
 
diff --git a/src/main/java/net/Indyuce/mmocore/api/math/particle/CastingParticle.java b/src/main/java/net/Indyuce/mmocore/api/util/math/particle/CastingParticle.java
similarity index 97%
rename from src/main/java/net/Indyuce/mmocore/api/math/particle/CastingParticle.java
rename to src/main/java/net/Indyuce/mmocore/api/util/math/particle/CastingParticle.java
index de758cba..d9b65182 100644
--- a/src/main/java/net/Indyuce/mmocore/api/math/particle/CastingParticle.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/math/particle/CastingParticle.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.math.particle;
+package net.Indyuce.mmocore.api.util.math.particle;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/net/Indyuce/mmocore/api/math/particle/ChestParticleEffect.java b/src/main/java/net/Indyuce/mmocore/api/util/math/particle/ChestParticleEffect.java
similarity index 96%
rename from src/main/java/net/Indyuce/mmocore/api/math/particle/ChestParticleEffect.java
rename to src/main/java/net/Indyuce/mmocore/api/util/math/particle/ChestParticleEffect.java
index cb96aa61..eece7a02 100644
--- a/src/main/java/net/Indyuce/mmocore/api/math/particle/ChestParticleEffect.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/math/particle/ChestParticleEffect.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.math.particle;
+package net.Indyuce.mmocore.api.util.math.particle;
 
 import java.util.function.BiConsumer;
 
diff --git a/src/main/java/net/Indyuce/mmocore/api/math/particle/ParabolicProjectile.java b/src/main/java/net/Indyuce/mmocore/api/util/math/particle/ParabolicProjectile.java
similarity index 98%
rename from src/main/java/net/Indyuce/mmocore/api/math/particle/ParabolicProjectile.java
rename to src/main/java/net/Indyuce/mmocore/api/util/math/particle/ParabolicProjectile.java
index 5149f218..fd4c494e 100644
--- a/src/main/java/net/Indyuce/mmocore/api/math/particle/ParabolicProjectile.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/math/particle/ParabolicProjectile.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.math.particle;
+package net.Indyuce.mmocore.api.util.math.particle;
 
 import java.util.function.Consumer;
 
diff --git a/src/main/java/net/Indyuce/mmocore/api/math/particle/PotionParticles.java b/src/main/java/net/Indyuce/mmocore/api/util/math/particle/PotionParticles.java
similarity index 95%
rename from src/main/java/net/Indyuce/mmocore/api/math/particle/PotionParticles.java
rename to src/main/java/net/Indyuce/mmocore/api/util/math/particle/PotionParticles.java
index 8d049b62..ba51c846 100644
--- a/src/main/java/net/Indyuce/mmocore/api/math/particle/PotionParticles.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/math/particle/PotionParticles.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.math.particle;
+package net.Indyuce.mmocore.api.util.math.particle;
 
 import org.bukkit.Color;
 import org.bukkit.Particle;
diff --git a/src/main/java/net/Indyuce/mmocore/api/math/particle/SmallParticleEffect.java b/src/main/java/net/Indyuce/mmocore/api/util/math/particle/SmallParticleEffect.java
similarity index 94%
rename from src/main/java/net/Indyuce/mmocore/api/math/particle/SmallParticleEffect.java
rename to src/main/java/net/Indyuce/mmocore/api/util/math/particle/SmallParticleEffect.java
index 77b85ed7..07075d2f 100644
--- a/src/main/java/net/Indyuce/mmocore/api/math/particle/SmallParticleEffect.java
+++ b/src/main/java/net/Indyuce/mmocore/api/util/math/particle/SmallParticleEffect.java
@@ -1,4 +1,4 @@
-package net.Indyuce.mmocore.api.math.particle;
+package net.Indyuce.mmocore.api.util.math.particle;
 
 import org.bukkit.Location;
 import org.bukkit.Particle;
diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandMap.java b/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandMap.java
index fe261f46..9814d8d8 100644
--- a/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandMap.java
+++ b/src/main/java/net/Indyuce/mmocore/command/rpg/CoinsCommandMap.java
@@ -5,8 +5,8 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import net.Indyuce.mmocore.api.item.CurrencyItem;
-import net.Indyuce.mmocore.api.item.SmartGive;
+import net.Indyuce.mmocore.api.util.item.CurrencyItem;
+import net.Indyuce.mmocore.api.util.item.SmartGive;
 import net.Indyuce.mmocore.command.api.CommandEnd;
 import net.Indyuce.mmocore.command.api.CommandMap;
 import net.Indyuce.mmocore.command.api.Parameter;
diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandMap.java b/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandMap.java
index 5c91031d..b04cb901 100644
--- a/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandMap.java
+++ b/src/main/java/net/Indyuce/mmocore/command/rpg/NoteCommandMap.java
@@ -7,8 +7,8 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import net.Indyuce.mmocore.api.item.CurrencyItem;
-import net.Indyuce.mmocore.api.item.SmartGive;
+import net.Indyuce.mmocore.api.util.item.CurrencyItem;
+import net.Indyuce.mmocore.api.util.item.SmartGive;
 import net.Indyuce.mmocore.command.api.CommandEnd;
 import net.Indyuce.mmocore.command.api.CommandMap;
 import net.Indyuce.mmocore.command.api.Parameter;
diff --git a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandMap.java b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandMap.java
index 251ec59b..60cd055c 100644
--- a/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandMap.java
+++ b/src/main/java/net/Indyuce/mmocore/command/rpg/booster/ListCommandMap.java
@@ -6,7 +6,7 @@ import org.bukkit.entity.Player;
 
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.experience.Booster;
-import net.Indyuce.mmocore.api.math.format.DelayFormat;
+import net.Indyuce.mmocore.api.util.math.format.DelayFormat;
 import net.Indyuce.mmocore.command.api.CommandEnd;
 import net.Indyuce.mmocore.command.api.CommandMap;
 import net.mmogroup.mmolib.MMOLib;
diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicMobSkill.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicMobSkill.java
index 35bb5b9d..306d7032 100644
--- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicMobSkill.java
+++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/MythicMobSkill.java
@@ -10,13 +10,13 @@ import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Entity;
 
 import io.lumine.xikage.mythicmobs.MythicMobs;
-import net.Indyuce.mmocore.MMOCoreUtils;
-import net.Indyuce.mmocore.api.math.formula.IntegerLinearValue;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.SkillResult.CancelReason;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
+import net.Indyuce.mmocore.api.util.math.formula.IntegerLinearValue;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 
 public class MythicMobSkill extends Skill {
 	private final io.lumine.xikage.mythicmobs.skills.Skill skill;
diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/CurrencyItemDrop.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/CurrencyItemDrop.java
index fe7d90dc..7a8f4b6e 100644
--- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/CurrencyItemDrop.java
+++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/CurrencyItemDrop.java
@@ -9,7 +9,7 @@ import io.lumine.xikage.mythicmobs.drops.IMultiDrop;
 import io.lumine.xikage.mythicmobs.drops.LootBag;
 import io.lumine.xikage.mythicmobs.drops.droppables.ItemDrop;
 import io.lumine.xikage.mythicmobs.io.MythicLineConfig;
-import net.Indyuce.mmocore.api.item.CurrencyItem;
+import net.Indyuce.mmocore.api.util.item.CurrencyItem;
 
 public class CurrencyItemDrop extends Drop implements IMultiDrop {
 	private String key;
diff --git a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/GoldPouchDrop.java b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/GoldPouchDrop.java
index 7ed8bb83..8d6eeecd 100644
--- a/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/GoldPouchDrop.java
+++ b/src/main/java/net/Indyuce/mmocore/comp/mythicmobs/load/GoldPouchDrop.java
@@ -12,9 +12,9 @@ import io.lumine.xikage.mythicmobs.drops.IMultiDrop;
 import io.lumine.xikage.mythicmobs.drops.LootBag;
 import io.lumine.xikage.mythicmobs.drops.droppables.ItemDrop;
 import io.lumine.xikage.mythicmobs.io.MythicLineConfig;
-import net.Indyuce.mmocore.MMOCoreUtils;
-import net.Indyuce.mmocore.api.item.ConfigItem;
-import net.Indyuce.mmocore.api.item.CurrencyItem;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
+import net.Indyuce.mmocore.api.util.item.ConfigItem;
+import net.Indyuce.mmocore.api.util.item.CurrencyItem;
 import net.mmogroup.mmolib.api.item.ItemTag;
 import net.mmogroup.mmolib.api.item.NBTItem;
 
diff --git a/src/main/java/net/Indyuce/mmocore/comp/vault/MoneyTrigger.java b/src/main/java/net/Indyuce/mmocore/comp/vault/MoneyTrigger.java
index 9b5f2ec9..c3af4555 100644
--- a/src/main/java/net/Indyuce/mmocore/comp/vault/MoneyTrigger.java
+++ b/src/main/java/net/Indyuce/mmocore/comp/vault/MoneyTrigger.java
@@ -2,9 +2,9 @@ package net.Indyuce.mmocore.comp.vault;
 
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.load.MMOLineConfig;
-import net.Indyuce.mmocore.api.math.formula.RandomAmount;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.quest.trigger.Trigger;
+import net.Indyuce.mmocore.api.util.math.formula.RandomAmount;
 
 public class MoneyTrigger extends Trigger {
 	private final RandomAmount amount;
diff --git a/src/main/java/net/Indyuce/mmocore/gui/PlayerStats.java b/src/main/java/net/Indyuce/mmocore/gui/PlayerStats.java
index 078c8156..73be55a6 100644
--- a/src/main/java/net/Indyuce/mmocore/gui/PlayerStats.java
+++ b/src/main/java/net/Indyuce/mmocore/gui/PlayerStats.java
@@ -10,10 +10,10 @@ import org.bukkit.inventory.meta.SkullMeta;
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.experience.Booster;
 import net.Indyuce.mmocore.api.experience.Profession;
-import net.Indyuce.mmocore.api.math.format.DelayFormat;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.player.attribute.PlayerAttribute;
 import net.Indyuce.mmocore.api.player.stats.StatType;
+import net.Indyuce.mmocore.api.util.math.format.DelayFormat;
 import net.Indyuce.mmocore.gui.api.EditableInventory;
 import net.Indyuce.mmocore.gui.api.GeneratedInventory;
 import net.Indyuce.mmocore.gui.api.PluginInventory;
diff --git a/src/main/java/net/Indyuce/mmocore/gui/QuestViewer.java b/src/main/java/net/Indyuce/mmocore/gui/QuestViewer.java
index 41adc337..54fdcef3 100644
--- a/src/main/java/net/Indyuce/mmocore/gui/QuestViewer.java
+++ b/src/main/java/net/Indyuce/mmocore/gui/QuestViewer.java
@@ -18,9 +18,9 @@ import org.bukkit.inventory.meta.ItemMeta;
 
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.experience.Profession;
-import net.Indyuce.mmocore.api.math.format.DelayFormat;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.quest.Quest;
+import net.Indyuce.mmocore.api.util.math.format.DelayFormat;
 import net.Indyuce.mmocore.gui.api.EditableInventory;
 import net.Indyuce.mmocore.gui.api.GeneratedInventory;
 import net.Indyuce.mmocore.gui.api.item.InventoryItem;
diff --git a/src/main/java/net/Indyuce/mmocore/gui/SkillList.java b/src/main/java/net/Indyuce/mmocore/gui/SkillList.java
index 9f8650a7..9f5f0296 100644
--- a/src/main/java/net/Indyuce/mmocore/gui/SkillList.java
+++ b/src/main/java/net/Indyuce/mmocore/gui/SkillList.java
@@ -16,10 +16,10 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.MMOCoreUtils;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.Skill.SkillInfo;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
 import net.Indyuce.mmocore.gui.api.EditableInventory;
 import net.Indyuce.mmocore.gui.api.GeneratedInventory;
 import net.Indyuce.mmocore.gui.api.PluginInventory;
diff --git a/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryPlaceholderItem.java b/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryPlaceholderItem.java
index 6608b1de..9a038a87 100644
--- a/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryPlaceholderItem.java
+++ b/src/main/java/net/Indyuce/mmocore/gui/api/item/InventoryPlaceholderItem.java
@@ -17,7 +17,7 @@ import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.MMOCoreUtils;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
 import net.Indyuce.mmocore.gui.api.GeneratedInventory;
 import net.Indyuce.mmocore.gui.api.PluginInventory;
 import net.mmogroup.mmolib.MMOLib;
diff --git a/src/main/java/net/Indyuce/mmocore/gui/eco/DepositMenu.java b/src/main/java/net/Indyuce/mmocore/gui/eco/DepositMenu.java
index a1a8ebb1..98681563 100644
--- a/src/main/java/net/Indyuce/mmocore/gui/eco/DepositMenu.java
+++ b/src/main/java/net/Indyuce/mmocore/gui/eco/DepositMenu.java
@@ -11,9 +11,9 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.MMOCoreUtils;
-import net.Indyuce.mmocore.api.item.ConfigItem;
-import net.Indyuce.mmocore.api.item.SmartGive;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
+import net.Indyuce.mmocore.api.util.item.ConfigItem;
+import net.Indyuce.mmocore.api.util.item.SmartGive;
 import net.Indyuce.mmocore.gui.api.PluginInventory;
 import net.mmogroup.mmolib.api.item.NBTItem;
 
diff --git a/src/main/java/net/Indyuce/mmocore/gui/eco/GoldPouch.java b/src/main/java/net/Indyuce/mmocore/gui/eco/GoldPouch.java
index 0a664db3..b130cd6e 100644
--- a/src/main/java/net/Indyuce/mmocore/gui/eco/GoldPouch.java
+++ b/src/main/java/net/Indyuce/mmocore/gui/eco/GoldPouch.java
@@ -10,7 +10,7 @@ import org.bukkit.event.inventory.InventoryCloseEvent;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
-import net.Indyuce.mmocore.MMOCoreUtils;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
 import net.Indyuce.mmocore.gui.api.PluginInventory;
 import net.mmogroup.mmolib.api.item.ItemTag;
 import net.mmogroup.mmolib.api.item.NBTItem;
diff --git a/src/main/java/net/Indyuce/mmocore/gui/social/friend/EditableFriendList.java b/src/main/java/net/Indyuce/mmocore/gui/social/friend/EditableFriendList.java
index d9adf4c8..60f2f4d1 100644
--- a/src/main/java/net/Indyuce/mmocore/gui/social/friend/EditableFriendList.java
+++ b/src/main/java/net/Indyuce/mmocore/gui/social/friend/EditableFriendList.java
@@ -15,9 +15,9 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.input.PlayerInput.InputType;
-import net.Indyuce.mmocore.api.math.format.DelayFormat;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.input.PlayerInput.InputType;
+import net.Indyuce.mmocore.api.util.math.format.DelayFormat;
 import net.Indyuce.mmocore.gui.api.EditableInventory;
 import net.Indyuce.mmocore.gui.api.GeneratedInventory;
 import net.Indyuce.mmocore.gui.api.PluginInventory;
diff --git a/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildAdmin.java b/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildAdmin.java
index c4fef270..b7c62e09 100644
--- a/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildAdmin.java
+++ b/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildAdmin.java
@@ -15,9 +15,9 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.input.PlayerInput.InputType;
-import net.Indyuce.mmocore.api.math.format.DelayFormat;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.input.PlayerInput.InputType;
+import net.Indyuce.mmocore.api.util.math.format.DelayFormat;
 import net.Indyuce.mmocore.gui.api.EditableInventory;
 import net.Indyuce.mmocore.gui.api.GeneratedInventory;
 import net.Indyuce.mmocore.gui.api.PluginInventory;
diff --git a/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildCreation.java b/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildCreation.java
index 972ca29c..5b3e83ec 100644
--- a/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildCreation.java
+++ b/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildCreation.java
@@ -6,8 +6,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.InventoryClickEvent;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.input.PlayerInput.InputType;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.input.PlayerInput.InputType;
 import net.Indyuce.mmocore.gui.api.EditableInventory;
 import net.Indyuce.mmocore.gui.api.GeneratedInventory;
 import net.Indyuce.mmocore.gui.api.item.InventoryItem;
diff --git a/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildView.java b/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildView.java
index 64024fc0..c12d21f2 100644
--- a/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildView.java
+++ b/src/main/java/net/Indyuce/mmocore/gui/social/guild/EditableGuildView.java
@@ -15,10 +15,10 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.input.PlayerInput.InputType;
-import net.Indyuce.mmocore.api.math.format.DelayFormat;
 import net.Indyuce.mmocore.api.player.OfflinePlayerData;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.input.PlayerInput.InputType;
+import net.Indyuce.mmocore.api.util.math.format.DelayFormat;
 import net.Indyuce.mmocore.gui.api.EditableInventory;
 import net.Indyuce.mmocore.gui.api.GeneratedInventory;
 import net.Indyuce.mmocore.gui.api.PluginInventory;
diff --git a/src/main/java/net/Indyuce/mmocore/gui/social/party/EditablePartyView.java b/src/main/java/net/Indyuce/mmocore/gui/social/party/EditablePartyView.java
index f3da5626..6cc3b822 100644
--- a/src/main/java/net/Indyuce/mmocore/gui/social/party/EditablePartyView.java
+++ b/src/main/java/net/Indyuce/mmocore/gui/social/party/EditablePartyView.java
@@ -15,9 +15,9 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.input.PlayerInput.InputType;
-import net.Indyuce.mmocore.api.math.format.DelayFormat;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.input.PlayerInput.InputType;
+import net.Indyuce.mmocore.api.util.math.format.DelayFormat;
 import net.Indyuce.mmocore.gui.api.EditableInventory;
 import net.Indyuce.mmocore.gui.api.GeneratedInventory;
 import net.Indyuce.mmocore.gui.api.PluginInventory;
diff --git a/src/main/java/net/Indyuce/mmocore/listener/WaypointsListener.java b/src/main/java/net/Indyuce/mmocore/listener/WaypointsListener.java
index f721de3b..990ef103 100644
--- a/src/main/java/net/Indyuce/mmocore/listener/WaypointsListener.java
+++ b/src/main/java/net/Indyuce/mmocore/listener/WaypointsListener.java
@@ -9,8 +9,8 @@ import org.bukkit.event.player.PlayerToggleSneakEvent;
 
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.Waypoint;
-import net.Indyuce.mmocore.api.math.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.manager.InventoryManager;
 
 public class WaypointsListener implements Listener {
diff --git a/src/main/java/net/Indyuce/mmocore/listener/profession/PlayerCollectStats.java b/src/main/java/net/Indyuce/mmocore/listener/profession/PlayerCollectStats.java
index 2a5d6276..18332c8f 100644
--- a/src/main/java/net/Indyuce/mmocore/listener/profession/PlayerCollectStats.java
+++ b/src/main/java/net/Indyuce/mmocore/listener/profession/PlayerCollectStats.java
@@ -12,8 +12,8 @@ import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
 import net.Indyuce.mmocore.api.event.CustomBlockMineEvent;
-import net.Indyuce.mmocore.api.math.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.api.player.stats.StatType;
+import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect;
 import net.mmogroup.mmolib.MMOLib;
 
 public class PlayerCollectStats implements Listener {
diff --git a/src/main/java/net/Indyuce/mmocore/manager/ConfigItemManager.java b/src/main/java/net/Indyuce/mmocore/manager/ConfigItemManager.java
index 20755b47..bab316c6 100644
--- a/src/main/java/net/Indyuce/mmocore/manager/ConfigItemManager.java
+++ b/src/main/java/net/Indyuce/mmocore/manager/ConfigItemManager.java
@@ -7,7 +7,7 @@ import java.util.logging.Level;
 import org.bukkit.configuration.file.FileConfiguration;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.item.ConfigItem;
+import net.Indyuce.mmocore.api.util.item.ConfigItem;
 
 public class ConfigItemManager {
 	private Map<String, ConfigItem> map = new HashMap<>();
diff --git a/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java b/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java
index 02083b0b..7a67f056 100644
--- a/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java
+++ b/src/main/java/net/Indyuce/mmocore/manager/ConfigManager.java
@@ -18,11 +18,11 @@ import org.bukkit.util.Consumer;
 
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.ConfigFile;
-import net.Indyuce.mmocore.api.input.AnvilGUI;
-import net.Indyuce.mmocore.api.input.ChatInput;
-import net.Indyuce.mmocore.api.input.PlayerInput;
-import net.Indyuce.mmocore.api.input.PlayerInput.InputType;
 import net.Indyuce.mmocore.api.player.PlayerData;
+import net.Indyuce.mmocore.api.util.input.AnvilGUI;
+import net.Indyuce.mmocore.api.util.input.ChatInput;
+import net.Indyuce.mmocore.api.util.input.PlayerInput;
+import net.Indyuce.mmocore.api.util.input.PlayerInput.InputType;
 
 public class ConfigManager {
 
diff --git a/src/main/java/net/Indyuce/mmocore/manager/LootableChestManager.java b/src/main/java/net/Indyuce/mmocore/manager/LootableChestManager.java
index d5843ff6..15134998 100644
--- a/src/main/java/net/Indyuce/mmocore/manager/LootableChestManager.java
+++ b/src/main/java/net/Indyuce/mmocore/manager/LootableChestManager.java
@@ -22,7 +22,7 @@ import org.bukkit.scheduler.BukkitRunnable;
 
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.droptable.DropTable;
-import net.Indyuce.mmocore.api.math.particle.ChestParticleEffect;
+import net.Indyuce.mmocore.api.util.math.particle.ChestParticleEffect;
 
 public class LootableChestManager {
 	private Set<LootableChest> map = new HashSet<>();
diff --git a/src/main/java/net/Indyuce/mmocore/manager/SkillManager.java b/src/main/java/net/Indyuce/mmocore/manager/SkillManager.java
index 27e4c872..10c5a05c 100644
--- a/src/main/java/net/Indyuce/mmocore/manager/SkillManager.java
+++ b/src/main/java/net/Indyuce/mmocore/manager/SkillManager.java
@@ -17,8 +17,8 @@ import org.bukkit.configuration.file.YamlConfiguration;
 
 import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.ConfigFile;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.skill.Skill;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.Indyuce.mmocore.comp.mythicmobs.MythicMobSkill;
 
 public class SkillManager {
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Ambers.java b/src/main/java/net/Indyuce/mmocore/skill/Ambers.java
index fcfb324e..c949d96f 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Ambers.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Ambers.java
@@ -11,12 +11,12 @@ import org.bukkit.event.Listener;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
-import net.Indyuce.mmocore.api.math.particle.ParabolicProjectile;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.player.stats.StatType;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.particle.ParabolicProjectile;
 import net.mmogroup.mmolib.MMOLib;
 import net.mmogroup.mmolib.api.event.PlayerAttackEvent;
 
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Combo_Attack.java b/src/main/java/net/Indyuce/mmocore/skill/Combo_Attack.java
index bb58e305..d6c0d97e 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Combo_Attack.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Combo_Attack.java
@@ -7,11 +7,11 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.TargetSkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.mmogroup.mmolib.MMOLib;
 import net.mmogroup.mmolib.api.AttackResult;
 import net.mmogroup.mmolib.api.DamageType;
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Control.java b/src/main/java/net/Indyuce/mmocore/skill/Control.java
index e0c99564..a77b1fbb 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Control.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Control.java
@@ -14,11 +14,11 @@ import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.TargetSkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.mmogroup.mmolib.version.VersionMaterial;
 import net.mmogroup.mmolib.version.VersionSound;
 
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Deep_Wound.java b/src/main/java/net/Indyuce/mmocore/skill/Deep_Wound.java
index 72638bdf..99db73e0 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Deep_Wound.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Deep_Wound.java
@@ -6,11 +6,11 @@ import org.bukkit.Sound;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.LivingEntity;
 
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.TargetSkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.mmogroup.mmolib.MMOLib;
 import net.mmogroup.mmolib.api.AttackResult;
 import net.mmogroup.mmolib.api.DamageType;
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Empowered_Attack.java b/src/main/java/net/Indyuce/mmocore/skill/Empowered_Attack.java
index 95a19eec..00247aa1 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Empowered_Attack.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Empowered_Attack.java
@@ -11,12 +11,12 @@ import org.bukkit.event.Listener;
 import org.bukkit.util.Vector;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.MMOCoreUtils;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
-import net.Indyuce.mmocore.api.math.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect;
 import net.mmogroup.mmolib.MMOLib;
 import net.mmogroup.mmolib.api.AttackResult;
 import net.mmogroup.mmolib.api.DamageType;
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Evade.java b/src/main/java/net/Indyuce/mmocore/skill/Evade.java
index 525c99c4..0d8e1a25 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Evade.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Evade.java
@@ -10,11 +10,11 @@ import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
-import net.Indyuce.mmocore.api.math.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect;
 import net.mmogroup.mmolib.api.event.PlayerAttackEvent;
 import net.mmogroup.mmolib.version.VersionSound;
 
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Fire_Berserker.java b/src/main/java/net/Indyuce/mmocore/skill/Fire_Berserker.java
index d5acbaeb..23e9f0e5 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Fire_Berserker.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Fire_Berserker.java
@@ -6,9 +6,9 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.mmogroup.mmolib.api.event.PlayerAttackEvent;
 
 public class Fire_Berserker extends Skill implements Listener {
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Fire_Rage.java b/src/main/java/net/Indyuce/mmocore/skill/Fire_Rage.java
index 57841b94..46c2bb65 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Fire_Rage.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Fire_Rage.java
@@ -16,12 +16,12 @@ import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.MMOCoreUtils;
-import net.Indyuce.mmocore.api.math.VectorRotation;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
+import net.Indyuce.mmocore.api.util.math.VectorRotation;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.mmogroup.mmolib.MMOLib;
 import net.mmogroup.mmolib.api.AttackResult;
 import net.mmogroup.mmolib.api.DamageType;
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Fire_Storm.java b/src/main/java/net/Indyuce/mmocore/skill/Fire_Storm.java
index c5436acb..37b55194 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Fire_Storm.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Fire_Storm.java
@@ -9,12 +9,12 @@ import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
-import net.Indyuce.mmocore.api.math.particle.ParabolicProjectile;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.TargetSkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.particle.ParabolicProjectile;
 import net.mmogroup.mmolib.MMOLib;
 import net.mmogroup.mmolib.api.AttackResult;
 import net.mmogroup.mmolib.api.DamageType;
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Fireball.java b/src/main/java/net/Indyuce/mmocore/skill/Fireball.java
index c0c53ef2..39232ff9 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Fireball.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Fireball.java
@@ -9,11 +9,11 @@ import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.MMOCoreUtils;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.mmogroup.mmolib.MMOLib;
 import net.mmogroup.mmolib.api.AttackResult;
 import net.mmogroup.mmolib.api.DamageType;
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Furtive_Strike.java b/src/main/java/net/Indyuce/mmocore/skill/Furtive_Strike.java
index 30fa3753..d032da62 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Furtive_Strike.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Furtive_Strike.java
@@ -5,12 +5,12 @@ import org.bukkit.Particle;
 import org.bukkit.Sound;
 import org.bukkit.entity.LivingEntity;
 
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
-import net.Indyuce.mmocore.api.math.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.TargetSkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect;
 import net.mmogroup.mmolib.MMOLib;
 import net.mmogroup.mmolib.api.AttackResult;
 import net.mmogroup.mmolib.api.DamageType;
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Greater_Healings.java b/src/main/java/net/Indyuce/mmocore/skill/Greater_Healings.java
index c1851192..9cf8441a 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Greater_Healings.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Greater_Healings.java
@@ -6,12 +6,12 @@ import org.bukkit.Sound;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.LivingEntity;
 
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
-import net.Indyuce.mmocore.api.math.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.TargetSkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect;
 
 public class Greater_Healings extends Skill {
 	public Greater_Healings() {
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Human_Shield.java b/src/main/java/net/Indyuce/mmocore/skill/Human_Shield.java
index 032746d3..cd937f00 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Human_Shield.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Human_Shield.java
@@ -12,11 +12,11 @@ import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.TargetSkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.mmogroup.mmolib.version.VersionMaterial;
 
 public class Human_Shield extends Skill {
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Ice_Spikes.java b/src/main/java/net/Indyuce/mmocore/skill/Ice_Spikes.java
index 714658a2..e48a8d6f 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Ice_Spikes.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Ice_Spikes.java
@@ -12,12 +12,12 @@ import org.bukkit.util.RayTraceResult;
 import org.bukkit.util.Vector;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.MMOCoreUtils;
-import net.Indyuce.mmocore.api.math.Line3D;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
+import net.Indyuce.mmocore.api.util.math.Line3D;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.mmogroup.mmolib.MMOLib;
 import net.mmogroup.mmolib.api.AttackResult;
 import net.mmogroup.mmolib.api.DamageType;
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Minor_Healings.java b/src/main/java/net/Indyuce/mmocore/skill/Minor_Healings.java
index a757b95b..72d614dc 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Minor_Healings.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Minor_Healings.java
@@ -6,12 +6,12 @@ import org.bukkit.Sound;
 import org.bukkit.attribute.Attribute;
 import org.bukkit.entity.LivingEntity;
 
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
-import net.Indyuce.mmocore.api.math.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.TargetSkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect;
 
 public class Minor_Healings extends Skill {
 	public Minor_Healings() {
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Power_Mark.java b/src/main/java/net/Indyuce/mmocore/skill/Power_Mark.java
index 632f5cae..e3cb1014 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Power_Mark.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Power_Mark.java
@@ -16,13 +16,13 @@ import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.MMOCoreUtils;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
-import net.Indyuce.mmocore.api.math.particle.ParabolicProjectile;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.player.stats.PlayerStats.CachedStats;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
+import net.Indyuce.mmocore.api.util.MMOCoreUtils;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.particle.ParabolicProjectile;
 import net.mmogroup.mmolib.api.DamageType;
 import net.mmogroup.mmolib.api.event.PlayerAttackEvent;
 import net.mmogroup.mmolib.version.VersionMaterial;
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Sneaky_Picky.java b/src/main/java/net/Indyuce/mmocore/skill/Sneaky_Picky.java
index a226e511..74a0774a 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Sneaky_Picky.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Sneaky_Picky.java
@@ -6,10 +6,10 @@ import org.bukkit.Sound;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.EventHandler;
 
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
 import net.mmogroup.mmolib.api.event.PlayerAttackEvent;
 
 public class Sneaky_Picky extends Skill {
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Telekinesy.java b/src/main/java/net/Indyuce/mmocore/skill/Telekinesy.java
index b54e1d24..d7016f7f 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Telekinesy.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Telekinesy.java
@@ -12,12 +12,12 @@ import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
-import net.Indyuce.mmocore.api.math.particle.ParabolicProjectile;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.TargetSkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.particle.ParabolicProjectile;
 import net.mmogroup.mmolib.version.VersionMaterial;
 import net.mmogroup.mmolib.version.VersionSound;
 
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Warp.java b/src/main/java/net/Indyuce/mmocore/skill/Warp.java
index 81f5d1fb..20cef31a 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Warp.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Warp.java
@@ -6,11 +6,11 @@ import org.bukkit.Particle;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
 
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
-import net.Indyuce.mmocore.api.math.particle.ParabolicProjectile;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.particle.ParabolicProjectile;
 import net.mmogroup.mmolib.version.VersionSound;
 
 public class Warp extends Skill {
diff --git a/src/main/java/net/Indyuce/mmocore/skill/Weaken.java b/src/main/java/net/Indyuce/mmocore/skill/Weaken.java
index df88e275..06bf9a0e 100644
--- a/src/main/java/net/Indyuce/mmocore/skill/Weaken.java
+++ b/src/main/java/net/Indyuce/mmocore/skill/Weaken.java
@@ -11,13 +11,13 @@ import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.util.Vector;
 
 import net.Indyuce.mmocore.MMOCore;
-import net.Indyuce.mmocore.api.math.formula.LinearValue;
-import net.Indyuce.mmocore.api.math.particle.ParabolicProjectile;
-import net.Indyuce.mmocore.api.math.particle.SmallParticleEffect;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.skill.Skill;
 import net.Indyuce.mmocore.api.skill.SkillResult;
 import net.Indyuce.mmocore.api.skill.TargetSkillResult;
+import net.Indyuce.mmocore.api.util.math.formula.LinearValue;
+import net.Indyuce.mmocore.api.util.math.particle.ParabolicProjectile;
+import net.Indyuce.mmocore.api.util.math.particle.SmallParticleEffect;
 import net.mmogroup.mmolib.version.VersionMaterial;
 
 public class Weaken extends Skill {