diff --git a/src/com/projectkorra/projectkorra/BendingManager.java b/src/com/projectkorra/projectkorra/BendingManager.java
index ae26765d..e173b0f2 100644
--- a/src/com/projectkorra/projectkorra/BendingManager.java
+++ b/src/com/projectkorra/projectkorra/BendingManager.java
@@ -10,9 +10,9 @@ import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.FirePropertiesConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.properties.FirePropertiesConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
 import com.projectkorra.projectkorra.earthbending.metal.MetalClips;
 import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
 import com.projectkorra.projectkorra.util.ActionBar;
diff --git a/src/com/projectkorra/projectkorra/BendingPlayer.java b/src/com/projectkorra/projectkorra/BendingPlayer.java
index 03c58595..50530e49 100644
--- a/src/com/projectkorra/projectkorra/BendingPlayer.java
+++ b/src/com/projectkorra/projectkorra/BendingPlayer.java
@@ -27,8 +27,8 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.util.PassiveManager;
 import com.projectkorra.projectkorra.avatar.AvatarState;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
 import com.projectkorra.projectkorra.earthbending.metal.MetalClips;
 import com.projectkorra.projectkorra.event.PlayerCooldownChangeEvent;
 import com.projectkorra.projectkorra.event.PlayerCooldownChangeEvent.Result;
