diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/MHDCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/MHDCommand.java
index 5dfc12ac2..81b005aea 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/MHDCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/MHDCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.data.database.FlatfileDatabaseManager;
 import com.gmail.nossr50.core.data.database.SQLDatabaseManager;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java
index 104fb5e01..af98e6c95 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.commands;
 
 import com.gmail.nossr50.commands.party.PartySubcommandType;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.core.util.Permissions;
 import com.gmail.nossr50.mcMMO;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java
index 47f30be5c..b8f7ea2d0 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.core.util.commands.CommandUtils;
 import com.gmail.nossr50.core.util.scoreboards.ScoreboardManager;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/XprateCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/XprateCommand.java
index d655df001..d9d266b6a 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/XprateCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/XprateCommand.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.commands;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.core.util.Permissions;
 import com.gmail.nossr50.core.util.StringUtils;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
index 4c1c883e8..5b99c27f7 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
@@ -2,7 +2,7 @@ package com.gmail.nossr50.commands.chat;
 
 import com.gmail.nossr50.core.chat.ChatManager;
 import com.gmail.nossr50.core.chat.ChatManagerFactory;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.chat.ChatMode;
 import com.gmail.nossr50.core.datatypes.party.PartyFeature;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java
index 4cd76d299..d29509b90 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.commands.chat;
 
 import com.gmail.nossr50.core.chat.PartyChatManager;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.chat.ChatMode;
 import com.gmail.nossr50.core.datatypes.party.Party;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java
index 17d8cca79..a7c676d1a 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.database;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.google.common.collect.ImmutableList;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java
index 9b0566825..4023068bf 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.database;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.database.DatabaseManagerFactory;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.google.common.collect.ImmutableList;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java
index 9d816402f..407d132ca 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.hardcore;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.util.Permissions;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java
index b3a19a48c..e29c0cf97 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.hardcore;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.util.Permissions;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java
index 944bae118..b2d6b5ffc 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.datatypes.party.PartyFeature;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
index facdd9fad..7cf5e4c5a 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java
index 473d4f637..6ec809a28 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.party.ItemShareType;
 import com.gmail.nossr50.core.datatypes.party.Party;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java
index 2290132cf..ed5c00dfb 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.party;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.datatypes.party.PartyFeature;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java
index d7f7e07ee..d74643bf8 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.party.alliance;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.datatypes.party.PartyFeature;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java
index 824d5e7c9..64ff0919d 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.party.teleport;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.party.PartyTeleportRecord;
 import com.gmail.nossr50.core.locale.LocaleLoader;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
index 625cc8257..d89166723 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.commands.party.teleport;
 
-import com.gmail.nossr50.core.config.skills.Config;
-import com.gmail.nossr50.core.config.skills.WorldBlacklist;
+import com.gmail.nossr50.core.config.Config;
+import com.gmail.nossr50.core.config.WorldBlacklist;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.datatypes.party.PartyFeature;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
index 5bb5384bd..e73fb7e76 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.player;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java
index 6a3c06715..36fb59fe8 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.player;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.locale.LocaleLoader;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
index 419606632..d1b90bc41 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.player;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.locale.LocaleLoader;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java
index 64b2fc11d..10e97ca9f 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.player;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.core.util.commands.CommandUtils;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
index bbefd239a..6fb742aeb 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.player;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.locale.LocaleLoader;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
index 4e60a73b7..dc3d711f8 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.config.treasure.TreasureConfig;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.locale.LocaleLoader;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
index 95c21b0ac..6df353563 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.locale.LocaleLoader;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
index a202d2f3b..430e31f68 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.commands.skills;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
index e5205b7d7..515dcdf64 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/listeners/BlockListener.java
@@ -1,9 +1,9 @@
 package com.gmail.nossr50.listeners;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.Config;
-import com.gmail.nossr50.core.config.skills.HiddenConfig;
-import com.gmail.nossr50.core.config.skills.WorldBlacklist;
+import com.gmail.nossr50.core.config.Config;
+import com.gmail.nossr50.core.config.HiddenConfig;
+import com.gmail.nossr50.core.config.WorldBlacklist;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
index 59742142c..20e14784c 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
@@ -1,9 +1,9 @@
 package com.gmail.nossr50.listeners;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-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.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
+import com.gmail.nossr50.core.config.WorldBlacklist;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.meta.OldName;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
index c4e071c16..0be341eef 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.core.config.skills.Config;
-import com.gmail.nossr50.core.config.skills.WorldBlacklist;
+import com.gmail.nossr50.core.config.Config;
+import com.gmail.nossr50.core.config.WorldBlacklist;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.runnables.player.PlayerUpdateInventoryTask;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
index 7fc4135d4..0677bfb44 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java
@@ -4,8 +4,8 @@ import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.core.chat.ChatManager;
 import com.gmail.nossr50.core.chat.ChatManagerFactory;
 import com.gmail.nossr50.core.chat.PartyChatManager;
-import com.gmail.nossr50.core.config.skills.Config;
-import com.gmail.nossr50.core.config.skills.WorldBlacklist;
+import com.gmail.nossr50.core.config.Config;
+import com.gmail.nossr50.core.config.WorldBlacklist;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.chat.ChatMode;
 import com.gmail.nossr50.core.datatypes.party.Party;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
index f936898a3..74d2d1939 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/listeners/SelfListener.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.listeners;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/listeners/WorldListener.java b/bukkit/src/main/java/com/gmail/nossr50/listeners/WorldListener.java
index a533f0238..ffe58ae87 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/listeners/WorldListener.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/listeners/WorldListener.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.listeners;
 
-import com.gmail.nossr50.core.config.skills.WorldBlacklist;
+import com.gmail.nossr50.core.config.WorldBlacklist;
 import com.gmail.nossr50.core.data.blockmeta.conversion.BlockStoreConversionMain;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.Chunk;
