diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java b/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java
index c46d51fef..ec37f83a1 100644
--- a/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java
@@ -26,7 +26,7 @@ public class CustomArmorConfig extends ConfigLoader {
     private List<Material> customLeggings    = new ArrayList<Material>();
 
     public CustomArmorConfig() {
-        super("ModConfigs", "armor.yml");
+        super("mods", "armor.yml");
         loadKeys();
     }
 
diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java b/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java
index 3dbb928de..6679d4a40 100644
--- a/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java
@@ -28,7 +28,7 @@ public class CustomBlockConfig extends ConfigLoader {
     private HashMap<MaterialData, CustomBlock> customBlockMap = new HashMap<MaterialData, CustomBlock>();
 
     public CustomBlockConfig() {
-        super("ModConfigs", "blocks.yml");
+        super("mods", "blocks.yml");
         loadKeys();
     }
 
diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java b/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java
index b396b65a6..c001d6f78 100644
--- a/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java
@@ -18,7 +18,7 @@ public class CustomEntityConfig extends ConfigLoader {
     private HashMap<String, CustomEntity> customEntityTypeMap  = new HashMap<String, CustomEntity>();
 
     public CustomEntityConfig() {
-        super("ModConfigs", "entities.yml");
+        super("mods", "entities.yml");
         loadKeys();
     }
 
diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java b/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java
index 0073fd6a1..2642fc178 100644
--- a/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java
@@ -31,7 +31,7 @@ public class CustomToolConfig extends ConfigLoader {
     private HashMap<Material, CustomTool> customToolMap = new HashMap<Material, CustomTool>();
 
     private CustomToolConfig() {
-        super("ModConfigs", "tools.yml");
+        super("mods", "tools.yml");
         loadKeys();
     }
 
diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java
index 830ce70ff..105c0fc6a 100644
--- a/src/main/java/com/gmail/nossr50/mcMMO.java
+++ b/src/main/java/com/gmail/nossr50/mcMMO.java
@@ -289,7 +289,7 @@ public class mcMMO extends JavaPlugin {
         mainDirectory = getDataFolder().getPath() + File.separator;
         flatFileDirectory = mainDirectory + "FlatFileStuff" + File.separator;
         usersFile = flatFileDirectory + "mcmmo.users";
-        modDirectory = mainDirectory + "ModConfigs" + File.separator;
+        modDirectory = mainDirectory + "mods" + File.separator;
     }
 
     private void checkForUpdates() {
diff --git a/src/main/resources/armor.yml b/src/main/resources/mods/armor.yml
similarity index 100%
rename from src/main/resources/armor.yml
rename to src/main/resources/mods/armor.yml
diff --git a/src/main/resources/blocks.yml b/src/main/resources/mods/blocks.yml
similarity index 100%
rename from src/main/resources/blocks.yml
rename to src/main/resources/mods/blocks.yml
diff --git a/src/main/resources/entities.yml b/src/main/resources/mods/entities.yml
similarity index 100%
rename from src/main/resources/entities.yml
rename to src/main/resources/mods/entities.yml
diff --git a/src/main/resources/tools.yml b/src/main/resources/mods/tools.yml
similarity index 100%
rename from src/main/resources/tools.yml
rename to src/main/resources/mods/tools.yml