diff --git a/src/com/projectkorra/projectkorra/Element.java b/src/com/projectkorra/projectkorra/Element.java
index 402da194..48d7935a 100644
--- a/src/com/projectkorra/projectkorra/Element.java
+++ b/src/com/projectkorra/projectkorra/Element.java
@@ -10,8 +10,8 @@ import java.util.function.Supplier;
 import org.bukkit.ChatColor;
 import org.bukkit.plugin.Plugin;
 
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.ChatPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.properties.ChatPropertiesConfig;
 
 public class Element {
 
diff --git a/src/com/projectkorra/projectkorra/GeneralMethods.java b/src/com/projectkorra/projectkorra/GeneralMethods.java
index 804f38a1..f47d9b67 100644
--- a/src/com/projectkorra/projectkorra/GeneralMethods.java
+++ b/src/com/projectkorra/projectkorra/GeneralMethods.java
@@ -98,10 +98,10 @@ import com.projectkorra.projectkorra.airbending.AirShield;
 import com.projectkorra.projectkorra.airbending.AirSpout;
 import com.projectkorra.projectkorra.airbending.AirSuction;
 import com.projectkorra.projectkorra.airbending.AirSwipe;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.BindCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.ChatPropertiesConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.commands.BindCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.ChatPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
 import com.projectkorra.projectkorra.earthbending.EarthBlast;
 import com.projectkorra.projectkorra.earthbending.passive.EarthPassive;
 import com.projectkorra.projectkorra.event.BendingPlayerCreationEvent;
diff --git a/src/com/projectkorra/projectkorra/PKListener.java b/src/com/projectkorra/projectkorra/PKListener.java
index b5663b4c..c9baba45 100644
--- a/src/com/projectkorra/projectkorra/PKListener.java
+++ b/src/com/projectkorra/projectkorra/PKListener.java
@@ -112,68 +112,69 @@ import com.projectkorra.projectkorra.chiblocking.WarriorStance;
 import com.projectkorra.projectkorra.chiblocking.passive.Acrobatics;
 import com.projectkorra.projectkorra.chiblocking.passive.ChiPassive;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirBlastConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirBurstConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirScooterConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirShieldConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSpoutConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSuctionConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSwipeConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.FlightConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.SuffocateConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.TornadoConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.avatar.AvatarStateConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.AcrobatStanceConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.HighJumpConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.ParalyzeConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.QuickStrikeConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.RapidPunchConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.SmokescreenConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.SwiftKickConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.WarriorStanceConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.CatapultConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.CollapseConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.DensityShiftConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthArmorConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthBlastConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthGrabConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthPillarsConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthSmashConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthTunnelConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.ExtractionConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.FerroControlConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.LavaFlowConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.MetalClipsConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.RaiseEarthConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.ShockwaveConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.TremorsenseConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.BlazeConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.CombustionConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireBlastConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireBurstConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireJetConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireManipulationConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireShieldConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.HeatControlConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.IlluminationConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.LightningConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.WallOfFireConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.BloodbendingConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.FastSwimConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.HealingWatersConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.IceBlastConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.IceSpikeConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.OctopusFormConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.PhaseChangeConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.SurgeConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.TorrentConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterArmsConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterBubbleConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterManipulationConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterSpoutConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.ChatPropertiesConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirBlastConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirBurstConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirScooterConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirShieldConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSpoutConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSuctionConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSwipeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.FlightConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.SuffocateConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.TornadoConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.avatar.AvatarStateConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.AcrobatStanceConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.HighJumpConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.ParalyzeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.QuickStrikeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.RapidPunchConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.SmokescreenConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.SwiftKickConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.WarriorStanceConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.CatapultConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.CollapseConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.DensityShiftConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthArmorConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthBlastConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthGrabConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthPillarsConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthSmashConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthTunnelConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.ExtractionConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.FerroControlConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.LavaFlowConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.MetalClipsConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.RaiseEarthConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.ShockwaveConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.TremorsenseConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.BlazeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.CombustionConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireBlastConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireBurstConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireJetConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireManipulationConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireShieldConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.HeatControlConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.IlluminationConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.LightningConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.WallOfFireConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.BloodbendingConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.FastSwimConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.HealingWatersConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.IceBlastConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.IceSpikeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.OctopusFormConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.PhaseChangeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.SurgeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.TorrentConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterArmsConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterBubbleConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterManipulationConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterSpoutConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.ChatPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
 import com.projectkorra.projectkorra.earthbending.Catapult;
 import com.projectkorra.projectkorra.earthbending.Collapse;
 import com.projectkorra.projectkorra.earthbending.CollapseWall;
@@ -250,7 +251,7 @@ import com.projectkorra.projectkorra.waterbending.passive.HydroSink;
 
 import co.aikar.timings.lib.MCTiming;
 
-@SuppressWarnings({ "unused", "deprecation", "rawtypes" })
+@SuppressWarnings({ "unused", "deprecation", "rawtypes", "unchecked" })
 public class PKListener implements Listener {
 	ProjectKorra plugin;
 
@@ -1076,7 +1077,7 @@ public class PKListener implements Listener {
 
 		if (event.getEntity().getKiller() != null) {
 			if (BENDING_PLAYER_DEATH.containsKey(event.getEntity())) {
-				String message = ConfigManager.languageConfig.get().getString("DeathMessages.Default");
+				String message = ConfigManager.getConfig(GeneralPropertiesConfig.class).DefaultDeathMessage;
 				final String ability = BENDING_PLAYER_DEATH.get(event.getEntity());
 				final String tempAbility = ChatColor.stripColor(ability).replaceAll(" ", "");
 				final CoreAbility coreAbil = CoreAbility.getAbility(tempAbility);
@@ -1088,25 +1089,13 @@ public class PKListener implements Listener {
 				}
 
 				if (HorizontalVelocityTracker.hasBeenDamagedByHorizontalVelocity(event.getEntity()) && Arrays.asList(HorizontalVelocityTracker.abils).contains(tempAbility)) {
-					if (ConfigManager.languageConfig.get().contains("Abilities." + element.getName() + "." + tempAbility + ".HorizontalVelocityDeath")) {
-						message = ConfigManager.languageConfig.get().getString("Abilities." + element.getName() + "." + tempAbility + ".HorizontalVelocityDeath");
+					if (coreAbil != null && ConfigManager.getConfig((Class<? extends AbilityConfig>) coreAbil.getConfigType()).HorizontalVelocityDeathMessage != null) {
+						message = ConfigManager.getConfig((Class<? extends AbilityConfig>) coreAbil.getConfigType()).HorizontalVelocityDeathMessage;
 					}
-				} else if (element != null) {
-					if (element instanceof SubElement) {
-						element = ((SubElement) element).getParentElement();
-					}
-					if (ConfigManager.languageConfig.get().contains("Abilities." + element.getName() + "." + tempAbility + ".DeathMessage")) {
-						message = ConfigManager.languageConfig.get().getString("Abilities." + element.getName() + "." + tempAbility + ".DeathMessage");
-					} else if (ConfigManager.languageConfig.get().contains("Abilities." + element.getName() + ".Combo." + tempAbility + ".DeathMessage")) {
-						message = ConfigManager.languageConfig.get().getString("Abilities." + element.getName() + ".Combo." + tempAbility + ".DeathMessage");
-					}
-				} else {
-					if (isAvatarAbility) {
-						if (ConfigManager.languageConfig.get().contains("Abilities.Avatar." + tempAbility + ".DeathMessage")) {
-							message = ConfigManager.languageConfig.get().getString("Abilities.Avatar." + tempAbility + ".DeathMessage");
-						}
-					} else if (ConfigManager.languageConfig.get().contains("Abilities.Avatar.Combo." + tempAbility + ".DeathMessage")) {
-						message = ConfigManager.languageConfig.get().getString("Abilities.Avatar.Combo." + tempAbility + ".DeathMessage");
+				} else if (coreAbil != null) {
+					AbilityConfig conf = ConfigManager.getConfig((Class<? extends AbilityConfig>) coreAbil.getConfigType());
+					if (conf.DeathMessage != null) {
+						message = conf.DeathMessage;
 					}
 				}
 				message = message.replace("{victim}", event.getEntity().getName()).replace("{attacker}", event.getEntity().getKiller().getName()).replace("{ability}", ability);
diff --git a/src/com/projectkorra/projectkorra/ProjectKorra.java b/src/com/projectkorra/projectkorra/ProjectKorra.java
index 934be73d..67fc14f0 100644
--- a/src/com/projectkorra/projectkorra/ProjectKorra.java
+++ b/src/com/projectkorra/projectkorra/ProjectKorra.java
@@ -22,8 +22,8 @@ import com.projectkorra.projectkorra.ability.util.PassiveManager;
 import com.projectkorra.projectkorra.airbending.util.AirbendingManager;
 import com.projectkorra.projectkorra.chiblocking.util.ChiblockingManager;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
 import com.projectkorra.projectkorra.earthbending.util.EarthbendingManager;
 import com.projectkorra.projectkorra.firebending.util.FirebendingManager;
 import com.projectkorra.projectkorra.hooks.PlaceholderAPIHook;
diff --git a/src/com/projectkorra/projectkorra/ability/AirAbility.java b/src/com/projectkorra/projectkorra/ability/AirAbility.java
index 9ea6176a..8cd1c1ac 100644
--- a/src/com/projectkorra/projectkorra/ability/AirAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/AirAbility.java
@@ -13,9 +13,9 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.airbending.AirSpout;
 import com.projectkorra.projectkorra.airbending.Suffocate;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.AirPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.AirPropertiesConfig;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
 public abstract class AirAbility<C extends AbilityConfig> extends ElementalAbility<C> {
diff --git a/src/com/projectkorra/projectkorra/ability/AvatarAbility.java b/src/com/projectkorra/projectkorra/ability/AvatarAbility.java
index 2e40f51b..b97f6e4b 100644
--- a/src/com/projectkorra/projectkorra/ability/AvatarAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/AvatarAbility.java
@@ -4,9 +4,9 @@ import org.bukkit.Location;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.avatar.AvatarStateConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.avatar.AvatarStateConfig;
 
 public abstract class AvatarAbility<C extends AbilityConfig> extends ElementalAbility<C> {
 
diff --git a/src/com/projectkorra/projectkorra/ability/BloodAbility.java b/src/com/projectkorra/projectkorra/ability/BloodAbility.java
index 622560ab..f44ce158 100644
--- a/src/com/projectkorra/projectkorra/ability/BloodAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/BloodAbility.java
@@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public abstract class BloodAbility<C extends AbilityConfig> extends WaterAbility<C> implements SubAbility {
 
diff --git a/src/com/projectkorra/projectkorra/ability/ChiAbility.java b/src/com/projectkorra/projectkorra/ability/ChiAbility.java
index 95f00c20..9217274a 100644
--- a/src/com/projectkorra/projectkorra/ability/ChiAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/ChiAbility.java
@@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public abstract class ChiAbility<C extends AbilityConfig> extends ElementalAbility<C> {
 
diff --git a/src/com/projectkorra/projectkorra/ability/CombustionAbility.java b/src/com/projectkorra/projectkorra/ability/CombustionAbility.java
index 15cc9f2f..1ad9ed68 100644
--- a/src/com/projectkorra/projectkorra/ability/CombustionAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/CombustionAbility.java
@@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public abstract class CombustionAbility<C extends AbilityConfig> extends FireAbility<C> implements SubAbility {
 
diff --git a/src/com/projectkorra/projectkorra/ability/CoreAbility.java b/src/com/projectkorra/projectkorra/ability/CoreAbility.java
index 74ba9ac4..226a6193 100644
--- a/src/com/projectkorra/projectkorra/ability/CoreAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/CoreAbility.java
@@ -48,7 +48,7 @@ import com.projectkorra.projectkorra.ability.util.PassiveManager;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.attribute.AttributeModifier;
 import com.projectkorra.projectkorra.attribute.AttributePriority;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 import com.projectkorra.projectkorra.event.AbilityEndEvent;
 import com.projectkorra.projectkorra.event.AbilityProgressEvent;
 import com.projectkorra.projectkorra.event.AbilityStartEvent;
@@ -765,6 +765,8 @@ public abstract class CoreAbility<C extends AbilityConfig> implements Ability {
 	public int getId() {
 		return this.id;
 	}
+	
+	public abstract Class<C> getConfigType();
 
 	@Override
 	public boolean isHiddenAbility() {
diff --git a/src/com/projectkorra/projectkorra/ability/EarthAbility.java b/src/com/projectkorra/projectkorra/ability/EarthAbility.java
index e00803dc..d0aae2fc 100644
--- a/src/com/projectkorra/projectkorra/ability/EarthAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/EarthAbility.java
@@ -21,9 +21,9 @@ import com.projectkorra.projectkorra.BendingPlayer;
 import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.util.Collision;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.EarthPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.EarthPropertiesConfig;
 import com.projectkorra.projectkorra.earthbending.RaiseEarth;
 import com.projectkorra.projectkorra.earthbending.lava.LavaFlow;
 import com.projectkorra.projectkorra.earthbending.passive.DensityShift;
diff --git a/src/com/projectkorra/projectkorra/ability/ElementalAbility.java b/src/com/projectkorra/projectkorra/ability/ElementalAbility.java
index 1de8ea01..75e41c80 100644
--- a/src/com/projectkorra/projectkorra/ability/ElementalAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/ElementalAbility.java
@@ -16,10 +16,10 @@ import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffectType;
 
 import com.projectkorra.projectkorra.GeneralMethods;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.EarthPropertiesConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.EarthPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
 
 /**
  * ElementalAbility is used to hold methods that should be accessible by every
diff --git a/src/com/projectkorra/projectkorra/ability/FireAbility.java b/src/com/projectkorra/projectkorra/ability/FireAbility.java
index 9dc12871..e1cbd8fc 100644
--- a/src/com/projectkorra/projectkorra/ability/FireAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/FireAbility.java
@@ -17,9 +17,9 @@ import org.bukkit.inventory.ItemStack;
 import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.util.Collision;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.FirePropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.FirePropertiesConfig;
 import com.projectkorra.projectkorra.firebending.BlazeArc;
 import com.projectkorra.projectkorra.util.Information;
 import com.projectkorra.projectkorra.util.ParticleEffect;
diff --git a/src/com/projectkorra/projectkorra/ability/FlightAbility.java b/src/com/projectkorra/projectkorra/ability/FlightAbility.java
index d288cdf9..64931191 100644
--- a/src/com/projectkorra/projectkorra/ability/FlightAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/FlightAbility.java
@@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public abstract class FlightAbility<C extends AbilityConfig> extends AirAbility<C> implements SubAbility {
 
diff --git a/src/com/projectkorra/projectkorra/ability/HealingAbility.java b/src/com/projectkorra/projectkorra/ability/HealingAbility.java
index 89b30779..b2beec73 100644
--- a/src/com/projectkorra/projectkorra/ability/HealingAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/HealingAbility.java
@@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public abstract class HealingAbility<C extends AbilityConfig> extends WaterAbility<C> implements SubAbility {
 
diff --git a/src/com/projectkorra/projectkorra/ability/IceAbility.java b/src/com/projectkorra/projectkorra/ability/IceAbility.java
index 1215ac3b..6d467012 100644
--- a/src/com/projectkorra/projectkorra/ability/IceAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/IceAbility.java
@@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public abstract class IceAbility<C extends AbilityConfig> extends WaterAbility<C> implements SubAbility {
 
diff --git a/src/com/projectkorra/projectkorra/ability/LavaAbility.java b/src/com/projectkorra/projectkorra/ability/LavaAbility.java
index 2ee634f3..18b52402 100644
--- a/src/com/projectkorra/projectkorra/ability/LavaAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/LavaAbility.java
@@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public abstract class LavaAbility<C extends AbilityConfig> extends EarthAbility<C> implements SubAbility {
 
diff --git a/src/com/projectkorra/projectkorra/ability/LightningAbility.java b/src/com/projectkorra/projectkorra/ability/LightningAbility.java
index 5035da68..0e60eca8 100644
--- a/src/com/projectkorra/projectkorra/ability/LightningAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/LightningAbility.java
@@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public abstract class LightningAbility<C extends AbilityConfig> extends FireAbility<C> implements SubAbility {
 
diff --git a/src/com/projectkorra/projectkorra/ability/MetalAbility.java b/src/com/projectkorra/projectkorra/ability/MetalAbility.java
index ab16be68..913c12d9 100644
--- a/src/com/projectkorra/projectkorra/ability/MetalAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/MetalAbility.java
@@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public abstract class MetalAbility<C extends AbilityConfig> extends EarthAbility<C> implements SubAbility {
 
diff --git a/src/com/projectkorra/projectkorra/ability/PlantAbility.java b/src/com/projectkorra/projectkorra/ability/PlantAbility.java
index f8d4a20e..fd68942a 100644
--- a/src/com/projectkorra/projectkorra/ability/PlantAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/PlantAbility.java
@@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public abstract class PlantAbility<C extends AbilityConfig> extends WaterAbility<C> implements SubAbility {
 
diff --git a/src/com/projectkorra/projectkorra/ability/SandAbility.java b/src/com/projectkorra/projectkorra/ability/SandAbility.java
index 617c8a00..306f1783 100644
--- a/src/com/projectkorra/projectkorra/ability/SandAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/SandAbility.java
@@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public abstract class SandAbility<C extends AbilityConfig> extends EarthAbility<C> implements SubAbility {
 
diff --git a/src/com/projectkorra/projectkorra/ability/SpiritualAbility.java b/src/com/projectkorra/projectkorra/ability/SpiritualAbility.java
index 12336701..3631ce2c 100644
--- a/src/com/projectkorra/projectkorra/ability/SpiritualAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/SpiritualAbility.java
@@ -3,7 +3,7 @@ package com.projectkorra.projectkorra.ability;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.Element;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public abstract class SpiritualAbility<C extends AbilityConfig> extends AirAbility<C> implements SubAbility {
 
diff --git a/src/com/projectkorra/projectkorra/ability/WaterAbility.java b/src/com/projectkorra/projectkorra/ability/WaterAbility.java
index d215f54a..63c7d760 100644
--- a/src/com/projectkorra/projectkorra/ability/WaterAbility.java
+++ b/src/com/projectkorra/projectkorra/ability/WaterAbility.java
@@ -17,9 +17,9 @@ import com.projectkorra.projectkorra.BendingPlayer;
 import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.util.Collision;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
 import com.projectkorra.projectkorra.firebending.HeatControl;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ParticleEffect;
diff --git a/src/com/projectkorra/projectkorra/ability/util/ComboManager.java b/src/com/projectkorra/projectkorra/ability/util/ComboManager.java
index 3da0e04e..0c178cce 100644
--- a/src/com/projectkorra/projectkorra/ability/util/ComboManager.java
+++ b/src/com/projectkorra/projectkorra/ability/util/ComboManager.java
@@ -15,8 +15,8 @@ import com.projectkorra.projectkorra.Element.SubElement;
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.ComboAbility;
 import com.projectkorra.projectkorra.ability.CoreAbility;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthDomeConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthDomeConfig;
 import com.projectkorra.projectkorra.earthbending.combo.EarthDomeOthers;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.ReflectionHandler;
diff --git a/src/com/projectkorra/projectkorra/airbending/AirBlast.java b/src/com/projectkorra/projectkorra/airbending/AirBlast.java
index 8c7fdeef..1b1c0650 100644
--- a/src/com/projectkorra/projectkorra/airbending/AirBlast.java
+++ b/src/com/projectkorra/projectkorra/airbending/AirBlast.java
@@ -29,8 +29,8 @@ import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirBlastConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirBlastConfig;
 import com.projectkorra.projectkorra.earthbending.lava.LavaFlow;
 import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
 import com.projectkorra.projectkorra.util.DamageHandler;
@@ -650,5 +650,10 @@ public class AirBlast extends AirAbility<AirBlastConfig> {
 	public static double getSelectRange() {
 		return ConfigManager.getConfig(AirBlastConfig.class).SelectionRange;
 	}
+	
+	@Override
+	public Class<AirBlastConfig> getConfigType() {
+		return AirBlastConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/AirBurst.java b/src/com/projectkorra/projectkorra/airbending/AirBurst.java
index 54ada01b..6ea1c3ff 100644
--- a/src/com/projectkorra/projectkorra/airbending/AirBurst.java
+++ b/src/com/projectkorra/projectkorra/airbending/AirBurst.java
@@ -12,9 +12,9 @@ import org.bukkit.util.Vector;
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirBlastConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirBurstConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirBlastConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirBurstConfig;
 
 public class AirBurst extends AirAbility<AirBurstConfig> {
 
@@ -328,4 +328,9 @@ public class AirBurst extends AirAbility<AirBurstConfig> {
 	public ArrayList<Entity> getAffectedEntities() {
 		return this.affectedEntities;
 	}
+	
+	@Override
+	public Class<AirBurstConfig> getConfigType() {
+		return AirBurstConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/AirScooter.java b/src/com/projectkorra/projectkorra/airbending/AirScooter.java
index bfdef379..713c7893 100644
--- a/src/com/projectkorra/projectkorra/airbending/AirScooter.java
+++ b/src/com/projectkorra/projectkorra/airbending/AirScooter.java
@@ -18,7 +18,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirScooterConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirScooterConfig;
 
 public class AirScooter extends AirAbility<AirScooterConfig> {
 
@@ -326,4 +326,9 @@ public class AirScooter extends AirAbility<AirScooterConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<AirScooterConfig> getConfigType() {
+		return AirScooterConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/AirShield.java b/src/com/projectkorra/projectkorra/airbending/AirShield.java
index f675db36..58d7bc82 100644
--- a/src/com/projectkorra/projectkorra/airbending/AirShield.java
+++ b/src/com/projectkorra/projectkorra/airbending/AirShield.java
@@ -18,7 +18,7 @@ import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.avatar.AvatarState;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirShieldConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirShieldConfig;
 
 public class AirShield extends AirAbility<AirShieldConfig> {
 
@@ -286,4 +286,9 @@ public class AirShield extends AirAbility<AirShieldConfig> {
 	public HashMap<Integer, Integer> getAngles() {
 		return this.angles;
 	}
+	
+	@Override
+	public Class<AirShieldConfig> getConfigType() {
+		return AirShieldConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/AirSpout.java b/src/com/projectkorra/projectkorra/airbending/AirSpout.java
index 5b24ecfd..c474bf2e 100644
--- a/src/com/projectkorra/projectkorra/airbending/AirSpout.java
+++ b/src/com/projectkorra/projectkorra/airbending/AirSpout.java
@@ -14,7 +14,7 @@ import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSpoutConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSpoutConfig;
 
 public class AirSpout extends AirAbility<AirSpoutConfig> {
 
@@ -279,5 +279,10 @@ public class AirSpout extends AirAbility<AirSpoutConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<AirSpoutConfig> getConfigType() {
+		return AirSpoutConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/AirSuction.java b/src/com/projectkorra/projectkorra/airbending/AirSuction.java
index 8144ab20..175715f4 100644
--- a/src/com/projectkorra/projectkorra/airbending/AirSuction.java
+++ b/src/com/projectkorra/projectkorra/airbending/AirSuction.java
@@ -23,8 +23,8 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSuctionConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSuctionConfig;
 import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
 import com.projectkorra.projectkorra.waterbending.WaterSpout;
 
@@ -410,5 +410,10 @@ public class AirSuction extends AirAbility<AirSuctionConfig> {
 	public static double getSelectRange() {
 		return ConfigManager.getConfig(AirSuctionConfig.class).SelectionRange;
 	}
+	
+	@Override
+	public Class<AirSuctionConfig> getConfigType() {
+		return AirSuctionConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/AirSwipe.java b/src/com/projectkorra/projectkorra/airbending/AirSwipe.java
index f06d707e..eabf8215 100644
--- a/src/com/projectkorra/projectkorra/airbending/AirSwipe.java
+++ b/src/com/projectkorra/projectkorra/airbending/AirSwipe.java
@@ -24,7 +24,7 @@ import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSwipeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSwipeConfig;
 import com.projectkorra.projectkorra.earthbending.lava.LavaFlow;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.TempBlock;
@@ -451,5 +451,10 @@ public class AirSwipe extends AirAbility<AirSwipeConfig> {
 	public void setArcIncrement(final int arcIncrement) {
 		this.arcIncrement = arcIncrement;
 	}
+	
+	@Override
+	public Class<AirSwipeConfig> getConfigType() {
+		return AirSwipeConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/Suffocate.java b/src/com/projectkorra/projectkorra/airbending/Suffocate.java
index 61a4c797..776b4fcf 100644
--- a/src/com/projectkorra/projectkorra/airbending/Suffocate.java
+++ b/src/com/projectkorra/projectkorra/airbending/Suffocate.java
@@ -15,7 +15,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.SuffocateConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.SuffocateConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 
 /**
@@ -647,4 +647,9 @@ public class Suffocate extends AirAbility<SuffocateConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<SuffocateConfig> getConfigType() {
+		return SuffocateConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/Tornado.java b/src/com/projectkorra/projectkorra/airbending/Tornado.java
index 3cc2b85b..ca869fb4 100644
--- a/src/com/projectkorra/projectkorra/airbending/Tornado.java
+++ b/src/com/projectkorra/projectkorra/airbending/Tornado.java
@@ -16,7 +16,7 @@ import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.TornadoConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.TornadoConfig;
 
 public class Tornado extends AirAbility<TornadoConfig> {
 
@@ -323,4 +323,9 @@ public class Tornado extends AirAbility<TornadoConfig> {
 	public Map<Integer, Integer> getAngles() {
 		return this.angles;
 	}
+	
+	@Override
+	public Class<TornadoConfig> getConfigType() {
+		return TornadoConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/combo/AirStream.java b/src/com/projectkorra/projectkorra/airbending/combo/AirStream.java
index e0602098..29732b75 100644
--- a/src/com/projectkorra/projectkorra/airbending/combo/AirStream.java
+++ b/src/com/projectkorra/projectkorra/airbending/combo/AirStream.java
@@ -15,8 +15,8 @@ import com.projectkorra.projectkorra.ability.ComboAbility;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirStreamConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirStreamConfig;
 import com.projectkorra.projectkorra.util.ClickType;
 
 public class AirStream extends AirAbility<AirStreamConfig> implements ComboAbility {
@@ -301,4 +301,9 @@ public class AirStream extends AirAbility<AirStreamConfig> implements ComboAbili
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<AirStreamConfig> getConfigType() {
+		return AirStreamConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/combo/AirSweep.java b/src/com/projectkorra/projectkorra/airbending/combo/AirSweep.java
index 49579227..b287ee0a 100644
--- a/src/com/projectkorra/projectkorra/airbending/combo/AirSweep.java
+++ b/src/com/projectkorra/projectkorra/airbending/combo/AirSweep.java
@@ -18,8 +18,8 @@ import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSweepConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSweepConfig;
 import com.projectkorra.projectkorra.firebending.combo.FireComboStream;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.DamageHandler;
@@ -340,4 +340,9 @@ public class AirSweep extends AirAbility<AirSweepConfig> implements ComboAbility
 	public void setTasks(final ArrayList<BukkitRunnable> tasks) {
 		this.tasks = tasks;
 	}
+
+	@Override
+	public Class<AirSweepConfig> getConfigType() {
+		return AirSweepConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/combo/Twister.java b/src/com/projectkorra/projectkorra/airbending/combo/Twister.java
index f77302c4..a5063833 100644
--- a/src/com/projectkorra/projectkorra/airbending/combo/Twister.java
+++ b/src/com/projectkorra/projectkorra/airbending/combo/Twister.java
@@ -14,8 +14,8 @@ import com.projectkorra.projectkorra.ability.ComboAbility;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.TwisterConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.TwisterConfig;
 import com.projectkorra.projectkorra.util.ClickType;
 
 public class Twister extends AirAbility<TwisterConfig> implements ComboAbility {
@@ -194,4 +194,9 @@ public class Twister extends AirAbility<TwisterConfig> implements ComboAbility {
 		twister.add(new AbilityInformation("AirBlast", ClickType.LEFT_CLICK));
 		return twister;
 	}
+	
+	@Override
+	public Class<TwisterConfig> getConfigType() {
+		return TwisterConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/flight/FlightMultiAbility.java b/src/com/projectkorra/projectkorra/airbending/flight/FlightMultiAbility.java
index 4c9b47b2..eea8086a 100644
--- a/src/com/projectkorra/projectkorra/airbending/flight/FlightMultiAbility.java
+++ b/src/com/projectkorra/projectkorra/airbending/flight/FlightMultiAbility.java
@@ -27,7 +27,7 @@ import com.projectkorra.projectkorra.ability.util.MultiAbilityManager.MultiAbili
 import com.projectkorra.projectkorra.airbending.AirScooter;
 import com.projectkorra.projectkorra.airbending.AirSpout;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.FlightConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.FlightConfig;
 import com.projectkorra.projectkorra.firebending.FireJet;
 import com.projectkorra.projectkorra.util.ActionBar;
 import com.projectkorra.projectkorra.util.DamageHandler;
@@ -394,4 +394,9 @@ public class FlightMultiAbility extends FlightAbility<FlightConfig> implements M
 		}
 		return false;
 	}
+	
+	@Override
+	public Class<FlightConfig> getConfigType() {
+		return FlightConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/passive/AirAgility.java b/src/com/projectkorra/projectkorra/airbending/passive/AirAgility.java
index 090440b7..37470dce 100644
--- a/src/com/projectkorra/projectkorra/airbending/passive/AirAgility.java
+++ b/src/com/projectkorra/projectkorra/airbending/passive/AirAgility.java
@@ -8,7 +8,7 @@ import org.bukkit.potion.PotionEffectType;
 import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.PassiveAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirAgilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirAgilityConfig;
 
 public class AirAgility extends AirAbility<AirAgilityConfig> implements PassiveAbility {
 
@@ -86,5 +86,9 @@ public class AirAgility extends AirAbility<AirAgilityConfig> implements PassiveA
 	public int getSpeedPower() {
 		return this.speedPower;
 	}
-
+	
+	@Override
+	public Class<AirAgilityConfig> getConfigType() {
+		return AirAgilityConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/passive/AirSaturation.java b/src/com/projectkorra/projectkorra/airbending/passive/AirSaturation.java
index 8e8206b4..1410848f 100644
--- a/src/com/projectkorra/projectkorra/airbending/passive/AirSaturation.java
+++ b/src/com/projectkorra/projectkorra/airbending/passive/AirSaturation.java
@@ -5,8 +5,8 @@ import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.PassiveAbility;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.AirSaturationConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.AirSaturationConfig;
 
 public class AirSaturation extends AirAbility<AirSaturationConfig> implements PassiveAbility {
 	public AirSaturation(final AirSaturationConfig config, final Player player) {
@@ -54,4 +54,9 @@ public class AirSaturation extends AirAbility<AirSaturationConfig> implements Pa
 	public boolean isProgressable() {
 		return false;
 	}
+	
+	@Override
+	public Class<AirSaturationConfig> getConfigType() {
+		return AirSaturationConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/airbending/passive/GracefulDescent.java b/src/com/projectkorra/projectkorra/airbending/passive/GracefulDescent.java
index 0d48e6e4..da23c057 100644
--- a/src/com/projectkorra/projectkorra/airbending/passive/GracefulDescent.java
+++ b/src/com/projectkorra/projectkorra/airbending/passive/GracefulDescent.java
@@ -5,7 +5,7 @@ import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.PassiveAbility;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.air.GracefulDescentConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.air.GracefulDescentConfig;
 
 public class GracefulDescent extends AirAbility<GracefulDescentConfig> implements PassiveAbility {
 
@@ -52,4 +52,9 @@ public class GracefulDescent extends AirAbility<GracefulDescentConfig> implement
 	public boolean isProgressable() {
 		return false;
 	}
+	
+	@Override
+	public Class<GracefulDescentConfig> getConfigType() {
+		return GracefulDescentConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/avatar/AvatarState.java b/src/com/projectkorra/projectkorra/avatar/AvatarState.java
index 495686e5..9b31c51c 100644
--- a/src/com/projectkorra/projectkorra/avatar/AvatarState.java
+++ b/src/com/projectkorra/projectkorra/avatar/AvatarState.java
@@ -9,8 +9,8 @@ import org.bukkit.potion.PotionEffectType;
 
 import com.projectkorra.projectkorra.ability.AvatarAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.avatar.AvatarStateConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.avatar.AvatarStateConfig;
 
 public class AvatarState extends AvatarAbility<AvatarStateConfig> {
 
@@ -221,5 +221,10 @@ public class AvatarState extends AvatarAbility<AvatarStateConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<AvatarStateConfig> getConfigType() {
+		return AvatarStateConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java b/src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java
index d4bd3554..a45cfe68 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/AcrobatStance.java
@@ -10,7 +10,7 @@ import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.ChiAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.AcrobatStanceConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.AcrobatStanceConfig;
 
 @SuppressWarnings("rawtypes")
 public class AcrobatStance extends ChiAbility<AcrobatStanceConfig> {
@@ -147,5 +147,10 @@ public class AcrobatStance extends ChiAbility<AcrobatStanceConfig> {
 	public void setParalyzeDodgeBoost(final double paralyzeDodgeBoost) {
 		this.paralyzeDodgeBoost = paralyzeDodgeBoost;
 	}
+	
+	@Override
+	public Class<AcrobatStanceConfig> getConfigType() {
+		return AcrobatStanceConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/chiblocking/HighJump.java b/src/com/projectkorra/projectkorra/chiblocking/HighJump.java
index 8d357a89..4c18dd4d 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/HighJump.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/HighJump.java
@@ -8,7 +8,7 @@ import org.bukkit.util.Vector;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.ChiAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.HighJumpConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.HighJumpConfig;
 import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArmsWhip;
 
 public class HighJump extends ChiAbility<HighJumpConfig> {
@@ -90,5 +90,10 @@ public class HighJump extends ChiAbility<HighJumpConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<HighJumpConfig> getConfigType() {
+		return HighJumpConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/chiblocking/Paralyze.java b/src/com/projectkorra/projectkorra/chiblocking/Paralyze.java
index edd0ebe0..61c396b2 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/Paralyze.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/Paralyze.java
@@ -13,7 +13,7 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.airbending.Suffocate;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.ParalyzeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.ParalyzeConfig;
 import com.projectkorra.projectkorra.util.MovementHandler;
 
 public class Paralyze extends ChiAbility<ParalyzeConfig> {
@@ -104,4 +104,9 @@ public class Paralyze extends ChiAbility<ParalyzeConfig> {
 	public long getDuration() {
 		return this.duration;
 	}
+	
+	@Override
+	public Class<ParalyzeConfig> getConfigType() {
+		return ParalyzeConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/chiblocking/QuickStrike.java b/src/com/projectkorra/projectkorra/chiblocking/QuickStrike.java
index a30fb76a..bf8ff952 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/QuickStrike.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/QuickStrike.java
@@ -7,7 +7,7 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.ability.ChiAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.chiblocking.passive.ChiPassive;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.QuickStrikeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.QuickStrikeConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 
 public class QuickStrike extends ChiAbility<QuickStrikeConfig> {
@@ -105,4 +105,9 @@ public class QuickStrike extends ChiAbility<QuickStrikeConfig> {
 	public void setTarget(final Entity target) {
 		this.target = target;
 	}
+	
+	@Override
+	public Class<QuickStrikeConfig> getConfigType() {
+		return QuickStrikeConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/chiblocking/RapidPunch.java b/src/com/projectkorra/projectkorra/chiblocking/RapidPunch.java
index 0e7ba4ec..8d547e21 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/RapidPunch.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/RapidPunch.java
@@ -9,7 +9,7 @@ import com.projectkorra.projectkorra.ability.ChiAbility;
 import com.projectkorra.projectkorra.airbending.Suffocate;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.chiblocking.passive.ChiPassive;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.RapidPunchConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.RapidPunchConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 
 public class RapidPunch extends ChiAbility<RapidPunchConfig> {
@@ -125,5 +125,10 @@ public class RapidPunch extends ChiAbility<RapidPunchConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<RapidPunchConfig> getConfigType() {
+		return RapidPunchConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/chiblocking/Smokescreen.java b/src/com/projectkorra/projectkorra/chiblocking/Smokescreen.java
index c746a573..1ad7bc6b 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/Smokescreen.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/Smokescreen.java
@@ -14,7 +14,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.ChiAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.SmokescreenConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.SmokescreenConfig;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
 public class Smokescreen extends ChiAbility<SmokescreenConfig> {
@@ -152,5 +152,10 @@ public class Smokescreen extends ChiAbility<SmokescreenConfig> {
 	public static Map<String, Smokescreen> getBlindedToAbility() {
 		return BLINDED_TO_ABILITY;
 	}
+	
+	@Override
+	public Class<SmokescreenConfig> getConfigType() {
+		return SmokescreenConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java b/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java
index f1b9439a..0e0c2a5b 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/SwiftKick.java
@@ -8,7 +8,7 @@ import com.projectkorra.projectkorra.ability.ChiAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.chiblocking.passive.ChiPassive;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.SwiftKickConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.SwiftKickConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 
 public class SwiftKick extends ChiAbility<SwiftKickConfig> {
@@ -103,5 +103,10 @@ public class SwiftKick extends ChiAbility<SwiftKickConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<SwiftKickConfig> getConfigType() {
+		return SwiftKickConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java b/src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java
index 0be5b378..27cd0ca8 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/WarriorStance.java
@@ -10,7 +10,7 @@ import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.ChiAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.WarriorStanceConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.WarriorStanceConfig;
 
 @SuppressWarnings("rawtypes")
 public class WarriorStance extends ChiAbility<WarriorStanceConfig> {
@@ -127,5 +127,10 @@ public class WarriorStance extends ChiAbility<WarriorStanceConfig> {
 	public void setDuration(final long duration) {
 		this.duration = duration;
 	}
+	
+	@Override
+	public Class<WarriorStanceConfig> getConfigType() {
+		return WarriorStanceConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/chiblocking/combo/Immobilize.java b/src/com/projectkorra/projectkorra/chiblocking/combo/Immobilize.java
index 30448936..5c753271 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/combo/Immobilize.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/combo/Immobilize.java
@@ -15,8 +15,8 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.ImmobilizeConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.ImmobilizeConfig;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.MovementHandler;
 
@@ -123,4 +123,9 @@ public class Immobilize extends ChiAbility<ImmobilizeConfig> implements ComboAbi
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<ImmobilizeConfig> getConfigType() {
+		return ImmobilizeConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/chiblocking/passive/Acrobatics.java b/src/com/projectkorra/projectkorra/chiblocking/passive/Acrobatics.java
index e0b5546f..fe1c0869 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/passive/Acrobatics.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/passive/Acrobatics.java
@@ -5,8 +5,8 @@ import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.ability.ChiAbility;
 import com.projectkorra.projectkorra.ability.PassiveAbility;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.AcrobaticsConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.AcrobaticsConfig;
 
 public class Acrobatics extends ChiAbility<AcrobaticsConfig> implements PassiveAbility {
 	public Acrobatics(final AcrobaticsConfig config, final Player player) {
@@ -54,4 +54,9 @@ public class Acrobatics extends ChiAbility<AcrobaticsConfig> implements PassiveA
 	public boolean isProgressable() {
 		return false;
 	}
+	
+	@Override
+	public Class<AcrobaticsConfig> getConfigType() {
+		return AcrobaticsConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/chiblocking/passive/ChiAgility.java b/src/com/projectkorra/projectkorra/chiblocking/passive/ChiAgility.java
index 107e3c9b..dfe115b9 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/passive/ChiAgility.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/passive/ChiAgility.java
@@ -8,7 +8,7 @@ import org.bukkit.potion.PotionEffectType;
 import com.projectkorra.projectkorra.ability.ChiAbility;
 import com.projectkorra.projectkorra.ability.PassiveAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.ChiAgilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.ChiAgilityConfig;
 
 public class ChiAgility extends ChiAbility<ChiAgilityConfig> implements PassiveAbility {
 
@@ -86,5 +86,10 @@ public class ChiAgility extends ChiAbility<ChiAgilityConfig> implements PassiveA
 	public int getSpeedPower() {
 		return this.speedPower;
 	}
+	
+	@Override
+	public Class<ChiAgilityConfig> getConfigType() {
+		return ChiAgilityConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/chiblocking/passive/ChiPassive.java b/src/com/projectkorra/projectkorra/chiblocking/passive/ChiPassive.java
index c78dd735..0844960a 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/passive/ChiPassive.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/passive/ChiPassive.java
@@ -13,8 +13,8 @@ import com.projectkorra.projectkorra.airbending.Suffocate;
 import com.projectkorra.projectkorra.chiblocking.AcrobatStance;
 import com.projectkorra.projectkorra.chiblocking.QuickStrike;
 import com.projectkorra.projectkorra.chiblocking.SwiftKick;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.ChiPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.properties.ChiPropertiesConfig;
 import com.projectkorra.projectkorra.util.ActionBar;
 
 @SuppressWarnings("rawtypes")
diff --git a/src/com/projectkorra/projectkorra/chiblocking/passive/ChiSaturation.java b/src/com/projectkorra/projectkorra/chiblocking/passive/ChiSaturation.java
index f280f7a4..156ba90a 100644
--- a/src/com/projectkorra/projectkorra/chiblocking/passive/ChiSaturation.java
+++ b/src/com/projectkorra/projectkorra/chiblocking/passive/ChiSaturation.java
@@ -5,8 +5,8 @@ import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.ability.ChiAbility;
 import com.projectkorra.projectkorra.ability.PassiveAbility;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.chi.ChiSaturationConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.chi.ChiSaturationConfig;
 
 public class ChiSaturation extends ChiAbility<ChiSaturationConfig> implements PassiveAbility {
 	public ChiSaturation(final ChiSaturationConfig config, final Player player) {
@@ -54,4 +54,9 @@ public class ChiSaturation extends ChiAbility<ChiSaturationConfig> implements Pa
 	public boolean isProgressable() {
 		return false;
 	}
+	
+	@Override
+	public Class<ChiSaturationConfig> getConfigType() {
+		return ChiSaturationConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/command/AddCommand.java b/src/com/projectkorra/projectkorra/command/AddCommand.java
index b847a31f..f9ad161e 100644
--- a/src/com/projectkorra/projectkorra/command/AddCommand.java
+++ b/src/com/projectkorra/projectkorra/command/AddCommand.java
@@ -12,10 +12,10 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.BendingPlayer;
 import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.Element.SubElement;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.commands.AddCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.CommandPropertiesConfig;
 import com.projectkorra.projectkorra.GeneralMethods;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.AddCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.CommandPropertiesConfig;
 import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
 import com.projectkorra.projectkorra.event.PlayerChangeElementEvent.Result;
 import com.projectkorra.projectkorra.event.PlayerChangeSubElementEvent;
diff --git a/src/com/projectkorra/projectkorra/command/BindCommand.java b/src/com/projectkorra/projectkorra/command/BindCommand.java
index 4c70d17b..ad008788 100644
--- a/src/com/projectkorra/projectkorra/command/BindCommand.java
+++ b/src/com/projectkorra/projectkorra/command/BindCommand.java
@@ -16,7 +16,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.ComboAbility;
 import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.PassiveAbility;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.BindCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.BindCommandConfig;
 
 /**
  * Executor for /bending bind. Extends {@link PKCommand}.
diff --git a/src/com/projectkorra/projectkorra/command/CheckCommand.java b/src/com/projectkorra/projectkorra/command/CheckCommand.java
index b61391fb..81360dd7 100644
--- a/src/com/projectkorra/projectkorra/command/CheckCommand.java
+++ b/src/com/projectkorra/projectkorra/command/CheckCommand.java
@@ -6,7 +6,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
 import com.projectkorra.projectkorra.ProjectKorra;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.CheckCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.CheckCommandConfig;
 
 /**
  * Executor for /bending check. Extends {@link PKCommand}.
diff --git a/src/com/projectkorra/projectkorra/command/ChooseCommand.java b/src/com/projectkorra/projectkorra/command/ChooseCommand.java
index f60838be..be506e46 100644
--- a/src/com/projectkorra/projectkorra/command/ChooseCommand.java
+++ b/src/com/projectkorra/projectkorra/command/ChooseCommand.java
@@ -12,12 +12,12 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.BendingPlayer;
 import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.Element.SubElement;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.commands.ChooseCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.CommandPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ProjectKorra;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.ChooseCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.CommandPropertiesConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
 import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
 import com.projectkorra.projectkorra.event.PlayerChangeElementEvent.Result;
 import com.projectkorra.projectkorra.event.PlayerChangeSubElementEvent;
diff --git a/src/com/projectkorra/projectkorra/command/ClearCommand.java b/src/com/projectkorra/projectkorra/command/ClearCommand.java
index 4521706d..23c6ed95 100644
--- a/src/com/projectkorra/projectkorra/command/ClearCommand.java
+++ b/src/com/projectkorra/projectkorra/command/ClearCommand.java
@@ -11,7 +11,7 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.BendingPlayer;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.ClearCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.ClearCommandConfig;
 
 /**
  * Executor for /bending clear. Extends {@link PKCommand}.
diff --git a/src/com/projectkorra/projectkorra/command/Commands.java b/src/com/projectkorra/projectkorra/command/Commands.java
index 653bc0a6..88bba28c 100644
--- a/src/com/projectkorra/projectkorra/command/Commands.java
+++ b/src/com/projectkorra/projectkorra/command/Commands.java
@@ -10,25 +10,25 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.PluginCommand;
 
 import com.projectkorra.projectkorra.ProjectKorra;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.AddCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.BindCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.CheckCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.ChooseCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.ClearCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.CopyCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.DebugCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.DisplayCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.HelpCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.InvincibleCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.PermaremoveCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.PresetCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.ReloadCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.RemoveCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.StatsCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.ToggleCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.VersionCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.WhoCommandConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.commands.AddCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.BindCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.CheckCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.ChooseCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.ClearCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.CopyCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.DebugCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.DisplayCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.HelpCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.InvincibleCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.PermaremoveCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.PresetCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.ReloadCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.RemoveCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.StatsCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.ToggleCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.VersionCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.WhoCommandConfig;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class Commands {
diff --git a/src/com/projectkorra/projectkorra/command/CopyCommand.java b/src/com/projectkorra/projectkorra/command/CopyCommand.java
index e444b63c..bad54a1a 100644
--- a/src/com/projectkorra/projectkorra/command/CopyCommand.java
+++ b/src/com/projectkorra/projectkorra/command/CopyCommand.java
@@ -13,9 +13,9 @@ import com.projectkorra.projectkorra.BendingPlayer;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.CoreAbility;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.CopyCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.CommandPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.commands.CopyCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.CommandPropertiesConfig;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
 public class CopyCommand extends PKCommand<CopyCommandConfig> {
diff --git a/src/com/projectkorra/projectkorra/command/DebugCommand.java b/src/com/projectkorra/projectkorra/command/DebugCommand.java
index 3cb4257c..4e3ef82f 100644
--- a/src/com/projectkorra/projectkorra/command/DebugCommand.java
+++ b/src/com/projectkorra/projectkorra/command/DebugCommand.java
@@ -6,7 +6,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
 import com.projectkorra.projectkorra.GeneralMethods;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.DebugCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.DebugCommandConfig;
 
 /**
  * Executor for /bending debug. Extends {@link PKCommand}.
diff --git a/src/com/projectkorra/projectkorra/command/DisplayCommand.java b/src/com/projectkorra/projectkorra/command/DisplayCommand.java
index 3fa6134e..43a5a3f6 100644
--- a/src/com/projectkorra/projectkorra/command/DisplayCommand.java
+++ b/src/com/projectkorra/projectkorra/command/DisplayCommand.java
@@ -20,9 +20,9 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.SubAbility;
 import com.projectkorra.projectkorra.ability.util.ComboManager;
 import com.projectkorra.projectkorra.ability.util.PassiveManager;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.DisplayCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.CommandPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.commands.DisplayCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.CommandPropertiesConfig;
 
 /**
  * Executor for /bending display. Extends {@link PKCommand}.
diff --git a/src/com/projectkorra/projectkorra/command/HelpCommand.java b/src/com/projectkorra/projectkorra/command/HelpCommand.java
index 8a02fab1..2d487ec9 100644
--- a/src/com/projectkorra/projectkorra/command/HelpCommand.java
+++ b/src/com/projectkorra/projectkorra/command/HelpCommand.java
@@ -16,14 +16,14 @@ import com.projectkorra.projectkorra.ability.ComboAbility;
 import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.PassiveAbility;
 import com.projectkorra.projectkorra.ability.util.ComboManager;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.HelpCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.AirPropertiesConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.AvatarPropertiesConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.ChiPropertiesConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.EarthPropertiesConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.FirePropertiesConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.commands.HelpCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.AirPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.AvatarPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.ChiPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.EarthPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.FirePropertiesConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
 
 /**
  * Executor for /bending help. Extends {@link PKCommand}.
diff --git a/src/com/projectkorra/projectkorra/command/InvincibleCommand.java b/src/com/projectkorra/projectkorra/command/InvincibleCommand.java
index 6d2c03c8..145ad499 100644
--- a/src/com/projectkorra/projectkorra/command/InvincibleCommand.java
+++ b/src/com/projectkorra/projectkorra/command/InvincibleCommand.java
@@ -6,7 +6,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
 import com.projectkorra.projectkorra.GeneralMethods;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.InvincibleCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.InvincibleCommandConfig;
 
 /**
  * Executor for /bending invincible. Extends {@link PKCommand}.
diff --git a/src/com/projectkorra/projectkorra/command/PKCommand.java b/src/com/projectkorra/projectkorra/command/PKCommand.java
index e30cc304..a473395f 100644
--- a/src/com/projectkorra/projectkorra/command/PKCommand.java
+++ b/src/com/projectkorra/projectkorra/command/PKCommand.java
@@ -14,9 +14,9 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.GeneralMethods;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.CommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.CommandPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.commands.CommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.CommandPropertiesConfig;
 
 /**
  * Abstract representation of a command executor. Implements {@link SubCommand}.
diff --git a/src/com/projectkorra/projectkorra/command/PermaremoveCommand.java b/src/com/projectkorra/projectkorra/command/PermaremoveCommand.java
index 9b9bb2b5..ea3419e3 100644
--- a/src/com/projectkorra/projectkorra/command/PermaremoveCommand.java
+++ b/src/com/projectkorra/projectkorra/command/PermaremoveCommand.java
@@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.BendingPlayer;
 import com.projectkorra.projectkorra.GeneralMethods;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.PermaremoveCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.PermaremoveCommandConfig;
 import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
 import com.projectkorra.projectkorra.event.PlayerChangeElementEvent.Result;
 
diff --git a/src/com/projectkorra/projectkorra/command/PresetCommand.java b/src/com/projectkorra/projectkorra/command/PresetCommand.java
index c8a8d081..430ba910 100644
--- a/src/com/projectkorra/projectkorra/command/PresetCommand.java
+++ b/src/com/projectkorra/projectkorra/command/PresetCommand.java
@@ -12,9 +12,9 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.BendingPlayer;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.PresetCommandConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.CommandPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.commands.PresetCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.CommandPropertiesConfig;
 import com.projectkorra.projectkorra.object.Preset;
 
 /**
diff --git a/src/com/projectkorra/projectkorra/command/ReloadCommand.java b/src/com/projectkorra/projectkorra/command/ReloadCommand.java
index 5855798c..a74b44e5 100644
--- a/src/com/projectkorra/projectkorra/command/ReloadCommand.java
+++ b/src/com/projectkorra/projectkorra/command/ReloadCommand.java
@@ -6,7 +6,7 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
 import com.projectkorra.projectkorra.GeneralMethods;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.ReloadCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.ReloadCommandConfig;
 
 /**
  * Executor for /bending reload. Extends {@link PKCommand}.
diff --git a/src/com/projectkorra/projectkorra/command/RemoveCommand.java b/src/com/projectkorra/projectkorra/command/RemoveCommand.java
index dc2ffda5..4fb53d6d 100644
--- a/src/com/projectkorra/projectkorra/command/RemoveCommand.java
+++ b/src/com/projectkorra/projectkorra/command/RemoveCommand.java
@@ -11,8 +11,8 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.BendingPlayer;
 import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.Element.SubElement;
+import com.projectkorra.projectkorra.configuration.configs.commands.RemoveCommandConfig;
 import com.projectkorra.projectkorra.GeneralMethods;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.RemoveCommandConfig;
 import com.projectkorra.projectkorra.event.PlayerChangeElementEvent;
 import com.projectkorra.projectkorra.event.PlayerChangeElementEvent.Result;
 import com.projectkorra.projectkorra.event.PlayerChangeSubElementEvent;
diff --git a/src/com/projectkorra/projectkorra/command/StatsCommand.java b/src/com/projectkorra/projectkorra/command/StatsCommand.java
index 1a2c0ca3..62e59d38 100644
--- a/src/com/projectkorra/projectkorra/command/StatsCommand.java
+++ b/src/com/projectkorra/projectkorra/command/StatsCommand.java
@@ -20,7 +20,7 @@ import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.CoreAbility;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.StatsCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.StatsCommandConfig;
 import com.projectkorra.projectkorra.storage.DBConnection;
 import com.projectkorra.projectkorra.util.Statistic;
 import com.projectkorra.projectkorra.util.StatisticsMethods;
diff --git a/src/com/projectkorra/projectkorra/command/SubCommand.java b/src/com/projectkorra/projectkorra/command/SubCommand.java
index c8b84290..2a55ae91 100644
--- a/src/com/projectkorra/projectkorra/command/SubCommand.java
+++ b/src/com/projectkorra/projectkorra/command/SubCommand.java
@@ -4,7 +4,7 @@ import java.util.List;
 
 import org.bukkit.command.CommandSender;
 
-import com.projectkorra.projectkorra.configuration.better.configs.commands.CommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.CommandConfig;
 
 /**
  * Interface representation of a command executor.
diff --git a/src/com/projectkorra/projectkorra/command/ToggleCommand.java b/src/com/projectkorra/projectkorra/command/ToggleCommand.java
index 5b48c978..14de9b74 100644
--- a/src/com/projectkorra/projectkorra/command/ToggleCommand.java
+++ b/src/com/projectkorra/projectkorra/command/ToggleCommand.java
@@ -12,8 +12,8 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.BendingPlayer;
 import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.Element.SubElement;
+import com.projectkorra.projectkorra.configuration.configs.commands.ToggleCommandConfig;
 import com.projectkorra.projectkorra.GeneralMethods;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.ToggleCommandConfig;
 
 /**
  * Executor for /bending toggle. Extends {@link PKCommand}.
diff --git a/src/com/projectkorra/projectkorra/command/VersionCommand.java b/src/com/projectkorra/projectkorra/command/VersionCommand.java
index 58b71a92..4932a71c 100644
--- a/src/com/projectkorra/projectkorra/command/VersionCommand.java
+++ b/src/com/projectkorra/projectkorra/command/VersionCommand.java
@@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender;
 
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ProjectKorra;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.VersionCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.VersionCommandConfig;
 
 /**
  * Executor for /bending version. Extends {@link PKCommand}.
diff --git a/src/com/projectkorra/projectkorra/command/WhoCommand.java b/src/com/projectkorra/projectkorra/command/WhoCommand.java
index 4b16d568..f44908da 100644
--- a/src/com/projectkorra/projectkorra/command/WhoCommand.java
+++ b/src/com/projectkorra/projectkorra/command/WhoCommand.java
@@ -29,7 +29,7 @@ import com.projectkorra.projectkorra.Element.SubElement;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.CoreAbility;
-import com.projectkorra.projectkorra.configuration.better.configs.commands.WhoCommandConfig;
+import com.projectkorra.projectkorra.configuration.configs.commands.WhoCommandConfig;
 
 /**
  * Executor for /bending who. Extends {@link PKCommand}.
diff --git a/src/com/projectkorra/projectkorra/configuration/better/Config.java b/src/com/projectkorra/projectkorra/configuration/Config.java
similarity index 56%
rename from src/com/projectkorra/projectkorra/configuration/better/Config.java
rename to src/com/projectkorra/projectkorra/configuration/Config.java
index d56570af..fba5657e 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/Config.java
+++ b/src/com/projectkorra/projectkorra/configuration/Config.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better;
+package com.projectkorra.projectkorra.configuration;
 
 public interface Config {
 	
diff --git a/src/com/projectkorra/projectkorra/configuration/better/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
similarity index 97%
rename from src/com/projectkorra/projectkorra/configuration/better/ConfigManager.java
rename to src/com/projectkorra/projectkorra/configuration/ConfigManager.java
index d6a37288..95deda30 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/ConfigManager.java
+++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better;
+package com.projectkorra.projectkorra.configuration;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
diff --git a/src/com/projectkorra/projectkorra/configuration/OldConfig.java b/src/com/projectkorra/projectkorra/configuration/OldConfig.java
deleted file mode 100644
index e3e94d3d..00000000
--- a/src/com/projectkorra/projectkorra/configuration/OldConfig.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package com.projectkorra.projectkorra.configuration;
-
-import java.io.File;
-
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import com.projectkorra.projectkorra.ProjectKorra;
-
-/**
- * A config utility class for Project Korra. To get the config itself use
- * {@link #get()}.
- */
-public class OldConfig {
-
-	private final ProjectKorra plugin;
-
-	private final File file;
-	private final FileConfiguration config;
-
-	/**
-	 * Creates a new {@link Config} with the file being the configuration file.
-	 *
-	 * @param file The file to create/load
-	 */
-	public OldConfig(final File file) {
-		this.plugin = ProjectKorra.plugin;
-		this.file = new File(this.plugin.getDataFolder() + File.separator + file);
-		this.config = YamlConfiguration.loadConfiguration(this.file);
-		this.reload();
-	}
-
-	/**
-	 * Creates a file for the {@link FileConfiguration} object. If there are
-	 * missing folders, this method will try to create them before create a file
-	 * for the config.
-	 */
-	public void create() {
-		if (!this.file.getParentFile().exists()) {
-			try {
-				this.file.getParentFile().mkdir();
-				this.plugin.getLogger().info("Generating new directory for " + this.file.getName() + "!");
-			} catch (final Exception e) {
-				this.plugin.getLogger().info("Failed to generate directory!");
-				e.printStackTrace();
-			}
-		}
-
-		if (!this.file.exists()) {
-			try {
-				this.file.createNewFile();
-				this.plugin.getLogger().info("Generating new " + this.file.getName() + "!");
-			} catch (final Exception e) {
-				this.plugin.getLogger().info("Failed to generate " + this.file.getName() + "!");
-				e.printStackTrace();
-			}
-		}
-	}
-
-	/**
-	 * Gets the {@link FileConfiguration} object from the {@link Config}.
-	 *
-	 * @return the file configuration object
-	 */
-	public FileConfiguration get() {
-		return this.config;
-	}
-
-	/**
-	 * Reloads the {@link FileConfiguration} object. If the config object does
-	 * not exist it will run {@link #create()} first before loading the config.
-	 */
-	public void reload() {
-		this.create();
-		try {
-			this.config.load(this.file);
-		} catch (final Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Saves the {@link FileConfiguration} object.
-	 * {@code config.options().copyDefaults(true)} is called before saving the
-	 * config.
-	 */
-	public void save() {
-		try {
-			this.config.options().copyDefaults(true);
-			this.config.save(this.file);
-		} catch (final Exception e) {
-			e.printStackTrace();
-		}
-	}
-}
diff --git a/src/com/projectkorra/projectkorra/configuration/OldConfigManager.java b/src/com/projectkorra/projectkorra/configuration/OldConfigManager.java
deleted file mode 100644
index 4b1ab54b..00000000
--- a/src/com/projectkorra/projectkorra/configuration/OldConfigManager.java
+++ /dev/null
@@ -1,1555 +0,0 @@
-package com.projectkorra.projectkorra.configuration;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.bukkit.Material;
-import org.bukkit.configuration.file.FileConfiguration;
-
-public class OldConfigManager {
-
-	public static Config presetConfig;
-	public static Config defaultConfig;
-	public static Config languageConfig;
-
-	public OldConfigManager() {
-		presetConfig = new Config(new File("presets.yml"));
-		defaultConfig = new Config(new File("config.yml"));
-		languageConfig = new Config(new File("language.yml"));
-		configCheck(ConfigType.DEFAULT);
-		configCheck(ConfigType.LANGUAGE);
-		configCheck(ConfigType.PRESETS);
-	}
-
-	public static void configCheck(final ConfigType type) {
-		FileConfiguration config;
-		if (type == ConfigType.PRESETS) {
-			config = presetConfig.get();
-
-			final ArrayList<String> abilities = new ArrayList<String>();
-			abilities.add("FireBlast");
-			abilities.add("AirBlast");
-			abilities.add("WaterManipulation");
-			abilities.add("EarthBlast");
-			abilities.add("FireBurst");
-			abilities.add("AirBurst");
-			abilities.add("Torrent");
-			abilities.add("Shockwave");
-			abilities.add("AvatarState");
-
-			config.addDefault("Example", abilities);
-
-			presetConfig.save();
-		} else if (type == ConfigType.LANGUAGE) {
-			config = languageConfig.get();
-
-			final ArrayList<String> helpLines = new ArrayList<String>();
-			helpLines.add("&c/bending help [Ability/Command] &eDisplay help.");
-			helpLines.add("&c/bending choose [Element] &eChoose an element.");
-			helpLines.add("&c/bending bind [Ability] # &eBind an ability.");
-
-			config.addDefault("Chat.Enable", true);
-			config.addDefault("Chat.Format", "<name>: <message>");
-			config.addDefault("Chat.Colors.Avatar", "DARK_PURPLE");
-			config.addDefault("Chat.Colors.Air", "GRAY");
-			config.addDefault("Chat.Colors.AirSub", "DARK_GRAY");
-			config.addDefault("Chat.Colors.Water", "AQUA");
-			config.addDefault("Chat.Colors.WaterSub", "DARK_AQUA");
-			config.addDefault("Chat.Colors.Earth", "GREEN");
-			config.addDefault("Chat.Colors.EarthSub", "DARK_GREEN");
-			config.addDefault("Chat.Colors.Fire", "RED");
-			config.addDefault("Chat.Colors.FireSub", "DARK_RED");
-			config.addDefault("Chat.Colors.Chi", "GOLD");
-			config.addDefault("Chat.Branding.JoinMessage.Enabled", true);
-			config.addDefault("Chat.Branding.AutoAnnouncer.Enabled", true);
-			config.addDefault("Chat.Branding.AutoAnnouncer.Interval", 30);
-			config.addDefault("Chat.Branding.Color", "GOLD");
-			config.addDefault("Chat.Branding.Borders.TopBorder", "");
-			config.addDefault("Chat.Branding.Borders.BottomBorder", "");
-			config.addDefault("Chat.Branding.ChatPrefix.Prefix", "");
-			config.addDefault("Chat.Branding.ChatPrefix.Suffix", " ");
-
-			config.addDefault("Chat.Prefixes.Air", "[Air]");
-			config.addDefault("Chat.Prefixes.Earth", "[Earth]");
-			config.addDefault("Chat.Prefixes.Fire", "[Fire]");
-			config.addDefault("Chat.Prefixes.Water", "[Water]");
-			config.addDefault("Chat.Prefixes.Chi", "[Chi]");
-			config.addDefault("Chat.Prefixes.Avatar", "[Avatar]");
-			config.addDefault("Chat.Prefixes.Nonbender", "[Nonbender]");
-
-			config.addDefault("Extras.Water.NightMessage", "Your waterbending has become empowered due to the moon rising.");
-			config.addDefault("Extras.Water.DayMessage", "You feel the empowering of your waterbending subside as the moon sets.");
-			config.addDefault("Extras.Fire.NightMessage", "You feel the empowering of your firebending subside as the sun sets.");
-			config.addDefault("Extras.Fire.DayMessage", "You feel the strength of the rising sun empower your firebending.");
-
-			config.addDefault("Commands.NoPermission", "You do not have permission to do that.");
-			config.addDefault("Commands.MustBePlayer", "You must be a player to perform this action.");
-
-			config.addDefault("Commands.Who.Description", "This command will tell you what element all players that are online are (If you don't specify a player) or give you information about the player that you specify.");
-			config.addDefault("Commands.Who.NoPlayersOnline", "There is no one online.");
-			config.addDefault("Commands.Who.DatabaseOverload", "The database appears to be overloaded. Please try again later.");
-			config.addDefault("Commands.Who.PlayerOffline", "{target} is currently offline. A lookup is currently being done (this might take a few seconds).");
-
-			config.addDefault("Commands.Version.Description", "Displays the installed version of ProjectKorra.");
-
-			config.addDefault("Commands.Toggle.Description", "This command will toggle a player's own bending on or off. If toggled off, all abilities should stop working until it is toggled back on. Logging off will automatically toggle your Bending back on. If you run the command /bending toggle all, Bending will be turned off for all players and cannot be turned back on until the command is run again.");
-			config.addDefault("Commands.Toggle.ToggledOn", "You have turned your bending back on.");
-			config.addDefault("Commands.Toggle.ToggledOff", "Your bending has been toggled off. You will not be able to use most abilities until you toggle it back.");
-			config.addDefault("Commands.Toggle.ToggleOnSingleElement", "You have toggled on your {element}.");
-			config.addDefault("Commands.Toggle.ToggleOffSingleElement", "You have toggled off your {element}.");
-			config.addDefault("Commands.Toggle.WrongElement", "You do not have that element.");
-			config.addDefault("Commands.Toggle.All.ToggledOffForAll", "Bending is currently toggled off for all players.");
-			config.addDefault("Commands.Toggle.All.ToggleOn", "Bending has been toggled back on for all players.");
-			config.addDefault("Commands.Toggle.All.ToggleOff", "Bending has been toggled off for all players.");
-			config.addDefault("Commands.Toggle.Other.ToggledOnElementConfirm", "You've toggled on {target}'s {element}");
-			config.addDefault("Commands.Toggle.Other.ToggledOffElementConfirm", "You've toggled off {target}'s {element}");
-			config.addDefault("Commands.Toggle.Other.ToggledOnElementByOther", "Your {element} has been toggled on by {sender}.");
-			config.addDefault("Commands.Toggle.Other.ToggledOffElementByOther", "Your {element} has been toggled off by {sender}.");
-			config.addDefault("Commands.Toggle.Other.PlayerNotFound", "Target is not found.");
-			config.addDefault("Commands.Toggle.Other.WrongElement", "{target} doesn't have that element.");
-
-			config.addDefault("Commands.Remove.Description", "This command will remove the element of the targeted [Player]. The player will be able to re-pick their element after this command is run on them, assuming their bending was not permaremoved.");
-			config.addDefault("Commands.Remove.Other.RemovedAllElements", "Your bending has been removed by {sender}.");
-			config.addDefault("Commands.Remove.Other.RemovedAllElementsConfirm", "You've removed {target}'s bending.");
-			config.addDefault("Commands.Remove.Other.RemovedElement", "Your {element} has been removed by {sender}.");
-			config.addDefault("Commands.Remove.Other.RemovedElementConfirm", "You removed {target}'s {element}.");
-			config.addDefault("Commands.Remove.Other.WrongElement", "{target} does not have that element.");
-			config.addDefault("Commands.Remove.RemovedElement", "You've removed your {element}.");
-			config.addDefault("Commands.Remove.InvalidElement", "That element is invalid!");
-			config.addDefault("Commands.Remove.WrongElement", "You do not have that element.");
-			config.addDefault("Commands.Remove.PlayerOffline", "That player is offline!");
-
-			config.addDefault("Commands.Reload.Description", "This command will reload the bending config files.");
-			config.addDefault("Commands.Reload.SuccessfullyReloaded", "Bending Config reloaded!");
-
-			config.addDefault("Commands.Preset.Description", "This command manages Presets, which are saved bindings. Use /bending preset list to view your existing presets, use /bending [create|delete] [name] to manage your presets, and use /bending bind [name] to bind an existing preset.");
-			config.addDefault("Commands.Preset.NoPresets", "You do not have any presets.");
-			config.addDefault("Commands.Preset.NoPresetName", "You don't have a preset with that name.");
-			config.addDefault("Commands.Preset.Created", "Created a new preset named '{name}'.");
-			config.addDefault("Commands.Preset.Delete", "You have deleted your '{name}' preset.");
-			config.addDefault("Commands.Preset.Removed", "Your bending has been permanently removed.");
-			config.addDefault("Commands.Preset.RemovedConfirm", "You have permanently removed {target}'s bending.");
-			config.addDefault("Commands.Preset.SuccesfullyBound", "Your binds have been set to match the {name} preset.");
-			config.addDefault("Commands.Preset.SuccesfullyCopied", "Your binds have been set to match {target}'s binds.");
-			config.addDefault("Commands.Preset.FailedToBindAll", "Some abilities were not bound because you cannot bend the required element.");
-			config.addDefault("Commands.Preset.AlreadyExists", "A preset with that name already exists.");
-			config.addDefault("Commands.Preset.BendingPermanentlyRemoved", "Your bending was permanently removed.");
-			config.addDefault("Commands.Preset.PlayerNotFound", "Player not found.");
-			config.addDefault("Commands.Preset.MaxPresets", "You've reached your maximum number of presets.");
-			config.addDefault("Commands.Preset.CantEditBinds", "You can't edit your binds right now!");
-			config.addDefault("Commands.Preset.Other.BendingPermanentlyRemoved", "That player's bending was permanently removed.");
-			config.addDefault("Commands.Preset.Other.SuccesfullyBoundConfirm", "The bound slots of {target} have been set to match the {name} preset.");
-			config.addDefault("Commands.Preset.External.NoPresetName", "No external preset found with that name.");
-
-			config.addDefault("Commands.Stats.InvalidLookup", "Invalid lookup argument.");
-			config.addDefault("Commands.Stats.InvalidSearchType", "Invalid search type.");
-			config.addDefault("Commands.Stats.InvalidStatistic", "Invalid statistic.");
-			config.addDefault("Commands.Stats.InvalidPlayer", "Player '%player%' not found.");
-
-			config.addDefault("Commands.Stats.Description", "This command manages statistics. View your own, another player's statistics along with the server leaderboard.");
-
-			config.addDefault("Commands.PermaRemove.Description", "This command will permanently remove the bending of the targeted <Player>. Once removed, a player may only receive bending again if this command is run on them again. This command is typically reserved for administrators.");
-			config.addDefault("Commands.PermaRemove.PlayerOffline", "That player is not online.");
-			config.addDefault("Commands.PermaRemove.Restored", "Your bending has been restored.");
-			config.addDefault("Commands.PermaRemove.RestoredConfirm", "You have restored the bending of {target}.");
-			config.addDefault("Commands.PermaRemove.Removed", "Your bending has been permanently removed.");
-			config.addDefault("Commands.PermaRemove.RemovedConfirm", "You have removed the bending of {target}.");
-
-			config.addDefault("Commands.Invincible.Description", "This command will make you immune to all bending damage. Once you use this command, you will stay invincible until you log off or use this command again.");
-			config.addDefault("Commands.Invincible.ToggledOn", "You are now invincible to all bending damage and effects. Use this command again to disable this.");
-			config.addDefault("Commands.Invincible.ToggledOff", "You are no longer invincible to all bending damage and effects.");
-
-			config.addDefault("Commands.Help.Description", "This command provides information on how to use other commands in ProjectKorra.");
-			config.addDefault("Commands.Help.Required", "Required");
-			config.addDefault("Commands.Help.Optional", "Optional");
-			config.addDefault("Commands.Help.ProperUsage", "Proper Usage: {command1} or {command2}");
-			config.addDefault("Commands.Help.Elements.LearnMore", "Learn more at our website! ");
-			config.addDefault("Commands.Help.InvalidTopic", "That isn't a valid help topic. Use /bending help for more information.");
-			config.addDefault("Commands.Help.Usage", "Usage: ");
-			config.addDefault("Commands.Help.RPGUsage", "/bending rpg [argument]");
-			config.addDefault("Commands.Help.ItemsUsage", "/bending items [argument]");
-			config.addDefault("Commands.Help.SpiritsUsage", "/bending spirits [argument]");
-
-			config.addDefault("Commands.Display.Description", "This command will show you all of the elements you have bound if you do not specify an element. If you do specify an element (Air, Water, Earth, Fire, or Chi), it will show you all of the available abilities of that element installed on the server.");
-
-			config.addDefault("Commands.Display.NoCombosAvailable", "There are no {element} combos available.");
-			config.addDefault("Commands.Display.NoPassivesAvailable", "There are no {element} passives available.");
-			config.addDefault("Commands.Display.NoAbilitiesAvailable", "There are no {element} abilities on this server.");
-			config.addDefault("Commands.Display.InvalidArgument", "Not a valid argument.");
-			config.addDefault("Commands.Display.PlayersOnly", "This command is only usable by players.");
-			config.addDefault("Commands.Display.NoBinds", "You do not have any abilities bound.\nIf you would like to see a list of available abilities, please use the /bending display [Element] command. Use /bending help for more information.");
-
-			config.addDefault("Commands.Debug.Description", "Outputs information on the current ProjectKorra installation to /plugins/ProjectKorra/debug.txt");
-			config.addDefault("Commands.Debug.SuccessfullyExported", "Debug File Created as debug.txt in the ProjectKorra plugin folder.\nPut contents on pastie.org and create a bug report  on the ProjectKorra forum if you need to.");
-
-			config.addDefault("Commands.Copy.Description", "This command will allow the user to copy the binds of another player either for himself or assign them to <Player> if specified.");
-			config.addDefault("Commands.Copy.PlayerNotFound", "Couldn't find player.");
-			config.addDefault("Commands.Copy.SuccessfullyCopied", "Your binds have been set to match {target}'s!");
-			config.addDefault("Commands.Copy.FailedToBindAll", "Some moves were not bound due to insufficient permissions.");
-			config.addDefault("Commands.Copy.Other.SuccessfullyCopied", "{target1}'s binds have been set to match {target2}'s.");
-
-			config.addDefault("Commands.Clear.Description", "This command will clear the bound ability from the slot you specify (if you specify one). If you choose not to specify a slot, all of your abilities will be cleared.");
-			config.addDefault("Commands.Clear.CantEditBinds", "You can't edit your binds right now!");
-			config.addDefault("Commands.Clear.Cleared", "Your bound abilities have been cleared.");
-			config.addDefault("Commands.Clear.WrongNumber", "The slot must be an integer between 1 and 9.");
-			config.addDefault("Commands.Clear.ClearedSlot", "You have cleared slot #{slot}.");
-			config.addDefault("Commands.Clear.AlreadyEmpty", "That slot is already empty.");
-
-			config.addDefault("Commands.Choose.Description", "This command will allow the user to choose a single element for themselves or <Player> if specified. This command can only be used once per player unless they have permission to rechoose their element.");
-			config.addDefault("Commands.Choose.InvalidElement", "That is not a valid element.");
-			config.addDefault("Commands.Choose.PlayerNotFound", "Could not find player.");
-			config.addDefault("Commands.Choose.OnCooldown", "You must wait %cooldown% before changing your element.");
-			config.addDefault("Commands.Choose.SuccessfullyChosenCFW", "You are now a {element}.");
-			config.addDefault("Commands.Choose.SuccessfullyChosenAE", "You are now an {element}.");
-			config.addDefault("Commands.Choose.Other.SuccessfullyChosenCFW", "{target} is now a {element}.");
-			config.addDefault("Commands.Choose.Other.SuccessfullyChosenAE", "{target} is now an {element}.");
-
-			config.addDefault("Commands.Check.Description", "Checks if ProjectKorra is up to date.");
-			config.addDefault("Commands.Check.NewVersionAvailable", "There's a new version of ProjectKorra available!");
-			config.addDefault("Commands.Check.CurrentVersion", "Current Version: {version}");
-			config.addDefault("Commands.Check.LatestVersion", "Latest Version: {version}");
-			config.addDefault("Commands.Check.UpToDate", "You have the latest version of ProjectKorra.");
-
-			config.addDefault("Commands.Bind.Description", "This command will bind an ability to the slot you specify (if you specify one), or the slot currently selected in your hotbar (If you do not specify a Slot #).");
-			config.addDefault("Commands.Bind.AbilityDoesntExist", "{ability} is not a valid ability.");
-			config.addDefault("Commands.Bind.WrongNumber", "Slot must be an integer between 1 and 9.");
-			config.addDefault("Commands.Bind.ElementToggledOff", "You have that ability's element toggled off currently.");
-			config.addDefault("Commands.Bind.SuccessfullyBound", "Succesfully bound {ability} to slot {slot}.");
-			config.addDefault("Commands.Bind.NoElement", "You are not a {element}!");
-			config.addDefault("Commands.Bind.NoElementAE", "You are not an {element}!");
-			config.addDefault("Commands.Bind.NoSubElement", "You don't have access to {subelement}!");
-			config.addDefault("Commands.Bind.Unbindable", "{ability} cannot be bound!");
-
-			config.addDefault("Commands.Add.Description", "This command will allow the user to add an element to the targeted <Player>, or themselves if the target is not specified. This command is typically reserved for server administrators.");
-			config.addDefault("Commands.Add.SuccessfullyAddedCFW", "You are now also a {element}.");
-			config.addDefault("Commands.Add.SuccessfullyAddedAE", "You are now also an {element}.");
-			config.addDefault("Commands.Add.SuccessfullyAddedAll", "You now also have: ");
-			config.addDefault("Commands.Add.PlayerNotFound", "That player could not be found.");
-			config.addDefault("Commands.Add.InvalidElement", "You must specify a valid element.");
-			config.addDefault("Commands.Add.AlreadyHasElement", "You already have that element!");
-			config.addDefault("Commands.Add.AlreadyHasSubElement", "You already have that subelement!");
-			config.addDefault("Commands.Add.AlreadyHasAllElements", "You already have all elements!");
-			config.addDefault("Commands.Add.Other.SuccessfullyAddedCFW", "{target} is now also a {element}.");
-			config.addDefault("Commands.Add.Other.SuccessfullyAddedAE", "{target} is now also an {element}.");
-			config.addDefault("Commands.Add.Other.SuccessfullyAddedAll", "{target} now also has: ");
-			config.addDefault("Commands.Add.Other.AlreadyHasElement", "{target} already has that element!");
-			config.addDefault("Commands.Add.Other.AlreadyHasSubElement", "{target} already has that subelement!");
-			config.addDefault("Commands.Add.Other.AlreadyHasAllElements", "{target} already has all elements!");
-
-			config.addDefault("DeathMessages.Enabled", true);
-			config.addDefault("DeathMessages.Default", "{victim} was slain by {attacker}'s {ability}");
-
-			config.addDefault("Abilities.Avatar.AvatarState.Description", "The signature ability of the Avatar, this is a toggle. Left click to activate to become " + "nearly unstoppable. While in the Avatar State, the user takes severely reduced damage from " + "all sources, regenerates health rapidly, and is granted extreme speed. Nearly all abilities " + "are incredibly amplified in this state. Additionally, AirShield and FireJet become toggle-able " + "abilities and last until you deactivate them or the Avatar State. Left click again with the Avatar " + "State selected to deactivate it.");
-
-			config.addDefault("Commands.Help.Elements.Air", "Air is the element of freedom. Airbenders are natural pacifists and great explorers. There is nothing stopping them from scaling the tallest mountains and walls easily. They specialize in redirection, from blasting things away with gusts of winds, to forming a shield around them to prevent damage. Easy to get across flat terrains, such as oceans, there is practically no terrain off limits to Airbenders. They lack much raw damage output, but make up for it with with their ridiculous amounts of utility and speed.\nEnter /b display Air for a list of the available air abilities.");
-			config.addDefault("Abilities.Air.AirBlast.Description", "AirBlast is the most fundamental bending technique of an airbender. It allows the bender to be extremely agile and possess great mobility, but also has many utility options, such as cooling lava, opening doors and flicking levers.");
-			config.addDefault("Abilities.Air.AirBlast.Instructions", "\n" + "(Push) " + "Left click while aiming at an entity to push them back." + "\n" + "(Throw) " + "Tap sneak to select a location and left click in a direction to throw entities away from the selected location.");
-			config.addDefault("Abilities.Air.AirBlast.DeathMessage", "{victim} was flung by {attacker}'s {ability}");
-			config.addDefault("Abilities.Air.AirBlast.HorizontalVelocityDeath", "{victim} experienced a fatal collision by {attacker}'s {ability}");
-			config.addDefault("Abilities.Air.AirBurst.Description", "AirBurst is one of the most powerful abilities in the airbender's arsenal. It allows the bender to create space between them and whoever is close to them. AirBurst is extremely useful when you're surrounded by mobs, of if you're low in health and need to escape. It can also be useful for confusing your target also.");
-			config.addDefault("Abilities.Air.AirBurst.Instructions", "\n" + "(Sphere) Hold sneak until particles appear and then release shift to create air that expands outwards, pushing entities back. If you fall from great height while you are on this slot, the burst will automatically activate." + "\n" + "(Cone) While charging the move with shift, click to send the burst in a cone only going in one direction.");
-			config.addDefault("Abilities.Air.AirBurst.DeathMessage", "{victim} was thrown down by {attacker}'s {ability}");
-			config.addDefault("Abilities.Air.AirBurst.HorizontalVelocityDeath", "{victim} experienced a fatal collision by {attacker}'s {ability}");
-			config.addDefault("Abilities.Air.AirScooter.Description", "AirScooter is a fast means of transportation. It can be used to escape from enemies or confuse them by using air scooter around them.");
-			config.addDefault("Abilities.Air.AirScooter.Instructions", "Sprint, jump, and left click while in the air to activate air scooter. You will then move forward in the direction you're looking.");
-			config.addDefault("Abilities.Air.Tornado.Description", "Tornado is one of the most powerful and advanced abilities that an Airbender knows. If the tornado meets a player or mob, it will push them around. Tornado can also be used to push back projectiles and used for mobility. Use a tornado directly under you to propel yourself upwards.");
-			config.addDefault("Abilities.Air.Tornado.Instructions", "Hold sneak and a tornado will form gradually wherever you look.");
-			config.addDefault("Abilities.Air.AirShield.Description", "Air Shield is one of the most powerful defensive techniques in existence. This ability is mainly used when you are low health and need protection. It's also useful when you're surrounded by mobs.");
-			config.addDefault("Abilities.Air.AirShield.Instructions", "Hold sneak and a shield of air will form around you, blocking projectiles and pushing entities back.");
-			config.addDefault("Abilities.Air.AirSpout.Description", "This ability gives the airbender limited sustained levitation. It allows an airbender to gain a height advantage to escape from mobs, players or just to dodge from attacks. This ability is also useful for building as it allows you to reach great heights.");
-			config.addDefault("Abilities.Air.AirSpout.Instructions", "Left click to activate a spout beneath you and hold spacebar to go higher. If you wish to go lower, simply hold sneak. To disable this ability, left click once again.");
-			config.addDefault("Abilities.Air.AirSuction.Description", "AirSuction is a basic ability that allows you to manipulation an entity's movement. It can be used to bring someone back to you when they're running away, or even to get yourself to great heights.");
-			config.addDefault("Abilities.Air.AirSuction.Instructions", "\n" + "(Pull) Left click while aiming at a target to pull them towards you." + "\n" + "(Manipulation) Sneak to select a point and then left click at a target or yourself to send you or your target to the point that you selected.");
-			config.addDefault("Abilities.Air.AirSuction.HorizontalVelocityDeath", "{victim} experienced a fatal collision by {attacker}'s {ability}");
-			config.addDefault("Abilities.Air.AirSwipe.Description", "AirSwipe is the most commonly used damage ability in an airbender's arsenal. An arc of air will flow from you towards the direction you're facing, cutting and pushing back anything in its path. This ability will extinguish fires, cool lava, and cut things like grass, mushrooms, and flowers.");
-			config.addDefault("Abilities.Air.AirSwipe.Instructions", "\n" + "(Uncharged) Simply left click to send an air swipe out that will damage targets that it comes into contact with." + "\n" + "(Charged) Hold sneak until particles appear, then release sneak to send a more powerful air swipe out that damages entity's that it comes into contact with.");
-			config.addDefault("Abilities.Air.AirSwipe.DeathMessage", "{victim} was struck by {attacker}'s {ability}");
-			config.addDefault("Abilities.Air.Flight.Description", "Fly through the air as Zaheer and Guru Laghima did! This multiability allows for three modes of flight: soaring, gliding, and levitating. You can also right-click another player while flying to have them become your passenger! When flying at fast speeds, flying past nearby enemies will damage them for half your speed and knock them in the direction you're heading!");
-			config.addDefault("Abilities.Air.Flight.Instructions", "\n- (To start flying, jump and left-click)\n- (Soar) Left-Click to change flying speeds.\n- (Glide) Normal minecraft gliding. Slowing down or speeding up in this mode will affect the Soar speed.\n- (Levitate) Basically minecraft flying, allowing players to fly around for building purposes or a more controlled 'hovering'.\n- (Ending) Being in this mode sets any gliding and flight back the the state they were before using the ability.");
-			config.addDefault("Abilities.Air.Suffocate.Description", "This ability is one of the most dangerous abilities an Airbender possesses. Although it is difficult to perform, it's extremely deadly once the ability starts, making it difficult for enemies to escape.");
-			config.addDefault("Abilities.Air.Suffocate.Instructions", "Hold sneak while looking at a target to begin suffocating them. If the target goes out of range, you get damaged, or you release sneak, the ability will cancel.");
-			config.addDefault("Abilities.Air.Suffocate.DeathMessage", "{victim} was asphyxiated by {attacker}'s {ability}");
-			config.addDefault("Abilities.Air.Combo.Twister.Description", "Create a cyclone of air that travels along the ground grabbing nearby entities.");
-			config.addDefault("Abilities.Air.Combo.Twister.Instructions", "AirShield (Tap Shift) > Tornado (Hold Shift) > AirBlast (Left Click)");
-			config.addDefault("Abilities.Air.Combo.AirStream.Description", "Control a large stream of air that grabs onto enemies allowing you to direct them temporarily.");
-			config.addDefault("Abilities.Air.Combo.AirStream.Instructions", "AirShield (Hold Shift) > AirSuction (Left Click) > AirBlast (Left Click)");
-			config.addDefault("Abilities.Air.Combo.AirSweep.Description", "Sweep the air in front of you hitting multiple enemies, causing moderate damage and a large knockback. The radius and direction of AirSweep is controlled by moving your mouse in a sweeping motion. For example, if you want to AirSweep upward, then move your mouse upward right after you left click AirBurst");
-			config.addDefault("Abilities.Air.Combo.AirSweep.DeathMessage", "{victim} was swept away by {attacker}'s {ability}");
-			config.addDefault("Abilities.Air.Combo.AirSweep.Instructions", "AirSwipe (Left Click) > AirSwipe (Left Click) > AirBurst (Hold Shift) > AirBurst (Left Click)");
-			config.addDefault("Abilities.Air.Passive.AirAgility.Description", "AirAgility is a passive ability which enables airbenders to run faster and jump higher.");
-			config.addDefault("Abilities.Air.Passive.AirSaturation.Description", "AirSaturation is a passive ability which causes airbenders' hunger to deplete at a slower rate.");
-			config.addDefault("Abilities.Air.Passive.GracefulDescent.Description", "GracefulDescent is a passive ability which allows airbenders to make a gentle landing, negating all fall damage on any surface.");
-
-			config.addDefault("Commands.Help.Elements.Water", "Water is the element of change. Waterbending focuses on using your opponents own force against them. Using redirection and various dodging tactics, you can be made practically untouchable by an opponent. Waterbending provides agility, along with strong offensive skills while in or near water.\nEnter /b display Water for a list of the available water abilities.");
-			config.addDefault("Abilities.Water.Bloodbending.Description", "Bloodbending is one of the most unique bending abilities that existed and it has immense power, which is why it was made illegal in the Avatar universe. People who are capable of bloodbending are immune to your technique, and you are immune to theirs.");
-			config.addDefault("Abilities.Water.Bloodbending.Instructions", "\n" + "(Control) Hold sneak while looking at an entity to bloodbend them. You will then be controlling the entity, making them move wherever you look." + "\n" + "(Throw) While bloodbending an entity, left click to throw that entity in the direction you're looking.");
-			config.addDefault("Abilities.Water.Bloodbending.DeathMessage", "{victim} was destroyed by {attacker}'s {ability}");
-			config.addDefault("Abilities.Water.Bloodbending.HorizontalVelocityDeath", "{victim} experienced a fatal collision from {attacker}'s {ability}");
-			config.addDefault("Abilities.Water.HealingWaters.Description", "HealingWaters is an advanced waterbender skill that allows the player to heal themselves or others from the damage they've taken. If healing another player, you must continue to look at them to channel the ability.");
-			config.addDefault("Abilities.Water.HealingWaters.Instructions", "Hold sneak to begin healing yourself or right click while sneaking to begin healing another player. You or the player must be in water and damaged for this ability to work, or you need to have water bottles in your inventory.");
-			config.addDefault("Abilities.Water.IceBlast.Description", "IceBlast is a powerful ability that deals damage to entities it comes into contact with. Because IceBlast's travel time is pretty quick, it's increddibly useful for finishing off low health targets.");
-			config.addDefault("Abilities.Water.IceBlast.Instructions", "Tap sneak while looking at an ice block and then click in a direction to send an ice blast in that direction.");
-			config.addDefault("Abilities.Water.IceBlast.DeathMessage", "{victim} was shattered by {attacker}'s {ability}");
-			config.addDefault("Abilities.Water.IceSpike.Description", "This ability offers a powerful ice utility for Waterbenders. It can be used to fire an ice blast or raise an ice spike. If the ice blast or ice spike comes into contact with another entity, it will give them slowness and deal some damage to them..");
-			config.addDefault("Abilities.Water.IceSpike.Instructions", "\n" + "(Blast) Tap sneak on a water source and then left click in a direction to fire an ice blast in a direction. Additionally, you can left click to manipulate the ice blast while it's in the air to change the direction of the blast." + "\n" + "(Spike) While in range of ice, tap sneak to raise ice pillars from the ice. If a player is caught in these ice pillars they will be propelled into the air. You cannot be looking at ice or water or this feature will not activate. Alternatively, you can left click an ice block to raise a single pilar of ice.");
-			config.addDefault("Abilities.Water.IceSpike.DeathMessage", "{victim} was impaled by {attacker}'s {ability}");
-			config.addDefault("Abilities.Water.OctopusForm.Description", "OctopusForm is one of the most advanced abilities in a waterbender's aresenal. It has the possibility of doing high damage to anyone it comes into contact with.");
-			config.addDefault("Abilities.Water.OctopusForm.Instructions", "Left click a water source and then hold sneak to form a set of water tentacles. This ability will channel as long as you are holding sneak. Additionally, if you left click this ability will whip targets you're facing dealing damage and knockback, if they're in range.");
-			config.addDefault("Abilities.Water.OctopusForm.DeathMessage", "{victim} was slapped to death by {attacker}'s {ability}");
-			config.addDefault("Abilities.Water.PhaseChange.Description", "PhaseChange is one of the most useful utility moves that a waterbender possess. This ability is better used when fighting, allowing you to create a platform on water that you can fight on and being territorial by manipulating your environment. It's also useful for travelling across seas.");
-			config.addDefault("Abilities.Water.PhaseChange.Instructions", "\n" + "(Melt) To melt ice, hold sneak while looking at an ice block." + "\n" + "(Freeze) To freeze water and turn it into ice, simply left click at water. This ice will stay so long as you are in range, otherwise it will revert back to water. This only freezes the top layer of ice.");
-			config.addDefault("Abilities.Water.Surge.Description", "Surge offers great utility and is one of the most important defence abilities for waterbender's. It can be used to push entities back, used to push yourself in a direction, trap entities and protect yourself with a shield.");
-			config.addDefault("Abilities.Water.Surge.Instructions", "\n" + "(Shield) Left click on a water source and then hold sneak while looking up to create a water shield that will move wherever you look. Additionally, you can left click to turn this shield into ice. If you let go of sneak at any point, this ability will cancel." + "\n" + "(Surge) Tap sneak at a water source and click in a direction to fire a surge of water that will knock entities back. Additionally, if you tap sneak again before the surge reaches an entity, when it hits them it will encase them in ice.");
-			config.addDefault("Abilities.Water.Torrent.Description", "Torrent is one of the strongest moves in a waterbender's arsenal. It has the potential to do immense damage and to be comboed with other abilities to perform a deal a large damage burst. Torrent is fundamental for waterbender's. ");
-			config.addDefault("Abilities.Water.Torrent.Instructions", "\n" + "(Torrent) Left click at a water source and hold sneak to form the torrent. Then, left click and the torrent will shoot out, moving in the direction you're looking. If the torrent hits an entity, it can drag them and deal damage. Additionally, if you left click before the torrent hits a surface or entity it will freeze on impact." + "\n" + "(Wave) Left click a water source and hold sneak to form a torrent around you. Then, release sneak to send a wave of water expanding outwards every direction that will push entities back.");
-			config.addDefault("Abilities.Water.Torrent.DeathMessage", "{victim} was washed away by {attacker}'s {ability}");
-			config.addDefault("Abilities.Water.WaterArms.Description", "One of the most diverse moves in a Waterbender's arsenal, this move creates tendrils " + "of water from the players arms to emulate their actual arms. It has the potential to do a variety of things that can either do mass amounts of damage, or used for mobility.");
-			config.addDefault("Abilities.Water.WaterArms.Instructions", "To activate this ability, tap sneak at a water source. Additionally, to de-activate this ability, hold sneak and left click." + "\n" + "(Pull) Left click at a target and your arms will expand outwards, pulling entities towards you if they're in range." + "\n" + "(Punch) Left click and one arm will expand outwards, punching anyone it hits and dealing damage." + "\n" + "(Grapple) Left click to send your arms forward, pulling you to whatever surface they land on." + "\n" + "(Grab) Left click to grab an entity that's in range. They will then be controlled and moved in whatever direction you look. Additionally, if you left click again you can throw the target that you're controlling." + "\n" + "(Freeze) Left click to rapidly fire ice blasts at a target, damaging the target and giving them slowness." + "\n" + "(Spear) Left click to send an ice spear out, damaging and freezing whoever it hits in ice blocks.");
-			config.addDefault("Abilities.Water.WaterArms.SneakMessage", "Active Ability:");
-			config.addDefault("Abilities.Water.WaterArms.Punch.DeathMessage", "{victim} was too slow for {attacker}'s {ability}");
-			config.addDefault("Abilities.Water.WaterArms.Freeze.DeathMessage", "{victim} was frozen by {attacker}'s {ability}");
-			config.addDefault("Abilities.Water.WaterArms.Spear.DeathMessage", "{victim} was speared to death by {attacker}'s {ability}");
-			config.addDefault("Abilities.Water.WaterBubble.Description", "WaterBubble is a basic waterbending ability that allows the bender to create air pockets under water. This is increddibly useful for building under water.");
-			config.addDefault("Abilities.Water.WaterBubble.Instructions", "Hold sneak when in range of water to push the water back and create a water bubble. Alternatively, you can click to create a bubble for a short amount of time.");
-			config.addDefault("Abilities.Water.WaterManipulation.Description", "WaterManipulation is a fundamental ability for waterbenders. Although it is a basic move, it allows for fast damage due to its rapid fire nature, which is incredibly useful when wanting to finish off low health targets.");
-			config.addDefault("Abilities.Water.WaterManipulation.Instructions", "Tap sneak on a water source and left click to send a water manipulation to the point that you clicked. Additionally, you can left click again to change the direction of this move. This includes other players' WaterManipulations.");
-			config.addDefault("Abilities.Water.WaterManipulation.DeathMessage", "{victim} was drowned by {attacker}'s {ability}");
-			config.addDefault("Abilities.Water.WaterSpout.Description", "This ability provides a Waterbender with a means of transportation. It's the most useful mobility move that a waterbender possesses and is great for chasing down targets or escaping.");
-			config.addDefault("Abilities.Water.WaterSpout.Instructions", "\n" + "(Spout) Left click to activate a spout beneath you and hold spacebar to go higher. If you wish to go lower, simply hold sneak. To disable this ability, left click once again." + "\n" + "(Wave) Left click a water source and hold sneak until water has formed around you. Then, release sneak to ride a water wave that transports you in the direction you're looking. To cancel this water wave, left click with WaterSpout.");
-			config.addDefault("Abilities.Water.Combo.IceBullet.Description", "Using a large cavern of ice, you can punch ice shards at your opponent causing moderate damage. To rapid fire, you must alternate between Left clicking and right clicking with IceBlast.");
-			config.addDefault("Abilities.Water.Combo.IceBullet.DeathMessage", "{victim}'s heart was frozen by {attacker}'s {ability}");
-			config.addDefault("Abilities.Water.Combo.IceBullet.Instructions", "WaterBubble (Tap Shift) > IceBlast (Hold Shift) > Wait for ice to Form > Then alternate between Left and Right click with IceBlast");
-			config.addDefault("Abilities.Water.Combo.IceWave.Description", "PhaseChange your WaterWave into an IceWave that freezes and damages enemies.");
-			config.addDefault("Abilities.Water.Combo.IceWave.DeathMessage", "{victim} was frozen solid by {attacker}'s {ability}");
-			config.addDefault("Abilities.Water.Combo.IceWave.Instructions", "Create a WaterSpout Wave > PhaseChange (Left Click)");
-			config.addDefault("Abilities.Water.Passive.FastSwim.Description", "FastSwim is a passive ability for waterbenders allowing them to travel quickly through the water. Simple hold shift while underwater to propel yourself forward.");
-			config.addDefault("Abilities.Water.Passive.HydroSink.Description", "Hydrosink is a passive ability for waterbenders enabling them to softly land on any waterbendable surface, cancelling all damage.");
-
-			config.addDefault("Commands.Help.Elements.Earth", "Earth is the element of substance. Earthbenders share many of the same fundamental techniques as Waterbenders, but their domain is quite different and more readily accessible. Earthbenders dominate the ground and subterranean, having abilities to pull columns of rock straight up from the earth or drill their way through the mountain. They can also launch themselves through the air using pillars of rock, and will not hurt themselves assuming they land on something they can bend. The more skilled Earthbenders can even bend metal, sand, and lava.\nEnter /b display Earth for a list of the available earth abilities.");
-			config.addDefault("Abilities.Earth.Catapult.Description", "Catapult is an advanced earthbending ability that allows you to forcefully push yourself using earth, reaching great heights. This technique is best used when travelling, but it can also be used to quickly escape a battle.");
-			config.addDefault("Abilities.Earth.Catapult.Instructions", "Hold sneak until you see particles and hear a sound and then release to be propelled in the direction you're looking. Additionally, you can left-click to be propelled with less power.");
-			config.addDefault("Abilities.Earth.Collapse.Description", "This ability is a basic earthbending ability that allows the earthbender great utility. It allows them to control earth blocks by compressing earth. Players and mobs can be trapped and killed if earth is collapsed and they're stuck inside it, meaning this move is deadly when in cave systems.");
-			config.addDefault("Abilities.Earth.Collapse.Instructions", "Left click an earthbendable block. If there's space under that block, it will be collapsed. Alternatively, you can tap sneak to collapse multiple blocks at a time.");
-			config.addDefault("Abilities.Earth.Collapse.DeathMessage", "{victim} was suffocated by {attacker}'s {ability}");
-			config.addDefault("Abilities.Earth.EarthArmor.Description", "This ability encases the Earthbender in armor, giving them protection. It is a fundamental earthbending technique that's used to survive longer in battles.");
-			config.addDefault("Abilities.Earth.EarthArmor.Instructions", "Tap sneak while looking at an earthbendable block to bring those blocks towards you, forming earth armor. This ability will give you extra hearts and will be removed once those extra hearts are gone. You can disable this ability by holding sneak and left clicking with EarthArmor.");
-			config.addDefault("Abilities.Earth.EarthBlast.Description", "EarthBlast is a basic yet fundamental earthbending ability. It allows you to deal rapid fire damage to your target to finish low health targets off or deal burst damage to them. Although it can be used at long range, it's potential is greater in close ranged comat.");
-			config.addDefault("Abilities.Earth.EarthBlast.Instructions", "Tap sneak at an earthbendable block and then left click in a direction to send an earthblast. Additionally, you can left click again to change the direction of the earthblast. You can also redirect other earthbender's earth blast by left clicking. If the earth blast hits an entity it will deal damage and knockback.");
-			config.addDefault("Abilities.Earth.EarthBlast.DeathMessage", "{victim} was shattered by {attacker}'s {ability}");
-			config.addDefault("Abilities.Earth.EarthGrab.Description", "EarthGrab is one of the best defence abilities in an earthbender's arsenal. It allows you to trap someone who is running away so that you can catch up to someone. It is also of great utility use to an earthbender. It can be used to drag items, arrows, and crops that are on earthbendable blocks towards you, saving you the time of running to get them.");
-			config.addDefault("Abilities.Earth.EarthGrab.Instructions", "\n" + "(Grab) To grab an entity, left click in the direction of the target. Your power will be sent through the earth, and then it will reach up and root them in their spot upon contact. The ability can be manually be disabled by sneaking or clicking again on the EarthGrab slot." + "\n" + "(Drag) To drag items towards you, sneak" + "\n(Escaping) To escape, the trap must be destroyed or the user damaged. The trap can be destroyed by damage or the trapped entity right-clicking it a certain number of times. Additionally, forcefully moving the entity with another earth ability destroys the trap.");
-			config.addDefault("Abilities.Earth.EarthTunnel.Description", "Earth Tunnel is a completely utility ability for earthbenders. It allows you to dig a hole that lowers players down while you continue the ability, create fast escape routes or just great for making your own cave systems.");
-			config.addDefault("Abilities.Earth.EarthTunnel.Instructions", "Hold sneak while looking at an earthbendable block to tunnel the blocks away. If you release sneak or look at a block that isn't earthbendable, the ability will cancel.");
-			config.addDefault("Abilities.Earth.Extraction.Description", "This ability allows metalbenders to extract the minerals from ore blocks. This ability is extremely useful for gathering materials as it has a chance to extract double or tripple the ores.");
-			config.addDefault("Abilities.Earth.Extraction.Instructions", "Tap sneak while looking at an earthbendable ore to extract the ore.");
-			config.addDefault("Abilities.Earth.LavaFlow.Description", "LavaFlow is an extremely advanced, and dangerous ability. It allows the earthbender to create pools of lava around them, or to solidify existing lava. This ability can be deadly when comboed with EarthGrab.");
-			config.addDefault("Abilities.Earth.LavaFlow.Instructions", "\n" + "(Flow) Hold sneak and lava will begin expanding outwards. Once the lava has stopped expanding, you can release sneak. Additionally, if you tap sneak the lava you created will revert back to the earthbendable block." + "\n" + "(Lava Pool) Left click to slowly transform earthbendable blocks into a pool of lava." + "\n" + "(Solidify) Left click on lava to solidify it, turning it to stone.");
-			config.addDefault("Abilities.Earth.LavaFlow.DeathMessage", "{victim} was caught by {attacker}'s {ability}");
-			config.addDefault("Abilities.Earth.EarthSmash.Description", "EarthSmash is an advanced earthbending technique that has lots of utility. It can be comboed with abilities such as Shockwave, but also be used for mobility and to produce high damage. EarthSmash is great for escaping when at low health.");
-			config.addDefault("Abilities.Earth.EarthSmash.Instructions", "\n" + "(Smash) Hold sneak until particles appear, then release sneak while looking at an earthbendable block which will raise an earth boulder. Then, hold sneak while looking at this boulder to control it. Left click to send the bounder in the direction you're facing, damanging entities and knocking them back." + "\n" + "(Ride) After you have created an earth boulder, hold sneak and right click on the boulder to ride it. You will now ride the boulder in whatever direction you look. Additionally, you can ride the boulder by going on top of it and holding sneak. If you come into contact with an entity while riding the boulder, it will drag them along with you. If you left go of sneak, the ability will cancel.");
-			config.addDefault("Abilities.Earth.EarthSmash.DeathMessage", "{victim} was crushed by {attacker}'s {ability}");
-			config.addDefault("Abilities.Earth.MetalClips.Description", "MetalClips is an advanced metalbending ability that allows you to take control of a fight. It gives the metalbender the ability to control an entity, create space between them and a player and even added utility.");
-			config.addDefault("Abilities.Earth.MetalClips.Instructions", "\n" + "(Clips) This ability requires iron ingots in your inventory. Left click to throw an ingot at an entity, dealing damage to them. This ingot will form into armor, wrapping itself around the entity. Once enough armor pieces are around the entity, you can then control them. To control them, hold sneak while looking at them and then they will be moved in the direction you look. Additionally, you can release sneak to throw them in the direction you're looking." + "\n" + "(Magnet) Hold sneak with this ability to pull iron ingots towards you.");
-			config.addDefault("Abilities.Earth.MetalClips.DeathMessage", "{victim} was too slow for {attacker}'s {ability}");
-			config.addDefault("Abilities.Earth.RaiseEarth.Description", "RaiseEarth is a basic yet useful utility move. It has the potential to allow the earthbender to create great escape routes by raising earth underneath them to propell themselves upwards. It also offers synergy with other moves, such as shockwave. RaiseEarth is often used to block incoming abilities.");
-			config.addDefault("Abilities.Earth.RaiseEarth.Instructions", "\n" + "(Pillar) To raise a pillar of earth, left click on an earthbendable block." + "\n" + "(Wall) To raise a wall of earth, tap sneak on an earthbendable block.");
-			config.addDefault("Abilities.Earth.Shockwave.Description", "Shockwave is one of the most powerful earthbending abilities. It allows the earthbender to deal mass damage to everyone around them and knock them back. It's extremely useful when fighting more than one target or if you're surrounded by mobs.");
-			config.addDefault("Abilities.Earth.Shockwave.Instructions", "Hold sneak until you see particles and then release sneak to send a wave of earth outwards, damaging and knocking entities back that it collides with. Additionally, instead of releasing sneak you can send a cone of earth forwards by left clicking. If you are on the Shockwave slot and you fall from a great height, your Shockwave will automatically activate.");
-			config.addDefault("Abilities.Earth.Shockwave.DeathMessage", "{victim} was blown away by {attacker}'s {ability}");
-			config.addDefault("Abilities.Earth.Tremorsense.Description", "This is a pure utility ability for earthbenders. If you are in an area of low-light and are standing on top of an earthbendable block, this ability will automatically turn that block into glowstone, visible *only by you*. If you lose contact with a bendable block, the light will go out as you have lost contact with the earth and cannot 'see' until you can touch earth again. Additionally, if you click with this ability selected, smoke will appear above nearby earth with pockets of air beneath them.");
-			config.addDefault("Abilities.Earth.Tremorsense.Instructions", "Simply left click while on an earthbendable block.");
-			config.addDefault("Abilities.Earth.Combo.EarthDome.Description", "EarthDome allows earthbenders to surround themselves or another entity in earth, temporarily preventing anything from entering or escaping the dome.");
-			config.addDefault("Abilities.Earth.Combo.EarthDome.Instructions", "(Self) RaiseEarth (Right click) > Shockwave (Right click)\\n(Projection) RaiseEarth(Right click) > Shockwave (Left click)");
-			config.addDefault("Abilities.Earth.Combo.EarthPillars.Description", "Send players and entities flying into the air and possibly stunning them by raising pillars of earth under their feet, dealing damage initally as well. This combo can also be used by falling from high off the ground and landing while on the Catapult ability");
-			config.addDefault("Abilities.Earth.Combo.EarthPillars.Instructions", "Shockwave (Tap sneak) > Shockwave (Hold sneak) > Catapult (Release sneak)");
-			config.addDefault("Abilities.Earth.Passive.DensityShift.Description", "DensityShift is a passive ability which allows earthbenders to make a firm landing negating all fall damage on any earthbendable surface.");
-			config.addDefault("Abilities.Earth.Passive.FerroControl.Description", "FerroControl is a passive ability which allows metalbenders to simply open and close iron doors by sneaking.");
-
-			config.addDefault("Commands.Help.Elements.Fire", "Fire is the element of power. Firebenders focus on destruction and incineration. Their abilities are pretty straight forward: set things on fire. They do have a bit of utility however, being able to make themselves un-ignitable, extinguish large areas, cook food in their hands, extinguish large areas, small bursts of flight, and then comes the abilities to shoot fire from your hands.\nEnter /b display Fire for a list of the available fire abilities.");
-			config.addDefault("Abilities.Fire.Blaze.Description", "Blaze is a basic firebending technique that can be extremely deadly if used right. It's useful to stop people from chasing you or to create space between you and other players..");
-			config.addDefault("Abilities.Fire.Blaze.Instructions", "Left click to send an arc of fire in the direction you're facing that will burn entities in its path. Additionally, you can tap sneak to send a blaze all around you.");
-			config.addDefault("Abilities.Fire.Blaze.DeathMessage", "{victim} was incinerated by {attacker}'s {ability}");
-			config.addDefault("Abilities.Fire.Combustion.Description", "Combustion is a special firebending technique that's extremely deadly. It allows you to create a powerful blast to deal immense damage to players at long range.");
-			config.addDefault("Abilities.Fire.Combustion.Instructions", "Tap sneak to send a combustion out in the direction you're looking. It will explode on impact, or you can left click to manually expload it. This deals damage to players who are in radius of the blast.");
-			config.addDefault("Abilities.Fire.Combustion.DeathMessage", "{victim} was shot down by {attacker}'s {ability}");
-			config.addDefault("Abilities.Fire.FireBlast.Description", "FireBlast is the most fundamental bending technique of a firebender. It allows the firebender to create mass amounts of fire blasts to constantly keep damaging an entity. It's great for rapid fire successions to deal immense damage.");
-			config.addDefault("Abilities.Fire.FireBlast.Instructions", "\n" + "(Ball) Left click to send out a ball of fire that will deal damage and knockback entities it hits. Additionally, this ability can refuel furnace power if the blast connects with a furnace." + "\n" + "(Blast) Hold sneak until you see particles and then release sneak to send out a powerful fire blast outwards. This deals damage and knocks back anyone it hits, while exploding on impact.");
-			config.addDefault("Abilities.Fire.FireBlast.DeathMessage", "{victim} was burnt by {attacker}'s {ability}");
-			config.addDefault("Abilities.Fire.FireBurst.Description", "FireBurst is a very powerful firebending ability. " + "FireBurst is an advanced firebending technique that has a large range and the potential to deal immense damage. It's incredibly useful when surrounded by lots of mobs, to damage them all at once.");
-			config.addDefault("Abilities.Fire.FireBurst.Instructions", "Hold sneak until you see particles and then release sneak to send out a sphere of fire expanding outwards, damaging anything it hits. Additionally, you can left click instead of releasing sneak to send the fire burst into one direction only.");
-			config.addDefault("Abilities.Fire.FireBurst.DeathMessage", "{victim} was blown apart by {attacker}'s {ability}");
-			config.addDefault("Abilities.Fire.FireJet.Description", "FireJet is a fundamental utility move for firebenders. It allows the firebender to blast fire behind them to propel them forward, which can prevent them from taking fall damage or to escape from deadly situations.");
-			config.addDefault("Abilities.Fire.FireJet.Instructions", "Left click to propel yourself in the direction you're looking. Additionally, left click while flying to cancel the jet.");
-			config.addDefault("Abilities.Fire.FireShield.Description", "FireShield is a basic defensive ability that allows a firebender to block projectiles or other bending abilities. It's useful while fighting off skeletons, or while trying to block bending abilities at low health.");
-			config.addDefault("Abilities.Fire.FireShield.Instructions", "Hold sneak to create a fire shield around you that will block projectiles and other bending abilities. Additionally, left click to create a temporary fire shield. If entities step inside this fire shield, they will be ignited.");
-			config.addDefault("Abilities.Fire.FireShield.DeathMessage", "{victim} scorched themselves on {attacker}'s {ability}");
-			config.addDefault("Abilities.Fire.FireManipulation.Description", "FireManipulation is an extremely advanced and unique Firebending technique that allows the bender to create fire and manipulate it to block incoming attacks. You can also manipulate the fire you create to be used as an offence ability.");
-			config.addDefault("Abilities.Fire.FireManipulation.Instructions", "Stream: Hold sneak and move your cursor around to create a fire where you look, blocking incoming attacks. Once you've created enough fire, left click to send the fire stream outwards, damaging anything it comes into contact with.");
-			config.addDefault("Abilities.Fire.FireManipulation.DeathMessage", "{victim} scorched themselves on {attacker}'s {ability}");
-			config.addDefault("Abilities.Fire.HeatControl.Description", "HeatControl is a fundamental firebending technique that allows the firebender to control and manipulate heat. This ability is extremely useful for ensuring that you're protected from your own fire and fire from that of other firebenders. It's also offers utility by melting ice or cooking food.");
-			config.addDefault("Abilities.Fire.HeatControl.Instructions", "\n" + "(Melt) To melt ice, simply left click while looking at ice." + "\n" + "(Solidify) To solidify lava, hold sneak while looking at lava while standing still and it will start to solidify the lava pool you're looking at." + "\n" + "(Extinguish) To extinguish nearby fire or yourself, simply tap sneak." + "\n" + "(Cook) To cook food, place the raw food on your HeatControl slot and hold sneak. The food will then begin to cook.");
-			config.addDefault("Abilities.Fire.Illumination.Description", "Illumination is a basic firebending technique that allows firebenders to manipulate their fire to create a light source. This ability will automatically activate when you're in low light.");
-			config.addDefault("Abilities.Fire.Illumination.Instructions", "Left click to enable. Additionally, left click to disable.");
-			config.addDefault("Abilities.Fire.Lightning.Description", "Lightning is an advanced firebending technique. It allows you to create lightning and manipulate it towards a target to deal immense damage.");
-			config.addDefault("Abilities.Fire.Lightning.Instructions", "\n" + "(Lightning) Hold sneak to create lightning until particles appear, then release sneak to send lightning in the direction you're looking. This deals damage to entities that it hits and has a chance to stun them for a short duration." + "\n" + "(Redirection) When someone has fired a lightning strike at you, you can hold sneak to absorb this lightning and then release sneak to fire it back.");
-			config.addDefault("Abilities.Fire.Lightning.DeathMessage", "{victim} was electrocuted by {attacker}'s {ability}");
-			config.addDefault("Abilities.Fire.WallOfFire.Description", "WallOfFire is an advanced firebending technique that can be used aggressively or defensively. It's incredibly useful when trying to block off opponents from chasing you or to back them into corners.");
-			config.addDefault("Abilities.Fire.WallOfFire.Instructions", "Left click to create a fire wall at the location you clicked. This fire wall will damage entities that run into it and deal knockback.");
-			config.addDefault("Abilities.Fire.WallOfFire.DeathMessage", "{victim} ran into {attacker}'s {ability}");
-			config.addDefault("Abilities.Fire.Combo.FireKick.Description", "A short ranged arc of fire launches from the player's feet dealing moderate damage to enemies.");
-			config.addDefault("Abilities.Fire.Combo.FireKick.DeathMessage", "{victim} was kicked to the floor, in flames, from {attacker}'s {ability}");
-			config.addDefault("Abilities.Fire.Combo.FireKick.Instructions", "FireBlast > FireBlast > (Hold sneak) > FireBlast");
-			config.addDefault("Abilities.Fire.Combo.FireSpin.Description", "A circular array of fire that causes damage and massive knockback to nearby enemies.");
-			config.addDefault("Abilities.Fire.Combo.FireSpin.DeathMessage", "{victim} was caught in {attacker}'s {ability} inferno");
-			config.addDefault("Abilities.Fire.Combo.FireSpin.Instructions", "FireBlast > FireBlast > FireShield (Left Click) > FireShield (Tap Shift)");
-			config.addDefault("Abilities.Fire.Combo.JetBlaze.Description", "Damages and burns all enemies in the proximity of your FireJet.");
-			config.addDefault("Abilities.Fire.Combo.JetBlaze.DeathMessage", "{victim} was lit ablaze by {attacker}'s {ability}");
-			config.addDefault("Abilities.Fire.Combo.JetBlaze.Instructions", "FireJet (Tap Shift) > FireJet (Tap Shift) > Blaze (Tap Shift) > FireJet");
-			config.addDefault("Abilities.Fire.Combo.JetBlast.Description", "Create an explosive blast that propels your FireJet at higher speeds.");
-			config.addDefault("Abilities.Fire.Combo.JetBlast.Instructions", "FireJet (Tap Shift) > FireJet (Tap Shift) > FireShield (Tap Shift) > FireJet");
-			config.addDefault("Abilities.Fire.Combo.FireWheel.Description", "A high-speed wheel of fire that travels along the ground for long distances dealing high damage.");
-			config.addDefault("Abilities.Fire.Combo.FireWheel.DeathMessage", "{victim} was incinerated by {attacker}'s {ability}");
-			config.addDefault("Abilities.Fire.Combo.FireWheel.Instructions", "FireShield (Hold Shift) > Right Click a block in front of you twice > Switch to Blaze > Release Shift");
-
-			config.addDefault("Commands.Help.Elements.Chi", "Chiblockers focus on bare handed combat, utilizing their agility and speed to stop any bender right in their path. Although they lack the ability to bend any of the other elements, they are great in combat, and a serious threat to any bender. Chiblocking was first shown to be used by Ty Lee in Avatar: The Last Airbender, then later by members of the Equalists in The Legend of Korra.\nEnter /b display Chi for a list of the available chi abilities.");
-			config.addDefault("Abilities.Chi.AcrobatStance.Description", "AcrobatStance gives a Chiblocker a higher probability of blocking a Bender's Chi while granting them a Speed and Jump Boost. It also increases the rate at which the hunger bar depletes.");
-			config.addDefault("Abilities.Chi.AcrobatStance.Instructions", "To use, simply left click to activate this stance. Left click once more to deactivate it.");
-			config.addDefault("Abilities.Chi.HighJump.Description", "HighJump gives the Chiblocker the ability to leap into the air. This ability is used for mobility, and is often used to dodge incoming attacks.");
-			config.addDefault("Abilities.Chi.HighJump.Instructions", "To use, simply left click while standing on the ground.");
-			config.addDefault("Abilities.Chi.Smokescreen.Description", "Smokescreen, if used correctly, can serve as a defensive and offensive ability for Chiblockers. When used, a smoke bomb is fired which will blind anyone within a small radius of the explosion, allowing you to either get away, or move in for the kill.");
-			config.addDefault("Abilities.Chi.Smokescreen.Instructions", "Left click and a smoke bomb will be fired in the direction you're looking.");
-			config.addDefault("Abilities.Chi.WarriorStance.Description", "WariorStance is an advanced chiblocker technique that gives the chiblocker increased damage but makes them a tad more vulnerable. This ability is useful when finishing off weak targets.");
-			config.addDefault("Abilities.Chi.WarriorStance.Instructions", "Left click to activate the warrior stance mode. Additionally, left click to disable it.");
-			config.addDefault("Abilities.Chi.Paralyze.Description", "Paralyzes the target, making them unable to do anything for a short period of time as they will be paralyzed where they're stood. ");
-			config.addDefault("Abilities.Chi.Paralyze.Instructions", "Punch a player to paralyze them.");
-			config.addDefault("Abilities.Chi.RapidPunch.Description", "This ability allows the chiblocker to punch rapidly in a short period. To use, simply punch. This has a short cooldown.");
-			config.addDefault("Abilities.Chi.RapidPunch.Instructions", "Punch a player to deal massive damage.");
-			config.addDefault("Abilities.Chi.RapidPunch.DeathMessage", "{victim} took all the hits from {attacker}'s {ability}");
-			config.addDefault("Abilities.Chi.QuickStrike.Description", "QuickStrike enables a chiblocker to quickly strike an enemy, potentially blocking their chi.");
-			config.addDefault("Abilities.Chi.QuickStrike.Instructions", "Left click on a player to quick strike them.");
-			config.addDefault("Abilities.Chi.QuickStrike.DeathMessage", "{victim} was struck down by {attacker}'s {ability}");
-			config.addDefault("Abilities.Chi.SwiftKick.Description", "SwiftKick allows a chiblocker to swiftly kick an enemy, potentially blocking their chi.");
-			config.addDefault("Abilities.Chi.SwiftKick.Instructions", "Jump and left click on a player to swift kick them.");
-			config.addDefault("Abilities.Chi.SwiftKick.DeathMessage", "{victim} was kicked to the floor by {attacker}'s {ability}");
-			config.addDefault("Abilities.Chi.Combo.Immobilize.Description", "Immobilizes the opponent for several seconds.");
-			config.addDefault("Abilities.Chi.Combo.Immobilize.Instructions", "QuickStrike > SwiftKick > QuickStrike > QuickStrike");
-			config.addDefault("Abilities.Chi.Passive.ChiAgility.Description", "ChiAgility is a passive ability which enables chiblockers to run faster and jump higher.");
-			config.addDefault("Abilities.Chi.Passive.ChiSaturation.Description", "ChiSaturation is a passive ability which causes chiblockers' hunger to deplete at a slower rate.");
-			config.addDefault("Abilities.Chi.Passive.Acrobatics.Description", "Acrobatics is a passive ability which negates all fall damage based on a percent chance.");
-
-			config.addDefault("Commands.Help.Elements.Avatar", "Avatars are the human embodiment of light and peace created through a connection with the Avatar Spirit. It is considered an Avatar's duty to master the four elements and use that power to keep balance among the four nations as well as act as the bridge between the physical and spiritual worlds.\nEnter /b display Avatar for a list of the available avatar abilities.");
-
-			languageConfig.save();
-		} else if (type == ConfigType.DEFAULT) {
-			config = defaultConfig.get();
-
-			final ArrayList<String> earthBlocks = new ArrayList<String>();
-			earthBlocks.add(Material.DIRT.toString());
-			earthBlocks.add(Material.MYCELIUM.toString());
-			earthBlocks.add(Material.STONE.toString());
-			earthBlocks.add(Material.GRAVEL.toString());
-			earthBlocks.add(Material.CLAY.toString());
-			earthBlocks.add(Material.COAL_ORE.toString());
-			earthBlocks.add(Material.REDSTONE_ORE.toString());
-			earthBlocks.add(Material.LAPIS_ORE.toString());
-			earthBlocks.add(Material.DIAMOND_ORE.toString());
-			earthBlocks.add(Material.EMERALD_ORE.toString());
-			earthBlocks.add(Material.NETHERRACK.toString());
-			earthBlocks.add(Material.COBBLESTONE.toString());
-			earthBlocks.add(Material.STONE_SLAB.toString());
-			earthBlocks.add(Material.COBBLESTONE_SLAB.toString());
-			earthBlocks.add(Material.GRASS_BLOCK.toString());
-			earthBlocks.add(Material.GRASS_PATH.toString());
-			earthBlocks.add(Material.ANDESITE.toString());
-			earthBlocks.add(Material.GRANITE.toString());
-			earthBlocks.add(Material.DIORITE.toString());
-
-			final ArrayList<String> metalBlocks = new ArrayList<String>();
-			metalBlocks.add(Material.IRON_ORE.toString());
-			metalBlocks.add(Material.GOLD_ORE.toString());
-			metalBlocks.add(Material.NETHER_QUARTZ_ORE.toString());
-			metalBlocks.add(Material.IRON_BLOCK.toString());
-			metalBlocks.add(Material.GOLD_BLOCK.toString());
-			metalBlocks.add(Material.QUARTZ_BLOCK.toString());
-
-			final ArrayList<String> sandBlocks = new ArrayList<String>();
-			sandBlocks.add(Material.SAND.toString());
-			sandBlocks.add(Material.SANDSTONE.toString());
-			sandBlocks.add(Material.SANDSTONE_SLAB.toString());
-			sandBlocks.add(Material.RED_SAND.toString());
-			sandBlocks.add(Material.RED_SANDSTONE.toString());
-			sandBlocks.add(Material.RED_SANDSTONE_SLAB.toString());
-
-			final ArrayList<String> iceBlocks = new ArrayList<String>();
-			iceBlocks.add(Material.ICE.toString());
-			iceBlocks.add(Material.PACKED_ICE.toString());
-			iceBlocks.add(Material.BLUE_ICE.toString());
-			iceBlocks.add(Material.FROSTED_ICE.toString());
-
-			final ArrayList<String> plantBlocks = new ArrayList<String>();
-			plantBlocks.add(Material.ACACIA_SAPLING.toString());
-			plantBlocks.add(Material.BIRCH_SAPLING.toString());
-			plantBlocks.add(Material.DARK_OAK_SAPLING.toString());
-			plantBlocks.add(Material.JUNGLE_SAPLING.toString());
-			plantBlocks.add(Material.OAK_SAPLING.toString());
-			plantBlocks.add(Material.SPRUCE_SAPLING.toString());
-			plantBlocks.add(Material.ACACIA_LEAVES.toString());
-			plantBlocks.add(Material.BIRCH_LEAVES.toString());
-			plantBlocks.add(Material.DARK_OAK_LEAVES.toString());
-			plantBlocks.add(Material.JUNGLE_LEAVES.toString());
-			plantBlocks.add(Material.OAK_LEAVES.toString());
-			plantBlocks.add(Material.SPRUCE_LEAVES.toString());
-			plantBlocks.add(Material.DEAD_BUSH.toString());
-			plantBlocks.add(Material.ORANGE_TULIP.toString());
-			plantBlocks.add(Material.PINK_TULIP.toString());
-			plantBlocks.add(Material.RED_TULIP.toString());
-			plantBlocks.add(Material.WHITE_TULIP.toString());
-			plantBlocks.add(Material.ROSE_BUSH.toString());
-			plantBlocks.add(Material.BLUE_ORCHID.toString());
-			plantBlocks.add(Material.ALLIUM.toString());
-			plantBlocks.add(Material.DANDELION.toString());
-			plantBlocks.add(Material.LILAC.toString());
-			plantBlocks.add(Material.OXEYE_DAISY.toString());
-			plantBlocks.add(Material.AZURE_BLUET.toString());
-			plantBlocks.add(Material.PEONY.toString());
-			plantBlocks.add(Material.SUNFLOWER.toString());
-			plantBlocks.add(Material.POPPY.toString());
-			plantBlocks.add(Material.FERN.toString());
-			plantBlocks.add(Material.LARGE_FERN.toString());
-			plantBlocks.add(Material.RED_MUSHROOM.toString());
-			plantBlocks.add(Material.RED_MUSHROOM_BLOCK.toString());
-			plantBlocks.add(Material.BROWN_MUSHROOM.toString());
-			plantBlocks.add(Material.BROWN_MUSHROOM_BLOCK.toString());
-			plantBlocks.add(Material.MUSHROOM_STEM.toString());
-			plantBlocks.add(Material.CACTUS.toString());
-			plantBlocks.add(Material.PUMPKIN.toString());
-			plantBlocks.add(Material.PUMPKIN_STEM.toString());
-			plantBlocks.add(Material.MELON.toString());
-			plantBlocks.add(Material.MELON_STEM.toString());
-			plantBlocks.add(Material.VINE.toString());
-			plantBlocks.add(Material.LILY_PAD.toString());
-			plantBlocks.add(Material.WHEAT.toString());
-			plantBlocks.add(Material.BEETROOTS.toString());
-			plantBlocks.add(Material.CARROTS.toString());
-			plantBlocks.add(Material.POTATOES.toString());
-			plantBlocks.add(Material.SUGAR_CANE.toString());
-			plantBlocks.add(Material.GRASS.toString());
-			plantBlocks.add(Material.TALL_GRASS.toString());
-
-			final ArrayList<String> snowBlocks = new ArrayList<>();
-			snowBlocks.add(Material.SNOW.toString());
-
-			config.addDefault("Properties.UpdateChecker", true);
-			config.addDefault("Properties.Statistics", true);
-			config.addDefault("Properties.DatabaseCooldowns", true);
-			config.addDefault("Properties.BendingPreview", true);
-			config.addDefault("Properties.BendingAffectFallingSand.Normal", true);
-			config.addDefault("Properties.BendingAffectFallingSand.NormalStrengthMultiplier", 1.0);
-			config.addDefault("Properties.BendingAffectFallingSand.TNT", true);
-			config.addDefault("Properties.BendingAffectFallingSand.TNTStrengthMultiplier", 1.0);
-			config.addDefault("Properties.GlobalCooldown", 500);
-			config.addDefault("Properties.TogglePassivesWithAllBending", true);
-			config.addDefault("Properties.SeaLevel", 62);
-			config.addDefault("Properties.ChooseCooldown", 0L);
-			config.addDefault("Properties.MaxPresets", 10);
-
-			config.addDefault("Properties.HorizontalCollisionPhysics.Enabled", true);
-			config.addDefault("Properties.HorizontalCollisionPhysics.DamageOnBarrierBlock", false);
-			config.addDefault("Properties.HorizontalCollisionPhysics.WallDamageMinimumDistance", 5.0);
-			config.addDefault("Properties.HorizontalCollisionPhysics.WallDamageCap", 5.0);
-
-			config.addDefault("Properties.RegionProtection.AllowHarmlessAbilities", true);
-			config.addDefault("Properties.RegionProtection.RespectWorldGuard", true);
-			config.addDefault("Properties.RegionProtection.RespectGriefPrevention", true);
-			config.addDefault("Properties.RegionProtection.RespectFactions", true);
-			config.addDefault("Properties.RegionProtection.RespectTowny", true);
-			config.addDefault("Properties.RegionProtection.RespectPreciousStones", true);
-			config.addDefault("Properties.RegionProtection.RespectLWC", true);
-			config.addDefault("Properties.RegionProtection.Residence.Flag", "bending");
-			config.addDefault("Properties.RegionProtection.Residence.Respect", true);
-			config.addDefault("Properties.RegionProtection.RespectKingdoms", true);
-			config.addDefault("Properties.RegionProtection.RespectPlotSquared", true);
-			config.addDefault("Properties.RegionProtection.RespectRedProtect", true);
-			config.addDefault("Properties.RegionProtection.CacheBlockTime", 5000);
-
-			config.addDefault("Properties.Air.CanBendWithWeapons", false);
-			config.addDefault("Properties.Air.Particles", "spell");
-			config.addDefault("Properties.Air.PlaySound", true);
-			config.addDefault("Properties.Air.Sound.Sound", "ENTITY_CREEPER_HURT");
-			config.addDefault("Properties.Air.Sound.Volume", 1);
-			config.addDefault("Properties.Air.Sound.Pitch", 2);
-
-			config.addDefault("Properties.Water.DynamicSourcing", true);
-			config.addDefault("Properties.Water.FreezePlayerHead", true);
-			config.addDefault("Properties.Water.FreezePlayerFeet", true);
-			config.addDefault("Properties.Water.CanBendWithWeapons", true);
-			config.addDefault("Properties.Water.IceBlocks", iceBlocks);
-			config.addDefault("Properties.Water.PlantBlocks", plantBlocks);
-			config.addDefault("Properties.Water.SnowBlocks", snowBlocks);
-			config.addDefault("Properties.Water.NightFactor", 1.5);
-			config.addDefault("Properties.Water.FullMoonFactor", 1.75);
-			config.addDefault("Properties.Water.PlaySound", true);
-			config.addDefault("Properties.Water.WaterSound.Sound", "BLOCK_WATER_AMBIENT");
-			config.addDefault("Properties.Water.WaterSound.Volume", 1);
-			config.addDefault("Properties.Water.WaterSound.Pitch", 1);
-			config.addDefault("Properties.Water.IceSound.Sound", "ITEM_FLINTANDSTEEL_USE");
-			config.addDefault("Properties.Water.IceSound.Volume", 1);
-			config.addDefault("Properties.Water.IceSound.Pitch", 1);
-			config.addDefault("Properties.Water.PlantSound.Sound", "BLOCK_GRASS_STEP");
-			config.addDefault("Properties.Water.IceSound.Volume", 1);
-			config.addDefault("Properties.Water.IceSound.Pitch", 1);
-
-			config.addDefault("Properties.Earth.DynamicSourcing", true);
-			config.addDefault("Properties.Earth.RevertEarthbending", true);
-			config.addDefault("Properties.Earth.SafeRevert", true);
-			config.addDefault("Properties.Earth.RevertCheckTime", 300000);
-			config.addDefault("Properties.Earth.CanBendWithWeapons", true);
-			config.addDefault("Properties.Earth.EarthBlocks", earthBlocks);
-			config.addDefault("Properties.Earth.MetalBlocks", metalBlocks);
-			config.addDefault("Properties.Earth.SandBlocks", sandBlocks);
-			config.addDefault("Properties.Earth.MetalPowerFactor", 1.5);
-			config.addDefault("Properties.Earth.PlaySound", true);
-			config.addDefault("Properties.Earth.EarthSound.Sound", "ENTITY_GHAST_SHOOT");
-			config.addDefault("Properties.Earth.EarthSound.Volume", 1);
-			config.addDefault("Properties.Earth.EarthSound.Pitch", 1);
-			config.addDefault("Properties.Earth.MetalSound.Sound", "ENTITY_IRON_GOLEM_HURT");
-			config.addDefault("Properties.Earth.MetalSound.Volume", 1);
-			config.addDefault("Properties.Earth.MetalSound.Pitch", 1.25);
-			config.addDefault("Properties.Earth.SandSound.Sound", "BLOCK_SAND_BREAK");
-			config.addDefault("Properties.Earth.SandSound.Volume", 1);
-			config.addDefault("Properties.Earth.SandSound.Pitch", 1);
-			config.addDefault("Properties.Earth.LavaSound.Sound", "BLOCK_LAVA_AMBIENT");
-			config.addDefault("Properties.Earth.LavaSound.Volume", 1);
-			config.addDefault("Properties.Earth.LavaSound.Pitch", 1);
-
-			config.addDefault("Properties.Fire.CanBendWithWeapons", true);
-			config.addDefault("Properties.Fire.DayFactor", 1.25);
-			config.addDefault("Properties.Fire.PlaySound", true);
-			config.addDefault("Properties.Fire.FireGriefing", false);
-			config.addDefault("Properties.Fire.RevertTicks", 12000L);
-			config.addDefault("Properties.Fire.FireSound.Sound", "BLOCK_FIRE_AMBIENT");
-			config.addDefault("Properties.Fire.FireSound.Volume", 1);
-			config.addDefault("Properties.Fire.FireSound.Pitch", 1);
-			config.addDefault("Properties.Fire.CombustionSound.Sound", "ENTITY_FIREWORK_ROCKET_BLAST");
-			config.addDefault("Properties.Fire.CombustionSound.Volume", 1);
-			config.addDefault("Properties.Fire.CombustionSound.Pitch", 0);
-			config.addDefault("Properties.Fire.LightningSound.Sound", "ENTITY_CREEPER_HURT");
-			config.addDefault("Properties.Fire.LightningSound.Volume", 1);
-			config.addDefault("Properties.Fire.LightningSound.Pitch", 0);
-
-			config.addDefault("Properties.Chi.CanBendWithWeapons", true);
-
-			final ArrayList<String> disabledWorlds = new ArrayList<String>();
-			disabledWorlds.add("TestWorld");
-			disabledWorlds.add("TestWorld2");
-			config.addDefault("Properties.DisabledWorlds", disabledWorlds);
-
-			config.addDefault("Abilities.Avatar.AvatarState.Enabled", true);
-			config.addDefault("Abilities.Avatar.AvatarState.Cooldown", 7200000);
-			config.addDefault("Abilities.Avatar.AvatarState.Duration", 480000);
-			config.addDefault("Abilities.Avatar.AvatarState.PotionEffects.Regeneration.Enabled", true);
-			config.addDefault("Abilities.Avatar.AvatarState.PotionEffects.Regeneration.Power", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.PotionEffects.Speed.Enabled", true);
-			config.addDefault("Abilities.Avatar.AvatarState.PotionEffects.Speed.Power", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.PotionEffects.DamageResistance.Enabled", true);
-			config.addDefault("Abilities.Avatar.AvatarState.PotionEffects.DamageResistance.Power", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.PotionEffects.FireResistance.Enabled", true);
-			config.addDefault("Abilities.Avatar.AvatarState.PotionEffects.FireResistance.Power", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.PowerMultiplier", 2);
-			config.addDefault("Abilities.Avatar.AvatarState.PlaySound", true);
-			config.addDefault("Abilities.Avatar.AvatarState.Sound.Sound", "BLOCK_ANVIL_LAND");
-			config.addDefault("Abilities.Avatar.AvatarState.Sound.Volume", 1);
-			config.addDefault("Abilities.Avatar.AvatarState.Sound.Pitch", 1.5);
-
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirBlast.Push.Entities", 4.5);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirBlast.Push.Self", 4.0);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirSpout.Height", 26);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirSuction.Push", 3.5);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirSwipe.Cooldown", 1000);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirSwipe.Damage", 4.5);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirSwipe.Push", 1.0);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirSwipe.Range", 24);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirSwipe.Radius", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirBurst.ChargeTime", 1000);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirBurst.Damage", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirShield.IsAvatarStateToggle", true);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.Suffocate.Cooldown", 0);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.Suffocate.ChargeTime", 1000);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.Suffocate.Damage", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.Suffocate.Range", 16);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirStream.Range", 60);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirStream.EntityCarry.Height", 21);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirStream.EntityCarry.Duration", 20000);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirSweep.Damage", 6);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirSweep.Range", 21);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.AirSweep.Knockback", 4);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.Twister.Range", 24);
-			config.addDefault("Abilities.Avatar.AvatarState.Air.Twister.Height", 12);
-
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.Catapult.MaxDistance", 80);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.Catapult.Cooldown", 0);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.LavaFlow.ShiftCooldown", 1500);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.LavaFlow.ClickLavaCooldown", 1500);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.LavaFlow.ClickLandCooldown", 1500);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.LavaFlow.ShiftPlatformRadius", 2);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.LavaFlow.ClickRadius", 10);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.LavaFlow.ShiftRadius", 12);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.MetalClips.Cooldown", 2000);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.MetalClips.Range", 20);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.MetalClips.CrushDamage", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.RaiseEarth.Column.Height", 8);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.RaiseEarth.Wall.Height", 8);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.RaiseEarth.Wall.Width", 8);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.Collapse.Column.Height", 12);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.Collapse.Wall.Height", 12);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthArmor.Cooldown", 2000);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthArmor.GoldHearts", 6);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthBlast.Cooldown", 500);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthBlast.Damage", 5);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthGrab.Cooldown", 0);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthGrab.Height", 6);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthGrab.Radius", 6);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.Shockwave.Range", 20);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.Shockwave.Cooldown", 0);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.Shockwave.ChargeTime", 1500);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.Shockwave.Damage", 5);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.Shockwave.Knockback", 2);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthSmash.SelectRange", 16);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthSmash.GrabRange", 16);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthSmash.ChargeTime", 1500);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthSmash.Cooldown", 0);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthSmash.Damage", 7);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthSmash.Knockback", 4.5);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthSmash.FlightSpeed", 1.0);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthSmash.FlightTimer", 10000);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthSmash.ShootRange", 30);
-			config.addDefault("Abilities.Avatar.AvatarState.Earth.EarthTunnel.Radius", 0.5);
-
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.Blaze.Ring.Range", 14);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireJet.IsAvatarStateToggle", true);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.Lightning.ChargeTime", 1500);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.Lightning.Damage", 6);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.Lightning.Cooldown", 1000);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireBurst.ChargeTime", 1);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireBurst.Damage", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireBurst.Cooldown", 0);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireBlast.Charged.ChargeTime", 1500);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireBlast.Charged.Damage", 5);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireKick.Damage", 5);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireKick.Range", 9);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireSpin.Damage", 5);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireSpin.Range", 9);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireSpin.Knockback", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireWheel.Damage", 5);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireWheel.Range", 35);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireWheel.Height", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireWheel.Speed", 0.75);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.FireWheel.FireTicks", 4);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.WallOfFire.Height", 6);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.WallOfFire.Width", 6);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.WallOfFire.Duration", 8000);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.WallOfFire.Damage", 2);
-			config.addDefault("Abilities.Avatar.AvatarState.Fire.WallOfFire.FireTicks", 2);
-
-			config.addDefault("Abilities.Avatar.AvatarState.Water.OctopusForm.AttackRange", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.OctopusForm.Radius", 4);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.OctopusForm.Damage", 4);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.OctopusForm.Knockback", 2);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.Surge.Wall.Radius", 4);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.Surge.Wave.Radius", 20);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.Torrent.InitialDamage", 4);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.Torrent.SuccessiveDamage", 1.5);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.Torrent.MaxHits", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.Torrent.Push", 1.5);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.WaterManipulation.Damage", 5);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceBlast.Damage", 4);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceBlast.Range", 30);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceBlast.Cooldown", 0);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceBullet.Cooldown", 0);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.Damage", 4);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.Range", 30);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.Push", 0.9);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.Height", 7);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.SlowPotency", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.SlowDuration", 90);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.Field.Damage", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.Field.Radius", 8);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.Field.Push", 1.2);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.Blast.Range", 30);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.Blast.Damage", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.Blast.SlowPotency", 3);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceSpike.Blast.SlowDuration", 90);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceBullet.Damage", 4);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceBullet.Range", 16);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceBullet.MaxShots", 45);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceBullet.ShootTime", 12000);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.IceWave.Damage", 4);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.WaterSpout.Height", 20);
-			config.addDefault("Abilities.Avatar.AvatarState.Water.WaterSpout.Wave.FlightDuration", 5000);
-
-			config.addDefault("Abilities.Air.Passive.Factor", 0.3);
-			config.addDefault("Abilities.Air.Passive.AirAgility.Enabled", true);
-			config.addDefault("Abilities.Air.Passive.AirAgility.JumpPower", 3);
-			config.addDefault("Abilities.Air.Passive.AirAgility.SpeedPower", 2);
-			config.addDefault("Abilities.Air.Passive.AirSaturation.Enabled", true);
-			config.addDefault("Abilities.Air.Passive.GracefulDescent.Enabled", true);
-
-			config.addDefault("Abilities.Air.AirBlast.Enabled", true);
-			config.addDefault("Abilities.Air.AirBlast.Speed", 25);
-			config.addDefault("Abilities.Air.AirBlast.Range", 20);
-			config.addDefault("Abilities.Air.AirBlast.Radius", 2);
-			config.addDefault("Abilities.Air.AirBlast.SelectRange", 10);
-			config.addDefault("Abilities.Air.AirBlast.SelectParticles", 4);
-			config.addDefault("Abilities.Air.AirBlast.Particles", 6);
-			config.addDefault("Abilities.Air.AirBlast.Cooldown", 500);
-			config.addDefault("Abilities.Air.AirBlast.Push.Self", 2.5);
-			config.addDefault("Abilities.Air.AirBlast.Push.Entities", 3.5);
-			config.addDefault("Abilities.Air.AirBlast.CanFlickLevers", true);
-			config.addDefault("Abilities.Air.AirBlast.CanOpenDoors", true);
-			config.addDefault("Abilities.Air.AirBlast.CanPressButtons", true);
-			config.addDefault("Abilities.Air.AirBlast.CanCoolLava", true);
-
-			config.addDefault("Abilities.Air.AirBurst.Enabled", true);
-			config.addDefault("Abilities.Air.AirBurst.FallThreshold", 10);
-			config.addDefault("Abilities.Air.AirBurst.PushFactor", 1.5);
-			config.addDefault("Abilities.Air.AirBurst.ChargeTime", 1750);
-			config.addDefault("Abilities.Air.AirBurst.Damage", 0);
-			config.addDefault("Abilities.Air.AirBurst.Cooldown", 0);
-			config.addDefault("Abilities.Air.AirBurst.SneakParticles", 10);
-			config.addDefault("Abilities.Air.AirBurst.ParticlePercentage", 50);
-			config.addDefault("Abilities.Air.AirBurst.AnglePhi", 10);
-			config.addDefault("Abilities.Air.AirBurst.AngleTheta", 10);
-
-			config.addDefault("Abilities.Air.AirScooter.Enabled", true);
-			config.addDefault("Abilities.Air.AirScooter.ShowSitting", false);
-			config.addDefault("Abilities.Air.AirScooter.Speed", 0.675);
-			config.addDefault("Abilities.Air.AirScooter.Interval", 100);
-			config.addDefault("Abilities.Air.AirScooter.Radius", 1);
-			config.addDefault("Abilities.Air.AirScooter.Cooldown", 7000);
-			config.addDefault("Abilities.Air.AirScooter.Duration", 0);
-			config.addDefault("Abilities.Air.AirScooter.MaxHeightFromGround", 7);
-
-			config.addDefault("Abilities.Air.AirShield.Enabled", true);
-			config.addDefault("Abilities.Air.AirShield.Cooldown", 0);
-			config.addDefault("Abilities.Air.AirShield.Duration", 0);
-			config.addDefault("Abilities.Air.AirShield.MaxRadius", 7);
-			config.addDefault("Abilities.Air.AirShield.InitialRadius", 1);
-			config.addDefault("Abilities.Air.AirShield.Streams", 5);
-			config.addDefault("Abilities.Air.AirShield.Speed", 10);
-			config.addDefault("Abilities.Air.AirShield.Particles", 5);
-			config.addDefault("Abilities.Air.AirShield.DynamicCooldown", false);
-
-			config.addDefault("Abilities.Air.AirSpout.Enabled", true);
-			config.addDefault("Abilities.Air.AirSpout.Cooldown", 0);
-			config.addDefault("Abilities.Air.AirSpout.Duration", 0);
-			config.addDefault("Abilities.Air.AirSpout.Height", 16);
-			config.addDefault("Abilities.Air.AirSpout.Interval", 100);
-
-			config.addDefault("Abilities.Air.AirSuction.Enabled", true);
-			config.addDefault("Abilities.Air.AirSuction.Speed", 25);
-			config.addDefault("Abilities.Air.AirSuction.Range", 20);
-			config.addDefault("Abilities.Air.AirSuction.SelectRange", 10);
-			config.addDefault("Abilities.Air.AirSuction.Radius", 2);
-			config.addDefault("Abilities.Air.AirSuction.Push", 2.5);
-			config.addDefault("Abilities.Air.AirSuction.Cooldown", 500);
-			config.addDefault("Abilities.Air.AirSuction.Particles", 6);
-			config.addDefault("Abilities.Air.AirSuction.SelectParticles", 6);
-
-			config.addDefault("Abilities.Air.AirSwipe.Enabled", true);
-			config.addDefault("Abilities.Air.AirSwipe.Damage", 2);
-			config.addDefault("Abilities.Air.AirSwipe.Range", 14);
-			config.addDefault("Abilities.Air.AirSwipe.Radius", 2);
-			config.addDefault("Abilities.Air.AirSwipe.Push", 0.5);
-			config.addDefault("Abilities.Air.AirSwipe.Arc", 16);
-			config.addDefault("Abilities.Air.AirSwipe.Speed", 25);
-			config.addDefault("Abilities.Air.AirSwipe.Cooldown", 1500);
-			config.addDefault("Abilities.Air.AirSwipe.ChargeFactor", 3);
-			config.addDefault("Abilities.Air.AirSwipe.MaxChargeTime", 2500);
-			config.addDefault("Abilities.Air.AirSwipe.Particles", 3);
-			config.addDefault("Abilities.Air.AirSwipe.StepSize", 4);
-
-			config.addDefault("Abilities.Air.Flight.Enabled", true);
-			config.addDefault("Abilities.Air.Flight.Cooldown", 0);
-			config.addDefault("Abilities.Air.Flight.BaseSpeed", 1.2);
-			config.addDefault("Abilities.Air.Flight.Duration", 0);
-
-			config.addDefault("Abilities.Air.Suffocate.Enabled", true);
-			config.addDefault("Abilities.Air.Suffocate.ChargeTime", 500);
-			config.addDefault("Abilities.Air.Suffocate.Cooldown", 0);
-			config.addDefault("Abilities.Air.Suffocate.Range", 20);
-			config.addDefault("Abilities.Air.Suffocate.Damage", 2);
-			config.addDefault("Abilities.Air.Suffocate.DamageInitialDelay", 2);
-			config.addDefault("Abilities.Air.Suffocate.DamageInterval", 1);
-			config.addDefault("Abilities.Air.Suffocate.SlowPotency", 1);
-			config.addDefault("Abilities.Air.Suffocate.SlowDelay", 0.5);
-			config.addDefault("Abilities.Air.Suffocate.SlowInterval", 1.25);
-			config.addDefault("Abilities.Air.Suffocate.BlindPotentcy", 30);
-			config.addDefault("Abilities.Air.Suffocate.BlindDelay", 2);
-			config.addDefault("Abilities.Air.Suffocate.BlindInterval", 1.5);
-			config.addDefault("Abilities.Air.Suffocate.CanBeUsedOnUndeadMobs", true);
-			config.addDefault("Abilities.Air.Suffocate.RequireConstantAim", true);
-			config.addDefault("Abilities.Air.Suffocate.RequireConstantAimRadius", 5);
-			config.addDefault("Abilities.Air.Suffocate.AnimationRadius", 2.0);
-			config.addDefault("Abilities.Air.Suffocate.AnimationParticleAmount", 1);
-			config.addDefault("Abilities.Air.Suffocate.AnimationSpeed", 1.0);
-
-			config.addDefault("Abilities.Air.Tornado.Enabled", true);
-			config.addDefault("Abilities.Air.Tornado.Cooldown", 0);
-			config.addDefault("Abilities.Air.Tornado.Duration", 0);
-			config.addDefault("Abilities.Air.Tornado.Radius", 10);
-			config.addDefault("Abilities.Air.Tornado.Height", 20);
-			config.addDefault("Abilities.Air.Tornado.Range", 25);
-			config.addDefault("Abilities.Air.Tornado.Speed", 1);
-			config.addDefault("Abilities.Air.Tornado.NpcPushFactor", 1);
-			config.addDefault("Abilities.Air.Tornado.PlayerPushFactor", 1);
-
-			config.addDefault("Abilities.Air.Twister.Enabled", true);
-			config.addDefault("Abilities.Air.Twister.Speed", 0.35);
-			config.addDefault("Abilities.Air.Twister.Range", 16);
-			config.addDefault("Abilities.Air.Twister.Height", 8);
-			config.addDefault("Abilities.Air.Twister.Radius", 3.5);
-			config.addDefault("Abilities.Air.Twister.RemoveDelay", 1500);
-			config.addDefault("Abilities.Air.Twister.Cooldown", 10000);
-			config.addDefault("Abilities.Air.Twister.DegreesPerParticle", 7);
-			config.addDefault("Abilities.Air.Twister.HeightPerParticle", 1.25);
-
-			config.addDefault("Abilities.Air.AirStream.Enabled", true);
-			config.addDefault("Abilities.Air.AirStream.Speed", 0.5);
-			config.addDefault("Abilities.Air.AirStream.Range", 40);
-			config.addDefault("Abilities.Air.AirStream.EntityCarry.Duration", 4000);
-			config.addDefault("Abilities.Air.AirStream.EntityCarry.Height", 14);
-			config.addDefault("Abilities.Air.AirStream.Cooldown", 7000);
-
-			config.addDefault("Abilities.Air.AirSweep.Enabled", true);
-			config.addDefault("Abilities.Air.AirSweep.Speed", 1.4);
-			config.addDefault("Abilities.Air.AirSweep.Range", 14);
-			config.addDefault("Abilities.Air.AirSweep.Damage", 3);
-			config.addDefault("Abilities.Air.AirSweep.Knockback", 3.5);
-			config.addDefault("Abilities.Air.AirSweep.Cooldown", 6000);
-
-			config.addDefault("Abilities.Water.Passive.FastSwim.Enabled", true);
-			config.addDefault("Abilities.Water.Passive.FastSwim.Cooldown", 0);
-			config.addDefault("Abilities.Water.Passive.FastSwim.Duration", 0);
-			config.addDefault("Abilities.Water.Passive.FastSwim.SpeedFactor", 0.7);
-			config.addDefault("Abilities.Water.Passive.Hydrosink.Enabled", true);
-
-			config.addDefault("Abilities.Water.Bloodbending.Enabled", true);
-			config.addDefault("Abilities.Water.Bloodbending.CanOnlyBeUsedAtNight", true);
-			config.addDefault("Abilities.Water.Bloodbending.CanBeUsedOnUndeadMobs", true);
-			config.addDefault("Abilities.Water.Bloodbending.Knockback", 2);
-			config.addDefault("Abilities.Water.Bloodbending.Range", 10);
-			config.addDefault("Abilities.Water.Bloodbending.Duration", 0);
-			config.addDefault("Abilities.Water.Bloodbending.Cooldown", 3000);
-			config.addDefault("Abilities.Water.Bloodbending.CanOnlyBeUsedDuringFullMoon", true);
-			config.addDefault("Abilities.Water.Bloodbending.CanBloodbendOtherBloodbenders", false);
-
-			config.addDefault("Abilities.Water.HealingWaters.Enabled", true);
-			config.addDefault("Abilities.Water.HealingWaters.Cooldown", 0);
-			config.addDefault("Abilities.Water.HealingWaters.Range", 5);
-			config.addDefault("Abilities.Water.HealingWaters.Interval", 750);
-			config.addDefault("Abilities.Water.HealingWaters.ChargeTime", 1000);
-			config.addDefault("Abilities.Water.HealingWaters.PotionPotency", 1);
-			config.addDefault("Abilities.Water.HealingWaters.Duration", 0);
-			config.addDefault("Abilities.Water.HealingWaters.EnableParticles", true);
-
-			config.addDefault("Abilities.Water.IceBlast.Enabled", true);
-			config.addDefault("Abilities.Water.IceBlast.Damage", 3);
-			config.addDefault("Abilities.Water.IceBlast.Range", 20);
-			config.addDefault("Abilities.Water.IceBlast.DeflectRange", 3);
-			config.addDefault("Abilities.Water.IceBlast.CollisionRadius", 1.5);
-			config.addDefault("Abilities.Water.IceBlast.Interval", 20);
-			config.addDefault("Abilities.Water.IceBlast.Cooldown", 1500);
-			config.addDefault("Abilities.Water.IceBlast.AllowSnow", false);
-
-			config.addDefault("Abilities.Water.IceSpike.Enabled", true);
-			config.addDefault("Abilities.Water.IceSpike.Cooldown", 2000);
-			config.addDefault("Abilities.Water.IceSpike.Damage", 2);
-			config.addDefault("Abilities.Water.IceSpike.Range", 20);
-			config.addDefault("Abilities.Water.IceSpike.Push", 0.7);
-			config.addDefault("Abilities.Water.IceSpike.Height", 6);
-			config.addDefault("Abilities.Water.IceSpike.Speed", 25);
-			config.addDefault("Abilities.Water.IceSpike.SlowCooldown", 5000);
-			config.addDefault("Abilities.Water.IceSpike.SlowPotency", 2);
-			config.addDefault("Abilities.Water.IceSpike.SlowDuration", 70);
-			config.addDefault("Abilities.Water.IceSpike.Field.Damage", 2);
-			config.addDefault("Abilities.Water.IceSpike.Field.Radius", 6);
-			config.addDefault("Abilities.Water.IceSpike.Field.Knockup", 1);
-			config.addDefault("Abilities.Water.IceSpike.Field.Cooldown", 2000);
-			config.addDefault("Abilities.Water.IceSpike.Blast.Range", 20);
-			config.addDefault("Abilities.Water.IceSpike.Blast.Damage", 1);
-			config.addDefault("Abilities.Water.IceSpike.Blast.CollisionRadius", 1.5);
-			config.addDefault("Abilities.Water.IceSpike.Blast.DeflectRange", 3);
-			config.addDefault("Abilities.Water.IceSpike.Blast.Cooldown", 500);
-			config.addDefault("Abilities.Water.IceSpike.Blast.SlowCooldown", 5000);
-			config.addDefault("Abilities.Water.IceSpike.Blast.SlowPotency", 2);
-			config.addDefault("Abilities.Water.IceSpike.Blast.SlowDuration", 70);
-			config.addDefault("Abilities.Water.IceSpike.Blast.Interval", 20);
-
-			config.addDefault("Abilities.Water.OctopusForm.Enabled", true);
-			config.addDefault("Abilities.Water.OctopusForm.Range", 10);
-			config.addDefault("Abilities.Water.OctopusForm.AttackRange", 2.5);
-			config.addDefault("Abilities.Water.OctopusForm.Radius", 3);
-			config.addDefault("Abilities.Water.OctopusForm.Damage", 2);
-			config.addDefault("Abilities.Water.OctopusForm.Knockback", 1.75);
-			config.addDefault("Abilities.Water.OctopusForm.FormDelay", 40);
-			config.addDefault("Abilities.Water.OctopusForm.Cooldown", 0);
-			config.addDefault("Abilities.Water.OctopusForm.Duration", 0);
-			config.addDefault("Abilities.Water.OctopusForm.UsageCooldown", 0);
-			config.addDefault("Abilities.Water.OctopusForm.AngleIncrement", 45);
-
-			config.addDefault("Abilities.Water.PhaseChange.Enabled", true);
-			config.addDefault("Abilities.Water.PhaseChange.SourceRange", 7);
-			config.addDefault("Abilities.Water.PhaseChange.Freeze.Cooldown", 500);
-			config.addDefault("Abilities.Water.PhaseChange.Freeze.Radius", 3);
-			config.addDefault("Abilities.Water.PhaseChange.Freeze.Depth", 1);
-			config.addDefault("Abilities.Water.PhaseChange.Freeze.ControlRadius", 25);
-			config.addDefault("Abilities.Water.PhaseChange.Melt.Cooldown", 2000);
-			config.addDefault("Abilities.Water.PhaseChange.Melt.Speed", 8.0);
-			config.addDefault("Abilities.Water.PhaseChange.Melt.Radius", 7);
-			config.addDefault("Abilities.Water.PhaseChange.Melt.AllowFlow", true);
-
-			config.addDefault("Abilities.Water.Surge.Enabled", true);
-			config.addDefault("Abilities.Water.Surge.Wave.Radius", 3);
-			config.addDefault("Abilities.Water.Surge.Wave.Range", 20);
-			config.addDefault("Abilities.Water.Surge.Wave.SelectRange", 12);
-			config.addDefault("Abilities.Water.Surge.Wave.Knockback", 1);
-			config.addDefault("Abilities.Water.Surge.Wave.Knockup", 0.2);
-			config.addDefault("Abilities.Water.Surge.Wave.MaxFreezeRadius", 7);
-			config.addDefault("Abilities.Water.Surge.Wave.Cooldown", 500);
-			config.addDefault("Abilities.Water.Surge.Wave.Interval", 30);
-			config.addDefault("Abilities.Water.Surge.Wall.Range", 5);
-			config.addDefault("Abilities.Water.Surge.Wall.Radius", 2);
-			config.addDefault("Abilities.Water.Surge.Wall.Cooldown", 0);
-			config.addDefault("Abilities.Water.Surge.Wall.Duration", 0);
-			config.addDefault("Abilities.Water.Surge.Wall.Interval", 30);
-			config.addDefault("Abilities.Water.Surge.Wave.IceRevertTime", 60000);
-
-			config.addDefault("Abilities.Water.Torrent.Enabled", true);
-			config.addDefault("Abilities.Water.Torrent.Range", 25);
-			config.addDefault("Abilities.Water.Torrent.SelectRange", 16);
-			config.addDefault("Abilities.Water.Torrent.InitialDamage", 3);
-			config.addDefault("Abilities.Water.Torrent.DeflectDamage", 1);
-			config.addDefault("Abilities.Water.Torrent.SuccessiveDamage", 1);
-			config.addDefault("Abilities.Water.Torrent.MaxLayer", 3);
-			config.addDefault("Abilities.Water.Torrent.MaxHits", 2);
-			config.addDefault("Abilities.Water.Torrent.Knockback", 1);
-			config.addDefault("Abilities.Water.Torrent.Angle", 20);
-			config.addDefault("Abilities.Water.Torrent.Radius", 3);
-			config.addDefault("Abilities.Water.Torrent.Knockup", 0.2);
-			config.addDefault("Abilities.Water.Torrent.Interval", 30);
-			config.addDefault("Abilities.Water.Torrent.Cooldown", 0);
-			config.addDefault("Abilities.Water.Torrent.Revert", true);
-			config.addDefault("Abilities.Water.Torrent.RevertTime", 60000);
-			config.addDefault("Abilities.Water.Torrent.Wave.Radius", 12);
-			config.addDefault("Abilities.Water.Torrent.Wave.Knockback", 1.5);
-			config.addDefault("Abilities.Water.Torrent.Wave.Height", 1);
-			config.addDefault("Abilities.Water.Torrent.Wave.GrowSpeed", 0.5);
-			config.addDefault("Abilities.Water.Torrent.Wave.Interval", 30);
-			config.addDefault("Abilities.Water.Torrent.Wave.Cooldown", 0);
-
-			config.addDefault("Abilities.Water.Plantbending.RegrowTime", 180000);
-
-			config.addDefault("Abilities.Water.WaterArms.Enabled", true);
-
-			config.addDefault("Abilities.Water.WaterArms.Arms.InitialLength", 4);
-			config.addDefault("Abilities.Water.WaterArms.Arms.SourceGrabRange", 12);
-			config.addDefault("Abilities.Water.WaterArms.Arms.MaxAttacks", 10);
-			config.addDefault("Abilities.Water.WaterArms.Arms.MaxAlternateUsage", 50);
-			config.addDefault("Abilities.Water.WaterArms.Arms.MaxIceShots", 8);
-			config.addDefault("Abilities.Water.WaterArms.Arms.Cooldown", 20000);
-			config.addDefault("Abilities.Water.WaterArms.Arms.AllowPlantSource", true);
-
-			config.addDefault("Abilities.Water.WaterArms.Arms.Lightning.Enabled", true);
-			config.addDefault("Abilities.Water.WaterArms.Arms.Lightning.Damage", Double.valueOf(10.0));
-			config.addDefault("Abilities.Water.WaterArms.Arms.Lightning.KillUser", false);
-
-			config.addDefault("Abilities.Water.WaterArms.Arms.Cooldowns.UsageCooldown.Enabled", false);
-			config.addDefault("Abilities.Water.WaterArms.Arms.Cooldowns.UsageCooldown.Pull", 200);
-			config.addDefault("Abilities.Water.WaterArms.Arms.Cooldowns.UsageCooldown.Punch", 200);
-			config.addDefault("Abilities.Water.WaterArms.Arms.Cooldowns.UsageCooldown.Grapple", 200);
-			config.addDefault("Abilities.Water.WaterArms.Arms.Cooldowns.UsageCooldown.Grab", 200);
-			config.addDefault("Abilities.Water.WaterArms.Arms.Cooldowns.UsageCooldown.Freeze", 200);
-			config.addDefault("Abilities.Water.WaterArms.Arms.Cooldowns.UsageCooldown.Spear", 200);
-
-			config.addDefault("Abilities.Water.WaterArms.Whip.MaxLength", 12);
-			config.addDefault("Abilities.Water.WaterArms.Whip.MaxLengthWeak", 8);
-
-			config.addDefault("Abilities.Water.WaterArms.Whip.NightAugments.MaxLength.Normal", 16);
-			config.addDefault("Abilities.Water.WaterArms.Whip.NightAugments.MaxLength.FullMoon", 20);
-
-			config.addDefault("Abilities.Water.WaterArms.Whip.Pull.Multiplier", 0.15);
-
-			config.addDefault("Abilities.Water.WaterArms.Whip.Punch.Damage", 0.5);
-			config.addDefault("Abilities.Water.WaterArms.Whip.Punch.MaxLength", 8);
-			config.addDefault("Abilities.Water.WaterArms.Whip.Punch.NightAugments.MaxLength.Normal", 11);
-			config.addDefault("Abilities.Water.WaterArms.Whip.Punch.NightAugments.MaxLength.FullMoon", 13);
-
-			config.addDefault("Abilities.Water.WaterArms.Whip.Grapple.RespectRegions", false);
-
-			config.addDefault("Abilities.Water.WaterArms.Whip.Grab.Duration", 3500);
-
-			config.addDefault("Abilities.Water.WaterArms.Freeze.Range", 20);
-			config.addDefault("Abilities.Water.WaterArms.Freeze.Damage", 2);
-
-			config.addDefault("Abilities.Water.WaterArms.Spear.Range", 30);
-			config.addDefault("Abilities.Water.WaterArms.Spear.Damage", 3);
-			config.addDefault("Abilities.Water.WaterArms.Spear.DamageEnabled", true);
-			config.addDefault("Abilities.Water.WaterArms.Spear.SphereRadius", 2);
-			config.addDefault("Abilities.Water.WaterArms.Spear.Duration", 4500);
-			config.addDefault("Abilities.Water.WaterArms.Spear.Length", 18);
-
-			config.addDefault("Abilities.Water.WaterArms.Spear.NightAugments.Range.Normal", 45);
-			config.addDefault("Abilities.Water.WaterArms.Spear.NightAugments.Range.FullMoon", 60);
-			config.addDefault("Abilities.Water.WaterArms.Spear.NightAugments.Sphere.Normal", 3);
-			config.addDefault("Abilities.Water.WaterArms.Spear.NightAugments.Sphere.FullMoon", 6);
-			config.addDefault("Abilities.Water.WaterArms.Spear.NightAugments.Duration.Normal", 7000);
-			config.addDefault("Abilities.Water.WaterArms.Spear.NightAugments.Duration.FullMoon", 12000);
-
-			config.addDefault("Abilities.Water.WaterBubble.Enabled", true);
-			config.addDefault("Abilities.Water.WaterBubble.Cooldown.Shift", 0);
-			config.addDefault("Abilities.Water.WaterBubble.Cooldown.Click", 0);
-			config.addDefault("Abilities.Water.WaterBubble.Radius", 4.0);
-			config.addDefault("Abilities.Water.WaterBubble.Speed", 0.5);
-			config.addDefault("Abilities.Water.WaterBubble.ClickDuration", 2000L);
-			config.addDefault("Abilities.Water.WaterBubble.MustStartAboveWater", false);
-
-			config.addDefault("Abilities.Water.WaterManipulation.Enabled", true);
-			config.addDefault("Abilities.Water.WaterManipulation.Damage", 3.0);
-			config.addDefault("Abilities.Water.WaterManipulation.Range", 25);
-			config.addDefault("Abilities.Water.WaterManipulation.SelectRange", 16);
-			config.addDefault("Abilities.Water.WaterManipulation.CollisionRadius", 1.5);
-			config.addDefault("Abilities.Water.WaterManipulation.DeflectRange", 3);
-			config.addDefault("Abilities.Water.WaterManipulation.Speed", 35);
-			config.addDefault("Abilities.Water.WaterManipulation.Knockback", 0.3);
-			config.addDefault("Abilities.Water.WaterManipulation.Cooldown", 1000);
-
-			config.addDefault("Abilities.Water.WaterSpout.Enabled", true);
-			config.addDefault("Abilities.Water.WaterSpout.Cooldown", 0);
-			config.addDefault("Abilities.Water.WaterSpout.Duration", 0);
-			config.addDefault("Abilities.Water.WaterSpout.Height", 16);
-			config.addDefault("Abilities.Water.WaterSpout.Interval", 50);
-			config.addDefault("Abilities.Water.WaterSpout.BlockSpiral", true);
-			config.addDefault("Abilities.Water.WaterSpout.Particles", false);
-			config.addDefault("Abilities.Water.WaterSpout.Wave.Particles", false);
-			config.addDefault("Abilities.Water.WaterSpout.Wave.Enabled", true);
-			config.addDefault("Abilities.Water.WaterSpout.Wave.AllowPlantSource", true);
-			config.addDefault("Abilities.Water.WaterSpout.Wave.Radius", 3.8);
-			config.addDefault("Abilities.Water.WaterSpout.Wave.WaveRadius", 1.5);
-			config.addDefault("Abilities.Water.WaterSpout.Wave.SelectRange", 6);
-			config.addDefault("Abilities.Water.WaterSpout.Wave.AnimationSpeed", 1.2);
-			config.addDefault("Abilities.Water.WaterSpout.Wave.ChargeTime", 500);
-			config.addDefault("Abilities.Water.WaterSpout.Wave.FlightDuration", 2500);
-			config.addDefault("Abilities.Water.WaterSpout.Wave.Speed", 1.3);
-			config.addDefault("Abilities.Water.WaterSpout.Wave.Cooldown", 6000);
-
-			config.addDefault("Abilities.Water.IceWave.Enabled", true);
-			config.addDefault("Abilities.Water.IceWave.Damage", 3);
-			config.addDefault("Abilities.Water.IceWave.Cooldown", 6000);
-			config.addDefault("Abilities.Water.IceWave.ThawRadius", 10);
-			config.addDefault("Abilities.Water.IceWave.RevertSphere", true);
-			config.addDefault("Abilities.Water.IceWave.RevertSphereTime", 30000L);
-
-			config.addDefault("Abilities.Water.IceBullet.Enabled", true);
-			config.addDefault("Abilities.Water.IceBullet.Damage", 2);
-			config.addDefault("Abilities.Water.IceBullet.Radius", 2.5);
-			config.addDefault("Abilities.Water.IceBullet.Range", 12);
-			config.addDefault("Abilities.Water.IceBullet.MaxShots", 30);
-			config.addDefault("Abilities.Water.IceBullet.AnimationSpeed", 1);
-			config.addDefault("Abilities.Water.IceBullet.ShootTime", 10000);
-			config.addDefault("Abilities.Water.IceBullet.Cooldown", 10000);
-			config.addDefault("Abilities.Water.IceBullet.ShotCooldown", 500);
-
-			config.addDefault("Abilities.Earth.Passive.Duration", 2500);
-			config.addDefault("Abilities.Earth.Passive.DensityShift.Enabled", true);
-			config.addDefault("Abilities.Earth.Passive.FerroControl.Enabled", true);
-
-			config.addDefault("Abilities.Earth.Catapult.Enabled", true);
-			config.addDefault("Abilities.Earth.Catapult.Cooldown", 7000);
-			config.addDefault("Abilities.Earth.Catapult.StageTimeMult", 2.0);
-			config.addDefault("Abilities.Earth.Catapult.Angle", 45);
-			config.addDefault("Abilities.Earth.Catapult.CancelWithAngle", false);
-
-			config.addDefault("Abilities.Earth.Collapse.Enabled", true);
-			config.addDefault("Abilities.Earth.Collapse.SelectRange", 20);
-			config.addDefault("Abilities.Earth.Collapse.Radius", 7);
-			config.addDefault("Abilities.Earth.Collapse.Speed", 8);
-			config.addDefault("Abilities.Earth.Collapse.Column.Height", 6);
-			config.addDefault("Abilities.Earth.Collapse.Column.Cooldown", 500);
-			config.addDefault("Abilities.Earth.Collapse.Wall.Height", 6);
-			config.addDefault("Abilities.Earth.Collapse.Wall.Cooldown", 500);
-
-			config.addDefault("Abilities.Earth.EarthArmor.Enabled", true);
-			config.addDefault("Abilities.Earth.EarthArmor.SelectRange", 10);
-			config.addDefault("Abilities.Earth.EarthArmor.GoldHearts", 4);
-			config.addDefault("Abilities.Earth.EarthArmor.Cooldown", 7500);
-			config.addDefault("Abilities.Earth.EarthArmor.MaxDuration", 17500);
-
-			config.addDefault("Abilities.Earth.EarthBlast.Enabled", true);
-			config.addDefault("Abilities.Earth.EarthBlast.CanHitSelf", false);
-			config.addDefault("Abilities.Earth.EarthBlast.SelectRange", 10);
-			config.addDefault("Abilities.Earth.EarthBlast.Range", 30);
-			config.addDefault("Abilities.Earth.EarthBlast.Speed", 35);
-			config.addDefault("Abilities.Earth.EarthBlast.Revert", true);
-			config.addDefault("Abilities.Earth.EarthBlast.Damage", 3);
-			config.addDefault("Abilities.Earth.EarthBlast.Push", 0.3);
-			config.addDefault("Abilities.Earth.EarthBlast.Cooldown", 500);
-			config.addDefault("Abilities.Earth.EarthBlast.DeflectRange", 3);
-			config.addDefault("Abilities.Earth.EarthBlast.CollisionRadius", 1.5);
-
-			config.addDefault("Abilities.Earth.EarthDome.Enabled", true);
-			config.addDefault("Abilities.Earth.EarthDome.Cooldown", 10000);
-			config.addDefault("Abilities.Earth.EarthDome.Radius", 2);
-			config.addDefault("Abilities.Earth.EarthDome.Range", 14);
-			config.addDefault("Abilities.Earth.EarthDome.Height", 3);
-
-			config.addDefault("Abilities.Earth.EarthGrab.Enabled", true);
-			config.addDefault("Abilities.Earth.EarthGrab.SelectRange", 7);
-			config.addDefault("Abilities.Earth.EarthGrab.DragSpeed", 0.8);
-			config.addDefault("Abilities.Earth.EarthGrab.Cooldown", 5000);
-			config.addDefault("Abilities.Earth.EarthGrab.Range", 14);
-			config.addDefault("Abilities.Earth.EarthGrab.TrapHitInterval", 400);
-			config.addDefault("Abilities.Earth.EarthGrab.TrapHP", 3);
-			config.addDefault("Abilities.Earth.EarthGrab.DamageThreshold", 4);
-
-			config.addDefault("Abilities.Earth.EarthTunnel.Enabled", true);
-			config.addDefault("Abilities.Earth.EarthTunnel.Cooldown", 0);
-			config.addDefault("Abilities.Earth.EarthTunnel.MaxRadius", 1);
-			config.addDefault("Abilities.Earth.EarthTunnel.Range", 10);
-			config.addDefault("Abilities.Earth.EarthTunnel.Radius", 0.25);
-			config.addDefault("Abilities.Earth.EarthTunnel.Revert", true);
-			config.addDefault("Abilities.Earth.EarthTunnel.DropLootIfNotRevert", false);
-			config.addDefault("Abilities.Earth.EarthTunnel.IgnoreOres", false);
-			config.addDefault("Abilities.Earth.EarthTunnel.Interval", 30);
-			config.addDefault("Abilities.Earth.EarthTunnel.BlocksPerInterval", 1);
-
-			config.addDefault("Abilities.Earth.Extraction.Enabled", true);
-			config.addDefault("Abilities.Earth.Extraction.SelectRange", 5);
-			config.addDefault("Abilities.Earth.Extraction.Cooldown", 500);
-			config.addDefault("Abilities.Earth.Extraction.TripleLootChance", 10);
-			config.addDefault("Abilities.Earth.Extraction.DoubleLootChance", 30);
-
-			config.addDefault("Abilities.Earth.LavaFlow.Enabled", true);
-			config.addDefault("Abilities.Earth.LavaFlow.ShiftCooldown", 20000);
-			config.addDefault("Abilities.Earth.LavaFlow.ClickLavaCooldown", 10000);
-			config.addDefault("Abilities.Earth.LavaFlow.ClickLandCooldown", 500);
-			config.addDefault("Abilities.Earth.LavaFlow.ShiftCleanupDelay", 10000);
-			config.addDefault("Abilities.Earth.LavaFlow.ClickLavaCleanupDelay", 7000);
-			config.addDefault("Abilities.Earth.LavaFlow.ClickLandCleanupDelay", 20000);
-			config.addDefault("Abilities.Earth.LavaFlow.ClickRange", 10.0);
-			config.addDefault("Abilities.Earth.LavaFlow.ShiftRadius", 7.0);
-			config.addDefault("Abilities.Earth.LavaFlow.ShiftPlatformRadius", 1.5);
-			config.addDefault("Abilities.Earth.LavaFlow.ClickRadius", 5.0);
-			config.addDefault("Abilities.Earth.LavaFlow.ClickLavaCreateSpeed", 0.045);
-			config.addDefault("Abilities.Earth.LavaFlow.ClickLandCreateSpeed", 0.10);
-			config.addDefault("Abilities.Earth.LavaFlow.ShiftFlowSpeed", 0.01);
-			config.addDefault("Abilities.Earth.LavaFlow.ShiftRemoveSpeed", 3.0);
-			config.addDefault("Abilities.Earth.LavaFlow.ClickLavaStartDelay", 1500);
-			config.addDefault("Abilities.Earth.LavaFlow.ClickLandStartDelay", 0);
-			config.addDefault("Abilities.Earth.LavaFlow.UpwardFlow", 2);
-			config.addDefault("Abilities.Earth.LavaFlow.DownwardFlow", 4);
-			config.addDefault("Abilities.Earth.LavaFlow.AllowNaturalFlow", false);
-			config.addDefault("Abilities.Earth.LavaFlow.ParticleDensity", 0.11);
-			config.addDefault("Abilities.Earth.LavaFlow.RevertMaterial", "STONE");
-
-			config.addDefault("Abilities.Earth.EarthSmash.Enabled", true);
-			config.addDefault("Abilities.Earth.EarthSmash.Duration", 30000);
-			config.addDefault("Abilities.Earth.EarthSmash.SelectRange", 12);
-			config.addDefault("Abilities.Earth.EarthSmash.ChargeTime", 1500);
-			config.addDefault("Abilities.Earth.EarthSmash.Cooldown", 3000);
-			config.addDefault("Abilities.Earth.EarthSmash.Damage", 5);
-			config.addDefault("Abilities.Earth.EarthSmash.Knockback", 3.5);
-			config.addDefault("Abilities.Earth.EarthSmash.Knockup", 0.15);
-			config.addDefault("Abilities.Earth.EarthSmash.Flight.Enabled", true);
-			config.addDefault("Abilities.Earth.EarthSmash.Flight.Speed", 0.72);
-			config.addDefault("Abilities.Earth.EarthSmash.Flight.Duration", 3000);
-			config.addDefault("Abilities.Earth.EarthSmash.Flight.AnimationInterval", 0);
-			config.addDefault("Abilities.Earth.EarthSmash.Flight.DetectionRadius", 3.5);
-			config.addDefault("Abilities.Earth.EarthSmash.Grab.Enabled", true);
-			config.addDefault("Abilities.Earth.EarthSmash.Grab.Range", 16);
-			config.addDefault("Abilities.Earth.EarthSmash.Grab.DetectionRadius", 2.5);
-			config.addDefault("Abilities.Earth.EarthSmash.Shoot.Range", 25);
-			config.addDefault("Abilities.Earth.EarthSmash.Shoot.AnimationInterval", 25);
-			config.addDefault("Abilities.Earth.EarthSmash.RequiredBendableBlocks", 11);
-			config.addDefault("Abilities.Earth.EarthSmash.MaxBlocksToPassThrough", 3);
-			config.addDefault("Abilities.Earth.EarthSmash.LiftAnimationInterval", 30);
-
-			config.addDefault("Abilities.Earth.MetalClips.Enabled", true);
-			config.addDefault("Abilities.Earth.MetalClips.Damage", 2);
-			config.addDefault("Abilities.Earth.MetalClips.Range", 10);
-			config.addDefault("Abilities.Earth.MetalClips.Cooldown", 6000);
-			config.addDefault("Abilities.Earth.MetalClips.Duration", 10000);
-			config.addDefault("Abilities.Earth.MetalClips.Magnet.Range", 20);
-			config.addDefault("Abilities.Earth.MetalClips.Magnet.Speed", 0.6);
-			config.addDefault("Abilities.Earth.MetalClips.Magnet.Cooldown", 1000);
-			config.addDefault("Abilities.Earth.MetalClips.Crush.Damage", 1);
-			config.addDefault("Abilities.Earth.MetalClips.Crush.Cooldown", 2000);
-			config.addDefault("Abilities.Earth.MetalClips.ThrowEnabled", true);
-
-			config.addDefault("Abilities.Earth.RaiseEarth.Enabled", true);
-			config.addDefault("Abilities.Earth.RaiseEarth.Speed", 10);
-			config.addDefault("Abilities.Earth.RaiseEarth.Column.SelectRange", 20);
-			config.addDefault("Abilities.Earth.RaiseEarth.Column.Height", 6);
-			config.addDefault("Abilities.Earth.RaiseEarth.Column.Cooldown", 500);
-			config.addDefault("Abilities.Earth.RaiseEarth.Wall.SelectRange", 20);
-			config.addDefault("Abilities.Earth.RaiseEarth.Wall.Height", 6);
-			config.addDefault("Abilities.Earth.RaiseEarth.Wall.Width", 6);
-			config.addDefault("Abilities.Earth.RaiseEarth.Wall.Cooldown", 500);
-
-			config.addDefault("Abilities.Earth.Shockwave.Enabled", true);
-			config.addDefault("Abilities.Earth.Shockwave.FallThreshold", 12);
-			config.addDefault("Abilities.Earth.Shockwave.ChargeTime", 2500);
-			config.addDefault("Abilities.Earth.Shockwave.Cooldown", 6000);
-			config.addDefault("Abilities.Earth.Shockwave.Damage", 4);
-			config.addDefault("Abilities.Earth.Shockwave.Knockback", 1.1);
-			config.addDefault("Abilities.Earth.Shockwave.Range", 15);
-			config.addDefault("Abilities.Earth.Shockwave.Angle", 40);
-
-			config.addDefault("Abilities.Earth.Tremorsense.Enabled", true);
-			config.addDefault("Abilities.Earth.Tremorsense.MaxDepth", 10);
-			config.addDefault("Abilities.Earth.Tremorsense.Radius", 5);
-			config.addDefault("Abilities.Earth.Tremorsense.LightThreshold", 7);
-			config.addDefault("Abilities.Earth.Tremorsense.Cooldown", 1000);
-			config.addDefault("Abilities.Earth.Tremorsense.StickyRange", 3);
-
-			config.addDefault("Abilities.Earth.EarthPillars.Enabled", true);
-			config.addDefault("Abilities.Earth.EarthPillars.Cooldown", 8000);
-			config.addDefault("Abilities.Earth.EarthPillars.Radius", 9);
-			config.addDefault("Abilities.Earth.EarthPillars.Knockup", 1.2);
-			config.addDefault("Abilities.Earth.EarthPillars.Damage.Enabled", true);
-			config.addDefault("Abilities.Earth.EarthPillars.Damage.Value", 2);
-			config.addDefault("Abilities.Earth.EarthPillars.FallThreshold", 12);
-
-			config.addDefault("Abilities.Fire.Blaze.Enabled", true);
-			config.addDefault("Abilities.Fire.Blaze.Arc", 14);
-			config.addDefault("Abilities.Fire.Blaze.Range", 7);
-			config.addDefault("Abilities.Fire.Blaze.Speed", 15);
-			config.addDefault("Abilities.Fire.Blaze.Cooldown", 500);
-			config.addDefault("Abilities.Fire.Blaze.Ring.Range", 7);
-			config.addDefault("Abilities.Fire.Blaze.Ring.Angle", 10);
-			config.addDefault("Abilities.Fire.Blaze.Ring.Cooldown", 1000);
-
-			config.addDefault("Abilities.Fire.Combustion.Enabled", true);
-			config.addDefault("Abilities.Fire.Combustion.Cooldown", 10000);
-			config.addDefault("Abilities.Fire.Combustion.BreakBlocks", false);
-			config.addDefault("Abilities.Fire.Combustion.ExplosivePower", 1.0);
-			config.addDefault("Abilities.Fire.Combustion.Damage", 4);
-			config.addDefault("Abilities.Fire.Combustion.Radius", 4);
-			config.addDefault("Abilities.Fire.Combustion.Range", 35);
-			config.addDefault("Abilities.Fire.Combustion.Speed", 25);
-
-			config.addDefault("Abilities.Fire.FireBlast.Enabled", true);
-			config.addDefault("Abilities.Fire.FireBlast.Speed", 20);
-			config.addDefault("Abilities.Fire.FireBlast.Range", 20);
-			config.addDefault("Abilities.Fire.FireBlast.CollisionRadius", 1.5);
-			config.addDefault("Abilities.Fire.FireBlast.Knockback", 0.3);
-			config.addDefault("Abilities.Fire.FireBlast.Damage", 3);
-			config.addDefault("Abilities.Fire.FireBlast.Cooldown", 1500);
-			config.addDefault("Abilities.Fire.FireBlast.Dissipate", false);
-			config.addDefault("Abilities.Fire.FireBlast.FireTicks", 0);
-			config.addDefault("Abilities.Fire.FireBlast.SmokeParticleRadius", 0.3);
-			config.addDefault("Abilities.Fire.FireBlast.FlameParticleRadius", 0.275);
-			config.addDefault("Abilities.Fire.FireBlast.Charged.ChargeTime", 3000);
-			config.addDefault("Abilities.Fire.FireBlast.Charged.Cooldown", 2000);
-			config.addDefault("Abilities.Fire.FireBlast.Charged.CollisionRadius", 2);
-			config.addDefault("Abilities.Fire.FireBlast.Charged.Damage", 4);
-			config.addDefault("Abilities.Fire.FireBlast.Charged.DamageRadius", 4);
-			config.addDefault("Abilities.Fire.FireBlast.Charged.DamageBlocks", true);
-			config.addDefault("Abilities.Fire.FireBlast.Charged.ExplosionRadius", 1);
-			config.addDefault("Abilities.Fire.FireBlast.Charged.Range", 20);
-			config.addDefault("Abilities.Fire.FireBlast.Charged.FireTicks", 0);
-
-			config.addDefault("Abilities.Fire.FireBurst.Enabled", true);
-			config.addDefault("Abilities.Fire.FireBurst.Damage", 2);
-			config.addDefault("Abilities.Fire.FireBurst.Ignite", true);
-			config.addDefault("Abilities.Fire.FireBurst.ChargeTime", 3500);
-			config.addDefault("Abilities.Fire.FireBurst.Cooldown", 0);
-			config.addDefault("Abilities.Fire.FireBurst.Range", 14);
-			config.addDefault("Abilities.Fire.FireBurst.AnglePhi", 10);
-			config.addDefault("Abilities.Fire.FireBurst.AngleTheta", 10);
-			config.addDefault("Abilities.Fire.FireBurst.ParticlesPercentage", 5);
-
-			config.addDefault("Abilities.Fire.FireJet.Enabled", true);
-			config.addDefault("Abilities.Fire.FireJet.Speed", 0.8);
-			config.addDefault("Abilities.Fire.FireJet.Duration", 2000);
-			config.addDefault("Abilities.Fire.FireJet.Cooldown", 7000);
-			config.addDefault("Abilities.Fire.FireJet.ShowGliding", false);
-
-			config.addDefault("Abilities.Fire.FireManipulation.Enabled", false);
-
-			config.addDefault("Abilities.Fire.FireManipulation.Stream.Cooldown", 12000);
-			config.addDefault("Abilities.Fire.FireManipulation.Stream.Range", 50);
-			config.addDefault("Abilities.Fire.FireManipulation.Stream.Damage", 2);
-			config.addDefault("Abilities.Fire.FireManipulation.Stream.Speed", 0.75);
-			config.addDefault("Abilities.Fire.FireManipulation.Stream.Particles", 50);
-
-			config.addDefault("Abilities.Fire.FireManipulation.Shield.Cooldown", 6000);
-			config.addDefault("Abilities.Fire.FireManipulation.Shield.Range", 4);
-			config.addDefault("Abilities.Fire.FireManipulation.Shield.Damage", 1);
-			config.addDefault("Abilities.Fire.FireManipulation.Shield.MaxDuration", 5000L);
-			config.addDefault("Abilities.Fire.FireManipulation.Shield.Particles", 12);
-
-			config.addDefault("Abilities.Fire.FireShield.Enabled", true);
-			config.addDefault("Abilities.Fire.FireShield.Shield.Radius", 3);
-			config.addDefault("Abilities.Fire.FireShield.Shield.Duration", 0);
-			config.addDefault("Abilities.Fire.FireShield.Shield.Cooldown", 0);
-			config.addDefault("Abilities.Fire.FireShield.Disc.Radius", 1.5);
-			config.addDefault("Abilities.Fire.FireShield.Disc.Duration", 1000);
-			config.addDefault("Abilities.Fire.FireShield.Disc.Cooldown", 500);
-			config.addDefault("Abilities.Fire.FireShield.Shield.FireTicks", 2);
-			config.addDefault("Abilities.Fire.FireShield.Disc.FireTicks", 2);
-
-			config.addDefault("Abilities.Fire.HeatControl.Enabled", true);
-			config.addDefault("Abilities.Fire.HeatControl.Cook.Interval", 1000);
-			config.addDefault("Abilities.Fire.HeatControl.Extinguish.Cooldown", 5000);
-			config.addDefault("Abilities.Fire.HeatControl.Extinguish.Radius", 6);
-			config.addDefault("Abilities.Fire.HeatControl.Melt.Range", 15);
-			config.addDefault("Abilities.Fire.HeatControl.Melt.Radius", 5);
-			config.addDefault("Abilities.Fire.HeatControl.Solidify.MaxRadius", 10);
-			config.addDefault("Abilities.Fire.HeatControl.Solidify.Range", 7);
-			config.addDefault("Abilities.Fire.HeatControl.Solidify.Revert", true);
-			config.addDefault("Abilities.Fire.HeatControl.Solidify.RevertTime", 120000);
-
-			config.addDefault("Abilities.Fire.Illumination.Enabled", true);
-			config.addDefault("Abilities.Fire.Illumination.Passive", true);
-			config.addDefault("Abilities.Fire.Illumination.Range", 5);
-			config.addDefault("Abilities.Fire.Illumination.Cooldown", 500);
-			config.addDefault("Abilities.Fire.Illumination.LightThreshold", 7);
-
-			config.addDefault("Abilities.Fire.Lightning.Enabled", true);
-			config.addDefault("Abilities.Fire.Lightning.Damage", 4.0);
-			config.addDefault("Abilities.Fire.Lightning.Range", 20.0);
-			config.addDefault("Abilities.Fire.Lightning.ChargeTime", 2500);
-			config.addDefault("Abilities.Fire.Lightning.Cooldown", 500);
-			config.addDefault("Abilities.Fire.Lightning.StunChance", 0.20);
-			config.addDefault("Abilities.Fire.Lightning.StunDuration", 30.0);
-			config.addDefault("Abilities.Fire.Lightning.MaxArcAngle", 2.5);
-			config.addDefault("Abilities.Fire.Lightning.SubArcChance", 0.00125);
-			config.addDefault("Abilities.Fire.Lightning.ChainArcRange", 6.0);
-			config.addDefault("Abilities.Fire.Lightning.ChainArcChance", 0.50);
-			config.addDefault("Abilities.Fire.Lightning.MaxChainArcs", 2);
-			config.addDefault("Abilities.Fire.Lightning.WaterArcs", 4);
-			config.addDefault("Abilities.Fire.Lightning.WaterArcRange", 20.0);
-			config.addDefault("Abilities.Fire.Lightning.SelfHitWater", true);
-			config.addDefault("Abilities.Fire.Lightning.SelfHitClose", false);
-			config.addDefault("Abilities.Fire.Lightning.ArcOnIce", false);
-
-			config.addDefault("Abilities.Fire.WallOfFire.Enabled", true);
-			config.addDefault("Abilities.Fire.WallOfFire.Range", 3);
-			config.addDefault("Abilities.Fire.WallOfFire.Height", 4);
-			config.addDefault("Abilities.Fire.WallOfFire.Width", 4);
-			config.addDefault("Abilities.Fire.WallOfFire.Duration", 5000);
-			config.addDefault("Abilities.Fire.WallOfFire.Damage", 1);
-			config.addDefault("Abilities.Fire.WallOfFire.Cooldown", 11000);
-			config.addDefault("Abilities.Fire.WallOfFire.Interval", 250);
-			config.addDefault("Abilities.Fire.WallOfFire.DamageInterval", 500);
-			config.addDefault("Abilities.Fire.WallOfFire.FireTicks", 0);
-			config.addDefault("Abilities.Fire.WallOfFire.MaxAngle", 50);
-
-			config.addDefault("Abilities.Fire.FireKick.Enabled", true);
-			config.addDefault("Abilities.Fire.FireKick.Range", 7.0);
-			config.addDefault("Abilities.Fire.FireKick.Damage", 3.0);
-			config.addDefault("Abilities.Fire.FireKick.Cooldown", 6000);
-			config.addDefault("Abilities.Fire.FireKick.Speed", 1);
-
-			config.addDefault("Abilities.Fire.FireSpin.Enabled", true);
-			config.addDefault("Abilities.Fire.FireSpin.Range", 7);
-			config.addDefault("Abilities.Fire.FireSpin.Damage", 3.0);
-			config.addDefault("Abilities.Fire.FireSpin.Knockback", 3.0);
-			config.addDefault("Abilities.Fire.FireSpin.Cooldown", 5000);
-			config.addDefault("Abilities.Fire.FireSpin.Speed", 0.3);
-
-			config.addDefault("Abilities.Fire.FireWheel.Enabled", true);
-			config.addDefault("Abilities.Fire.FireWheel.Range", 20.0);
-			config.addDefault("Abilities.Fire.FireWheel.Damage", 4.0);
-			config.addDefault("Abilities.Fire.FireWheel.Speed", 0.55);
-			config.addDefault("Abilities.Fire.FireWheel.Cooldown", 6000);
-			config.addDefault("Abilities.Fire.FireWheel.FireTicks", 2.5);
-			config.addDefault("Abilities.Fire.FireWheel.Height", 2);
-
-			config.addDefault("Abilities.Fire.JetBlast.Enabled", true);
-			config.addDefault("Abilities.Fire.JetBlast.Speed", 1.2);
-			config.addDefault("Abilities.Fire.JetBlast.Cooldown", 6000);
-			config.addDefault("Abilities.Fire.JetBlast.Duration", 5000);
-
-			config.addDefault("Abilities.Fire.JetBlaze.Enabled", true);
-			config.addDefault("Abilities.Fire.JetBlaze.Speed", 1.1);
-			config.addDefault("Abilities.Fire.JetBlaze.Damage", 4);
-			config.addDefault("Abilities.Fire.JetBlaze.Cooldown", 6000);
-			config.addDefault("Abilities.Fire.JetBlaze.FireTicks", 2.5);
-			config.addDefault("Abilities.Fire.JetBlaze.Duration", 5000);
-
-			config.addDefault("Abilities.Chi.Passive.Acrobatics.Enabled", true);
-			config.addDefault("Abilities.Chi.Passive.Acrobatics.FallReductionFactor", 0.5);
-			config.addDefault("Abilities.Chi.Passive.FallReductionFactor", 0.5);
-			config.addDefault("Abilities.Chi.Passive.ChiAgility.Enabled", true);
-			config.addDefault("Abilities.Chi.Passive.ChiAgility.JumpPower", 1);
-			config.addDefault("Abilities.Chi.Passive.ChiAgility.SpeedPower", 1);
-			config.addDefault("Abilities.Chi.Passive.ChiSaturation.Enabled", true);
-			config.addDefault("Abilities.Chi.Passive.ChiSaturation.ExhaustionFactor", 0.3);
-			config.addDefault("Abilities.Chi.Passive.BlockChi.Chance", 25);
-			config.addDefault("Abilities.Chi.Passive.BlockChi.Duration", 1000);
-
-			config.addDefault("Abilities.Chi.Immobilize.Enabled", true);
-			config.addDefault("Abilities.Chi.Immobilize.ParalyzeDuration", 3500);
-			config.addDefault("Abilities.Chi.Immobilize.Cooldown", 15000);
-
-			config.addDefault("Abilities.Chi.AcrobatStance.Enabled", true);
-			config.addDefault("Abilities.Chi.AcrobatStance.Cooldown", 0);
-			config.addDefault("Abilities.Chi.AcrobatStance.Duration", 0);
-			config.addDefault("Abilities.Chi.AcrobatStance.ChiBlockBoost", 3);
-			config.addDefault("Abilities.Chi.AcrobatStance.Speed", 3);
-			config.addDefault("Abilities.Chi.AcrobatStance.Jump", 3);
-
-			config.addDefault("Abilities.Chi.HighJump.Enabled", true);
-			config.addDefault("Abilities.Chi.HighJump.Height", 1.3);
-			config.addDefault("Abilities.Chi.HighJump.Cooldown", 3000);
-
-			config.addDefault("Abilities.Chi.Paralyze.Enabled", true);
-			config.addDefault("Abilities.Chi.Paralyze.Cooldown", 10000);
-			config.addDefault("Abilities.Chi.Paralyze.Duration", 1500);
-
-			config.addDefault("Abilities.Chi.RapidPunch.Enabled", true);
-			config.addDefault("Abilities.Chi.RapidPunch.Damage", 1);
-			config.addDefault("Abilities.Chi.RapidPunch.Cooldown", 6000);
-			config.addDefault("Abilities.Chi.RapidPunch.Punches", 3);
-			config.addDefault("Abilities.Chi.RapidPunch.Interval", 500);
-
-			config.addDefault("Abilities.Chi.Smokescreen.Enabled", true);
-			config.addDefault("Abilities.Chi.Smokescreen.Cooldown", 25000);
-			config.addDefault("Abilities.Chi.Smokescreen.Radius", 4);
-			config.addDefault("Abilities.Chi.Smokescreen.Duration", 12);
-
-			config.addDefault("Abilities.Chi.WarriorStance.Enabled", true);
-			config.addDefault("Abilities.Chi.WarriorStance.Cooldown", 0);
-			config.addDefault("Abilities.Chi.WarriorStance.Duration", 0);
-			config.addDefault("Abilities.Chi.WarriorStance.Strength", 1);
-			config.addDefault("Abilities.Chi.WarriorStance.Resistance", -3);
-
-			config.addDefault("Abilities.Chi.QuickStrike.Enabled", true);
-			config.addDefault("Abilities.Chi.QuickStrike.Damage", 2);
-			config.addDefault("Abilities.Chi.QuickStrike.Cooldown", 3000);
-			config.addDefault("Abilities.Chi.QuickStrike.ChiBlockChance", 10);
-
-			config.addDefault("Abilities.Chi.SwiftKick.Enabled", true);
-			config.addDefault("Abilities.Chi.SwiftKick.Damage", 2);
-			config.addDefault("Abilities.Chi.SwiftKick.ChiBlockChance", 15);
-			config.addDefault("Abilities.Chi.SwiftKick.Cooldown", 4000);
-
-			config.addDefault("Storage.engine", "sqlite");
-
-			config.addDefault("Storage.MySQL.host", "localhost");
-			config.addDefault("Storage.MySQL.port", 3306);
-			config.addDefault("Storage.MySQL.pass", "");
-			config.addDefault("Storage.MySQL.db", "minecraft");
-			config.addDefault("Storage.MySQL.user", "root");
-
-			config.addDefault("debug", false);
-
-			defaultConfig.save();
-		}
-	}
-
-	public static FileConfiguration getConfig() {
-		return ConfigManager.defaultConfig.get();
-	}
-}
diff --git a/src/com/projectkorra/projectkorra/configuration/OldConfigType.java b/src/com/projectkorra/projectkorra/configuration/OldConfigType.java
deleted file mode 100644
index 31a3f0af..00000000
--- a/src/com/projectkorra/projectkorra/configuration/OldConfigType.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.projectkorra.projectkorra.configuration;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-
-public class OldConfigType {
-
-	private static final HashMap<String, ConfigType> ALL_TYPES = new HashMap<>();
-
-	public static final ConfigType DEFAULT = new ConfigType("Default");
-	public static final ConfigType PRESETS = new ConfigType("Presets");
-	public static final ConfigType LANGUAGE = new ConfigType("Language");
-	public static final ConfigType[] CORE_TYPES = { DEFAULT, PRESETS, LANGUAGE };
-
-	private final String string;
-
-	public OldConfigType(final String string) {
-		this.string = string;
-		ALL_TYPES.put(string, this);
-	}
-
-	public static List<ConfigType> addonValues() {
-		final List<ConfigType> values = new ArrayList<>();
-		for (final String key : ALL_TYPES.keySet()) {
-			if (!Arrays.asList(CORE_TYPES).contains(ALL_TYPES.get(key))) {
-				values.add(ALL_TYPES.get(key));
-			}
-		}
-		return values;
-	}
-
-	public static List<ConfigType> coreValues() {
-		return Arrays.asList(CORE_TYPES);
-	}
-
-	@Override
-	public String toString() {
-		return this.string;
-	}
-
-	public static List<ConfigType> values() {
-		final List<ConfigType> values = new ArrayList<>();
-		for (final String key : ALL_TYPES.keySet()) {
-			values.add(ALL_TYPES.get(key));
-		}
-		return values;
-	}
-}
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/AbilityConfig.java b/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/AbilityConfig.java
deleted file mode 100644
index 1b06e517..00000000
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/AbilityConfig.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities;
-
-import com.projectkorra.projectkorra.configuration.better.Config;
-
-public abstract class AbilityConfig implements Config {
-	
-	public final boolean Enabled;
-	public final String Description;
-	public final String Instructions;
-	
-	public AbilityConfig(boolean enabled, String description, String instructions) {
-		Enabled = enabled;
-		Description = description;
-		Instructions = instructions;
-	}
-	
-}
\ No newline at end of file
diff --git a/src/com/projectkorra/projectkorra/configuration/configs/abilities/AbilityConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/AbilityConfig.java
new file mode 100644
index 00000000..10a89f46
--- /dev/null
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/AbilityConfig.java
@@ -0,0 +1,26 @@
+package com.projectkorra.projectkorra.configuration.configs.abilities;
+
+import com.projectkorra.projectkorra.configuration.Config;
+
+public abstract class AbilityConfig implements Config {
+	
+	public final boolean Enabled;
+	public final String Description;
+	public final String Instructions;
+	
+	public final String DeathMessage;
+	public final String HorizontalVelocityDeathMessage;
+	
+	public AbilityConfig(boolean enabled, String description, String instructions, String deathMessage, String horizontalVelocityDeathMessage) {
+		Enabled = enabled;
+		Description = description;
+		Instructions = instructions;
+		DeathMessage = deathMessage;
+		HorizontalVelocityDeathMessage = horizontalVelocityDeathMessage;
+	}
+	
+	public AbilityConfig(boolean enabled, String description, String instructions) {
+		this(enabled, description, instructions, null, null);
+	}
+	
+}
\ No newline at end of file
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/EmptyAbilityConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/EmptyAbilityConfig.java
similarity index 75%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/EmptyAbilityConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/EmptyAbilityConfig.java
index 96f555ca..4639455b 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/EmptyAbilityConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/EmptyAbilityConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities;
+package com.projectkorra.projectkorra.configuration.configs.abilities;
 
 public class EmptyAbilityConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirAgilityConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirAgilityConfig.java