diff --git a/bukkit/src/main/java/com/gmail/nossr50/mcMMO.java b/bukkit/src/main/java/com/gmail/nossr50/mcMMO.java
index 836198c74..5b1a998d6 100644
--- a/bukkit/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/bukkit/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -8,7 +8,7 @@ import com.gmail.nossr50.config.mods.ToolConfigManager;
 import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
 import com.gmail.nossr50.config.skills.repair.RepairConfigManager;
 import com.gmail.nossr50.config.skills.salvage.SalvageConfigManager;
-import com.gmail.nossr50.core.config.skills.*;
+import com.gmail.nossr50.core.config.*;
 import com.gmail.nossr50.core.config.treasure.TreasureConfig;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.data.blockmeta.chunkmeta.ChunkManager;
diff --git a/core/src/main/java/com/gmail/nossr50/core/api/AbilityAPI.java b/core/src/main/java/com/gmail/nossr50/core/api/AbilityAPI.java
index ed84f56f3..b2e90ce65 100644
--- a/core/src/main/java/com/gmail/nossr50/core/api/AbilityAPI.java
+++ b/core/src/main/java/com/gmail/nossr50/core/api/AbilityAPI.java
@@ -2,10 +2,10 @@ package com.gmail.nossr50.core.api;
 
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.mcmmo.entity.Living;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.runnables.skills.BleedTimerTask;
 import com.gmail.nossr50.core.skills.SuperAbilityType;
