diff --git a/src/engine/parsers/wpak/CharCreateRuneParser.java b/src/engine/parsers/wpak/CharCreateRuneParser.java
index 7990f7fa..3e58053d 100644
--- a/src/engine/parsers/wpak/CharCreateRuneParser.java
+++ b/src/engine/parsers/wpak/CharCreateRuneParser.java
@@ -18,7 +18,7 @@ import java.util.ArrayList;
 
 public class CharCreateRuneParser {
 
-    private static final String fileName = "CharCreateRuneList.cfg";
+    private static final String fileName = "Config/CharCreateRuneList.cfg";
 
     public static CharCreateRuneList parseCharCreateRuneFile() {
 
diff --git a/src/engine/parsers/wpak/CompoundCurveParser.java b/src/engine/parsers/wpak/CompoundCurveParser.java
index e54d9e49..cfec7c4e 100644
--- a/src/engine/parsers/wpak/CompoundCurveParser.java
+++ b/src/engine/parsers/wpak/CompoundCurveParser.java
@@ -18,7 +18,7 @@ import java.util.HashMap;
 
 public class CompoundCurveParser {
 
-    private static final String fileName = "CompoundCurves.cfg";
+    private static final String fileName = "Config/CompoundCurves.cfg";
 
     // Segments run back to back on one line, so the param count per simple curve
     // is what tells where the next segment starts.
diff --git a/src/engine/parsers/wpak/EffectParser.java b/src/engine/parsers/wpak/EffectParser.java
index b0bc9669..426ec872 100644
--- a/src/engine/parsers/wpak/EffectParser.java
+++ b/src/engine/parsers/wpak/EffectParser.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
 
 public class EffectParser {
 
-    private static final String fileName = "Effects.cfg";
+    private static final String fileName = "Config/Effects.cfg";
 
     public static HashMap<String, EffectTemplate> parseEffectsFile() {
 
diff --git a/src/engine/parsers/wpak/ModTypeParser.java b/src/engine/parsers/wpak/ModTypeParser.java
index 1e3f5208..47abc751 100644
--- a/src/engine/parsers/wpak/ModTypeParser.java
+++ b/src/engine/parsers/wpak/ModTypeParser.java
@@ -18,7 +18,7 @@ import java.util.HashMap;
 
 public class ModTypeParser {
 
-    private static final String fileName = "ModTypes.cfg";
+    private static final String fileName = "Config/ModTypes.cfg";
 
     public static HashMap<String, ModTypeTemplate> parseModTypesFile() {
 
diff --git a/src/engine/parsers/wpak/PowActionCostParser.java b/src/engine/parsers/wpak/PowActionCostParser.java
index 5560997b..b2a5f40d 100644
--- a/src/engine/parsers/wpak/PowActionCostParser.java
+++ b/src/engine/parsers/wpak/PowActionCostParser.java
@@ -19,7 +19,7 @@ import java.util.HashMap;
 
 public class PowActionCostParser {
 
-    private static final String fileName = "PowActionCostInfo.cfg";
+    private static final String fileName = "Config/PowActionCostInfo.cfg";
 
     public static HashMap<String, PowActionCostTemplate> parsePowActionCostFile() {
 
diff --git a/src/engine/parsers/wpak/PowerActionParser.java b/src/engine/parsers/wpak/PowerActionParser.java
index ab851d81..10ae3905 100644
--- a/src/engine/parsers/wpak/PowerActionParser.java
+++ b/src/engine/parsers/wpak/PowerActionParser.java
@@ -20,7 +20,7 @@ import java.util.HashMap;
 
 public class PowerActionParser {
 
-    private static final String fileName = "PowerActions.cfg";
+    private static final String fileName = "Config/PowerActions.cfg";
 
     public static HashMap<String, PowerActionTemplate> parsePowerActionsFile() {
 
diff --git a/src/engine/parsers/wpak/PowerParser.java b/src/engine/parsers/wpak/PowerParser.java
index a2973ca5..d912b2dc 100644
--- a/src/engine/parsers/wpak/PowerParser.java
+++ b/src/engine/parsers/wpak/PowerParser.java
@@ -21,7 +21,7 @@ import java.util.HashSet;
 
 public class PowerParser {
 
-    private static final String fileName = "Powers.cfg";
+    private static final String fileName = "Config/Powers.cfg";
     private static final int headerSize = 22;
 
     // Keys the client's loader doesn't know and skips; "POWEREND=" is a typo for CURVE= on one power
diff --git a/src/engine/parsers/wpak/SkillParser.java b/src/engine/parsers/wpak/SkillParser.java
index ca7ddbcf..83335978 100644
--- a/src/engine/parsers/wpak/SkillParser.java
+++ b/src/engine/parsers/wpak/SkillParser.java
@@ -19,7 +19,7 @@ import java.util.HashMap;
 
 public class SkillParser {
 
-    private static final String fileName = "Skills.cfg";
+    private static final String fileName = "Config/Skills.cfg";
 
     public static HashMap<String, SkillTemplate> parseSkillsFile() {
 
diff --git a/src/engine/parsers/wpak/StartingKitParser.java b/src/engine/parsers/wpak/StartingKitParser.java
index 878d5c3d..d980cdff 100644
--- a/src/engine/parsers/wpak/StartingKitParser.java
+++ b/src/engine/parsers/wpak/StartingKitParser.java
@@ -18,7 +18,7 @@ import java.util.ArrayList;
 
 public class StartingKitParser {
 
-    private static final String fileName = "StartingKitTable.cfg";
+    private static final String fileName = "Config/StartingKitTable.cfg";
     private static final int maxKitItems = 10;
 
     public static ArrayList<StartingKitTemplate> parseStartingKitFile() {
diff --git a/src/engine/parsers/wpak/WpakFileReader.java b/src/engine/parsers/wpak/WpakFileReader.java
index bc5771c7..edbb7367 100644
--- a/src/engine/parsers/wpak/WpakFileReader.java
+++ b/src/engine/parsers/wpak/WpakFileReader.java
@@ -18,11 +18,12 @@ import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.List;
 
-// Reads the client's wpak cfg files (an mbEditorPro export of Config.wpak) into
-// tokenized lines and XxxBEGIN/XxxEND blocks. Each parser maps the tokens itself.
+// Reads the client's wpak cfg files (an mbEditorPro export) into tokenized lines and
+// XxxBEGIN/XxxEND blocks. Each parser maps the tokens itself.
 
 public class WpakFileReader {
 
+    // One folder per archive, as the client names them: wpak/Config/Powers.cfg is Powers.cfg in Config/Config.wpak
     public static final String wpakPath = ConfigManager.DEFAULT_DATA_DIR + "wpak/";
 
     // Lines starting with '#' or '*' are comments (PowerActions_LoadCfg 0x578EC0).