similarity index 67%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirAgilityConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirAgilityConfig.java
index 99702b37..f6660d3e 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirAgilityConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirAgilityConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AirAgilityConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirBlastConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBlastConfig.java
similarity index 84%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirBlastConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBlastConfig.java
index f9dcf060..b8948578 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirBlastConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBlastConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AirBlastConfig extends AbilityConfig {
 	
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirBurstConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBurstConfig.java
similarity index 80%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirBurstConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBurstConfig.java
index f2600872..69ea4867 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirBurstConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirBurstConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AirBurstConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSaturationConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSaturationConfig.java
similarity index 66%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSaturationConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSaturationConfig.java
index 51ddcd92..870b48f5 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSaturationConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSaturationConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AirSaturationConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirScooterConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirScooterConfig.java
similarity index 75%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirScooterConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirScooterConfig.java
index b238e797..b6b594d8 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirScooterConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirScooterConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AirScooterConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirShieldConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirShieldConfig.java
similarity index 78%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirShieldConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirShieldConfig.java
index 4da7646e..de325e16 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirShieldConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirShieldConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AirShieldConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSpoutConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSpoutConfig.java
similarity index 72%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSpoutConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSpoutConfig.java
index a4c41d48..7fa05674 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSpoutConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSpoutConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AirSpoutConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirStreamConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirStreamConfig.java
similarity index 78%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirStreamConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirStreamConfig.java
index f759c8c4..246d0495 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirStreamConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirStreamConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AirStreamConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSuctionConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSuctionConfig.java
similarity index 78%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSuctionConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSuctionConfig.java
index 1a8a8111..ebd7cd9f 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSuctionConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSuctionConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AirSuctionConfig extends AbilityConfig {
 	
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSweepConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSweepConfig.java
similarity index 77%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSweepConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSweepConfig.java
index f34a223e..409fa4fb 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSweepConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSweepConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AirSweepConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSwipeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSwipeConfig.java
similarity index 83%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSwipeConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSwipeConfig.java
index 32e1a2b4..598290e3 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/AirSwipeConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/AirSwipeConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AirSwipeConfig extends AbilityConfig {
 	
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/FlightConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/FlightConfig.java
similarity index 67%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/FlightConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/FlightConfig.java
index a03a7cda..a298ad9b 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/FlightConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/FlightConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class FlightConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/GracefulDescentConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/GracefulDescentConfig.java
similarity index 63%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/GracefulDescentConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/GracefulDescentConfig.java
index 1275687c..a78b6371 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/GracefulDescentConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/GracefulDescentConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class GracefulDescentConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/SuffocateConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/SuffocateConfig.java
similarity index 87%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/SuffocateConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/SuffocateConfig.java
index 3293b7a5..6b4a1f41 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/SuffocateConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/SuffocateConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class SuffocateConfig extends AbilityConfig {
 	
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/TornadoConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TornadoConfig.java
similarity index 75%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/TornadoConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TornadoConfig.java
index 4e997237..f19f2c61 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/TornadoConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TornadoConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class TornadoConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/TwisterConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TwisterConfig.java
similarity index 79%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/TwisterConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TwisterConfig.java
index 3b17485b..c23b61f9 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/air/TwisterConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/air/TwisterConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.air;
+package com.projectkorra.projectkorra.configuration.configs.abilities.air;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class TwisterConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/avatar/AvatarStateConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/avatar/AvatarStateConfig.java
similarity index 83%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/avatar/AvatarStateConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/avatar/AvatarStateConfig.java
index 2638aee7..d3d28d88 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/avatar/AvatarStateConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/avatar/AvatarStateConfig.java
@@ -1,8 +1,8 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.avatar;
+package com.projectkorra.projectkorra.configuration.configs.abilities.avatar;
 
 import org.bukkit.Sound;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AvatarStateConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/AcrobatStanceConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobatStanceConfig.java
similarity index 74%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/AcrobatStanceConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobatStanceConfig.java
index 3398c1f7..14896ea2 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/AcrobatStanceConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobatStanceConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.chi;
+package com.projectkorra.projectkorra.configuration.configs.abilities.chi;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AcrobatStanceConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/AcrobaticsConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobaticsConfig.java
similarity index 66%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/AcrobaticsConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobaticsConfig.java
index fb127172..cc4ed613 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/AcrobaticsConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/AcrobaticsConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.chi;
+package com.projectkorra.projectkorra.configuration.configs.abilities.chi;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class AcrobaticsConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/ChiAgilityConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiAgilityConfig.java
similarity index 67%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/ChiAgilityConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiAgilityConfig.java
index ec0103ab..f51a840e 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/ChiAgilityConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiAgilityConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.chi;
+package com.projectkorra.projectkorra.configuration.configs.abilities.chi;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class ChiAgilityConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/ChiSaturationConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiSaturationConfig.java
similarity index 66%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/ChiSaturationConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiSaturationConfig.java
index b2008e37..c8ff581b 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/ChiSaturationConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ChiSaturationConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.chi;
+package com.projectkorra.projectkorra.configuration.configs.abilities.chi;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class ChiSaturationConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/HighJumpConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/HighJumpConfig.java
similarity index 65%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/HighJumpConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/HighJumpConfig.java
index 1cc7a01f..d385b76d 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/HighJumpConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/HighJumpConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.chi;
+package com.projectkorra.projectkorra.configuration.configs.abilities.chi;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class HighJumpConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/ImmobilizeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ImmobilizeConfig.java
similarity index 67%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/ImmobilizeConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ImmobilizeConfig.java
index 141d7bcf..5a2c4e0f 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/ImmobilizeConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ImmobilizeConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.chi;
+package com.projectkorra.projectkorra.configuration.configs.abilities.chi;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class ImmobilizeConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/ParalyzeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ParalyzeConfig.java
similarity index 65%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/ParalyzeConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ParalyzeConfig.java
index caa9e9e4..e3fcc9ac 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/ParalyzeConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/ParalyzeConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.chi;
+package com.projectkorra.projectkorra.configuration.configs.abilities.chi;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class ParalyzeConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/QuickStrikeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/QuickStrikeConfig.java
similarity index 68%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/QuickStrikeConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/QuickStrikeConfig.java
index 5b235d9a..01b3e291 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/QuickStrikeConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/QuickStrikeConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.chi;
+package com.projectkorra.projectkorra.configuration.configs.abilities.chi;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class QuickStrikeConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/RapidPunchConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/RapidPunchConfig.java
similarity index 70%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/RapidPunchConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/RapidPunchConfig.java
index 8aeb1ad7..b9ae59b9 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/RapidPunchConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/RapidPunchConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.chi;
+package com.projectkorra.projectkorra.configuration.configs.abilities.chi;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class RapidPunchConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/SmokescreenConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SmokescreenConfig.java
similarity index 68%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/SmokescreenConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SmokescreenConfig.java
index 98057254..6841ea0a 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/SmokescreenConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SmokescreenConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.chi;
+package com.projectkorra.projectkorra.configuration.configs.abilities.chi;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class SmokescreenConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/SwiftKickConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SwiftKickConfig.java
similarity index 68%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/SwiftKickConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SwiftKickConfig.java
index da9e7833..e4688afd 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/SwiftKickConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/SwiftKickConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.chi;
+package com.projectkorra.projectkorra.configuration.configs.abilities.chi;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class SwiftKickConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/WarriorStanceConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/WarriorStanceConfig.java
similarity index 70%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/WarriorStanceConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/WarriorStanceConfig.java
index e5112257..73c2e3fe 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/chi/WarriorStanceConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/chi/WarriorStanceConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.chi;
+package com.projectkorra.projectkorra.configuration.configs.abilities.chi;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class WarriorStanceConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/CatapultConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CatapultConfig.java
similarity index 72%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/CatapultConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CatapultConfig.java
index e141f332..97fa45d3 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/CatapultConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CatapultConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class CatapultConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/CollapseConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CollapseConfig.java
similarity index 82%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/CollapseConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CollapseConfig.java
index 8ad1862d..a38ceafb 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/CollapseConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/CollapseConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class CollapseConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/DensityShiftConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/DensityShiftConfig.java
similarity index 65%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/DensityShiftConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/DensityShiftConfig.java
index 7426ff3b..839866c5 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/DensityShiftConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/DensityShiftConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class DensityShiftConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthArmorConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthArmorConfig.java
similarity index 74%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthArmorConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthArmorConfig.java
index 31d38469..ab10147a 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthArmorConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthArmorConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class EarthArmorConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthBlastConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthBlastConfig.java
similarity index 79%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthBlastConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthBlastConfig.java
index eedf12bb..1c529efe 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthBlastConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthBlastConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class EarthBlastConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthDomeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthDomeConfig.java
similarity index 70%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthDomeConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthDomeConfig.java
index d22dab3c..57f7e4fa 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthDomeConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthDomeConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class EarthDomeConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthGrabConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthGrabConfig.java
similarity index 73%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthGrabConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthGrabConfig.java
index c8ca2bed..17a37f18 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthGrabConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthGrabConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class EarthGrabConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthPillarsConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthPillarsConfig.java
similarity index 74%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthPillarsConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthPillarsConfig.java
index 3af2e3b2..9db05532 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthPillarsConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthPillarsConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class EarthPillarsConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthSmashConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthSmashConfig.java
similarity index 90%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthSmashConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthSmashConfig.java
index a5ee6ff1..cd5366e6 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthSmashConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthSmashConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class EarthSmashConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthTunnelConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthTunnelConfig.java
similarity index 80%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthTunnelConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthTunnelConfig.java
index 5a732f03..ae83552f 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/EarthTunnelConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/EarthTunnelConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class EarthTunnelConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/ExtractionConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ExtractionConfig.java
similarity index 70%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/ExtractionConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ExtractionConfig.java
index b8949c39..2e870e2e 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/ExtractionConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ExtractionConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class ExtractionConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/FerroControlConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/FerroControlConfig.java
similarity index 62%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/FerroControlConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/FerroControlConfig.java
index 6322d945..81e1c9b6 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/FerroControlConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/FerroControlConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class FerroControlConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/LavaFlowConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/LavaFlowConfig.java
similarity index 89%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/LavaFlowConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/LavaFlowConfig.java
index 2c153d0d..d238a327 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/LavaFlowConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/LavaFlowConfig.java
@@ -1,8 +1,8 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
 import org.bukkit.Material;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class LavaFlowConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/MetalClipsConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/MetalClipsConfig.java
similarity index 84%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/MetalClipsConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/MetalClipsConfig.java
index 5d23c856..61f2a292 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/MetalClipsConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/MetalClipsConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class MetalClipsConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/RaiseEarthConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/RaiseEarthConfig.java
similarity index 83%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/RaiseEarthConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/RaiseEarthConfig.java
index 3410ff8d..4ec847c3 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/RaiseEarthConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/RaiseEarthConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class RaiseEarthConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/ShockwaveConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ShockwaveConfig.java
similarity index 80%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/ShockwaveConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ShockwaveConfig.java
index 4548771b..d57d3098 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/ShockwaveConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/ShockwaveConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class ShockwaveConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/TremorsenseConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/TremorsenseConfig.java
similarity index 71%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/TremorsenseConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/TremorsenseConfig.java
index 1949a3e3..fe7c8406 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/earth/TremorsenseConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/earth/TremorsenseConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.earth;
+package com.projectkorra.projectkorra.configuration.configs.abilities.earth;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class TremorsenseConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/BlazeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/BlazeConfig.java
similarity index 78%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/BlazeConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/BlazeConfig.java
index 1e3102af..390b0cbb 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/BlazeConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/BlazeConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class BlazeConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/CombustionConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/CombustionConfig.java
similarity index 74%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/CombustionConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/CombustionConfig.java
index 597c3143..acf0760e 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/CombustionConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/CombustionConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class CombustionConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireBlastConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBlastConfig.java
similarity index 86%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireBlastConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBlastConfig.java
index 2789d56a..506352c0 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireBlastConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBlastConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class FireBlastConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireBurstConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBurstConfig.java
similarity index 80%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireBurstConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBurstConfig.java
index 559bfbb4..5d693da3 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireBurstConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireBurstConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class FireBurstConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireJetConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireJetConfig.java
similarity index 72%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireJetConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireJetConfig.java
index d2d9537d..17c74387 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireJetConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireJetConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class FireJetConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireKickConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireKickConfig.java
similarity index 74%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireKickConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireKickConfig.java
index 8645eff2..fdd3fc66 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireKickConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireKickConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class FireKickConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireManipulationConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireManipulationConfig.java
similarity index 83%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireManipulationConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireManipulationConfig.java
index deb8dca2..af58675e 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireManipulationConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireManipulationConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class FireManipulationConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireShieldConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireShieldConfig.java
similarity index 81%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireShieldConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireShieldConfig.java
index f898aef5..590c4bba 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireShieldConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireShieldConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class FireShieldConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireSpinConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireSpinConfig.java
similarity index 77%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireSpinConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireSpinConfig.java
index f878fc18..9b1b09f6 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireSpinConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireSpinConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class FireSpinConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireWheelConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireWheelConfig.java
similarity index 80%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireWheelConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireWheelConfig.java
index 171a23d6..3993bd86 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/FireWheelConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/FireWheelConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class FireWheelConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/HeatControlConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/HeatControlConfig.java
similarity index 85%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/HeatControlConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/HeatControlConfig.java
index d4fa1773..d5156610 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/HeatControlConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/HeatControlConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class HeatControlConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/IlluminationConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/IlluminationConfig.java
similarity index 70%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/IlluminationConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/IlluminationConfig.java
index 3e769065..392f0b94 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/IlluminationConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/IlluminationConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class IlluminationConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/JetBlastConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/JetBlastConfig.java
similarity index 68%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/JetBlastConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/JetBlastConfig.java
index 3165c27c..fc87cf95 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/JetBlastConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/JetBlastConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class JetBlastConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/JetBlazeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/JetBlazeConfig.java
similarity index 75%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/JetBlazeConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/JetBlazeConfig.java
index 1865d3a4..ba25ab67 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/JetBlazeConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/JetBlazeConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class JetBlazeConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/LightningConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/LightningConfig.java
similarity index 85%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/LightningConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/LightningConfig.java
index 3dfc0279..1466c2f9 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/LightningConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/LightningConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class LightningConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/WallOfFireConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/WallOfFireConfig.java
similarity index 82%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/WallOfFireConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/WallOfFireConfig.java
index 2c88742a..dda78475 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/fire/WallOfFireConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/fire/WallOfFireConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.fire;
+package com.projectkorra.projectkorra.configuration.configs.abilities.fire;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class WallOfFireConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/BloodbendingConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/BloodbendingConfig.java
similarity index 78%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/BloodbendingConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/BloodbendingConfig.java
index 6fac8909..7fbbd650 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/BloodbendingConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/BloodbendingConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class BloodbendingConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/FastSwimConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/FastSwimConfig.java
similarity index 68%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/FastSwimConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/FastSwimConfig.java
index aad90935..d355e12f 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/FastSwimConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/FastSwimConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class FastSwimConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/HealingWatersConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/HealingWatersConfig.java
similarity index 75%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/HealingWatersConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/HealingWatersConfig.java
index 618ef24e..c02c5777 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/HealingWatersConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/HealingWatersConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class HealingWatersConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/HydroSinkConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/HydroSinkConfig.java
similarity index 61%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/HydroSinkConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/HydroSinkConfig.java
index ca481d0b..d1bb7c3e 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/HydroSinkConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/HydroSinkConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class HydroSinkConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/IceBlastConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBlastConfig.java
similarity index 78%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/IceBlastConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBlastConfig.java
index e4361390..846918d3 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/IceBlastConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBlastConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class IceBlastConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/IceBulletConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBulletConfig.java
similarity index 77%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/IceBulletConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBulletConfig.java
index f72d3679..492dc254 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/IceBulletConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceBulletConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class IceBulletConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/IceSpikeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceSpikeConfig.java
similarity index 91%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/IceSpikeConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceSpikeConfig.java
index e8d36134..20e69419 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/IceSpikeConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceSpikeConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class IceSpikeConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/IceWaveConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceWaveConfig.java
similarity index 74%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/IceWaveConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceWaveConfig.java
index 8b11b89d..23cf73e6 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/IceWaveConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/IceWaveConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class IceWaveConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/OctopusFormConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/OctopusFormConfig.java
similarity index 82%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/OctopusFormConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/OctopusFormConfig.java
index 8574274a..f22ededd 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/OctopusFormConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/OctopusFormConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class OctopusFormConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/PhaseChangeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/PhaseChangeConfig.java
similarity index 82%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/PhaseChangeConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/PhaseChangeConfig.java
index 05a59715..e8467004 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/PhaseChangeConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/PhaseChangeConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class PhaseChangeConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/SurgeConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/SurgeConfig.java
similarity index 86%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/SurgeConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/SurgeConfig.java
index dbd624f9..56fd49fa 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/SurgeConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/SurgeConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class SurgeConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/TorrentConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/TorrentConfig.java
similarity index 88%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/TorrentConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/TorrentConfig.java
index 3c042ad2..f4c2f363 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/TorrentConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/TorrentConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class TorrentConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/WaterArmsConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterArmsConfig.java
similarity index 93%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/WaterArmsConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterArmsConfig.java
index 5558829f..eb0acbbf 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/WaterArmsConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterArmsConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class WaterArmsConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/WaterBubbleConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterBubbleConfig.java
similarity index 71%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/WaterBubbleConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterBubbleConfig.java
index 2be5e9cd..b54e4af7 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/WaterBubbleConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterBubbleConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class WaterBubbleConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/WaterManipulationConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterManipulationConfig.java
similarity index 78%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/WaterManipulationConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterManipulationConfig.java
index 61519600..07e10eff 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/WaterManipulationConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterManipulationConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class WaterManipulationConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/WaterSpoutConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterSpoutConfig.java
similarity index 85%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/WaterSpoutConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterSpoutConfig.java
index 3a2c1fb4..7f6f37b5 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/abilities/water/WaterSpoutConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/abilities/water/WaterSpoutConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.abilities.water;
+package com.projectkorra.projectkorra.configuration.configs.abilities.water;
 
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.AbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.AbilityConfig;
 
 public class WaterSpoutConfig extends AbilityConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/AddCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/AddCommandConfig.java
similarity index 91%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/AddCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/AddCommandConfig.java
index bbf0a870..9fbe5430 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/AddCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/AddCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class AddCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/BindCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/BindCommandConfig.java
similarity index 88%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/BindCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/BindCommandConfig.java
index 1daf5a2d..50f65ce4 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/BindCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/BindCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class BindCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/CheckCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/CheckCommandConfig.java
similarity index 81%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/CheckCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/CheckCommandConfig.java
index 695e67ad..daaad7ba 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/CheckCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/CheckCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class CheckCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/ChooseCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/ChooseCommandConfig.java
similarity index 86%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/ChooseCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/ChooseCommandConfig.java
index fc8f47c5..b857623e 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/ChooseCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/ChooseCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class ChooseCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/ClearCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/ClearCommandConfig.java
similarity index 82%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/ClearCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/ClearCommandConfig.java
index c22f7f71..804b263c 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/ClearCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/ClearCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class ClearCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/CommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/CommandConfig.java
similarity index 64%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/CommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/CommandConfig.java
index f08e7bfc..9b72c7a7 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/CommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/CommandConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
-import com.projectkorra.projectkorra.configuration.better.Config;
+import com.projectkorra.projectkorra.configuration.Config;
 
 public abstract class CommandConfig implements Config {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/CopyCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/CopyCommandConfig.java
similarity index 81%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/CopyCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/CopyCommandConfig.java
index 4b6d6d02..f198c278 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/CopyCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/CopyCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class CopyCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/DebugCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/DebugCommandConfig.java
similarity index 73%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/DebugCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/DebugCommandConfig.java
index e545ab1e..b5f72e6b 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/DebugCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/DebugCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class DebugCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/DisplayCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/DisplayCommandConfig.java
similarity index 83%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/DisplayCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/DisplayCommandConfig.java
index c4cbb2ba..0a162ca9 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/DisplayCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/DisplayCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class DisplayCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/HelpCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/HelpCommandConfig.java
similarity index 86%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/HelpCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/HelpCommandConfig.java
index 354b484f..772b6ba4 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/HelpCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/HelpCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class HelpCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/InvincibleCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/InvincibleCommandConfig.java
similarity index 77%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/InvincibleCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/InvincibleCommandConfig.java
index e7119165..b47c3bb8 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/InvincibleCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/InvincibleCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class InvincibleCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/PermaremoveCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/PermaremoveCommandConfig.java
similarity index 83%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/PermaremoveCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/PermaremoveCommandConfig.java
index 285548ee..01999748 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/PermaremoveCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/PermaremoveCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class PermaremoveCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/PresetCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/PresetCommandConfig.java
similarity index 90%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/PresetCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/PresetCommandConfig.java
index 843879be..cbeceb40 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/PresetCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/PresetCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class PresetCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/ReloadCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/ReloadCommandConfig.java
similarity index 74%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/ReloadCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/ReloadCommandConfig.java
index 0bd11853..c27ed514 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/ReloadCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/ReloadCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class ReloadCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/RemoveCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/RemoveCommandConfig.java
similarity index 88%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/RemoveCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/RemoveCommandConfig.java
index 3b157189..40a2754c 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/RemoveCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/RemoveCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class RemoveCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/StatsCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/StatsCommandConfig.java
similarity index 81%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/StatsCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/StatsCommandConfig.java
index 2c456376..c8bf479b 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/StatsCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/StatsCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class StatsCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/ToggleCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/ToggleCommandConfig.java
similarity index 92%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/ToggleCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/ToggleCommandConfig.java
index 24b05efe..d8478437 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/ToggleCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/ToggleCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class ToggleCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/VersionCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/VersionCommandConfig.java
similarity index 69%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/VersionCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/VersionCommandConfig.java
index e660fff5..16e04fe1 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/VersionCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/VersionCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class VersionCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/WhoCommandConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/commands/WhoCommandConfig.java
similarity index 79%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/commands/WhoCommandConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/commands/WhoCommandConfig.java
index 82453ebd..42260749 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/commands/WhoCommandConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/commands/WhoCommandConfig.java
@@ -1,4 +1,4 @@
-package com.projectkorra.projectkorra.configuration.better.configs.commands;
+package com.projectkorra.projectkorra.configuration.configs.commands;
 
 public class WhoCommandConfig extends CommandConfig {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/AirPropertiesConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/properties/AirPropertiesConfig.java
similarity index 79%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/properties/AirPropertiesConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/properties/AirPropertiesConfig.java
index c2e4acb4..6553fef2 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/AirPropertiesConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/properties/AirPropertiesConfig.java
@@ -1,8 +1,8 @@
-package com.projectkorra.projectkorra.configuration.better.configs.properties;
+package com.projectkorra.projectkorra.configuration.configs.properties;
 
 import org.bukkit.Sound;
 
-import com.projectkorra.projectkorra.configuration.better.Config;
+import com.projectkorra.projectkorra.configuration.Config;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
 public class AirPropertiesConfig implements Config {
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/AvatarPropertiesConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/properties/AvatarPropertiesConfig.java
similarity index 63%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/properties/AvatarPropertiesConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/properties/AvatarPropertiesConfig.java
index 75bd3464..e0b73fc8 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/AvatarPropertiesConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/properties/AvatarPropertiesConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.properties;
+package com.projectkorra.projectkorra.configuration.configs.properties;
 
-import com.projectkorra.projectkorra.configuration.better.Config;
+import com.projectkorra.projectkorra.configuration.Config;
 
 public class AvatarPropertiesConfig implements Config {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/ChatPropertiesConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/properties/ChatPropertiesConfig.java
similarity index 89%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/properties/ChatPropertiesConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/properties/ChatPropertiesConfig.java
index 4e461990..d7262344 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/ChatPropertiesConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/properties/ChatPropertiesConfig.java
@@ -1,8 +1,8 @@
-package com.projectkorra.projectkorra.configuration.better.configs.properties;
+package com.projectkorra.projectkorra.configuration.configs.properties;
 
 import org.bukkit.ChatColor;
 
-import com.projectkorra.projectkorra.configuration.better.Config;
+import com.projectkorra.projectkorra.configuration.Config;
 
 public class ChatPropertiesConfig implements Config {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/ChiPropertiesConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/properties/ChiPropertiesConfig.java
similarity index 69%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/properties/ChiPropertiesConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/properties/ChiPropertiesConfig.java
index d0a1cef3..775038df 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/ChiPropertiesConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/properties/ChiPropertiesConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.properties;
+package com.projectkorra.projectkorra.configuration.configs.properties;
 
-import com.projectkorra.projectkorra.configuration.better.Config;
+import com.projectkorra.projectkorra.configuration.Config;
 
 public class ChiPropertiesConfig implements Config {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/CommandPropertiesConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/properties/CommandPropertiesConfig.java
similarity index 73%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/properties/CommandPropertiesConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/properties/CommandPropertiesConfig.java
index 6647fb0d..394bfbb0 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/CommandPropertiesConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/properties/CommandPropertiesConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.properties;
+package com.projectkorra.projectkorra.configuration.configs.properties;
 
-import com.projectkorra.projectkorra.configuration.better.Config;
+import com.projectkorra.projectkorra.configuration.Config;
 
 public class CommandPropertiesConfig implements Config {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/EarthPropertiesConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/properties/EarthPropertiesConfig.java
similarity index 90%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/properties/EarthPropertiesConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/properties/EarthPropertiesConfig.java
index 5cd0e9c7..991baaca 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/EarthPropertiesConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/properties/EarthPropertiesConfig.java
@@ -1,9 +1,9 @@
-package com.projectkorra.projectkorra.configuration.better.configs.properties;
+package com.projectkorra.projectkorra.configuration.configs.properties;
 
 import org.bukkit.Material;
 import org.bukkit.Sound;
 
-import com.projectkorra.projectkorra.configuration.better.Config;
+import com.projectkorra.projectkorra.configuration.Config;
 
 public class EarthPropertiesConfig implements Config {
 
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/FirePropertiesConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/properties/FirePropertiesConfig.java
similarity index 88%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/properties/FirePropertiesConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/properties/FirePropertiesConfig.java
index 00a790ff..9201bada 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/FirePropertiesConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/properties/FirePropertiesConfig.java
@@ -1,8 +1,8 @@
-package com.projectkorra.projectkorra.configuration.better.configs.properties;
+package com.projectkorra.projectkorra.configuration.configs.properties;
 
 import org.bukkit.Sound;
 
-import com.projectkorra.projectkorra.configuration.better.Config;
+import com.projectkorra.projectkorra.configuration.Config;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
 public class FirePropertiesConfig implements Config {
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/GeneralPropertiesConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/properties/GeneralPropertiesConfig.java
similarity index 92%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/properties/GeneralPropertiesConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/properties/GeneralPropertiesConfig.java
index 24614304..ae38e71f 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/GeneralPropertiesConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/properties/GeneralPropertiesConfig.java
@@ -1,6 +1,6 @@
-package com.projectkorra.projectkorra.configuration.better.configs.properties;
+package com.projectkorra.projectkorra.configuration.configs.properties;
 
-import com.projectkorra.projectkorra.configuration.better.Config;
+import com.projectkorra.projectkorra.configuration.Config;
 
 public class GeneralPropertiesConfig implements Config {
 
@@ -34,6 +34,8 @@ public class GeneralPropertiesConfig implements Config {
 	
 	public final boolean DeathMessages = true;
 	
+	public final String DefaultDeathMessage = "";
+	
 	public final boolean ApplyHorizontalCollisionBarrierBlockDamage = true;
 	
 	public final String[] DisabledWorlds = {};
diff --git a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/WaterPropertiesConfig.java b/src/com/projectkorra/projectkorra/configuration/configs/properties/WaterPropertiesConfig.java
similarity index 89%
rename from src/com/projectkorra/projectkorra/configuration/better/configs/properties/WaterPropertiesConfig.java
rename to src/com/projectkorra/projectkorra/configuration/configs/properties/WaterPropertiesConfig.java
index ecdfb761..27a6ead7 100644
--- a/src/com/projectkorra/projectkorra/configuration/better/configs/properties/WaterPropertiesConfig.java
+++ b/src/com/projectkorra/projectkorra/configuration/configs/properties/WaterPropertiesConfig.java
@@ -1,9 +1,9 @@
-package com.projectkorra.projectkorra.configuration.better.configs.properties;
+package com.projectkorra.projectkorra.configuration.configs.properties;
 
 import org.bukkit.Material;
 import org.bukkit.Sound;
 
-import com.projectkorra.projectkorra.configuration.better.Config;
+import com.projectkorra.projectkorra.configuration.Config;
 
 public class WaterPropertiesConfig implements Config {
 
diff --git a/src/com/projectkorra/projectkorra/earthbending/Catapult.java b/src/com/projectkorra/projectkorra/earthbending/Catapult.java
index 8f1e663b..044add6b 100644
--- a/src/com/projectkorra/projectkorra/earthbending/Catapult.java
+++ b/src/com/projectkorra/projectkorra/earthbending/Catapult.java
@@ -14,7 +14,7 @@ import org.bukkit.util.Vector;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.CatapultConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.CatapultConfig;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
 public class Catapult extends EarthAbility<CatapultConfig> {
@@ -184,4 +184,9 @@ public class Catapult extends EarthAbility<CatapultConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<CatapultConfig> getConfigType() {
+		return CatapultConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/Collapse.java b/src/com/projectkorra/projectkorra/earthbending/Collapse.java
index 158f6ec3..42db5e40 100644
--- a/src/com/projectkorra/projectkorra/earthbending/Collapse.java
+++ b/src/com/projectkorra/projectkorra/earthbending/Collapse.java
@@ -12,7 +12,7 @@ import org.bukkit.util.Vector;
 
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.CollapseConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.CollapseConfig;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
 
@@ -251,4 +251,9 @@ public class Collapse extends EarthAbility<CollapseConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<CollapseConfig> getConfigType() {
+		return CollapseConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/CollapseWall.java b/src/com/projectkorra/projectkorra/earthbending/CollapseWall.java
index 07b09b56..310bbaf2 100644
--- a/src/com/projectkorra/projectkorra/earthbending/CollapseWall.java
+++ b/src/com/projectkorra/projectkorra/earthbending/CollapseWall.java
@@ -12,7 +12,7 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.CollapseConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.CollapseConfig;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
 
@@ -159,5 +159,10 @@ public class CollapseWall extends EarthAbility<CollapseConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<CollapseConfig> getConfigType() {
+		return CollapseConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java b/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
index 74f7753f..60a095de 100644
--- a/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
+++ b/src/com/projectkorra/projectkorra/earthbending/EarthArmor.java
@@ -23,9 +23,9 @@ import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthArmorConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthArmorConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 import com.projectkorra.projectkorra.util.TempArmor;
 import com.projectkorra.projectkorra.util.TempBlock;
@@ -614,5 +614,10 @@ public class EarthArmor extends EarthAbility<EarthArmorConfig> {
 	public void setMaxGoldHearts(final int maxGoldHearts) {
 		this.maxGoldHearts = maxGoldHearts;
 	}
+	
+	@Override
+	public Class<EarthArmorConfig> getConfigType() {
+		return EarthArmorConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/EarthBlast.java b/src/com/projectkorra/projectkorra/earthbending/EarthBlast.java
index 376d7632..43c32723 100644
--- a/src/com/projectkorra/projectkorra/earthbending/EarthBlast.java
+++ b/src/com/projectkorra/projectkorra/earthbending/EarthBlast.java
@@ -16,7 +16,7 @@ import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthBlastConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthBlastConfig;
 import com.projectkorra.projectkorra.earthbending.passive.DensityShift;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
@@ -671,4 +671,9 @@ public class EarthBlast extends EarthAbility<EarthBlastConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<EarthBlastConfig> getConfigType() {
+		return EarthBlastConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/EarthDome.java b/src/com/projectkorra/projectkorra/earthbending/EarthDome.java
index e2f66a32..f29a3251 100644
--- a/src/com/projectkorra/projectkorra/earthbending/EarthDome.java
+++ b/src/com/projectkorra/projectkorra/earthbending/EarthDome.java
@@ -13,9 +13,9 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthDomeConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.RaiseEarthConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthDomeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.RaiseEarthConfig;
 
 public class EarthDome extends EarthAbility<EarthDomeConfig> {
 
@@ -123,5 +123,10 @@ public class EarthDome extends EarthAbility<EarthDomeConfig> {
 	public boolean isHiddenAbility() {
 		return true;
 	}
+	
+	@Override
+	public Class<EarthDomeConfig> getConfigType() {
+		return EarthDomeConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/EarthGrab.java b/src/com/projectkorra/projectkorra/earthbending/EarthGrab.java
index fe2f39d8..b08123aa 100644
--- a/src/com/projectkorra/projectkorra/earthbending/EarthGrab.java
+++ b/src/com/projectkorra/projectkorra/earthbending/EarthGrab.java
@@ -32,7 +32,7 @@ import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.avatar.AvatarState;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthGrabConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthGrabConfig;
 import com.projectkorra.projectkorra.util.MovementHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 import com.projectkorra.projectkorra.util.TempArmor;
@@ -385,4 +385,9 @@ public class EarthGrab extends EarthAbility<EarthGrabConfig> {
 	public LivingEntity getTarget() {
 		return this.target;
 	}
+	
+	@Override
+	public Class<EarthGrabConfig> getConfigType() {
+		return EarthGrabConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/EarthSmash.java b/src/com/projectkorra/projectkorra/earthbending/EarthSmash.java
index 20d8ddfd..9bf249ac 100644
--- a/src/com/projectkorra/projectkorra/earthbending/EarthSmash.java
+++ b/src/com/projectkorra/projectkorra/earthbending/EarthSmash.java
@@ -20,7 +20,7 @@ import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthSmashConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthSmashConfig;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
@@ -976,5 +976,10 @@ public class EarthSmash extends EarthAbility<EarthSmashConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<EarthSmashConfig> getConfigType() {
+		return EarthSmashConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/EarthTunnel.java b/src/com/projectkorra/projectkorra/earthbending/EarthTunnel.java
index 0947d250..51e11779 100644
--- a/src/com/projectkorra/projectkorra/earthbending/EarthTunnel.java
+++ b/src/com/projectkorra/projectkorra/earthbending/EarthTunnel.java
@@ -13,7 +13,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthTunnelConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthTunnelConfig;
 import com.projectkorra.projectkorra.util.TempBlock;
 
 public class EarthTunnel extends EarthAbility<EarthTunnelConfig> {
@@ -292,5 +292,10 @@ public class EarthTunnel extends EarthAbility<EarthTunnelConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<EarthTunnelConfig> getConfigType() {
+		return EarthTunnelConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/RaiseEarth.java b/src/com/projectkorra/projectkorra/earthbending/RaiseEarth.java
index 102f8175..d5433629 100644
--- a/src/com/projectkorra/projectkorra/earthbending/RaiseEarth.java
+++ b/src/com/projectkorra/projectkorra/earthbending/RaiseEarth.java
@@ -12,7 +12,7 @@ import org.bukkit.util.Vector;
 
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.RaiseEarthConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.RaiseEarthConfig;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
 
@@ -270,5 +270,10 @@ public class RaiseEarth extends EarthAbility<RaiseEarthConfig> {
 	public void setSelectRange(final double selectRange) {
 		this.selectRange = selectRange;
 	}
+	
+	@Override
+	public Class<RaiseEarthConfig> getConfigType() {
+		return RaiseEarthConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/RaiseEarthWall.java b/src/com/projectkorra/projectkorra/earthbending/RaiseEarthWall.java
index bde88ca7..960c09dc 100644
--- a/src/com/projectkorra/projectkorra/earthbending/RaiseEarthWall.java
+++ b/src/com/projectkorra/projectkorra/earthbending/RaiseEarthWall.java
@@ -9,7 +9,7 @@ import org.bukkit.util.Vector;
 
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.RaiseEarthConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.RaiseEarthConfig;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
 
@@ -192,5 +192,10 @@ public class RaiseEarthWall extends EarthAbility<RaiseEarthConfig> {
 	public void setSelectRange(final int selectRange) {
 		this.selectRange = selectRange;
 	}
+	
+	@Override
+	public Class<RaiseEarthConfig> getConfigType() {
+		return RaiseEarthConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/Ripple.java b/src/com/projectkorra/projectkorra/earthbending/Ripple.java
index 236bd1e2..56fbd26f 100644
--- a/src/com/projectkorra/projectkorra/earthbending/Ripple.java
+++ b/src/com/projectkorra/projectkorra/earthbending/Ripple.java
@@ -19,7 +19,7 @@ import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.avatar.AvatarState;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.ShockwaveConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.ShockwaveConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 
 public class Ripple extends EarthAbility<ShockwaveConfig> {
@@ -440,5 +440,10 @@ public class Ripple extends EarthAbility<ShockwaveConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<ShockwaveConfig> getConfigType() {
+		return ShockwaveConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/Shockwave.java b/src/com/projectkorra/projectkorra/earthbending/Shockwave.java
index 21619f83..a38755f7 100644
--- a/src/com/projectkorra/projectkorra/earthbending/Shockwave.java
+++ b/src/com/projectkorra/projectkorra/earthbending/Shockwave.java
@@ -6,7 +6,7 @@ import org.bukkit.util.Vector;
 
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.ShockwaveConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.ShockwaveConfig;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
 public class Shockwave extends EarthAbility<ShockwaveConfig> {
@@ -189,5 +189,10 @@ public class Shockwave extends EarthAbility<ShockwaveConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<ShockwaveConfig> getConfigType() {
+		return ShockwaveConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/Tremorsense.java b/src/com/projectkorra/projectkorra/earthbending/Tremorsense.java
index 0c125f37..8c1e3eb6 100644
--- a/src/com/projectkorra/projectkorra/earthbending/Tremorsense.java
+++ b/src/com/projectkorra/projectkorra/earthbending/Tremorsense.java
@@ -16,7 +16,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.TremorsenseConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.TremorsenseConfig;
 
 @SuppressWarnings("deprecation")
 public class Tremorsense extends EarthAbility<TremorsenseConfig> {
@@ -235,5 +235,10 @@ public class Tremorsense extends EarthAbility<TremorsenseConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<TremorsenseConfig> getConfigType() {
+		return TremorsenseConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/combo/EarthDomeOthers.java b/src/com/projectkorra/projectkorra/earthbending/combo/EarthDomeOthers.java
index a99a4dea..4e56929b 100644
--- a/src/com/projectkorra/projectkorra/earthbending/combo/EarthDomeOthers.java
+++ b/src/com/projectkorra/projectkorra/earthbending/combo/EarthDomeOthers.java
@@ -11,7 +11,7 @@ import org.bukkit.util.Vector;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthDomeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthDomeConfig;
 import com.projectkorra.projectkorra.earthbending.EarthDome;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
@@ -128,4 +128,9 @@ public class EarthDomeOthers extends EarthAbility<EarthDomeConfig> {
 	public boolean isHiddenAbility() {
 		return true;
 	}
+	
+	@Override
+	public Class<EarthDomeConfig> getConfigType() {
+		return EarthDomeConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/combo/EarthDomeSelf.java b/src/com/projectkorra/projectkorra/earthbending/combo/EarthDomeSelf.java
index f7eef61d..a3869e49 100644
--- a/src/com/projectkorra/projectkorra/earthbending/combo/EarthDomeSelf.java
+++ b/src/com/projectkorra/projectkorra/earthbending/combo/EarthDomeSelf.java
@@ -8,8 +8,8 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.ability.ComboAbility;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthDomeConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthDomeConfig;
 import com.projectkorra.projectkorra.earthbending.EarthDome;
 import com.projectkorra.projectkorra.util.ClickType;
 
@@ -61,4 +61,9 @@ public class EarthDomeSelf extends EarthAbility<EarthDomeConfig> implements Comb
 		combo.add(new AbilityInformation("Shockwave", ClickType.RIGHT_CLICK_BLOCK));
 		return combo;
 	}
+	
+	@Override
+	public Class<EarthDomeConfig> getConfigType() {
+		return EarthDomeConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/combo/EarthPillars.java b/src/com/projectkorra/projectkorra/earthbending/combo/EarthPillars.java
index 89944bde..2788d31a 100644
--- a/src/com/projectkorra/projectkorra/earthbending/combo/EarthPillars.java
+++ b/src/com/projectkorra/projectkorra/earthbending/combo/EarthPillars.java
@@ -17,9 +17,9 @@ import com.projectkorra.projectkorra.ability.ComboAbility;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.EarthPillarsConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.RaiseEarthConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.EarthPillarsConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.RaiseEarthConfig;
 import com.projectkorra.projectkorra.earthbending.RaiseEarth;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.DamageHandler;
@@ -164,4 +164,9 @@ public class EarthPillars extends EarthAbility<EarthPillarsConfig> implements Co
 		earthPillars.add(new AbilityInformation("Catapult", ClickType.SHIFT_UP));
 		return earthPillars;
 	}
+	
+	@Override
+	public Class<EarthPillarsConfig> getConfigType() {
+		return EarthPillarsConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/lava/LavaFlow.java b/src/com/projectkorra/projectkorra/earthbending/lava/LavaFlow.java
index 620a2e48..f48048a4 100644
--- a/src/com/projectkorra/projectkorra/earthbending/lava/LavaFlow.java
+++ b/src/com/projectkorra/projectkorra/earthbending/lava/LavaFlow.java
@@ -20,7 +20,7 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.ability.LavaAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.LavaFlowConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.LavaFlowConfig;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.Information;
@@ -947,5 +947,10 @@ public class LavaFlow extends LavaAbility<LavaFlowConfig> {
 	public ArrayList<BukkitRunnable> getTasks() {
 		return this.tasks;
 	}
+	
+	@Override
+	public Class<LavaFlowConfig> getConfigType() {
+		return LavaFlowConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/metal/Extraction.java b/src/com/projectkorra/projectkorra/earthbending/metal/Extraction.java
index 190df75b..58aca48e 100644
--- a/src/com/projectkorra/projectkorra/earthbending/metal/Extraction.java
+++ b/src/com/projectkorra/projectkorra/earthbending/metal/Extraction.java
@@ -12,7 +12,7 @@ import org.bukkit.inventory.ItemStack;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.MetalAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.ExtractionConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.ExtractionConfig;
 import com.projectkorra.projectkorra.util.TempBlock;
 
 public class Extraction extends MetalAbility<ExtractionConfig> {
@@ -160,5 +160,10 @@ public class Extraction extends MetalAbility<ExtractionConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<ExtractionConfig> getConfigType() {
+		return ExtractionConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/metal/MetalClips.java b/src/com/projectkorra/projectkorra/earthbending/metal/MetalClips.java
index 2f47dfc9..e2e5eab4 100644
--- a/src/com/projectkorra/projectkorra/earthbending/metal/MetalClips.java
+++ b/src/com/projectkorra/projectkorra/earthbending/metal/MetalClips.java
@@ -22,7 +22,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.MetalAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.MetalClipsConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.MetalClipsConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.TempArmor;
 
@@ -676,5 +676,10 @@ public class MetalClips extends MetalAbility<MetalClipsConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<MetalClipsConfig> getConfigType() {
+		return MetalClipsConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/passive/DensityShift.java b/src/com/projectkorra/projectkorra/earthbending/passive/DensityShift.java
index e3e4bd0e..f297dd42 100644
--- a/src/com/projectkorra/projectkorra/earthbending/passive/DensityShift.java
+++ b/src/com/projectkorra/projectkorra/earthbending/passive/DensityShift.java
@@ -15,9 +15,9 @@ import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.PassiveAbility;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.DensityShiftConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.DensityShiftConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
 import com.projectkorra.projectkorra.util.TempBlock;
 
 public class DensityShift extends EarthAbility<DensityShiftConfig> implements PassiveAbility {
@@ -133,4 +133,9 @@ public class DensityShift extends EarthAbility<DensityShiftConfig> implements Pa
 	public boolean isProgressable() {
 		return false;
 	}
+	
+	@Override
+	public Class<DensityShiftConfig> getConfigType() {
+		return DensityShiftConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/passive/FerroControl.java b/src/com/projectkorra/projectkorra/earthbending/passive/FerroControl.java
index 59aac847..073fd7f3 100644
--- a/src/com/projectkorra/projectkorra/earthbending/passive/FerroControl.java
+++ b/src/com/projectkorra/projectkorra/earthbending/passive/FerroControl.java
@@ -13,7 +13,7 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.MetalAbility;
 import com.projectkorra.projectkorra.ability.PassiveAbility;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.FerroControlConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.FerroControlConfig;
 
 public class FerroControl extends MetalAbility<FerroControlConfig> implements PassiveAbility {
 
@@ -99,4 +99,9 @@ public class FerroControl extends MetalAbility<FerroControlConfig> implements Pa
 	public boolean isProgressable() {
 		return true;
 	}
+	
+	@Override
+	public Class<FerroControlConfig> getConfigType() {
+		return FerroControlConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/earthbending/util/EarthbendingManager.java b/src/com/projectkorra/projectkorra/earthbending/util/EarthbendingManager.java
index b18a7ce7..cb5cede2 100644
--- a/src/com/projectkorra/projectkorra/earthbending/util/EarthbendingManager.java
+++ b/src/com/projectkorra/projectkorra/earthbending/util/EarthbendingManager.java
@@ -3,8 +3,8 @@ package com.projectkorra.projectkorra.earthbending.util;
 import org.bukkit.Bukkit;
 
 import com.projectkorra.projectkorra.ProjectKorra;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.earth.TremorsenseConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.earth.TremorsenseConfig;
 import com.projectkorra.projectkorra.earthbending.Shockwave;
 import com.projectkorra.projectkorra.earthbending.Tremorsense;
 import com.projectkorra.projectkorra.util.RevertChecker;
diff --git a/src/com/projectkorra/projectkorra/firebending/Blaze.java b/src/com/projectkorra/projectkorra/firebending/Blaze.java
index 35eac4d7..becba90d 100644
--- a/src/com/projectkorra/projectkorra/firebending/Blaze.java
+++ b/src/com/projectkorra/projectkorra/firebending/Blaze.java
@@ -7,7 +7,7 @@ import org.bukkit.util.Vector;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.avatar.AvatarState;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.BlazeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.BlazeConfig;
 
 public class Blaze extends FireAbility<BlazeConfig> {
 
@@ -86,5 +86,10 @@ public class Blaze extends FireAbility<BlazeConfig> {
 	public boolean isHarmlessAbility() {
 		return false;
 	}
+	
+	@Override
+	public Class<BlazeConfig> getConfigType() {
+		return BlazeConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/BlazeArc.java b/src/com/projectkorra/projectkorra/firebending/BlazeArc.java
index 52575471..fe7eaf87 100644
--- a/src/com/projectkorra/projectkorra/firebending/BlazeArc.java
+++ b/src/com/projectkorra/projectkorra/firebending/BlazeArc.java
@@ -16,7 +16,7 @@ import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.BlazeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.BlazeConfig;
 import com.projectkorra.projectkorra.waterbending.plant.PlantRegrowth;
 
 public class BlazeArc extends FireAbility<BlazeConfig> {
@@ -284,5 +284,10 @@ public class BlazeArc extends FireAbility<BlazeConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<BlazeConfig> getConfigType() {
+		return BlazeConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/BlazeRing.java b/src/com/projectkorra/projectkorra/firebending/BlazeRing.java
index db83b427..fed82d15 100644
--- a/src/com/projectkorra/projectkorra/firebending/BlazeRing.java
+++ b/src/com/projectkorra/projectkorra/firebending/BlazeRing.java
@@ -6,7 +6,7 @@ import org.bukkit.util.Vector;
 
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.BlazeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.BlazeConfig;
 
 public class BlazeRing extends FireAbility<BlazeConfig> {
 
@@ -105,5 +105,10 @@ public class BlazeRing extends FireAbility<BlazeConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<BlazeConfig> getConfigType() {
+		return BlazeConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/FireBlast.java b/src/com/projectkorra/projectkorra/firebending/FireBlast.java
index b4b543f6..2c3dd735 100644
--- a/src/com/projectkorra/projectkorra/firebending/FireBlast.java
+++ b/src/com/projectkorra/projectkorra/firebending/FireBlast.java
@@ -22,8 +22,8 @@ import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.avatar.AvatarState;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireBlastConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireBurstConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireBlastConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireBurstConfig;
 import com.projectkorra.projectkorra.firebending.util.FireDamageTimer;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
@@ -430,5 +430,10 @@ public class FireBlast extends FireAbility<FireBlastConfig> {
 			this.fireBurstIgnite = config.Ignite;
 		}
 	}
+	
+	@Override
+	public Class<FireBlastConfig> getConfigType() {
+		return FireBlastConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java b/src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java
index eabb24fe..3fa43402 100644
--- a/src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java
+++ b/src/com/projectkorra/projectkorra/firebending/FireBlastCharged.java
@@ -22,7 +22,7 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.avatar.AvatarState;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireBlastConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireBlastConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
@@ -488,5 +488,10 @@ public class FireBlastCharged extends FireAbility<FireBlastConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<FireBlastConfig> getConfigType() {
+		return FireBlastConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/FireBurst.java b/src/com/projectkorra/projectkorra/firebending/FireBurst.java
index b7d068e5..61c92821 100644
--- a/src/com/projectkorra/projectkorra/firebending/FireBurst.java
+++ b/src/com/projectkorra/projectkorra/firebending/FireBurst.java
@@ -14,9 +14,9 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireBlastConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireBurstConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireBlastConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireBurstConfig;
 
 public class FireBurst extends FireAbility<FireBurstConfig> {
 
@@ -265,5 +265,10 @@ public class FireBurst extends FireAbility<FireBurstConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<FireBurstConfig> getConfigType() {
+		return FireBurstConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/FireJet.java b/src/com/projectkorra/projectkorra/firebending/FireJet.java
index 1e75300b..f7f0e4f8 100644
--- a/src/com/projectkorra/projectkorra/firebending/FireJet.java
+++ b/src/com/projectkorra/projectkorra/firebending/FireJet.java
@@ -14,7 +14,7 @@ import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.airbending.AirSpout;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireJetConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireJetConfig;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
 public class FireJet extends FireAbility<FireJetConfig> {
@@ -181,5 +181,10 @@ public class FireJet extends FireAbility<FireJetConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<FireJetConfig> getConfigType() {
+		return FireJetConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/FireManipulation.java b/src/com/projectkorra/projectkorra/firebending/FireManipulation.java
index 22f34bba..a877456c 100644
--- a/src/com/projectkorra/projectkorra/firebending/FireManipulation.java
+++ b/src/com/projectkorra/projectkorra/firebending/FireManipulation.java
@@ -14,7 +14,7 @@ import org.bukkit.util.Vector;
 
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.FireAbility;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireManipulationConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireManipulationConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
@@ -229,4 +229,9 @@ public class FireManipulation extends FireAbility<FireManipulationConfig> {
 	public double getCollisionRadius() {
 		return 0.4;
 	}
+	
+	@Override
+	public Class<FireManipulationConfig> getConfigType() {
+		return FireManipulationConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/FireShield.java b/src/com/projectkorra/projectkorra/firebending/FireShield.java
index 8e9dfc10..37a961de 100644
--- a/src/com/projectkorra/projectkorra/firebending/FireShield.java
+++ b/src/com/projectkorra/projectkorra/firebending/FireShield.java
@@ -16,7 +16,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireShieldConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireShieldConfig;
 import com.projectkorra.projectkorra.firebending.util.FireDamageTimer;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
@@ -289,5 +289,10 @@ public class FireShield extends FireAbility<FireShieldConfig> {
 	public void setShieldCooldown(final long cooldown) {
 		this.shieldCooldown = cooldown;
 	}
+	
+	@Override
+	public Class<FireShieldConfig> getConfigType() {
+		return FireShieldConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/HeatControl.java b/src/com/projectkorra/projectkorra/firebending/HeatControl.java
index 91832791..a5423239 100644
--- a/src/com/projectkorra/projectkorra/firebending/HeatControl.java
+++ b/src/com/projectkorra/projectkorra/firebending/HeatControl.java
@@ -26,9 +26,9 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.HeatControlConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.PhaseChangeConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.HeatControlConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.PhaseChangeConfig;
 import com.projectkorra.projectkorra.earthbending.lava.LavaFlow;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 import com.projectkorra.projectkorra.util.TempBlock;
@@ -493,7 +493,11 @@ public class HeatControl extends FireAbility<HeatControlConfig> {
 
 	public static Collection<TempBlock> getMeltedBlocks() {
 		return MELTED_BLOCKS.values();
-
+	}
+	
+	@Override
+	public Class<HeatControlConfig> getConfigType() {
+		return HeatControlConfig.class;
 	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/Illumination.java b/src/com/projectkorra/projectkorra/firebending/Illumination.java
index 279d4298..06b8d7f0 100644
--- a/src/com/projectkorra/projectkorra/firebending/Illumination.java
+++ b/src/com/projectkorra/projectkorra/firebending/Illumination.java
@@ -14,7 +14,7 @@ import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.IlluminationConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.IlluminationConfig;
 import com.projectkorra.projectkorra.util.TempBlock;
 
 public class Illumination extends FireAbility<IlluminationConfig> {
@@ -209,5 +209,10 @@ public class Illumination extends FireAbility<IlluminationConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<IlluminationConfig> getConfigType() {
+		return IlluminationConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/WallOfFire.java b/src/com/projectkorra/projectkorra/firebending/WallOfFire.java
index 60aa751d..a8695d29 100644
--- a/src/com/projectkorra/projectkorra/firebending/WallOfFire.java
+++ b/src/com/projectkorra/projectkorra/firebending/WallOfFire.java
@@ -15,7 +15,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.WallOfFireConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.WallOfFireConfig;
 import com.projectkorra.projectkorra.firebending.util.FireDamageTimer;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
@@ -364,5 +364,10 @@ public class WallOfFire extends FireAbility<WallOfFireConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<WallOfFireConfig> getConfigType() {
+		return WallOfFireConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/combo/FireKick.java b/src/com/projectkorra/projectkorra/firebending/combo/FireKick.java
index 879387f1..f39eb31b 100644
--- a/src/com/projectkorra/projectkorra/firebending/combo/FireKick.java
+++ b/src/com/projectkorra/projectkorra/firebending/combo/FireKick.java
@@ -17,8 +17,8 @@ import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireKickConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireKickConfig;
 import com.projectkorra.projectkorra.util.ClickType;
 
 public class FireKick extends FireAbility<FireKickConfig> implements ComboAbility {
@@ -211,4 +211,9 @@ public class FireKick extends FireAbility<FireKickConfig> implements ComboAbilit
 	public void setTasks(final ArrayList<BukkitRunnable> tasks) {
 		this.tasks = tasks;
 	}
+	
+	@Override
+	public Class<FireKickConfig> getConfigType() {
+		return FireKickConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/combo/FireSpin.java b/src/com/projectkorra/projectkorra/firebending/combo/FireSpin.java
index 85641ebb..890db77e 100644
--- a/src/com/projectkorra/projectkorra/firebending/combo/FireSpin.java
+++ b/src/com/projectkorra/projectkorra/firebending/combo/FireSpin.java
@@ -18,8 +18,8 @@ import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireSpinConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireSpinConfig;
 import com.projectkorra.projectkorra.util.ClickType;
 
 public class FireSpin extends FireAbility<FireSpinConfig> implements ComboAbility {
@@ -214,4 +214,9 @@ public class FireSpin extends FireAbility<FireSpinConfig> implements ComboAbilit
 	public void setTasks(final ArrayList<BukkitRunnable> tasks) {
 		this.tasks = tasks;
 	}
+	
+	@Override
+	public Class<FireSpinConfig> getConfigType() {
+		return FireSpinConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/combo/FireWheel.java b/src/com/projectkorra/projectkorra/firebending/combo/FireWheel.java
index db0ef9be..2bdf3352 100644
--- a/src/com/projectkorra/projectkorra/firebending/combo/FireWheel.java
+++ b/src/com/projectkorra/projectkorra/firebending/combo/FireWheel.java
@@ -18,8 +18,8 @@ import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.FireWheelConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.FireWheelConfig;
 import com.projectkorra.projectkorra.firebending.util.FireDamageTimer;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.DamageHandler;
@@ -187,4 +187,9 @@ public class FireWheel extends FireAbility<FireWheelConfig> implements ComboAbil
 	public ArrayList<LivingEntity> getAffectedEntities() {
 		return this.affectedEntities;
 	}
+	
+	@Override
+	public Class<FireWheelConfig> getConfigType() {
+		return FireWheelConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/combo/JetBlast.java b/src/com/projectkorra/projectkorra/firebending/combo/JetBlast.java
index ea9547ec..a4421df1 100644
--- a/src/com/projectkorra/projectkorra/firebending/combo/JetBlast.java
+++ b/src/com/projectkorra/projectkorra/firebending/combo/JetBlast.java
@@ -11,8 +11,8 @@ import com.projectkorra.projectkorra.ability.ComboAbility;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.JetBlastConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.JetBlastConfig;
 import com.projectkorra.projectkorra.firebending.FireJet;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.ParticleEffect;
@@ -134,4 +134,9 @@ public class JetBlast extends FireAbility<JetBlastConfig> implements ComboAbilit
 	public boolean isHarmlessAbility() {
 		return false;
 	}
+	
+	@Override
+	public Class<JetBlastConfig> getConfigType() {
+		return JetBlastConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/combo/JetBlaze.java b/src/com/projectkorra/projectkorra/firebending/combo/JetBlaze.java
index 65b96fd3..2063e3c3 100644
--- a/src/com/projectkorra/projectkorra/firebending/combo/JetBlaze.java
+++ b/src/com/projectkorra/projectkorra/firebending/combo/JetBlaze.java
@@ -13,8 +13,8 @@ import com.projectkorra.projectkorra.ability.ComboAbility;
 import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.JetBlazeConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.JetBlazeConfig;
 import com.projectkorra.projectkorra.firebending.FireJet;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.ParticleEffect;
@@ -153,4 +153,9 @@ public class JetBlaze extends FireAbility<JetBlazeConfig> implements ComboAbilit
 	public ArrayList<LivingEntity> getAffectedEntities() {
 		return this.affectedEntities;
 	}
+	
+	@Override
+	public Class<JetBlazeConfig> getConfigType() {
+		return JetBlazeConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/combustion/Combustion.java b/src/com/projectkorra/projectkorra/firebending/combustion/Combustion.java
index 026ec18a..98284e32 100644
--- a/src/com/projectkorra/projectkorra/firebending/combustion/Combustion.java
+++ b/src/com/projectkorra/projectkorra/firebending/combustion/Combustion.java
@@ -15,7 +15,7 @@ import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.avatar.AvatarState;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.CombustionConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.CombustionConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 
@@ -286,5 +286,10 @@ public class Combustion extends CombustionAbility<CombustionConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<CombustionConfig> getConfigType() {
+		return CombustionConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/lightning/Lightning.java b/src/com/projectkorra/projectkorra/firebending/lightning/Lightning.java
index 255961c1..5eb0801e 100644
--- a/src/com/projectkorra/projectkorra/firebending/lightning/Lightning.java
+++ b/src/com/projectkorra/projectkorra/firebending/lightning/Lightning.java
@@ -16,7 +16,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.LightningAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.LightningConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.LightningConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.MovementHandler;
 
@@ -842,5 +842,10 @@ public class Lightning extends LightningAbility<LightningConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<LightningConfig> getConfigType() {
+		return LightningConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/firebending/passive/FirePassive.java b/src/com/projectkorra/projectkorra/firebending/passive/FirePassive.java
index ff4dc7ff..5dc26ef4 100644
--- a/src/com/projectkorra/projectkorra/firebending/passive/FirePassive.java
+++ b/src/com/projectkorra/projectkorra/firebending/passive/FirePassive.java
@@ -5,9 +5,9 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.BendingPlayer;
 import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.fire.IlluminationConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.fire.IlluminationConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
 import com.projectkorra.projectkorra.earthbending.Tremorsense;
 import com.projectkorra.projectkorra.firebending.Illumination;
 
diff --git a/src/com/projectkorra/projectkorra/hooks/PlaceholderAPIHook.java b/src/com/projectkorra/projectkorra/hooks/PlaceholderAPIHook.java
index f24dcd98..f53ac7fb 100644
--- a/src/com/projectkorra/projectkorra/hooks/PlaceholderAPIHook.java
+++ b/src/com/projectkorra/projectkorra/hooks/PlaceholderAPIHook.java
@@ -9,8 +9,8 @@ import com.projectkorra.projectkorra.BendingPlayer;
 import com.projectkorra.projectkorra.Element;
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.CoreAbility;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.ChatPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.properties.ChatPropertiesConfig;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 
diff --git a/src/com/projectkorra/projectkorra/object/HorizontalVelocityTracker.java b/src/com/projectkorra/projectkorra/object/HorizontalVelocityTracker.java
index d441adaf..8c9936f3 100644
--- a/src/com/projectkorra/projectkorra/object/HorizontalVelocityTracker.java
+++ b/src/com/projectkorra/projectkorra/object/HorizontalVelocityTracker.java
@@ -19,8 +19,8 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.Ability;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
 import com.projectkorra.projectkorra.event.HorizontalVelocityChangeEvent;
 
 public class HorizontalVelocityTracker {
diff --git a/src/com/projectkorra/projectkorra/storage/DBConnection.java b/src/com/projectkorra/projectkorra/storage/DBConnection.java
index 161f0f52..d92a29c1 100644
--- a/src/com/projectkorra/projectkorra/storage/DBConnection.java
+++ b/src/com/projectkorra/projectkorra/storage/DBConnection.java
@@ -5,8 +5,8 @@ import java.sql.SQLException;
 
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ProjectKorra;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
 
 public class DBConnection {
 
diff --git a/src/com/projectkorra/projectkorra/util/BlockSource.java b/src/com/projectkorra/projectkorra/util/BlockSource.java
index 255bfb50..ed985e1b 100644
--- a/src/com/projectkorra/projectkorra/util/BlockSource.java
+++ b/src/com/projectkorra/projectkorra/util/BlockSource.java
@@ -11,9 +11,9 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.EarthAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.WaterAbility;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.EarthPropertiesConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.properties.EarthPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
 
 /**
  * BlockSource is a class that handles water and earth bending sources. When a
diff --git a/src/com/projectkorra/projectkorra/util/PassiveHandler.java b/src/com/projectkorra/projectkorra/util/PassiveHandler.java
index 0bc1427d..f8514463 100644
--- a/src/com/projectkorra/projectkorra/util/PassiveHandler.java
+++ b/src/com/projectkorra/projectkorra/util/PassiveHandler.java
@@ -12,8 +12,8 @@ import com.projectkorra.projectkorra.ability.util.PassiveManager;
 import com.projectkorra.projectkorra.airbending.passive.AirSaturation;
 import com.projectkorra.projectkorra.chiblocking.passive.ChiSaturation;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
 
 public class PassiveHandler {
 	private static final Map<Player, Float> FOOD = new ConcurrentHashMap<>();
diff --git a/src/com/projectkorra/projectkorra/util/RevertChecker.java b/src/com/projectkorra/projectkorra/util/RevertChecker.java
index a571ac5c..6c98ada5 100644
--- a/src/com/projectkorra/projectkorra/util/RevertChecker.java
+++ b/src/com/projectkorra/projectkorra/util/RevertChecker.java
@@ -14,8 +14,8 @@ import org.bukkit.entity.Player;
 
 import com.projectkorra.projectkorra.ProjectKorra;
 import com.projectkorra.projectkorra.ability.EarthAbility;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.EarthPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.properties.EarthPropertiesConfig;
 
 import io.papermc.lib.PaperLib;
 
diff --git a/src/com/projectkorra/projectkorra/waterbending/OctopusForm.java b/src/com/projectkorra/projectkorra/waterbending/OctopusForm.java
index e0efd7a8..dd8d6dfa 100644
--- a/src/com/projectkorra/projectkorra/waterbending/OctopusForm.java
+++ b/src/com/projectkorra/projectkorra/waterbending/OctopusForm.java
@@ -19,9 +19,9 @@ import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.avatar.AvatarState;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.OctopusFormConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.PhaseChangeConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.OctopusFormConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.PhaseChangeConfig;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.DamageHandler;
@@ -715,5 +715,10 @@ public class OctopusForm extends WaterAbility<OctopusFormConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<OctopusFormConfig> getConfigType() {
+		return OctopusFormConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java b/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
index af6bb11b..b451f74a 100644
--- a/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
+++ b/src/com/projectkorra/projectkorra/waterbending/SurgeWall.java
@@ -19,7 +19,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.SurgeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.SurgeConfig;
 import com.projectkorra.projectkorra.firebending.FireBlast;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
@@ -668,5 +668,10 @@ public class SurgeWall extends WaterAbility<SurgeConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<SurgeConfig> getConfigType() {
+		return SurgeConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/SurgeWave.java b/src/com/projectkorra/projectkorra/waterbending/SurgeWave.java
index 8320cece..a297575c 100644
--- a/src/com/projectkorra/projectkorra/waterbending/SurgeWave.java
+++ b/src/com/projectkorra/projectkorra/waterbending/SurgeWave.java
@@ -22,9 +22,9 @@ import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.avatar.AvatarState;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.SurgeConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.SurgeConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
 import com.projectkorra.projectkorra.firebending.FireBlast;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
@@ -644,5 +644,10 @@ public class SurgeWave extends WaterAbility<SurgeConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<SurgeConfig> getConfigType() {
+		return SurgeConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/Torrent.java b/src/com/projectkorra/projectkorra/waterbending/Torrent.java
index a2b1b5ed..76310282 100644
--- a/src/com/projectkorra/projectkorra/waterbending/Torrent.java
+++ b/src/com/projectkorra/projectkorra/waterbending/Torrent.java
@@ -23,9 +23,9 @@ import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.avatar.AvatarState;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.TorrentConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.TorrentConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.DamageHandler;
@@ -981,4 +981,9 @@ public class Torrent extends WaterAbility<TorrentConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<TorrentConfig> getConfigType() {
+		return TorrentConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/TorrentWave.java b/src/com/projectkorra/projectkorra/waterbending/TorrentWave.java
index 4e9d86d2..11b68cac 100644
--- a/src/com/projectkorra/projectkorra/waterbending/TorrentWave.java
+++ b/src/com/projectkorra/projectkorra/waterbending/TorrentWave.java
@@ -17,7 +17,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.TorrentConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.TorrentConfig;
 import com.projectkorra.projectkorra.util.TempBlock;
 import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
 
@@ -318,5 +318,10 @@ public class TorrentWave extends WaterAbility<TorrentConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<TorrentConfig> getConfigType() {
+		return TorrentConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterBubble.java b/src/com/projectkorra/projectkorra/waterbending/WaterBubble.java
index 8cdc5f00..7d636fa8 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterBubble.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterBubble.java
@@ -18,7 +18,7 @@ import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterBubbleConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterBubbleConfig;
 import com.projectkorra.projectkorra.util.TempBlock;
 
 public class WaterBubble extends WaterAbility<WaterBubbleConfig> {
@@ -218,5 +218,10 @@ public class WaterBubble extends WaterAbility<WaterBubbleConfig> {
 		}
 		return false;
 	}
+	
+	@Override
+	public Class<WaterBubbleConfig> getConfigType() {
+		return WaterBubbleConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java b/src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java
index f5353d57..1e3c3396 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java
@@ -21,7 +21,7 @@ import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterManipulationConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterManipulationConfig;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.DamageHandler;
@@ -798,5 +798,10 @@ public class WaterManipulation extends WaterAbility<WaterManipulationConfig> {
 	public void setCollisionRadius(final double collisionRadius) {
 		this.collisionRadius = collisionRadius;
 	}
+	
+	@Override
+	public Class<WaterManipulationConfig> getConfigType() {
+		return WaterManipulationConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterSpout.java b/src/com/projectkorra/projectkorra/waterbending/WaterSpout.java
index 687b2204..48fa5733 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterSpout.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterSpout.java
@@ -17,7 +17,7 @@ import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterSpoutConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterSpoutConfig;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 import com.projectkorra.projectkorra.util.TempBlock;
 
@@ -460,5 +460,10 @@ public class WaterSpout extends WaterAbility<WaterSpoutConfig> {
 	public static Map<Block, Block> getAffectedBlocks() {
 		return AFFECTED_BLOCKS;
 	}
+	
+	@Override
+	public Class<WaterSpoutConfig> getConfigType() {
+		return WaterSpoutConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/WaterSpoutWave.java b/src/com/projectkorra/projectkorra/waterbending/WaterSpoutWave.java
index dcac56a8..45202cc1 100644
--- a/src/com/projectkorra/projectkorra/waterbending/WaterSpoutWave.java
+++ b/src/com/projectkorra/projectkorra/waterbending/WaterSpoutWave.java
@@ -26,11 +26,10 @@ import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.IceWaveConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterSpoutConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterSpoutConfig.WaterSpoutWaveConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.IceWaveConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterSpoutConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.TempBlock;
 import com.projectkorra.projectkorra.waterbending.combo.IceWave;
@@ -752,4 +751,9 @@ public class WaterSpoutWave extends WaterAbility<WaterSpoutConfig> {
 	public boolean allowBreakPlants() {
 		return false;
 	}
+	
+	@Override
+	public Class<WaterSpoutConfig> getConfigType() {
+		return WaterSpoutConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/blood/Bloodbending.java b/src/com/projectkorra/projectkorra/waterbending/blood/Bloodbending.java
index 46228deb..2edfd386 100644
--- a/src/com/projectkorra/projectkorra/waterbending/blood/Bloodbending.java
+++ b/src/com/projectkorra/projectkorra/waterbending/blood/Bloodbending.java
@@ -22,7 +22,7 @@ import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.BloodAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.avatar.AvatarState;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.BloodbendingConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.BloodbendingConfig;
 import com.projectkorra.projectkorra.object.HorizontalVelocityTracker;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.TempPotionEffect;
@@ -444,5 +444,10 @@ public class Bloodbending extends BloodAbility<BloodbendingConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<BloodbendingConfig> getConfigType() {
+		return BloodbendingConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/combo/IceBullet.java b/src/com/projectkorra/projectkorra/waterbending/combo/IceBullet.java
index 425904a0..2d328071 100644
--- a/src/com/projectkorra/projectkorra/waterbending/combo/IceBullet.java
+++ b/src/com/projectkorra/projectkorra/waterbending/combo/IceBullet.java
@@ -25,8 +25,8 @@ import com.projectkorra.projectkorra.ability.util.Collision;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.avatar.AvatarState;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.IceBulletConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.IceBulletConfig;
 import com.projectkorra.projectkorra.firebending.combo.FireComboStream;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
@@ -520,5 +520,10 @@ public class IceBullet extends IceAbility<IceBulletConfig> implements ComboAbili
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<IceBulletConfig> getConfigType() {
+		return IceBulletConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/combo/IceWave.java b/src/com/projectkorra/projectkorra/waterbending/combo/IceWave.java
index dc484c1e..42fae6f0 100644
--- a/src/com/projectkorra/projectkorra/waterbending/combo/IceWave.java
+++ b/src/com/projectkorra/projectkorra/waterbending/combo/IceWave.java
@@ -12,8 +12,8 @@ import com.projectkorra.projectkorra.ability.ComboAbility;
 import com.projectkorra.projectkorra.ability.IceAbility;
 import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.IceWaveConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.IceWaveConfig;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.TempBlock;
 import com.projectkorra.projectkorra.waterbending.WaterSpoutWave;
@@ -127,4 +127,9 @@ public class IceWave extends IceAbility<IceWaveConfig> implements ComboAbility {
 		iceWave.add(new AbilityInformation("PhaseChange", ClickType.LEFT_CLICK));
 		return iceWave;
 	}
+	
+	@Override
+	public Class<IceWaveConfig> getConfigType() {
+		return IceWaveConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/healing/HealingWaters.java b/src/com/projectkorra/projectkorra/waterbending/healing/HealingWaters.java
index 5c74e26d..6c8bb68a 100644
--- a/src/com/projectkorra/projectkorra/waterbending/healing/HealingWaters.java
+++ b/src/com/projectkorra/projectkorra/waterbending/healing/HealingWaters.java
@@ -20,7 +20,7 @@ import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.HealingAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.chiblocking.Smokescreen;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.HealingWatersConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.HealingWatersConfig;
 import com.projectkorra.projectkorra.util.TempBlock;
 import com.projectkorra.projectkorra.waterbending.util.WaterReturn;
 
@@ -357,5 +357,10 @@ public class HealingWaters extends HealingAbility<HealingWatersConfig> {
 	public Location getLocation() {
 		return this.location;
 	}
+	
+	@Override
+	public Class<HealingWatersConfig> getConfigType() {
+		return HealingWatersConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/ice/IceBlast.java b/src/com/projectkorra/projectkorra/waterbending/ice/IceBlast.java
index f70ef4d6..155cb100 100644
--- a/src/com/projectkorra/projectkorra/waterbending/ice/IceBlast.java
+++ b/src/com/projectkorra/projectkorra/waterbending/ice/IceBlast.java
@@ -20,7 +20,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.IceAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.IceBlastConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.IceBlastConfig;
 import com.projectkorra.projectkorra.util.BlockSource;
 import com.projectkorra.projectkorra.util.ClickType;
 import com.projectkorra.projectkorra.util.DamageHandler;
@@ -493,5 +493,10 @@ public class IceBlast extends IceAbility<IceBlastConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<IceBlastConfig> getConfigType() {
+		return IceBlastConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikeBlast.java b/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikeBlast.java
index 75db2945..aabe0a5d 100644
--- a/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikeBlast.java
+++ b/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikeBlast.java
@@ -18,7 +18,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.AirAbility;
 import com.projectkorra.projectkorra.ability.IceAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.IceSpikeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.IceSpikeConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.TempBlock;
 import com.projectkorra.projectkorra.util.TempPotionEffect;
@@ -603,5 +603,10 @@ public class IceSpikeBlast extends IceAbility<IceSpikeConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<IceSpikeConfig> getConfigType() {
+		return IceSpikeConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillar.java b/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillar.java
index 8c809517..feaca184 100644
--- a/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillar.java
+++ b/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillar.java
@@ -22,7 +22,7 @@ import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.IceAbility;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.IceSpikeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.IceSpikeConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.TempBlock;
 import com.projectkorra.projectkorra.util.TempPotionEffect;
@@ -451,5 +451,10 @@ public class IceSpikePillar extends IceAbility<IceSpikeConfig> {
 	public Block getBaseBlock() {
 		return this.base_block;
 	}
+	
+	@Override
+	public Class<IceSpikeConfig> getConfigType() {
+		return IceSpikeConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillarField.java b/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillarField.java
index 626aa588..eb5ba680 100644
--- a/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillarField.java
+++ b/src/com/projectkorra/projectkorra/waterbending/ice/IceSpikePillarField.java
@@ -18,7 +18,7 @@ import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.IceAbility;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.IceSpikeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.IceSpikeConfig;
 import com.projectkorra.projectkorra.util.TempBlock;
 
 public class IceSpikePillarField extends IceAbility<IceSpikeConfig> {
@@ -188,5 +188,10 @@ public class IceSpikePillarField extends IceAbility<IceSpikeConfig> {
 	public void setCooldown(final long cooldown) {
 		this.cooldown = cooldown;
 	}
+	
+	@Override
+	public Class<IceSpikeConfig> getConfigType() {
+		return IceSpikeConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/ice/PhaseChange.java b/src/com/projectkorra/projectkorra/waterbending/ice/PhaseChange.java
index 25cdb046..23cb4c64 100644
--- a/src/com/projectkorra/projectkorra/waterbending/ice/PhaseChange.java
+++ b/src/com/projectkorra/projectkorra/waterbending/ice/PhaseChange.java
@@ -19,7 +19,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.IceAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.PhaseChangeConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.PhaseChangeConfig;
 import com.projectkorra.projectkorra.util.TempBlock;
 import com.projectkorra.projectkorra.waterbending.SurgeWall;
 import com.projectkorra.projectkorra.waterbending.SurgeWave;
@@ -565,4 +565,9 @@ public class PhaseChange extends IceAbility<PhaseChangeConfig> {
 	public List<PhaseChangeType> getActiveTypes() {
 		return this.active_types;
 	}
+	
+	@Override
+	public Class<PhaseChangeConfig> getConfigType() {
+		return PhaseChangeConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArms.java b/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArms.java
index 065d0900..71e8d78f 100644
--- a/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArms.java
+++ b/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArms.java
@@ -20,7 +20,7 @@ import com.projectkorra.projectkorra.ability.FireAbility;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
 import com.projectkorra.projectkorra.attribute.Attribute;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterArmsConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterArmsConfig;
 import com.projectkorra.projectkorra.firebending.lightning.Lightning;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
@@ -759,4 +759,9 @@ public class WaterArms extends WaterAbility<WaterArmsConfig> {
 			this.right.add(block);
 		}
 	}
+	
+	@Override
+	public Class<WaterArmsConfig> getConfigType() {
+		return WaterArmsConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsFreeze.java b/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsFreeze.java
index 6c30437b..d0549b79 100644
--- a/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsFreeze.java
+++ b/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsFreeze.java
@@ -15,7 +15,7 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.IceAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterArmsConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterArmsConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 import com.projectkorra.projectkorra.util.TempBlock;
@@ -267,5 +267,10 @@ public class WaterArmsFreeze extends IceAbility<WaterArmsConfig> {
 	public void setLocation(final Location location) {
 		this.location = location;
 	}
+	
+	@Override
+	public Class<WaterArmsConfig> getConfigType() {
+		return WaterArmsConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsSpear.java b/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsSpear.java
index ba78dc43..5427328f 100644
--- a/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsSpear.java
+++ b/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsSpear.java
@@ -19,9 +19,9 @@ import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterArmsConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterArmsConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.TempBlock;
 import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArms.Arm;
@@ -481,5 +481,10 @@ public class WaterArmsSpear extends WaterAbility<WaterArmsConfig> {
 	public static Map<Block, Long> getIceBlocks() {
 		return ICE_BLOCKS;
 	}
+	
+	@Override
+	public Class<WaterArmsConfig> getConfigType() {
+		return WaterArmsConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsWhip.java b/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsWhip.java
index 33765605..693b6c6b 100644
--- a/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsWhip.java
+++ b/src/com/projectkorra/projectkorra/waterbending/multiabilities/WaterArmsWhip.java
@@ -17,7 +17,7 @@ import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.ability.util.MultiAbilityManager;
 import com.projectkorra.projectkorra.attribute.Attribute;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.WaterArmsConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.WaterArmsConfig;
 import com.projectkorra.projectkorra.util.DamageHandler;
 import com.projectkorra.projectkorra.util.TempBlock;
 import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArms.Arm;
@@ -671,5 +671,10 @@ public class WaterArmsWhip extends WaterAbility<WaterArmsConfig> {
 	public static HashMap<LivingEntity, WaterArmsWhip> getGrabbedEntities() {
 		return GRABBED_ENTITIES;
 	}
+	
+	@Override
+	public Class<WaterArmsConfig> getConfigType() {
+		return WaterArmsConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/passive/FastSwim.java b/src/com/projectkorra/projectkorra/waterbending/passive/FastSwim.java
index 3d0ec100..475237c3 100644
--- a/src/com/projectkorra/projectkorra/waterbending/passive/FastSwim.java
+++ b/src/com/projectkorra/projectkorra/waterbending/passive/FastSwim.java
@@ -6,8 +6,8 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.ability.CoreAbility;
 import com.projectkorra.projectkorra.ability.PassiveAbility;
 import com.projectkorra.projectkorra.ability.WaterAbility;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.FastSwimConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.FastSwimConfig;
 import com.projectkorra.projectkorra.earthbending.EarthArmor;
 import com.projectkorra.projectkorra.waterbending.WaterSpout;
 import com.projectkorra.projectkorra.waterbending.multiabilities.WaterArms;
@@ -98,4 +98,9 @@ public class FastSwim extends WaterAbility<FastSwimConfig> implements PassiveAbi
 	public boolean isProgressable() {
 		return true;
 	}
+	
+	@Override
+	public Class<FastSwimConfig> getConfigType() {
+		return FastSwimConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/passive/HydroSink.java b/src/com/projectkorra/projectkorra/waterbending/passive/HydroSink.java
index abdd2fed..69b6acbd 100644
--- a/src/com/projectkorra/projectkorra/waterbending/passive/HydroSink.java
+++ b/src/com/projectkorra/projectkorra/waterbending/passive/HydroSink.java
@@ -10,9 +10,9 @@ import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.PassiveAbility;
 import com.projectkorra.projectkorra.ability.WaterAbility;
 import com.projectkorra.projectkorra.command.Commands;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.water.HydroSinkConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.GeneralPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.water.HydroSinkConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.GeneralPropertiesConfig;
 import com.projectkorra.projectkorra.util.TempBlock;
 
 public class HydroSink extends WaterAbility<HydroSinkConfig> implements PassiveAbility {
@@ -77,4 +77,9 @@ public class HydroSink extends WaterAbility<HydroSinkConfig> implements PassiveA
 	public boolean isProgressable() {
 		return false;
 	}
+	
+	@Override
+	public Class<HydroSinkConfig> getConfigType() {
+		return HydroSinkConfig.class;
+	}
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/plant/PlantRegrowth.java b/src/com/projectkorra/projectkorra/waterbending/plant/PlantRegrowth.java
index e3fc46a3..889d9055 100644
--- a/src/com/projectkorra/projectkorra/waterbending/plant/PlantRegrowth.java
+++ b/src/com/projectkorra/projectkorra/waterbending/plant/PlantRegrowth.java
@@ -10,9 +10,9 @@ import org.bukkit.entity.Player;
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.ElementalAbility;
 import com.projectkorra.projectkorra.ability.PlantAbility;
-import com.projectkorra.projectkorra.configuration.better.ConfigManager;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.EmptyAbilityConfig;
-import com.projectkorra.projectkorra.configuration.better.configs.properties.WaterPropertiesConfig;
+import com.projectkorra.projectkorra.configuration.ConfigManager;
+import com.projectkorra.projectkorra.configuration.configs.abilities.EmptyAbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.properties.WaterPropertiesConfig;
 
 public class PlantRegrowth extends PlantAbility<EmptyAbilityConfig> {
 
@@ -140,5 +140,10 @@ public class PlantRegrowth extends PlantAbility<EmptyAbilityConfig> {
 	public void setBlock(final Block block) {
 		this.block = block;
 	}
+	
+	@Override
+	public Class<EmptyAbilityConfig> getConfigType() {
+		return EmptyAbilityConfig.class;
+	}
 
 }
diff --git a/src/com/projectkorra/projectkorra/waterbending/util/WaterReturn.java b/src/com/projectkorra/projectkorra/waterbending/util/WaterReturn.java
index 80bafc92..52dd2c28 100644
--- a/src/com/projectkorra/projectkorra/waterbending/util/WaterReturn.java
+++ b/src/com/projectkorra/projectkorra/waterbending/util/WaterReturn.java
@@ -15,7 +15,7 @@ import org.bukkit.util.Vector;
 
 import com.projectkorra.projectkorra.GeneralMethods;
 import com.projectkorra.projectkorra.ability.WaterAbility;
-import com.projectkorra.projectkorra.configuration.better.configs.abilities.EmptyAbilityConfig;
+import com.projectkorra.projectkorra.configuration.configs.abilities.EmptyAbilityConfig;
 import com.projectkorra.projectkorra.util.ParticleEffect;
 import com.projectkorra.projectkorra.util.TempBlock;
 import com.projectkorra.projectkorra.waterbending.OctopusForm;
@@ -269,5 +269,10 @@ public class WaterReturn extends WaterAbility<EmptyAbilityConfig> {
 	public boolean isHiddenAbility() {
 		return true;
 	}
+	
+	@Override
+	public Class<EmptyAbilityConfig> getConfigType() {
+		return EmptyAbilityConfig.class;
+	}
 
 }