-import com.gmail.nossr50.runnables.skills.BleedTimerTask;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
 
 public final class AbilityAPI {
     private AbilityAPI() {
@@ -83,7 +83,7 @@ public final class AbilityAPI {
         UserManager.getPlayer(player).setAbilityDATS(SuperAbilityType.TREE_FELLER, cooldown);
     }
 
-    public static boolean isBleeding(LivingEntity entity) {
+    public static boolean isBleeding(Living entity) {
         return BleedTimerTask.isBleeding(entity);
     }
 }
diff --git a/core/src/main/java/com/gmail/nossr50/core/api/ChatAPI.java b/core/src/main/java/com/gmail/nossr50/core/api/ChatAPI.java
index bcdb7b498..2b7ac3ee6 100644
--- a/core/src/main/java/com/gmail/nossr50/core/api/ChatAPI.java
+++ b/core/src/main/java/com/gmail/nossr50/core/api/ChatAPI.java
@@ -1,13 +1,12 @@
 package com.gmail.nossr50.core.api;
 
-import com.gmail.nossr50.chat.ChatManager;
-import com.gmail.nossr50.chat.ChatManagerFactory;
-import com.gmail.nossr50.chat.PartyChatManager;
+import com.gmail.nossr50.core.chat.ChatManager;
+import com.gmail.nossr50.core.chat.ChatManagerFactory;
+import com.gmail.nossr50.core.chat.PartyChatManager;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.chat.ChatMode;
-import com.gmail.nossr50.party.PartyManager;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.party.PartyManager;
 
 public final class ChatAPI {
     private ChatAPI() {
diff --git a/core/src/main/java/com/gmail/nossr50/core/api/ExperienceAPI.java b/core/src/main/java/com/gmail/nossr50/core/api/ExperienceAPI.java
index d37cb51ac..61617ca00 100644
--- a/core/src/main/java/com/gmail/nossr50/core/api/ExperienceAPI.java
+++ b/core/src/main/java/com/gmail/nossr50/core/api/ExperienceAPI.java
@@ -1,20 +1,18 @@
 package com.gmail.nossr50.core.api;
 
-import com.gmail.nossr50.api.exceptions.*;
-import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.core.api.exceptions.*;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.experience.ExperienceConfig;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.experience.FormulaType;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.experience.XPGainSource;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
+import com.gmail.nossr50.core.mcmmo.block.BlockState;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.skills.child.FamilyTree;
-import org.bukkit.block.BlockState;
-import org.bukkit.entity.Player;
+import com.gmail.nossr50.core.skills.child.FamilyTree;
 
 import java.util.ArrayList;
 import java.util.Set;
diff --git a/core/src/main/java/com/gmail/nossr50/core/api/PartyAPI.java b/core/src/main/java/com/gmail/nossr50/core/api/PartyAPI.java
index 99c98ddc9..5149bbe86 100644
--- a/core/src/main/java/com/gmail/nossr50/core/api/PartyAPI.java
+++ b/core/src/main/java/com/gmail/nossr50/core/api/PartyAPI.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.api;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.party.Party;
diff --git a/core/src/main/java/com/gmail/nossr50/core/api/exceptions/McMMOPlayerNotFoundException.java b/core/src/main/java/com/gmail/nossr50/core/api/exceptions/McMMOPlayerNotFoundException.java
index cff599a11..0a89678cc 100644
--- a/core/src/main/java/com/gmail/nossr50/core/api/exceptions/McMMOPlayerNotFoundException.java
+++ b/core/src/main/java/com/gmail/nossr50/core/api/exceptions/McMMOPlayerNotFoundException.java
@@ -1,11 +1,11 @@
 package com.gmail.nossr50.core.api.exceptions;
 
-import org.bukkit.entity.Player;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 
 public class McMMOPlayerNotFoundException extends RuntimeException {
     private static final long serialVersionUID = 761917904993202836L;
 
     public McMMOPlayerNotFoundException(Player player) {
-        super("McMMOPlayer object was not found for: " + player.getName() + " " + player.getUniqueId());
+        super("McMMOPlayer object was not found for: " + player.getName() + " " + player.getUUID());
     }
 }
diff --git a/core/src/main/java/com/gmail/nossr50/core/chat/AdminChatManager.java b/core/src/main/java/com/gmail/nossr50/core/chat/AdminChatManager.java
index 3f85f66b8..bc8e3a5c0 100644
--- a/core/src/main/java/com/gmail/nossr50/core/chat/AdminChatManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/chat/AdminChatManager.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.chat;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.events.chat.McMMOAdminChatEvent;
 import org.bukkit.plugin.Plugin;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/chat/PartyChatManager.java b/core/src/main/java/com/gmail/nossr50/core/chat/PartyChatManager.java
index da8410b73..0c82e9128 100644
--- a/core/src/main/java/com/gmail/nossr50/core/chat/PartyChatManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/chat/PartyChatManager.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.chat;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.runnables.party.PartyChatTask;
 import com.gmail.nossr50.events.chat.McMMOPartyChatEvent;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/AdvancedConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/AdvancedConfig.java
index 6e4dd5155..6424e6725 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/AdvancedConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/AdvancedConfig.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.config.skills;
+package com.gmail.nossr50.core.config;
 
 import com.gmail.nossr50.core.mcmmo.interactions.NotificationType;
 import com.gmail.nossr50.core.mcmmo.skills.SubSkillType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/AutoUpdateConfigLoader.java b/core/src/main/java/com/gmail/nossr50/core/config/AutoUpdateConfigLoader.java
index da46aa542..16dd833c4 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/AutoUpdateConfigLoader.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/AutoUpdateConfigLoader.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.config.skills;
+package com.gmail.nossr50.core.config;
 
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/Config.java b/core/src/main/java/com/gmail/nossr50/core/config/Config.java
index 5735557fe..921fb362f 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/Config.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/Config.java
@@ -1,15 +1,11 @@
 package com.gmail.nossr50.core.config;
 
 import com.gmail.nossr50.core.data.database.SQLDatabaseManager;
-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;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.entity.EntityType;
+import com.gmail.nossr50.core.datatypes.party.PartyFeature;
+import com.gmail.nossr50.core.skills.MobHealthbarType;
+import com.gmail.nossr50.core.skills.PrimarySkillType;
+import com.gmail.nossr50.core.skills.SuperAbilityType;
+import com.gmail.nossr50.core.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/ConfigLoader.java b/core/src/main/java/com/gmail/nossr50/core/config/ConfigLoader.java
index 56196ab17..dbe24ef73 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/ConfigLoader.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/ConfigLoader.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.config.skills;
+package com.gmail.nossr50.core.config;
 
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.configuration.file.FileConfiguration;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/CoreSkillsConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/CoreSkillsConfig.java
index 7283bc759..613000373 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/CoreSkillsConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/CoreSkillsConfig.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.config.skills;
+package com.gmail.nossr50.core.config;
 
 import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
 import com.gmail.nossr50.core.mcmmo.skills.subskills.AbstractSubSkill;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/HiddenConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/HiddenConfig.java
index 497bcfc44..978097b72 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/HiddenConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/HiddenConfig.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.config.skills;
+package com.gmail.nossr50.core.config;
 
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/RankConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/RankConfig.java
index 3bb05e439..131e32acf 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/RankConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/RankConfig.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.config.skills;
+package com.gmail.nossr50.core.config;
 
 import com.gmail.nossr50.core.mcmmo.skills.SubSkillType;
 import com.gmail.nossr50.core.mcmmo.skills.subskills.AbstractSubSkill;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/SoundConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/SoundConfig.java
index ec771303a..9b395a422 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/SoundConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/SoundConfig.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.config.skills;
+package com.gmail.nossr50.core.config;
 
 import com.gmail.nossr50.util.sounds.SoundType;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/WorldBlacklist.java b/core/src/main/java/com/gmail/nossr50/core/config/WorldBlacklist.java
index b1c449221..5d01f848b 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/WorldBlacklist.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/WorldBlacklist.java
@@ -1,4 +1,4 @@
-package com.gmail.nossr50.core.config.skills;
+package com.gmail.nossr50.core.config;
 
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.World;
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 0d4b3ad23..fd5e85e24 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,6 +1,6 @@
 package com.gmail.nossr50.core.config.experience;
 
-import com.gmail.nossr50.core.config.skills.AutoUpdateConfigLoader;
+import com.gmail.nossr50.core.config.AutoUpdateConfigLoader;
 import com.gmail.nossr50.core.mcmmo.experience.FormulaType;
 import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
 import com.gmail.nossr50.core.mcmmo.skills.PrimarySkillType;
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 c5bbfa04e..214438936 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,6 +1,6 @@
 package com.gmail.nossr50.core.config.mods;
 
-import com.gmail.nossr50.core.config.skills.ConfigLoader;
+import com.gmail.nossr50.core.config.ConfigLoader;
 import com.gmail.nossr50.core.mcmmo.skills.ItemType;
 import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
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 73bf3d0bb..b60b1e652 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,6 +1,6 @@
 package com.gmail.nossr50.core.config.mods;
 
-import com.gmail.nossr50.core.config.skills.ConfigLoader;
+import com.gmail.nossr50.core.config.ConfigLoader;
 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 e4ad18bde..7852b8cb8 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,6 +1,6 @@
 package com.gmail.nossr50.core.config.mods;
 
-import com.gmail.nossr50.core.config.skills.ConfigLoader;
+import com.gmail.nossr50.core.config.ConfigLoader;
 import com.gmail.nossr50.core.mcmmo.mods.CustomEntity;
 import org.apache.commons.lang.ClassUtils;
 import org.bukkit.Material;
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 5f859ae85..550256a2b 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,6 +1,6 @@
 package com.gmail.nossr50.core.config.mods;
 
-import com.gmail.nossr50.core.config.skills.ConfigLoader;
+import com.gmail.nossr50.core.config.ConfigLoader;
 import com.gmail.nossr50.core.mcmmo.mods.CustomTool;
 import com.gmail.nossr50.core.mcmmo.skills.ItemType;
 import com.gmail.nossr50.core.mcmmo.skills.MaterialType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/party/ItemWeightConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/party/ItemWeightConfig.java
index 793ea2434..1558c1495 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/party/ItemWeightConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/party/ItemWeightConfig.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.config.party;
 
-import com.gmail.nossr50.core.config.skills.ConfigLoader;
+import com.gmail.nossr50.core.config.ConfigLoader;
 import com.gmail.nossr50.util.StringUtils;
 import org.bukkit.Material;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/config/treasure/TreasureConfig.java b/core/src/main/java/com/gmail/nossr50/core/config/treasure/TreasureConfig.java
index aec76a097..23647ac9a 100644
--- a/core/src/main/java/com/gmail/nossr50/core/config/treasure/TreasureConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/config/treasure/TreasureConfig.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.config.treasure;
 
-import com.gmail.nossr50.core.config.skills.ConfigLoader;
+import com.gmail.nossr50.core.config.ConfigLoader;
 import com.gmail.nossr50.util.EnchantmentUtils;
 import com.gmail.nossr50.util.StringUtils;
 import org.bukkit.ChatColor;
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 62f36fbe2..e602c4e94 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,12 +1,8 @@
 package com.gmail.nossr50.core.data;
 
-import com.gmail.nossr50.core.mcmmo.player.McMMOPlayer;
-import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
 import com.google.common.collect.ImmutableList;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.metadata.FixedMetadataValue;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/ChunkletManagerFactory.java b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/ChunkletManagerFactory.java
index 33367e204..7530ad13d 100644
--- a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/ChunkletManagerFactory.java
+++ b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/ChunkletManagerFactory.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.data.blockmeta;
 
-import com.gmail.nossr50.core.config.skills.HiddenConfig;
+import com.gmail.nossr50.core.config.HiddenConfig;
 
 public class ChunkletManagerFactory {
     public static ChunkletManager getChunkletManager() {
diff --git a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/chunkmeta/ChunkManagerFactory.java b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/chunkmeta/ChunkManagerFactory.java
index 20c249afd..624ec51dc 100644
--- a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/chunkmeta/ChunkManagerFactory.java
+++ b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/chunkmeta/ChunkManagerFactory.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.data.blockmeta.chunkmeta;
 
-import com.gmail.nossr50.core.config.skills.HiddenConfig;
+import com.gmail.nossr50.core.config.HiddenConfig;
 
 public class ChunkManagerFactory {
     public static ChunkManager getChunkManager() {
diff --git a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionMain.java b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionMain.java
index 433172a51..336356fd9 100644
--- a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionMain.java
+++ b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionMain.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.data.blockmeta.conversion;
 
-import com.gmail.nossr50.core.config.skills.HiddenConfig;
+import com.gmail.nossr50.core.config.HiddenConfig;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.scheduler.BukkitScheduler;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionXDirectory.java b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionXDirectory.java
index d20741f5a..baf10145d 100644
--- a/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionXDirectory.java
+++ b/core/src/main/java/com/gmail/nossr50/core/data/blockmeta/conversion/BlockStoreConversionXDirectory.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.data.blockmeta.conversion;
 
-import com.gmail.nossr50.core.config.skills.HiddenConfig;
+import com.gmail.nossr50.core.config.HiddenConfig;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.scheduler.BukkitScheduler;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java
index fee25e3e2..0f2d722eb 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java
+++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/Party.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.datatypes.party;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.experience.FormulaType;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java
index 222593b4b..971310e44 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java
+++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyFeature.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.datatypes.party;
 
 import com.gmail.nossr50.commands.party.PartySubcommandType;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java
index ba9ec1bd9..ddc0b8ab6 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java
+++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/party/PartyTeleportRecord.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.datatypes.party;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.util.Misc;
 import org.bukkit.entity.Player;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java
index d4312e6a2..e516ba1e9 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java
+++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/McMMOPlayer.java
@@ -1,9 +1,9 @@
 package com.gmail.nossr50.core.datatypes.player;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-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.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
+import com.gmail.nossr50.core.config.WorldBlacklist;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.chat.ChatMode;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
diff --git a/core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java
index 0240f8c77..642c52a9e 100644
--- a/core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java
+++ b/core/src/main/java/com/gmail/nossr50/core/datatypes/player/PlayerProfile.java
@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.datatypes.player;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.experience.FormulaType;
 import com.gmail.nossr50.core.datatypes.experience.SkillXpGain;
diff --git a/core/src/main/java/com/gmail/nossr50/core/locale/LocaleLoader.java b/core/src/main/java/com/gmail/nossr50/core/locale/LocaleLoader.java
index ce1629b5a..034b8827d 100644
--- a/core/src/main/java/com/gmail/nossr50/core/locale/LocaleLoader.java
+++ b/core/src/main/java/com/gmail/nossr50/core/locale/LocaleLoader.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.locale;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.ChatColor;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Living.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Living.java
index 23be2deb7..5ee1606c1 100644
--- a/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Living.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Living.java
@@ -3,7 +3,7 @@ package com.gmail.nossr50.core.mcmmo.entity;
 /**
  * Living means you can die, you have health, and you can be damaged
  */
-public interface Living {
+public interface Living extends Entity {
     /**
      * Whether or not this entity is still alive
      *
@@ -34,4 +34,10 @@ public interface Living {
      * @param damage the damage to deal to this entity
      */
     void damage(Entity source, int damage);
+
+    /**
+     * Whether or not this entity still exists
+     * @return true if valid
+     */
+    Boolean isValid();
 }
diff --git a/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java
index cd7b23493..99f5e399d 100644
--- a/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java
+++ b/core/src/main/java/com/gmail/nossr50/core/mcmmo/entity/Player.java
@@ -3,6 +3,8 @@ package com.gmail.nossr50.core.mcmmo.entity;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.mcmmo.Nameable;
 
+import java.util.UUID;
+
 /**
  * Players
  */
diff --git a/core/src/main/java/com/gmail/nossr50/core/party/PartyManager.java b/core/src/main/java/com/gmail/nossr50/core/party/PartyManager.java
index 45bcbba10..f99689c18 100644
--- a/core/src/main/java/com/gmail/nossr50/core/party/PartyManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/party/PartyManager.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.party;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.chat.ChatMode;
 import com.gmail.nossr50.core.datatypes.database.UpgradeType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/party/ShareHandler.java b/core/src/main/java/com/gmail/nossr50/core/party/ShareHandler.java
index 251629827..d42e4d42d 100644
--- a/core/src/main/java/com/gmail/nossr50/core/party/ShareHandler.java
+++ b/core/src/main/java/com/gmail/nossr50/core/party/ShareHandler.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.party;
 
 import com.gmail.nossr50.config.party.ItemWeightConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.experience.XPGainSource;
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/backups/CleanBackupsTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/backups/CleanBackupsTask.java
index b24466463..9b784eb32 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/backups/CleanBackupsTask.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/backups/CleanBackupsTask.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.runnables.backups;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.scheduler.BukkitRunnable;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandDisplayTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandDisplayTask.java
index e0095ac37..dd0139053 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandDisplayTask.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/McrankCommandDisplayTask.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.runnables.commands;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.mcMMO;
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandDisplayTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandDisplayTask.java
index 7c3c287df..2ed03772a 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandDisplayTask.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/commands/MctopCommandDisplayTask.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.runnables.commands;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.database.PlayerStat;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/database/UUIDUpdateAsyncTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/database/UUIDUpdateAsyncTask.java
index daee47db9..361f53aed 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/database/UUIDUpdateAsyncTask.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/database/UUIDUpdateAsyncTask.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.runnables.database;
 
-import com.gmail.nossr50.core.config.skills.HiddenConfig;
+import com.gmail.nossr50.core.config.HiddenConfig;
 import com.gmail.nossr50.core.data.database.DatabaseManager;
 import com.gmail.nossr50.core.datatypes.database.UpgradeType;
 import com.gmail.nossr50.mcMMO;
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/database/UserPurgeTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/database/UserPurgeTask.java
index 01bf1d877..377082b10 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/database/UserPurgeTask.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/database/UserPurgeTask.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.runnables.database;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.scheduler.BukkitRunnable;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/items/ChimaeraWingWarmup.java b/core/src/main/java/com/gmail/nossr50/core/runnables/items/ChimaeraWingWarmup.java
index ca72fa38a..f3a8209e3 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/items/ChimaeraWingWarmup.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/items/ChimaeraWingWarmup.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.runnables.items;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.util.ChimaeraWing;
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/items/TeleportationWarmup.java b/core/src/main/java/com/gmail/nossr50/core/runnables/items/TeleportationWarmup.java
index 9bd97f027..6da79ba2f 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/items/TeleportationWarmup.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/items/TeleportationWarmup.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.runnables.items;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.party.PartyManager;
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyAutoKickTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyAutoKickTask.java
index 4bdc5439e..991ca3714 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyAutoKickTask.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyAutoKickTask.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.runnables.party;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.party.PartyManager;
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyChatTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyChatTask.java
index 4bbd9c5f9..795d59baa 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyChatTask.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/party/PartyChatTask.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.runnables.party;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.party.Party;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import org.bukkit.ChatColor;
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileLoadingTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileLoadingTask.java
index e9a77e0be..123b9b401 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileLoadingTask.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/player/PlayerProfileLoadingTask.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.runnables.player;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityDisableTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityDisableTask.java
index fcd02db7f..10f45890f 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityDisableTask.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/AbilityDisableTask.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.runnables.skills;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.skills.SuperAbilityType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/BleedContainer.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/BleedContainer.java
index 671d918c8..c75d17e30 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/BleedContainer.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/BleedContainer.java
@@ -1,14 +1,15 @@
 package com.gmail.nossr50.core.runnables.skills;
 
-import org.bukkit.entity.LivingEntity;
+
+import com.gmail.nossr50.core.mcmmo.entity.Living;
 
 public class BleedContainer {
     public int bleedTicks;
     public int bleedRank;
-    public LivingEntity target;
-    public LivingEntity damageSource;
+    public Living target;
+    public Living damageSource;
 
-    public BleedContainer(LivingEntity target, int bleedTicks, int bleedRank, LivingEntity damageSource) {
+    public BleedContainer(Living target, int bleedTicks, int bleedRank, Living damageSource) {
         this.target = target;
         this.bleedTicks = bleedTicks;
         this.bleedRank = bleedRank;
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/BleedTimerTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/BleedTimerTask.java
index ebd0286d4..02d95be85 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/BleedTimerTask.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/BleedTimerTask.java
@@ -1,29 +1,28 @@
 package com.gmail.nossr50.core.runnables.skills;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.util.MobHealthbarUtils;
-import com.gmail.nossr50.util.player.NotificationManager;
-import com.gmail.nossr50.util.skills.CombatUtils;
-import com.gmail.nossr50.util.skills.ParticleEffectUtils;
-import com.gmail.nossr50.util.sounds.SoundManager;
-import com.gmail.nossr50.util.sounds.SoundType;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
+import com.gmail.nossr50.core.mcmmo.entity.Living;
+import com.gmail.nossr50.core.mcmmo.entity.Player;
+import com.gmail.nossr50.core.util.MobHealthbarUtils;
+import com.gmail.nossr50.core.util.player.NotificationManager;
+import com.gmail.nossr50.core.util.skills.CombatUtils;
+import com.gmail.nossr50.core.util.skills.ParticleEffectUtils;
+import com.gmail.nossr50.core.util.sounds.SoundManager;
+import com.gmail.nossr50.core.util.sounds.SoundType;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.UUID;
 
 public class BleedTimerTask extends BukkitRunnable {
-    private static Map<LivingEntity, BleedContainer> bleedList = new HashMap<LivingEntity, BleedContainer>();
+    private static Map<UUID, BleedContainer> bleedList = new HashMap<UUID, BleedContainer>();
 
     public static BleedContainer copyContainer(BleedContainer container) {
-        LivingEntity target = container.target;
-        LivingEntity source = container.damageSource;
+        Living target = container.target;
+        Living source = container.damageSource;
         int bleedTicks = container.bleedTicks;
         int bleedRank = container.bleedRank;
 
@@ -32,11 +31,11 @@ public class BleedTimerTask extends BukkitRunnable {
     }
 
     /**
-     * Instantly Bleed out a LivingEntity
+     * Instantly Bleed out a Living
      *
-     * @param entity LivingEntity to bleed out
+     * @param entity Living to bleed out
      */
-    public static void bleedOut(LivingEntity entity) {
+    public static void bleedOut(Living entity) {
         /*
          * Don't remove anything from the list outside of run()
          */
@@ -47,27 +46,27 @@ public class BleedTimerTask extends BukkitRunnable {
     }
 
     /**
-     * Add a LivingEntity to the bleedList if it is not in it.
+     * Add a Living to the bleedList if it is not in it.
      *
-     * @param entity LivingEntity to add
+     * @param entity Living to add
      * @param ticks  Number of bleeding ticks
      */
-    public static void add(LivingEntity entity, LivingEntity attacker, int ticks, int bleedRank) {
+    public static void add(Living entity, Living attacker, int ticks, int bleedRank) {
         BleedContainer newBleedContainer = new BleedContainer(entity, ticks, bleedRank, attacker);
         bleedList.put(entity, newBleedContainer);
     }
 
-    public static boolean isBleeding(LivingEntity entity) {
+    public static boolean isBleeding(Living entity) {
         return bleedList.containsKey(entity);
     }
 
     @Override
     public void run() {
-        Iterator<Entry<LivingEntity, BleedContainer>> bleedIterator = bleedList.entrySet().iterator();
+        Iterator<Entry<Living, BleedContainer>> bleedIterator = bleedList.entrySet().iterator();
 
         while (bleedIterator.hasNext()) {
-            Entry<LivingEntity, BleedContainer> containerEntry = bleedIterator.next();
-            LivingEntity target = containerEntry.getKey();
+            Entry<Living, BleedContainer> containerEntry = bleedIterator.next();
+            Living target = containerEntry.getKey();
 
             int bleedTicks = containerEntry.getValue().bleedTicks;
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/ToolLowerTask.java b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/ToolLowerTask.java
index 71344bdef..28af327dd 100644
--- a/core/src/main/java/com/gmail/nossr50/core/runnables/skills/ToolLowerTask.java
+++ b/core/src/main/java/com/gmail/nossr50/core/runnables/skills/ToolLowerTask.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.runnables.skills;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.skills.ToolType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/PrimarySkillType.java b/core/src/main/java/com/gmail/nossr50/core/skills/PrimarySkillType.java
index f9d399059..582e8f6fe 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/PrimarySkillType.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/PrimarySkillType.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.skills;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.acrobatics.AcrobaticsManager;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/SuperAbilityType.java b/core/src/main/java/com/gmail/nossr50/core/skills/SuperAbilityType.java
index 2d3a8ca89..817127ddd 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/SuperAbilityType.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/SuperAbilityType.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.util.BlockUtils;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/ChildConfig.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/ChildConfig.java
index 5af3c9449..f32e698b9 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/child/ChildConfig.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/ChildConfig.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.child;
 
-import com.gmail.nossr50.core.config.skills.AutoUpdateConfigLoader;
+import com.gmail.nossr50.core.config.AutoUpdateConfigLoader;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.util.StringUtils;
 import org.bukkit.configuration.file.YamlConfiguration;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/Salvage.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/Salvage.java
index 9a58635f0..30f9a473e 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/Salvage.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/Salvage.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.skills.child.salvage;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 import org.bukkit.Material;
 
 public class Salvage {
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/SalvageManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/SalvageManager.java
index 92aa8867d..86ba31888 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/SalvageManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/salvage/SalvageManager.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.skills.child.salvage;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.locale.LocaleLoader;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/Smelting.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/Smelting.java
index 03cf4409b..f844cff47 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/Smelting.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/Smelting.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.skills.child.smelting;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.skills.SubSkillType;
 import com.gmail.nossr50.mcMMO;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/SmeltingManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/SmeltingManager.java
index dd4873061..2b1cbdd02 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/SmeltingManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/child/smelting/SmeltingManager.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.child.smelting;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.experience.XPGainSource;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/Acrobatics.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/Acrobatics.java
index b175620ba..f0b145326 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/Acrobatics.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/acrobatics/Acrobatics.java
@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.skills.primary.acrobatics;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 
 public final class Acrobatics {
     public static double dodgeDamageModifier = AdvancedConfig.getInstance().getDodgeDamageModifier();
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/Alchemy.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/Alchemy.java
index a700518d0..1a36d4434 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/Alchemy.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/alchemy/Alchemy.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.primary.alchemy;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.skills.SubSkillType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.runnables.skills.AlchemyBrewTask;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/Archery.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/Archery.java
index 36f0c277c..870405a80 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/Archery.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/archery/Archery.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.skills.primary.archery;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.skills.SubSkillType;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.skills.RankUtils;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/Axes.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/Axes.java
index bb6b9042c..f26de6ed8 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/Axes.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/axes/Axes.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.primary.axes;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.skills.SubSkillType;
 import com.gmail.nossr50.util.ItemUtils;
 import com.gmail.nossr50.util.skills.RankUtils;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/ExcavationManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/ExcavationManager.java
index d1e715da6..db7afc5d3 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/ExcavationManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/excavation/ExcavationManager.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.primary.excavation;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/Fishing.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/Fishing.java
index 928cf60e9..31ba7f82c 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/Fishing.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/Fishing.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.primary.fishing;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.config.treasure.TreasureConfig;
 import com.gmail.nossr50.core.skills.treasure.ShakeTreasure;
 import com.gmail.nossr50.util.Misc;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/FishingManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/FishingManager.java
index 8b7eca90c..102e43e5a 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/FishingManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/fishing/FishingManager.java
@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.skills.primary.fishing;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.config.treasure.TreasureConfig;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/HerbalismManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/HerbalismManager.java
index e4e25e018..7b183ed22 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/HerbalismManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/herbalism/HerbalismManager.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.skills.primary.herbalism;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.config.treasure.TreasureConfig;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/BlastMining.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/BlastMining.java
index 5cd81b7ce..008f44cdf 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/BlastMining.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/BlastMining.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.skills.primary.mining;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.skills.SubSkillType;
 import com.gmail.nossr50.mcMMO;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/MiningManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/MiningManager.java
index 130efcca3..1bf1a25ee 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/MiningManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/mining/MiningManager.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.skills.primary.mining;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/ArcaneForging.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/ArcaneForging.java
index 6acc378ea..b26287927 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/ArcaneForging.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/ArcaneForging.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.primary.repair;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 
 public class ArcaneForging {
 
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/Repair.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/Repair.java
index 439e2886b..69f092bef 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/Repair.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/Repair.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.skills.primary.repair;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 import org.bukkit.Material;
 
 public class Repair {
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/RepairManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/RepairManager.java
index d8c148224..6edcf28c7 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/RepairManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/repair/RepairManager.java
@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.skills.primary.repair;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/swords/Swords.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/swords/Swords.java
index 11e3f9c7d..ded5643fe 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/swords/Swords.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/swords/Swords.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.primary.swords;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 
 public class Swords {
     public static int bleedMaxTicks = AdvancedConfig.getInstance().getRuptureMaxTicks();
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/Taming.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/Taming.java
index 7426d883f..a2824734c 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/Taming.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/Taming.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.primary.taming;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import org.bukkit.EntityEffect;
 
 public class Taming {
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TamingManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TamingManager.java
index 75c72bfc5..b69bcf6d6 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TamingManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TamingManager.java
@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.skills.primary.taming;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TrackedTamingEntity.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TrackedTamingEntity.java
index e158b8a13..daaacd00b 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TrackedTamingEntity.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/taming/TrackedTamingEntity.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.primary.taming;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.skills.CombatUtils;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/Unarmed.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/Unarmed.java
index 397b07c82..da2056813 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/Unarmed.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/Unarmed.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.primary.unarmed;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.util.sounds.SoundManager;
 import com.gmail.nossr50.util.sounds.SoundType;
 import org.bukkit.entity.Player;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/UnarmedManager.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/UnarmedManager.java
index d7ab72994..57936d574 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/UnarmedManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/unarmed/UnarmedManager.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.primary.unarmed;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/primary/woodcutting/Woodcutting.java b/core/src/main/java/com/gmail/nossr50/core/skills/primary/woodcutting/Woodcutting.java
index 6cebed974..68a0fe3fc 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/primary/woodcutting/Woodcutting.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/primary/woodcutting/Woodcutting.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.skills.primary.woodcutting;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.BlockUtils;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/AbstractSubSkill.java b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/AbstractSubSkill.java
index 7b9d3ae1d..bfb0e7d60 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/AbstractSubSkill.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/AbstractSubSkill.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.subskills;
 
-import com.gmail.nossr50.core.config.skills.CoreSkillsConfig;
+import com.gmail.nossr50.core.config.CoreSkillsConfig;
 import com.gmail.nossr50.core.skills.SubSkillType;
 import com.gmail.nossr50.core.skills.subskills.interfaces.Interaction;
 import com.gmail.nossr50.core.skills.subskills.interfaces.Rank;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/acrobatics/Roll.java b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/acrobatics/Roll.java
index 9c58b4e72..b85e604fd 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/subskills/acrobatics/Roll.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/subskills/acrobatics/Roll.java
@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.skills.subskills.acrobatics;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.LimitedSizeList;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
diff --git a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/Treasure.java b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/Treasure.java
index 6bbd50825..14b4ab33f 100644
--- a/core/src/main/java/com/gmail/nossr50/core/skills/treasure/Treasure.java
+++ b/core/src/main/java/com/gmail/nossr50/core/skills/treasure/Treasure.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.skills.treasure;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import org.bukkit.inventory.ItemStack;
 
 public abstract class Treasure {
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/ChimaeraWing.java b/core/src/main/java/com/gmail/nossr50/core/util/ChimaeraWing.java
index 6cb7fdeaa..48180fc81 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/ChimaeraWing.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/ChimaeraWing.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/HardcoreManager.java b/core/src/main/java/com/gmail/nossr50/core/util/HardcoreManager.java
index a44aba75a..504d28abb 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/HardcoreManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/HardcoreManager.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/ItemUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/ItemUtils.java
index 85b2d1ff1..2649fe765 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/ItemUtils.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/ItemUtils.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.util;
 
 import com.gmail.nossr50.config.party.ItemWeightConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.ChatColor;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/MobHealthbarUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/MobHealthbarUtils.java
index 2b69e64d5..c72e04a49 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/MobHealthbarUtils.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/MobHealthbarUtils.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.util;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.meta.OldName;
 import com.gmail.nossr50.core.runnables.MobHealthDisplayUpdaterTask;
 import com.gmail.nossr50.core.skills.MobHealthbarType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/ModManager.java b/core/src/main/java/com/gmail/nossr50/core/util/ModManager.java
index 7db1d74cf..b28329f50 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/ModManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/ModManager.java
@@ -4,7 +4,7 @@ import com.gmail.nossr50.config.mods.CustomArmorConfig;
 import com.gmail.nossr50.config.mods.CustomBlockConfig;
 import com.gmail.nossr50.config.mods.CustomEntityConfig;
 import com.gmail.nossr50.config.mods.CustomToolConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.mods.CustomBlock;
 import com.gmail.nossr50.core.datatypes.mods.CustomEntity;
 import com.gmail.nossr50.core.datatypes.mods.CustomTool;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/Motd.java b/core/src/main/java/com/gmail/nossr50/core/util/Motd.java
index f625b54a3..8f758af45 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/Motd.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/Motd.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.util.skills.PerksUtils;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/TextComponentFactory.java b/core/src/main/java/com/gmail/nossr50/core/util/TextComponentFactory.java
index 5c504dc8b..107ca7d92 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/TextComponentFactory.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/TextComponentFactory.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.util;
 
-import com.gmail.nossr50.core.config.skills.Config;
-import com.gmail.nossr50.core.config.skills.RankConfig;
+import com.gmail.nossr50.core.config.Config;
+import com.gmail.nossr50.core.config.RankConfig;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.json.McMMOUrl;
 import com.gmail.nossr50.core.datatypes.json.McMMOWebLinks;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandRegistrationManager.java b/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandRegistrationManager.java
index 53cf6cb45..280aa0c4d 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandRegistrationManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandRegistrationManager.java
@@ -14,7 +14,7 @@ import com.gmail.nossr50.commands.hardcore.HardcoreCommand;
 import com.gmail.nossr50.commands.hardcore.VampirismCommand;
 import com.gmail.nossr50.commands.party.PartyCommand;
 import com.gmail.nossr50.commands.party.teleport.PtpCommand;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.locale.LocaleLoader;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.util.StringUtils;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandUtils.java
index e80487891..04b164638 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandUtils.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/commands/CommandUtils.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util.commands;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.datatypes.player.PlayerProfile;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/experience/FormulaManager.java b/core/src/main/java/com/gmail/nossr50/core/util/experience/FormulaManager.java
index 93ddec6d2..f239e8144 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/experience/FormulaManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/experience/FormulaManager.java
@@ -1,7 +1,7 @@
 package com.gmail.nossr50.core.util.experience;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.datatypes.experience.FormulaType;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.mcMMO;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/player/NotificationManager.java b/core/src/main/java/com/gmail/nossr50/core/util/player/NotificationManager.java
index 21ba5142c..c8bea6c92 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/player/NotificationManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/player/NotificationManager.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util.player;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.datatypes.interactions.NotificationType;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceSkill.java b/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceSkill.java
index b317b0d0c..64770955e 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceSkill.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceSkill.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util.random;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.skills.SubSkillType;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceUtil.java b/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceUtil.java
index bb34e91f8..c5b988c7c 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceUtil.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/random/RandomChanceUtil.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util.random;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
 import com.gmail.nossr50.core.skills.PrimarySkillType;
 import com.gmail.nossr50.core.skills.SubSkillType;
 import com.gmail.nossr50.core.skills.subskills.AbstractSubSkill;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardManager.java b/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardManager.java
index 089b0631d..d55723a1c 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardManager.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util.scoreboards;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.database.PlayerStat;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardWrapper.java b/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardWrapper.java
index bf4b633d8..bec7faf8c 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardWrapper.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/scoreboards/ScoreboardWrapper.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util.scoreboards;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.database.PlayerStat;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/skills/ParticleEffectUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/skills/ParticleEffectUtils.java
index 0a26e40a9..8544db699 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/skills/ParticleEffectUtils.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/skills/ParticleEffectUtils.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util.skills;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.mcMMO;
 import org.bukkit.FireworkEffect.Type;
 import org.bukkit.block.Block;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/skills/RankUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/skills/RankUtils.java
index ae5535f11..8db36fea9 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/skills/RankUtils.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/skills/RankUtils.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util.skills;
 
-import com.gmail.nossr50.core.config.skills.RankConfig;
+import com.gmail.nossr50.core.config.RankConfig;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.core.runnables.skills.SkillUnlockNotificationTask;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/skills/SkillUtils.java b/core/src/main/java/com/gmail/nossr50/core/util/skills/SkillUtils.java
index 28892a5f4..22594fb89 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/skills/SkillUtils.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/skills/SkillUtils.java
@@ -1,8 +1,8 @@
 package com.gmail.nossr50.core.util.skills;
 
-import com.gmail.nossr50.core.config.skills.AdvancedConfig;
-import com.gmail.nossr50.core.config.skills.Config;
-import com.gmail.nossr50.core.config.skills.HiddenConfig;
+import com.gmail.nossr50.core.config.AdvancedConfig;
+import com.gmail.nossr50.core.config.Config;
+import com.gmail.nossr50.core.config.HiddenConfig;
 import com.gmail.nossr50.core.data.UserManager;
 import com.gmail.nossr50.core.datatypes.experience.XPGainReason;
 import com.gmail.nossr50.core.datatypes.experience.XPGainSource;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/sounds/SoundManager.java b/core/src/main/java/com/gmail/nossr50/core/util/sounds/SoundManager.java
index 14984334c..3ffeab4b1 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/sounds/SoundManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/sounds/SoundManager.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util.sounds;
 
-import com.gmail.nossr50.core.config.skills.SoundConfig;
+import com.gmail.nossr50.core.config.SoundConfig;
 import com.gmail.nossr50.core.util.Misc;
 import org.bukkit.Location;
 import org.bukkit.Sound;
diff --git a/core/src/main/java/com/gmail/nossr50/core/util/upgrade/UpgradeManager.java b/core/src/main/java/com/gmail/nossr50/core/util/upgrade/UpgradeManager.java
index 2a4a0e70a..d3c05ca12 100644
--- a/core/src/main/java/com/gmail/nossr50/core/util/upgrade/UpgradeManager.java
+++ b/core/src/main/java/com/gmail/nossr50/core/util/upgrade/UpgradeManager.java
@@ -1,6 +1,6 @@
 package com.gmail.nossr50.core.util.upgrade;
 
-import com.gmail.nossr50.core.config.skills.ConfigLoader;
+import com.gmail.nossr50.core.config.ConfigLoader;
 import com.gmail.nossr50.core.datatypes.database.UpgradeType;
 
 import java.util.Arrays;
diff --git a/core/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java b/core/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java
index bf4abe5f1..81415d88d 100644
--- a/core/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java
+++ b/core/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java
@@ -1,6 +1,6 @@
 package net.shatteredlands.shatt.backup;
 
-import com.gmail.nossr50.core.config.skills.Config;
+import com.gmail.nossr50.core.config.Config;
 import com.gmail.nossr50.mcMMO;
 
 import java.io.File;