diff --git a/core/src/main/java/com/gmail/nossr50/core/config/experience/ExperienceConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/experience/ExperienceConfig.java
index c7890622f..7c27e25f1 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/experience/ExperienceConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/experience/ExperienceConfig.java
@@ -1,10 +1,10 @@
 package com.gmail.nossr50.core.config.experience;
 
 import com.gmail.nossr50.core.config.skills.AutoUpdateConfigLoader;
-import com.gmail.nossr50.core.datatypes.experience.FormulaType;
-import com.gmail.nossr50.core.datatypes.skills.MaterialType;
-import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.core.datatypes.skills.alchemy.PotionStage;
+import com.gmail.nossr50.core.mcmmo.experience.FormulaType;
+import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
+import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
+import com.gmail.nossr50.core.mcmmo.skills.alchemy.PotionStage;
 import com.gmail.nossr50.util.StringUtils;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomArmorConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomArmorConfig.java
index 1ebaacaf2..915fd6cfa 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomArmorConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomArmorConfig.java
@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.config.mods;
 
 import com.gmail.nossr50.core.config.skills.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.skills.ItemType;
-import com.gmail.nossr50.core.datatypes.skills.MaterialType;
+import com.gmail.nossr50.core.mcmmo.skills.ItemType;
+import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
 import com.gmail.nossr50.util.skills.SkillUtils;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomBlockConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomBlockConfig.java
index 58a836471..2c2afadc1 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomBlockConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomBlockConfig.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.config.mods;
 
 import com.gmail.nossr50.core.config.skills.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.mods.CustomBlock;
+import com.gmail.nossr50.core.mcmmo.mods.CustomBlock;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomEntityConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomEntityConfig.java
index ed3263ca4..e0ebd99de 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomEntityConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomEntityConfig.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.config.mods;
 
 import com.gmail.nossr50.core.config.skills.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.mods.CustomEntity;
+import com.gmail.nossr50.core.mcmmo.mods.CustomEntity;
 import org.apache.commons.lang.ClassUtils;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomToolConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomToolConfig.java
index e0e7249a5..1f3a429b0 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomToolConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/mods/CustomToolConfig.java
@@ -1,9 +1,9 @@
 package com.gmail.nossr50.core.config.mods;
 
 import com.gmail.nossr50.core.config.skills.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.mods.CustomTool;
-import com.gmail.nossr50.core.datatypes.skills.ItemType;
-import com.gmail.nossr50.core.datatypes.skills.MaterialType;
+import com.gmail.nossr50.core.mcmmo.mods.CustomTool;
+import com.gmail.nossr50.core.mcmmo.skills.ItemType;
+import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
 import com.gmail.nossr50.util.skills.SkillUtils;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/skills/AdvancedConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/skills/AdvancedConfig.java
index 72fe7bc85..13dc1a48e 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/skills/AdvancedConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/skills/AdvancedConfig.java
@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.config.skills;
 
-import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
-import com.gmail.nossr50.core.datatypes.skills.SubSkillType;
-import com.gmail.nossr50.core.datatypes.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.core.mcmmo.interactions.NotificationType;
+import com.gmail.nossr50.core.mcmmo.skills.SubSkillType;
+import com.gmail.nossr50.core.mcmmo.skills.subskills.AbstractSubSkill;
 import com.gmail.nossr50.mcMMO;
 import net.md_5.bungee.api.ChatColor;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/skills/Config.java b/core/src/main/java/com/gmail/nossr50/core/config/skills/Config.java
index 7145c6216..6fea3abc7 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/skills/Config.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/skills/Config.java
@@ -1,10 +1,10 @@
 package com.gmail.nossr50.core.config.skills;
 
 import com.gmail.nossr50.core.data.database.SQLDatabaseManager;
-import com.gmail.nossr50.core.datatypes.MobHealthbarType;
-import com.gmail.nossr50.core.datatypes.party.PartyFeature;
-import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.core.mcmmo.MobHealthbarType;
+import com.gmail.nossr50.core.mcmmo.party.PartyFeature;
+import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
+import com.gmail.nossr50.core.mcmmo.skills.SuperAbilityType;
 import com.gmail.nossr50.util.StringUtils;
 import org.bukkit.Material;
 import org.bukkit.block.data.BlockData;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/skills/CoreSkillsConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/skills/CoreSkillsConfig.java
