diff --git a/build.xml b/build.xml
index 2e8aa6e0f..9dde5405f 100644
--- a/build.xml
+++ b/build.xml
@@ -238,7 +238,7 @@
 				<include name="html/images/sponsor_banner" />
 				<include name="lib/crg-scoreboard.jar" />
 				<include name="config/crg.scoreboard.properties" />
-				<include name="config/penalties.json" />
+				<include name="config/penalties/**" />
 				<include name="config/default/**" />
 			</zipfileset>
 		</zip>
diff --git a/config/wftda2016.json b/config/penalties/wftda2016.json
similarity index 100%
rename from config/wftda2016.json
rename to config/penalties/wftda2016.json
diff --git a/config/wftda2018.json b/config/penalties/wftda2018.json
similarity index 100%
rename from config/wftda2018.json
rename to config/penalties/wftda2018.json
diff --git a/src/com/carolinarollergirls/scoreboard/Ruleset.java b/src/com/carolinarollergirls/scoreboard/Ruleset.java
index 4c7ec4fb3..d3fe5bc79 100644
--- a/src/com/carolinarollergirls/scoreboard/Ruleset.java
+++ b/src/com/carolinarollergirls/scoreboard/Ruleset.java
@@ -51,7 +51,7 @@ private static Ruleset initialize() {
 			newRule( new StringRule(false, "ScoreBoard", Clock.ID_INTERMISSION, "Unofficial",    "", "Unofficial Score"));
 			newRule( new StringRule(false, "ScoreBoard", Clock.ID_INTERMISSION, "Official",      "", "Final Score"));
 			newRule( new StringRule(false, "ScoreBoard", null, "BackgroundStyle", "", "bg_black"));
-			newRule( new StringRule(false, "ScoreBoard", null, "PenaltyDefinitionFile", "", "/config/wftda2018.json"));
+			newRule( new StringRule(false, "ScoreBoard", null, "PenaltyDefinitionFile", "", "/config/penalties/wftda2018.json"));
 			newRule( new StringRule(false, "ScoreBoard", null, "BoxStyle",        "", "box_flat"));
 			newRule( new StringRule(false, "ScoreBoard", null, "CurrentView",     "", "scoreboard"));
 			newRule( new StringRule(false, "ScoreBoard", null, "CustomHtml",      "", "/customhtml/fullscreen/example.html"));