Moving Stuff Around Pt 3

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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);
     }
 }

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() {

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;

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;

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());
     }
 }

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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() {

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() {

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;
 

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;
 

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;

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;

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;
 

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;

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;

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;
 

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();
 }

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
  */

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;

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;

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;
 

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;

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;

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;

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 {

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;

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;

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;

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();

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;

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;

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;

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;

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;

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;

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;

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;