index f08b41db7..4f7fcb753 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/skills/CoreSkillsConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/skills/CoreSkillsConfig.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.config.skills;
 
-import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.core.datatypes.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
+import com.gmail.nossr50.core.mcmmo.skills.subskills.AbstractSubSkill;
 import com.gmail.nossr50.util.StringUtils;
 
 public class CoreSkillsConfig extends AutoUpdateConfigLoader {
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/skills/RankConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/skills/RankConfig.java
index 651c67bce..0f169b27d 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/skills/RankConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/skills/RankConfig.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.config.skills;
 
-import com.gmail.nossr50.core.datatypes.skills.SubSkillType;
-import com.gmail.nossr50.core.datatypes.skills.subskills.AbstractSubSkill;
+import com.gmail.nossr50.core.mcmmo.skills.SubSkillType;
+import com.gmail.nossr50.core.mcmmo.skills.subskills.AbstractSubSkill;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/skills/alchemy/PotionConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/skills/alchemy/PotionConfig.java
index 0b38de157..1bdf70c9c 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/skills/alchemy/PotionConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/skills/alchemy/PotionConfig.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.config.skills.alchemy;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.skills.alchemy.AlchemyPotion;
+import com.gmail.nossr50.core.mcmmo.skills.alchemy.AlchemyPotion;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.ChatColor;
 import org.bukkit.Color;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/skills/repair/RepairConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/skills/repair/RepairConfig.java
index 42993c1df..b676c0ad3 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/skills/repair/RepairConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/skills/repair/RepairConfig.java
@@ -1,8 +1,8 @@
 package com.gmail.nossr50.config.skills.repair;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.skills.ItemType;
-import com.gmail.nossr50.core.datatypes.skills.MaterialType;
+import com.gmail.nossr50.core.mcmmo.skills.ItemType;
+import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
 import com.gmail.nossr50.util.ItemUtils;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/skills/salvage/SalvageConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/skills/salvage/SalvageConfig.java
index e476b6751..76c540838 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/skills/salvage/SalvageConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/skills/salvage/SalvageConfig.java
@@ -1,8 +1,8 @@
 package com.gmail.nossr50.config.skills.salvage;
 
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.core.datatypes.skills.ItemType;
-import com.gmail.nossr50.core.datatypes.skills.MaterialType;
+import com.gmail.nossr50.core.mcmmo.skills.ItemType;
+import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
 import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
 import com.gmail.nossr50.skills.salvage.salvageables.SalvageableFactory;
 import com.gmail.nossr50.util.ItemUtils;
diff --git a/core/src/main/java/com/gmail/nossr50/core/data/UserManager.java b/core/src/main/java/com/gmail/nossr50/core/data/UserManager.java
index d49d3d88e..0768f4829 100644
--- a/core/src/main/java/com/gmail/nossr50/core/data/UserManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/data/UserManager.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.data;
 
-import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.mcmmo.player.McMMOPlayer;
 import com.gmail.nossr50.mcMMO;
 import com.google.common.collect.ImmutableList;
 import org.bukkit.OfflinePlayer;
diff --git a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/chunkmeta/PrimitiveChunkStore.java b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/chunkmeta/PrimitiveChunkStore.java
index 8af3897f2..58388c6bf 100644
--- a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/chunkmeta/PrimitiveChunkStore.java
+++ b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/chunkmeta/PrimitiveChunkStore.java
@@ -1,8 +1,7 @@
 package com.gmail.nossr50.core.data.blockmeta.chunkmeta;
 
 import com.gmail.nossr50.core.data.blockmeta.ChunkletStore;
-import org.bukkit.Bukkit;
-import org.bukkit.World;
+import com.gmail.nossr50.core.mcmmo.World;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/core/src/main/java/com/gmail/nossr50/core/data/database/DatabaseManager.java b/core/src/main/java/com/gmail/nossr50/core/data/database/DatabaseManager.java
index bdd928b7f..d8ccae273 100644
--- a/core/src/main/java/com/gmail/nossr50/core/data/database/DatabaseManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/data/database/DatabaseManager.java
@@ -1,10 +1,10 @@
 package com.gmail.nossr50.core.data.database;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.core.datatypes.database.DatabaseType;
-import com.gmail.nossr50.core.datatypes.database.PlayerStat;
-import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
+import com.gmail.nossr50.core.mcmmo.database.DatabaseType;
+import com.gmail.nossr50.core.mcmmo.database.PlayerStat;
+import com.gmail.nossr50.core.mcmmo.player.PlayerProfile;
+import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
 
 import java.util.List;
 import java.util.Map;
diff --git a/core/src/main/java/com/gmail/nossr50/core/data/database/DatabaseManagerFactory.java b/core/src/main/java/com/gmail/nossr50/core/data/database/DatabaseManagerFactory.java
index d999a11bd..d1e4bc497 100644
--- a/core/src/main/java/com/gmail/nossr50/core/data/database/DatabaseManagerFactory.java
+++ b/core/src/main/java/com/gmail/nossr50/core/data/database/DatabaseManagerFactory.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.data.database;
 
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.core.datatypes.database.DatabaseType;
+import com.gmail.nossr50.core.mcmmo.database.DatabaseType;
 import com.gmail.nossr50.mcMMO;
 
 public class DatabaseManagerFactory {
diff --git a/core/src/main/java/com/gmail/nossr50/core/data/database/FlatfileDatabaseManager.java b/core/src/main/java/com/gmail/nossr50/core/data/database/FlatfileDatabaseManager.java
index 0c33fcad0..0fa7ad213 100644
--- a/core/src/main/java/com/gmail/nossr50/core/data/database/FlatfileDatabaseManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/data/database/FlatfileDatabaseManager.java
@@ -2,14 +2,14 @@ package com.gmail.nossr50.core.data.database;
 
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.core.datatypes.MobHealthbarType;
-import com.gmail.nossr50.core.datatypes.database.DatabaseType;
-import com.gmail.nossr50.core.datatypes.database.PlayerStat;
-import com.gmail.nossr50.core.datatypes.database.UpgradeType;
-import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.core.datatypes.player.UniqueDataType;
-import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.core.mcmmo.MobHealthbarType;
+import com.gmail.nossr50.core.mcmmo.database.DatabaseType;
+import com.gmail.nossr50.core.mcmmo.database.PlayerStat;
+import com.gmail.nossr50.core.mcmmo.database.UpgradeType;
+import com.gmail.nossr50.core.mcmmo.player.PlayerProfile;
+import com.gmail.nossr50.core.mcmmo.player.UniqueDataType;
+import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
+import com.gmail.nossr50.core.mcmmo.skills.SuperAbilityType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask;
 import com.gmail.nossr50.util.Misc;
diff --git a/core/src/main/java/com/gmail/nossr50/core/data/database/SQLDatabaseManager.java b/core/src/main/java/com/gmail/nossr50/core/data/database/SQLDatabaseManager.java
index cf668ba01..d05476b61 100644
--- a/core/src/main/java/com/gmail/nossr50/core/data/database/SQLDatabaseManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/data/database/SQLDatabaseManager.java
@@ -2,14 +2,14 @@ package com.gmail.nossr50.core.data.database;
 
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.core.datatypes.MobHealthbarType;
-import com.gmail.nossr50.core.datatypes.database.DatabaseType;
-import com.gmail.nossr50.core.datatypes.database.PlayerStat;
-import com.gmail.nossr50.core.datatypes.database.UpgradeType;
-import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
-import com.gmail.nossr50.core.datatypes.player.UniqueDataType;
-import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
-import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.core.mcmmo.MobHealthbarType;
+import com.gmail.nossr50.core.mcmmo.database.DatabaseType;
+import com.gmail.nossr50.core.mcmmo.database.PlayerStat;
+import com.gmail.nossr50.core.mcmmo.database.UpgradeType;
+import com.gmail.nossr50.core.mcmmo.player.PlayerProfile;
+import com.gmail.nossr50.core.mcmmo.player.UniqueDataType;
+import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
+import com.gmail.nossr50.core.mcmmo.skills.SuperAbilityType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.database.UUIDUpdateAsyncTask;
 import com.gmail.nossr50.util.Misc;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/LimitedSizeList.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/LimitedSizeList.java
similarity index 96%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/LimitedSizeList.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/LimitedSizeList.java
index 6cf5a1a01..36aa98d47 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/LimitedSizeList.java
+++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/LimitedSizeList.java
@@ -1,7 +1,6 @@
 package com.gmail.nossr50.core.datatypes;
 
-
-import org.bukkit.Location;
+import com.gmail.nossr50.core.mcmmo.Location;
 
 public class LimitedSizeList {
     public Location[] limitedSizeOrderedList;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/MobHealthbarType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/MobHealthbarType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/MobHealthbarType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/MobHealthbarType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/chat/ChatMode.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/chat/ChatMode.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/chat/ChatMode.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/chat/ChatMode.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/database/DatabaseType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/database/DatabaseType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/database/DatabaseType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/database/DatabaseType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/database/PlayerStat.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/database/PlayerStat.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/database/PlayerStat.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/database/PlayerStat.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/database/UpgradeType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/database/UpgradeType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/database/UpgradeType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/database/UpgradeType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/experience/FormulaType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/experience/FormulaType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/experience/FormulaType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/experience/FormulaType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/experience/SkillXpGain.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/experience/SkillXpGain.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/experience/SkillXpGain.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/experience/SkillXpGain.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/experience/XPGainReason.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/experience/XPGainReason.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/experience/XPGainReason.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/experience/XPGainReason.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/experience/XPGainSource.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/experience/XPGainSource.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/experience/XPGainSource.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/experience/XPGainSource.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/interactions/NotificationType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/interactions/NotificationType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/interactions/NotificationType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/interactions/NotificationType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/json/CustomBaseComponent.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/json/CustomBaseComponent.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/json/CustomBaseComponent.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/json/CustomBaseComponent.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOUrl.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOUrl.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOUrl.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOUrl.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOWebLinks.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOWebLinks.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOWebLinks.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/json/McMMOWebLinks.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/meta/OldName.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/meta/OldName.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/meta/OldName.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/meta/OldName.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomBlock.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomBlock.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomBlock.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomBlock.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomEntity.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomEntity.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomEntity.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomEntity.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomTool.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomTool.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomTool.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/mods/CustomTool.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/party/ItemShareType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/ItemShareType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/party/ItemShareType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/party/ItemShareType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyLeader.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyLeader.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyLeader.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyLeader.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/party/ShareMode.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/ShareMode.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/party/ShareMode.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/party/ShareMode.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java
index 93c993e57..a54450686 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java
+++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java
@@ -4,15 +4,15 @@ import com.gmail.nossr50.core.config.skills.AdvancedConfig;
 import com.gmail.nossr50.core.config.skills.Config;
 import com.gmail.nossr50.core.config.skills.WorldBlacklist;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.datatypes.chat.ChatMode;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.experience.XPGainSource;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
-import com.gmail.nossr50.core.datatypes.mods.CustomTool;
-import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord;
 import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.core.datatypes.chat.ChatMode;
+import com.gmail.nossr50.core.datatypes.mods.CustomTool;
+import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.datatypes.skills.ToolType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java
index e0c3ca446..e02db264e 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java
+++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java
@@ -3,11 +3,11 @@ package com.gmail.nossr50.core.datatypes.player;
 import com.gmail.nossr50.core.config.skills.AdvancedConfig;
 import com.gmail.nossr50.core.config.skills.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.datatypes.MobHealthbarType;
 import com.gmail.nossr50.core.datatypes.experience.FormulaType;
 import com.gmail.nossr50.core.datatypes.experience.SkillXpGain;
 import com.gmail.nossr50.core.datatypes.skills.PrimarySkillType;
 import com.gmail.nossr50.core.datatypes.skills.SuperAbilityType;
+import com.gmail.nossr50.core.datatypes.MobHealthbarType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.player.PlayerProfileSaveTask;
 import com.gmail.nossr50.skills.child.FamilyTree;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/player/UniqueDataType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/UniqueDataType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/player/UniqueDataType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/player/UniqueDataType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/ItemType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/ItemType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/ItemType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/ItemType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/MaterialType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/MaterialType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/MaterialType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/MaterialType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/ModConfigType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/ModConfigType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/ModConfigType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/ModConfigType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/PrimarySkillType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/PrimarySkillType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/PrimarySkillType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/PrimarySkillType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/SubSkillFlags.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/SubSkillFlags.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/SubSkillFlags.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/SubSkillFlags.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/SubSkillType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/SubSkillType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/SubSkillType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/SubSkillType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/SuperAbilityType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/SuperAbilityType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/SuperAbilityType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/SuperAbilityType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/ToolType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/ToolType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/ToolType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/ToolType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/alchemy/AlchemyPotion.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/alchemy/AlchemyPotion.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/alchemy/AlchemyPotion.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/alchemy/AlchemyPotion.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/alchemy/PotionStage.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/alchemy/PotionStage.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/alchemy/PotionStage.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/alchemy/PotionStage.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/ChildSkill.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/ChildSkill.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/ChildSkill.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/ChildSkill.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/CoreSkill.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/CoreSkill.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/CoreSkill.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/CoreSkill.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/Localized.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/Localized.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/Localized.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/Localized.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/Skill.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/Skill.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/Skill.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/Skill.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/Toolable.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/Toolable.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/Toolable.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/interfaces/Toolable.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/progression/Progression.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/progression/Progression.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/progression/Progression.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/progression/Progression.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/AbstractSubSkill.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/AbstractSubSkill.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/AbstractSubSkill.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/AbstractSubSkill.java
index 12ff29dee..b12d8af0d 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/AbstractSubSkill.java
+++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/AbstractSubSkill.java
@@ -1,11 +1,11 @@
 package com.gmail.nossr50.core.datatypes.skills.subskills;
 
 import com.gmail.nossr50.core.config.skills.CoreSkillsConfig;
-import com.gmail.nossr50.core.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.core.datatypes.skills.subskills.interfaces.Interaction;
 import com.gmail.nossr50.core.datatypes.skills.subskills.interfaces.Rank;
 import com.gmail.nossr50.core.datatypes.skills.subskills.interfaces.SubSkill;
 import com.gmail.nossr50.core.datatypes.skills.subskills.interfaces.SubSkillProperties;
+import com.gmail.nossr50.core.datatypes.skills.SubSkillType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import org.bukkit.entity.Player;
 
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/acrobatics/Roll.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/acrobatics/Roll.java
similarity index 99%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/acrobatics/Roll.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/acrobatics/Roll.java
index ee634836f..72c3855f6 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/acrobatics/Roll.java
+++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/acrobatics/Roll.java
@@ -3,9 +3,9 @@ package com.gmail.nossr50.core.datatypes.skills.subskills.acrobatics;
 import com.gmail.nossr50.core.config.skills.AdvancedConfig;
 import com.gmail.nossr50.core.config.skills.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.datatypes.LimitedSizeList;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
+import com.gmail.nossr50.core.datatypes.LimitedSizeList;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
 import com.gmail.nossr50.core.datatypes.skills.SubSkillType;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/InteractType.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/InteractType.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/InteractType.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/InteractType.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/Interaction.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/Interaction.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/Interaction.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/Interaction.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/Rank.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/Rank.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/Rank.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/Rank.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/SubSkill.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/SubSkill.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/SubSkill.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/SubSkill.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/SubSkillProperties.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/SubSkillProperties.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/SubSkillProperties.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/skills/subskills/interfaces/SubSkillProperties.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/EnchantmentTreasure.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/EnchantmentTreasure.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/EnchantmentTreasure.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/EnchantmentTreasure.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/ExcavationTreasure.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/ExcavationTreasure.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/ExcavationTreasure.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/ExcavationTreasure.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/FishingTreasure.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/FishingTreasure.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/FishingTreasure.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/FishingTreasure.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/HylianTreasure.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/HylianTreasure.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/HylianTreasure.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/HylianTreasure.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/Rarity.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/Rarity.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/Rarity.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/Rarity.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/ShakeTreasure.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/ShakeTreasure.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/ShakeTreasure.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/ShakeTreasure.java
diff --git a/bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/Treasure.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/Treasure.java
similarity index 100%
rename from bukkit/src/main/java/com/gmail/nossr50/core/datatypes/treasure/Treasure.java
rename to core/src/main/java/com/gmail/nossr50/core/datatypes/treasure/Treasure.java
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/AbstractWorld.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/AbstractWorld.java
similarity index 96%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/AbstractWorld.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/AbstractWorld.java
index 17fee1929..e16eb44b7 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/AbstractWorld.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/AbstractWorld.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes;
+package com.gmail.nossr50.core.mcmmo;
 
 import java.util.Objects;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/Location.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/Location.java
similarity index 93%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/Location.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/Location.java
index 041f07c9a..52c6ae403 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/Location.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/Location.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes;
+package com.gmail.nossr50.core.mcmmo;
 
 /**
  * This class represents a Location in MC
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/Nameable.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/Nameable.java
similarity index 89%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/Nameable.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/Nameable.java
index fe61ef493..87981f308 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/Nameable.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/Nameable.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes;
+package com.gmail.nossr50.core.mcmmo;
 
 public interface Nameable extends Named {
     /**
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/Named.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/Named.java
similarity index 83%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/Named.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/Named.java
index 2eb1dcd8d..63c20a99d 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/Named.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/Named.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes;
+package com.gmail.nossr50.core.mcmmo;
 
 /**
  * A lot of Objects in MC have names
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/Property.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/Property.java
similarity index 95%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/Property.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/Property.java
index 1cfa6fe6d..ccb92d9aa 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/Property.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/Property.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes;
+package com.gmail.nossr50.core.mcmmo;
 
 import java.util.Collection;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/World.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/World.java
similarity index 76%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/World.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/World.java
index 9554279aa..04c4569c4 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/World.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/World.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes;
+package com.gmail.nossr50.core.mcmmo;
 
 public interface World {
     /**
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/block/Block.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/block/Block.java
similarity index 88%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/block/Block.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/block/Block.java
index b542d47a0..588905bdc 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/block/Block.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/block/Block.java
@@ -1,6 +1,6 @@
-package com.gmail.nossr50.core.datatypes.block;
+package com.gmail.nossr50.core.mcmmo.block;
 
-import com.gmail.nossr50.core.datatypes.Property;
+import com.gmail.nossr50.core.mcmmo.Property;
 
 /**
  * Represents a container of properties and values for a Block
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/block/BlockState.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/block/BlockState.java
similarity index 93%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/block/BlockState.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/block/BlockState.java
index 5e67265aa..444485f04 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/block/BlockState.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/block/BlockState.java
@@ -1,6 +1,6 @@
-package com.gmail.nossr50.core.datatypes.block;
+package com.gmail.nossr50.core.mcmmo.block;
 
-import com.gmail.nossr50.core.datatypes.Property;
+import com.gmail.nossr50.core.mcmmo.Property;
 import com.google.common.collect.ImmutableMap;
 
 import java.util.Collection;
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/entity/Entity.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Entity.java
similarity index 73%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/entity/Entity.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Entity.java
index 92975d92e..401adce52 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/entity/Entity.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Entity.java
@@ -1,7 +1,7 @@
-package com.gmail.nossr50.core.datatypes.entity;
+package com.gmail.nossr50.core.mcmmo.entity;
 
-import com.gmail.nossr50.core.datatypes.Location;
-import com.gmail.nossr50.core.datatypes.Named;
+import com.gmail.nossr50.core.mcmmo.Location;
+import com.gmail.nossr50.core.mcmmo.Named;
 
 import java.util.UUID;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/entity/Living.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Living.java
similarity index 94%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/entity/Living.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Living.java
index 1ad54b282..05ff0153c 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/entity/Living.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Living.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes.entity;
+package com.gmail.nossr50.core.mcmmo.entity;
 
 /**
  * Living means you can die, you have health, and you can be damaged
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/entity/Player.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java
similarity index 69%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/entity/Player.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java
index 730e6566a..328f5dd69 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/entity/Player.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java
@@ -1,6 +1,7 @@
-package com.gmail.nossr50.core.datatypes.entity;
+package com.gmail.nossr50.core.mcmmo.entity;
 
-import com.gmail.nossr50.core.datatypes.Nameable;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.mcmmo.Nameable;
 
 /**
  * Players
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/event/Cancellable.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/event/Cancellable.java
similarity index 86%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/event/Cancellable.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/event/Cancellable.java
index 4ba1938d3..6237f4447 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/event/Cancellable.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/event/Cancellable.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes.event;
+package com.gmail.nossr50.core.mcmmo.event;
 
 /**
  * This class handles cancellations for an event
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/event/Event.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/event/Event.java
similarity index 61%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/event/Event.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/event/Event.java
index 40df44a2e..fd6852066 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/event/Event.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/event/Event.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes.event;
+package com.gmail.nossr50.core.mcmmo.event;
 
 /**
  * Represents an event for a given API
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/event/EventType.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/event/EventType.java
similarity index 89%
rename from core/src/main/java/com/gmail/nossr50/core/datatypes/event/EventType.java
rename to core/src/main/java/com/gmail/nossr50/core/mcmmo/event/EventType.java
index 5cc5716cb..eded15cb0 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/event/EventType.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/event/EventType.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.datatypes.event;
+package com.gmail.nossr50.core.mcmmo.event;
 
 /**
  * Different platforms have different event systems